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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2f2b1d
r/aws_eks_cluster: Don't associate an encryption_config if there's al…
ewbankkit Jun 28, 2021
3392527
Add CHANGELOG entry.
ewbankkit Jun 28, 2021
38971b4
r/aws_eks_cluster: Remove extra 'ForceNew's.
ewbankkit Jul 2, 2021
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
3 changes: 3 additions & 0 deletions .changelog/19986.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_eks_cluster: Don't associate an `encryption_config` if there's already one
```
31 changes: 17 additions & 14 deletions aws/resource_aws_eks_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ func resourceAwsEksCluster() *schema.Resource {
},
"resources": {
Type: schema.TypeSet,
MinItems: 1,
Required: true,
Elem: &schema.Schema{
Type: schema.TypeString,
Expand Down Expand Up @@ -409,24 +408,28 @@ func resourceAwsEksClusterUpdate(d *schema.ResourceData, meta interface{}) error
}

if d.HasChange("encryption_config") {
input := &eks.AssociateEncryptionConfigInput{
ClusterName: aws.String(d.Id()),
EncryptionConfig: expandEksEncryptionConfig(d.Get("encryption_config").([]interface{})),
}
o, n := d.GetChange("encryption_config")

log.Printf("[DEBUG] Associating EKS Cluster (%s) encryption config: %s", d.Id(), input)
output, err := conn.AssociateEncryptionConfig(input)
if len(o.([]interface{})) == 0 && len(n.([]interface{})) == 1 {
input := &eks.AssociateEncryptionConfigInput{
ClusterName: aws.String(d.Id()),
EncryptionConfig: expandEksEncryptionConfig(d.Get("encryption_config").([]interface{})),
}

if err != nil {
return fmt.Errorf("error associating EKS Cluster (%s) encryption config: %w", d.Id(), err)
}
log.Printf("[DEBUG] Associating EKS Cluster (%s) encryption config: %s", d.Id(), input)
output, err := conn.AssociateEncryptionConfig(input)

updateID := aws.StringValue(output.Update.Id)
if err != nil {
return fmt.Errorf("error associating EKS Cluster (%s) encryption config: %w", d.Id(), err)
}

_, err = waiter.ClusterUpdateSuccessful(conn, d.Id(), updateID, d.Timeout(schema.TimeoutUpdate))
updateID := aws.StringValue(output.Update.Id)

if err != nil {
return fmt.Errorf("error waiting for EKS Cluster (%s) encryption config association (%s): %w", d.Id(), updateID, err)
_, err = waiter.ClusterUpdateSuccessful(conn, d.Id(), updateID, d.Timeout(schema.TimeoutUpdate))

if err != nil {
return fmt.Errorf("error waiting for EKS Cluster (%s) encryption config association (%s): %w", d.Id(), updateID, err)
}
}
}

Expand Down
81 changes: 78 additions & 3 deletions aws/resource_aws_eks_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func TestAccAWSEksCluster_EncryptionConfig_Create(t *testing.T) {
}

func TestAccAWSEksCluster_EncryptionConfig_Update(t *testing.T) {
var cluster eks.Cluster
var cluster1, cluster2 eks.Cluster
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_eks_cluster.test"
kmsKeyResourceName := "aws_kms_key.test"
Expand All @@ -188,14 +188,15 @@ func TestAccAWSEksCluster_EncryptionConfig_Update(t *testing.T) {
{
Config: testAccAWSEksClusterConfig_Required(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEksClusterExists(resourceName, &cluster),
testAccCheckAWSEksClusterExists(resourceName, &cluster1),
resource.TestCheckResourceAttr(resourceName, "encryption_config.#", "0"),
),
},
{
Config: testAccAWSEksClusterConfig_EncryptionConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEksClusterExists(resourceName, &cluster),
testAccCheckAWSEksClusterExists(resourceName, &cluster2),
testAccCheckAWSEksClusterNotRecreated(&cluster1, &cluster2),
resource.TestCheckResourceAttr(resourceName, "encryption_config.#", "1"),
resource.TestCheckResourceAttr(resourceName, "encryption_config.0.provider.#", "1"),
resource.TestCheckResourceAttrPair(resourceName, "encryption_config.0.provider.0.key_arn", kmsKeyResourceName, "arn"),
Expand All @@ -211,6 +212,51 @@ func TestAccAWSEksCluster_EncryptionConfig_Update(t *testing.T) {
})
}

// https://github.com/hashicorp/terraform-provider-aws/issues/19968.
func TestAccAWSEksCluster_EncryptionConfig_VersionUpdate(t *testing.T) {
var cluster1, cluster2 eks.Cluster
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_eks_cluster.test"
kmsKeyResourceName := "aws_kms_key.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSEks(t) },
ErrorCheck: testAccErrorCheck(t, eks.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSEksClusterDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSEksClusterConfig_EncryptionConfig_Version(rName, "1.19"),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEksClusterExists(resourceName, &cluster1),
resource.TestCheckResourceAttr(resourceName, "encryption_config.#", "1"),
resource.TestCheckResourceAttr(resourceName, "encryption_config.0.provider.#", "1"),
resource.TestCheckResourceAttrPair(resourceName, "encryption_config.0.provider.0.key_arn", kmsKeyResourceName, "arn"),
resource.TestCheckResourceAttr(resourceName, "encryption_config.0.resources.#", "1"),
resource.TestCheckResourceAttr(resourceName, "version", "1.19"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAWSEksClusterConfig_EncryptionConfig_Version(rName, "1.20"),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEksClusterExists(resourceName, &cluster2),
testAccCheckAWSEksClusterNotRecreated(&cluster1, &cluster2),
resource.TestCheckResourceAttr(resourceName, "encryption_config.#", "1"),
resource.TestCheckResourceAttr(resourceName, "encryption_config.0.provider.#", "1"),
resource.TestCheckResourceAttrPair(resourceName, "encryption_config.0.provider.0.key_arn", kmsKeyResourceName, "arn"),
resource.TestCheckResourceAttr(resourceName, "encryption_config.0.resources.#", "1"),
resource.TestCheckResourceAttr(resourceName, "version", "1.20"),
),
},
},
})
}

func TestAccAWSEksCluster_Version(t *testing.T) {
var cluster1, cluster2 eks.Cluster
rName := acctest.RandomWithPrefix("tf-acc-test")
Expand Down Expand Up @@ -816,6 +862,35 @@ resource "aws_eks_cluster" "test" {
`, rName))
}

func testAccAWSEksClusterConfig_EncryptionConfig_Version(rName, version string) string {
return composeConfig(testAccAWSEksClusterConfig_Base(rName), fmt.Sprintf(`
resource "aws_kms_key" "test" {
description = %[1]q
deletion_window_in_days = 7
}

resource "aws_eks_cluster" "test" {
name = %[1]q
role_arn = aws_iam_role.test.arn
version = %[2]q

encryption_config {
resources = ["secrets"]

provider {
key_arn = aws_kms_key.test.arn
}
}

vpc_config {
subnet_ids = aws_subnet.test[*].id
}

depends_on = [aws_iam_role_policy_attachment.test-AmazonEKSClusterPolicy]
}
`, rName, version))
}

func testAccAWSEksClusterConfig_VpcConfig_SecurityGroupIds(rName string) string {
return composeConfig(testAccAWSEksClusterConfig_Base(rName), fmt.Sprintf(`
resource "aws_security_group" "test" {
Expand Down