Merge pull request #7933 from kterada0509/feature/add-update-step-for…

…-backup-vault Add update step for change tags for aws_backup_vault resource
hashicorp · Mar 15, 2019 · 0350a64 · 0350a64
2 parents cdbeca9 + 5baf294
commit 0350a64
Show file tree

Hide file tree

Showing 2 changed files with 103 additions and 1 deletion.
diff --git a/aws/resource_aws_backup_vault.go b/aws/resource_aws_backup_vault.go
@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+	"log"
 	"regexp"
 
 	"github.com/hashicorp/terraform/helper/validation"
@@ -15,6 +16,7 @@ func resourceAwsBackupVault() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceAwsBackupVaultCreate,
 		Read:   resourceAwsBackupVaultRead,
+		Update: resourceAwsBackupVaultUpdate,
 		Delete: resourceAwsBackupVaultDelete,
 
 		Schema: map[string]*schema.Schema{
@@ -27,7 +29,6 @@ func resourceAwsBackupVault() *schema.Resource {
 			"tags": {
 				Type:     schema.TypeMap,
 				Optional: true,
-				ForceNew: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 			"kms_key_arn": {
@@ -82,6 +83,11 @@ func resourceAwsBackupVaultRead(d *schema.ResourceData, meta interface{}) error
 	}
 
 	resp, err := conn.DescribeBackupVault(input)
+	if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") {
+		log.Printf("[WARN] Backup Vault %s not found, removing from state", d.Id())
+		d.SetId("")
+		return nil
+	}
 	if err != nil {
 		return fmt.Errorf("error reading Backup Vault (%s): %s", d.Id(), err)
 	}
@@ -105,6 +111,54 @@ func resourceAwsBackupVaultRead(d *schema.ResourceData, meta interface{}) error
 	return nil
 }
 
+func resourceAwsBackupVaultUpdate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).backupconn
+
+	if d.HasChange("tags") {
+		resourceArn := d.Get("arn").(string)
+		oraw, nraw := d.GetChange("tags")
+		create, remove := diffTagsGeneric(oraw.(map[string]interface{}), nraw.(map[string]interface{}))
+
+		if len(remove) > 0 {
+			log.Printf("[DEBUG] Removing tags: %#v", remove)
+			keys := make([]*string, 0, len(remove))
+			for k := range remove {
+				keys = append(keys, aws.String(k))
+			}
+
+			_, err := conn.UntagResource(&backup.UntagResourceInput{
+				ResourceArn: aws.String(resourceArn),
+				TagKeyList:  keys,
+			})
+			if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") {
+				log.Printf("[WARN] Backup Vault %s not found, removing from state", d.Id())
+				d.SetId("")
+				return nil
+			}
+			if err != nil {
+				return fmt.Errorf("Error removing tags for (%s): %s", d.Id(), err)
+			}
+		}
+		if len(create) > 0 {
+			log.Printf("[DEBUG] Creating tags: %#v", create)
+			_, err := conn.TagResource(&backup.TagResourceInput{
+				ResourceArn: aws.String(resourceArn),
+				Tags:        create,
+			})
+			if isAWSErr(err, backup.ErrCodeResourceNotFoundException, "") {
+				log.Printf("[WARN] Backup Vault %s not found, removing from state", d.Id())
+				d.SetId("")
+				return nil
+			}
+			if err != nil {
+				return fmt.Errorf("Error setting tags for (%s): %s", d.Id(), err)
+			}
+		}
+	}
+
+	return resourceAwsBackupVaultRead(d, meta)
+}
+
 func resourceAwsBackupVaultDelete(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).backupconn
 

diff --git a/aws/resource_aws_backup_vault_test.go b/aws/resource_aws_backup_vault_test.go
@@ -68,6 +68,26 @@ func TestAccAwsBackupVault_withTags(t *testing.T) {
 					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.left", "right"),
 				),
 			},
+			{
+				Config: testAccBackupVaultWithUpdateTags(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsBackupVaultExists("aws_backup_vault.test", &vault),
+					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.%", "4"),
+					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.up", "downdown"),
+					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.left", "rightright"),
+					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.foo", "bar"),
+					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.fizz", "buzz"),
+				),
+			},
+			{
+				Config: testAccBackupVaultWithRemoveTags(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsBackupVaultExists("aws_backup_vault.test", &vault),
+					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.%", "2"),
+					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.foo", "bar"),
+					resource.TestCheckResourceAttr("aws_backup_vault.test", "tags.fizz", "buzz"),
+				),
+			},
 		},
 	})
 }
@@ -151,3 +171,31 @@ resource "aws_backup_vault" "test" {
 }
 `, randInt)
 }
+
+func testAccBackupVaultWithUpdateTags(randInt int) string {
+	return fmt.Sprintf(`
+resource "aws_backup_vault" "test" {
+	name = "tf_acc_test_backup_vault_%d"
+	
+	tags = {
+		up		= "downdown"
+		left	= "rightright"
+		foo		= "bar"
+		fizz	= "buzz"
+	}
+}
+`, randInt)
+}
+
+func testAccBackupVaultWithRemoveTags(randInt int) string {
+	return fmt.Sprintf(`
+resource "aws_backup_vault" "test" {
+	name = "tf_acc_test_backup_vault_%d"
+
+	tags = {
+		foo		= "bar"
+		fizz	= "buzz"
+	}
+}
+`, randInt)
+}