Merge pull request #24218 from stijndehaes/feature/add-support-for-ek…

…s-add-on-preserve feat: Add support for preserve to eks add-on
hashicorp · Apr 13, 2022 · d0c49cd · d0c49cd
2 parents f5d5c02 + c333c9b
commit d0c49cd
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 58 deletions.
diff --git a/.changelog/24218.txt b/.changelog/24218.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_eks_addon: Add `preserve` argument
+```
diff --git a/internal/service/eks/addon.go b/internal/service/eks/addon.go
@@ -68,6 +68,10 @@ func ResourceAddon() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"preserve": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
 			"resolve_conflicts": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -279,11 +283,17 @@ func resourceAddonDelete(ctx context.Context, d *schema.ResourceData, meta inter
 		return diag.FromErr(err)
 	}
 
-	log.Printf("[DEBUG] Deleting EKS Add-On: %s", d.Id())
-	_, err = conn.DeleteAddonWithContext(ctx, &eks.DeleteAddonInput{
+	input := &eks.DeleteAddonInput{
 		AddonName:   aws.String(addonName),
 		ClusterName: aws.String(clusterName),
-	})
+	}
+
+	if v, ok := d.GetOk("preserve"); ok {
+		input.Preserve = aws.Bool(v.(bool))
+	}
+
+	log.Printf("[DEBUG] Deleting EKS Add-On: %s", d.Id())
+	_, err = conn.DeleteAddonWithContext(ctx, input)
 
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("error deleting EKS Add-On (%s): %w", d.Id(), err))

diff --git a/internal/service/eks/addon_data_source_test.go b/internal/service/eks/addon_data_source_test.go
@@ -27,7 +27,7 @@ func TestAccEKSAddonDataSource_basic(t *testing.T) {
 		CheckDestroy:      testAccCheckAddonDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAddonDataSourceConfig_Basic(rName, addonName),
+				Config: testAccAddonDataSourceConfig(rName, addonName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAddonExists(ctx, dataSourceResourceName, &addon),
 					acctest.MatchResourceAttrRegionalARN(dataSourceResourceName, "arn", "eks", regexp.MustCompile(fmt.Sprintf("addon/%s/%s/.+$", rName, addonName))),
@@ -43,8 +43,8 @@ func TestAccEKSAddonDataSource_basic(t *testing.T) {
 	})
 }
 
-func testAccAddonDataSourceConfig_Basic(rName, addonName string) string {
-	return acctest.ConfigCompose(testAccAddonConfig_Base(rName), fmt.Sprintf(`
+func testAccAddonDataSourceConfig(rName, addonName string) string {
+	return acctest.ConfigCompose(testAccAddonBaseConfig(rName), fmt.Sprintf(`
 resource "aws_eks_addon" "test" {
   addon_name   = %[2]q
   cluster_name = aws_eks_cluster.test.name