Merge pull request #19086 from hashicorp/td-resource-update-with-has-…

…changes-except-clean-up resources: addition of "tags_all" to resource `Update` functions using `d.HasChangesExcept("tags"...)` and `d.HasChangeExcept`
hashicorp · Apr 23, 2021 · 244a32f · 244a32f
2 parents a3cb86b + 92acf8a
commit 244a32f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/aws/resource_aws_ebs_volume.go b/aws/resource_aws_ebs_volume.go
@@ -170,7 +170,7 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
 func resourceAWSEbsVolumeUpdate(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).ec2conn
 
-	if d.HasChangesExcept("tags") {
+	if d.HasChangesExcept("tags", "tags_all") {
 		params := &ec2.ModifyVolumeInput{
 			VolumeId: aws.String(d.Id()),
 		}

diff --git a/aws/resource_aws_ec2_managed_prefix_list.go b/aws/resource_aws_ec2_managed_prefix_list.go
@@ -114,7 +114,7 @@ func resourceAwsEc2ManagedPrefixListCreate(d *schema.ResourceData, meta interfac
 		input.PrefixListName = aws.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("tags"); ok && len(v.(map[string]interface{})) > 0 {
+	if len(tags) > 0 {
 		input.TagSpecifications = ec2TagSpecificationsFromKeyValueTags(tags, "prefix-list")
 	}
 
@@ -209,7 +209,7 @@ func resourceAwsEc2ManagedPrefixListRead(d *schema.ResourceData, meta interface{
 func resourceAwsEc2ManagedPrefixListUpdate(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).ec2conn
 
-	if d.HasChangeExcept("tags") {
+	if d.HasChangesExcept("tags", "tags_all") {
 		input := &ec2.ModifyManagedPrefixListInput{
 			PrefixListId: aws.String(d.Id()),
 		}

diff --git a/aws/resource_aws_mwaa_environment.go b/aws/resource_aws_mwaa_environment.go
@@ -391,7 +391,7 @@ func resourceAwsMwaaEnvironmentUpdate(d *schema.ResourceData, meta interface{})
 		Name: aws.String(d.Get("name").(string)),
 	}
 
-	if d.HasChangesExcept("tags") {
+	if d.HasChangesExcept("tags", "tags_all") {
 		if d.HasChange("airflow_configuration_options") {
 			options, ok := d.GetOk("airflow_configuration_options")
 			if !ok {

diff --git a/aws/resource_aws_ssm_document.go b/aws/resource_aws_ssm_document.go
@@ -406,7 +406,7 @@ func resourceAwsSsmDocumentUpdate(d *schema.ResourceData, meta interface{}) erro
 		return nil
 	}
 
-	if d.HasChangesExcept("tags", "permissions") {
+	if d.HasChangesExcept("tags", "tags_all", "permissions") {
 		if err := updateAwsSSMDocument(d, meta); err != nil {
 			return err
 		}

diff --git a/aws/resource_aws_synthetics_canary.go b/aws/resource_aws_synthetics_canary.go
@@ -401,7 +401,7 @@ func resourceAwsSyntheticsCanaryRead(d *schema.ResourceData, meta interface{}) e
 func resourceAwsSyntheticsCanaryUpdate(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).syntheticsconn
 
-	if d.HasChangesExcept("tags", "start_canary") {
+	if d.HasChangesExcept("tags", "tags_all", "start_canary") {
 		input := &synthetics.UpdateCanaryInput{
 			Name: aws.String(d.Id()),
 		}