Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions pkg/config/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,20 @@ func (c ClusterConfig) NewAdminClient(
var saslUsername string
var saslPassword string
var secretsManagerArn string

overridingUserPass := false
if opts.UsernameOverride != "" {
log.Debugf("Setting SASL username from override value")
saslUsername = opts.UsernameOverride
overridingUserPass = true
} else {
saslUsername = c.Spec.SASL.Username
}

if opts.PasswordOverride != "" {
log.Debugf("Setting SASL password from override value")
saslPassword = opts.PasswordOverride
overridingUserPass = true
} else {
saslPassword = c.Spec.SASL.Password
}
Expand All @@ -238,6 +242,15 @@ func (c ClusterConfig) NewAdminClient(
} else {
secretsManagerArn = c.Spec.SASL.SecretsManagerArn
}
if overridingUserPass {
// Make sure both user and pass were provided
if saslUsername == "" || saslPassword == "" {
return nil, errors.New("Both username and password are required when overriding config")
} else {
log.Warn("Username/Password override takes precedence over SecretsManagerArn")
secretsManagerArn = ""
}
}

var saslMechanism admin.SASLMechanism
var err error
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package version

// Version is the current topicctl version.
const Version = "1.19.1"
const Version = "1.19.2"