Repository navigation
feat(aws-msk-apache-kafka-cluster-master): extra SCRAM secret ARNs and sensitive password output - #367
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two changes to
aws-msk-apache-kafka-cluster-master, one commit each.1.
feat: extra SCRAM secret ARNs in the cluster associationaws_msk_scram_secret_association.defaultonly listed the module's own secret. If a SCRAM secret was associated with the cluster outside Terraform, the next apply disassociated it, because the resource manages the whole list.This adds an optional
extra_scram_secret_arnsinput. Its ARNs are added to the association after the module-managed secret, andcompact()removes empty entries.variables.tf: newextra_scram_secret_arns(list(string), default[])main.tf:secret_arn_list = compact(concat([aws_secretsmanager_secret.sm[0].arn], var.extra_scram_secret_arns));countis unchangedREADME.md: input documented2.
fix: mark thepasswordoutput sensitiveThe
passwordoutput (added in 0.2.0) was not markedsensitive. Any plan or apply that shows outputs, including CI logs, uploaded plan files and plan text posted to PR comments, printed the module-managed SCRAM user's password in plain text.outputs.tf:sensitive = trueand a description. The value expression is unchanged.README.md:passwordadded to the Outputs tableNotes for callers
password: a root module that re-exportspasswordmust mark its own outputsensitive = true. Otherwiseterraform planfails with "Output refers to sensitive values".encryption_at_rest_kms_key_arn).extra_scram_secret_arnsat its default[], the association is the same single ARN as before. The only plan change is thepasswordoutput becoming(sensitive value).Validation
Run from
modules/aws-msk-apache-kafka-cluster-master:terraform init -backend=false: OKterraform validate: Successterraform fmt -check main.tf variables.tf: OKterraform fmt -check outputs.tf: flags one line, the double space invalue = var.client_sasl_scram_enabled ? …in thepasswordoutput. That line is unchanged frommain, and this PR leaves it as is to keep the diff minimal.Not run:
terraform plan, which needs real inputs and AWS credentials.Release
Squash-merge takes the PR title as the release-please entry, so the
fixabove ships in the same minor release without its own changelog line unless the squash body lists it.BEGIN_COMMIT_OVERRIDE
feat(aws-msk-apache-kafka-cluster-master): allow extra SCRAM secret ARNs in the cluster association
fix(aws-msk-apache-kafka-cluster-master): mark the password output sensitive
END_COMMIT_OVERRIDE