Skip to content
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

r/aws_eks_cluster: Don't associate an encryption_config if there's already one #19986

Merged
merged 3 commits into from
Jul 7, 2021

Conversation

ewbankkit
Copy link
Contributor

@ewbankkit ewbankkit commented Jun 28, 2021

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #19968.

Output from acceptance testing:

Commercial

% make testacc TEST=./aws TESTARGS='-run=TestAccAWSEksCluster_EncryptionConfig_VersionUpdate\|TestAccAWSEksCluster_EncryptionConfig_Create\|TestAccAWSEksCluster_EncryptionConfig_Update'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSEksCluster_EncryptionConfig_VersionUpdate\|TestAccAWSEksCluster_EncryptionConfig_Create\|TestAccAWSEksCluster_EncryptionConfig_Update -timeout 180m
=== RUN   TestAccAWSEksCluster_EncryptionConfig_Create
=== PAUSE TestAccAWSEksCluster_EncryptionConfig_Create
=== RUN   TestAccAWSEksCluster_EncryptionConfig_Update
=== PAUSE TestAccAWSEksCluster_EncryptionConfig_Update
=== RUN   TestAccAWSEksCluster_EncryptionConfig_VersionUpdate
=== PAUSE TestAccAWSEksCluster_EncryptionConfig_VersionUpdate
=== CONT  TestAccAWSEksCluster_EncryptionConfig_Create
=== CONT  TestAccAWSEksCluster_EncryptionConfig_VersionUpdate
=== CONT  TestAccAWSEksCluster_EncryptionConfig_Update
--- PASS: TestAccAWSEksCluster_EncryptionConfig_Create (701.52s)
--- PASS: TestAccAWSEksCluster_EncryptionConfig_VersionUpdate (2181.28s)
--- PASS: TestAccAWSEksCluster_EncryptionConfig_Update (3741.37s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	3744.552s

GovCloud

% make testacc TEST=./aws TESTARGS='-run=TestAccAWSEksCluster_EncryptionConfig_VersionUpdate\|TestAccAWSEksCluster_EncryptionConfig_Create\|TestAccAWSEksCluster_EncryptionConfig_Update'

==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSEksCluster_EncryptionConfig_VersionUpdate\|TestAccAWSEksCluster_EncryptionConfig_Create\|TestAccAWSEksCluster_EncryptionConfig_Update -timeout 180m
=== RUN   TestAccAWSEksCluster_EncryptionConfig_Create
=== PAUSE TestAccAWSEksCluster_EncryptionConfig_Create
=== RUN   TestAccAWSEksCluster_EncryptionConfig_Update
=== PAUSE TestAccAWSEksCluster_EncryptionConfig_Update
=== RUN   TestAccAWSEksCluster_EncryptionConfig_VersionUpdate
=== PAUSE TestAccAWSEksCluster_EncryptionConfig_VersionUpdate
=== CONT  TestAccAWSEksCluster_EncryptionConfig_Create
=== CONT  TestAccAWSEksCluster_EncryptionConfig_VersionUpdate
=== CONT  TestAccAWSEksCluster_EncryptionConfig_Update
--- PASS: TestAccAWSEksCluster_EncryptionConfig_Create (779.08s)
--- PASS: TestAccAWSEksCluster_EncryptionConfig_VersionUpdate (2126.62s)
--- PASS: TestAccAWSEksCluster_EncryptionConfig_Update (3491.77s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	3495.209s

@ewbankkit ewbankkit changed the title r/aws_eks_cluster: Don't associate an encryption_config if there's already one [WIP] r/aws_eks_cluster: Don't associate an encryption_config if there's already one Jun 28, 2021
@github-actions github-actions bot added service/eks Issues and PRs that pertain to the eks service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/M Managed by automation to categorize the size of a PR. labels Jun 28, 2021
@ewbankkit ewbankkit changed the title [WIP] r/aws_eks_cluster: Don't associate an encryption_config if there's already one r/aws_eks_cluster: Don't associate an encryption_config if there's already one Jul 2, 2021
@petewilcock
Copy link

@ewbankkit Looks good, hope this can make it to next version release as we're still hitting this.

@YakDriver YakDriver self-assigned this Jul 6, 2021
Copy link
Member

@YakDriver YakDriver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! 🎉

Acceptance tests on us-west-2:

--- PASS: TestAccAWSEksCluster_EncryptionConfig_Create (655.57s)
--- PASS: TestAccAWSEksCluster_EncryptionConfig_VersionUpdate (2269.50s)
--- PASS: TestAccAWSEksCluster_EncryptionConfig_Update (3451.46s)

Acceptance tests on GovCloud:

--- PASS: TestAccAWSEksCluster_EncryptionConfig_Create (594.18s)
--- PASS: TestAccAWSEksCluster_EncryptionConfig_VersionUpdate (2305.52s)
--- PASS: TestAccAWSEksCluster_EncryptionConfig_Update (3389.76s)

@ewbankkit ewbankkit merged commit e858d1f into main Jul 7, 2021
@ewbankkit ewbankkit deleted the b-aws_eks_cluster-version-update-encryption_config branch July 7, 2021 17:52
github-actions bot pushed a commit that referenced this pull request Jul 7, 2021
@github-actions
Copy link

github-actions bot commented Aug 7, 2021

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
service/eks Issues and PRs that pertain to the eks service. size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EKS KMS Envelope Encryption: InvalidParameterException: Encryption is already enabled on the cluster
3 participants