Skip to content

[exporter/kafkaexporter] Skip Username and Password config validation for IAM #37417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Mar 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
64ac675
Add test for IAM mechanism without usr/pwd credentials
xavirg Jan 22, 2025
9ba8333
Skip usr/pwd validation if IAM mechanism is selected
xavirg Jan 22, 2025
9b11d06
Merge branch 'main' into main
xavirg Jan 22, 2025
5680e22
Merge branch 'main' into main
xavirg Jan 22, 2025
eab1701
Merge branch 'main' into main
xavirg Jan 22, 2025
e01e0a2
Merge branch 'main' into main
xavirg Jan 23, 2025
3289814
add chlog entry
xavirg Jan 24, 2025
0129553
Merge branch 'main' into main
xavirg Jan 24, 2025
854d9d8
Merge branch 'main' into main
xavirg Jan 27, 2025
5785ae7
Merge branch 'main' into main
xavirg Jan 29, 2025
5d8a7a8
Merge branch 'main' into main
xavirg Jan 31, 2025
8ea66ca
Merge branch 'main' into main
xavirg Jan 31, 2025
481c0bc
Merge branch 'main' into main
xavirg Feb 1, 2025
793983b
Merge branch 'main' into main
xavirg Feb 5, 2025
8fbb7f6
Merge branch 'main' into main
xavirg Feb 6, 2025
1e52226
Merge branch 'main' into main
xavirg Feb 11, 2025
a6c4a54
Merge branch 'main' into main
xavirg Feb 19, 2025
a26d7a4
Merge branch 'main' into main
xavirg Feb 19, 2025
9e468cd
Merge branch 'main' into main
MovieStoreGuy Feb 19, 2025
c50b1e0
Merge branch 'main' into main
xavirg Feb 20, 2025
e738ba2
Merge branch 'main' into main
xavirg Feb 21, 2025
1576b79
Merge branch 'main' into main
xavirg Feb 22, 2025
b4c860a
Merge branch 'main' into main
xavirg Feb 24, 2025
d5cc454
Update exporter/kafkaexporter/config_test.go
atoulme Mar 4, 2025
22679e1
Merge branch 'main' into main
atoulme Mar 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .chloggen/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: exporter/kafka

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: do not ask for user and password if auth mechanism is set to AWS IAM

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [37417]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
13 changes: 7 additions & 6 deletions exporter/kafkaexporter/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,13 @@ func validateSASLConfig(c *kafka.SASLConfig) error {
return nil
}

if c.Username == "" {
return fmt.Errorf("auth.sasl.username is required")
}

if c.Password == "" {
return fmt.Errorf("auth.sasl.password is required")
if c.Mechanism != "AWS_MSK_IAM" && c.Mechanism != "AWS_MSK_IAM_OAUTHBEARER" {
if c.Username == "" {
return fmt.Errorf("auth.sasl.username is required")
}
if c.Password == "" {
return fmt.Errorf("auth.sasl.password is required")
}
}

switch c.Mechanism {
Expand Down
16 changes: 16 additions & 0 deletions exporter/kafkaexporter/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,22 @@ func TestValidate_sasl_version(t *testing.T) {
assert.EqualError(t, err, "auth.sasl.version has to be either 0 or 1. configured value 42")
}

func TestValidate_sasl_iam(t *testing.T) {
config := &Config{
Producer: Producer{
Compression: "none",
},
Authentication: kafka.Authentication{
SASL: &kafka.SASLConfig{
Mechanism: "AWS_MSK_IAM",
},
},
}

err := config.Validate()
assert.NoError(t, err)
}

func Test_saramaProducerCompressionCodec(t *testing.T) {
tests := map[string]struct {
compression string
Expand Down