From 1bde07f4968d9c934dcf29913c6a4829b590ce88 Mon Sep 17 00:00:00 2001 From: Joshua Carp Date: Fri, 3 Mar 2017 10:32:04 -0500 Subject: [PATCH] Skip tag operations on cloudwatch logs in govcloud partition. --- .../aws/resource_aws_cloudwatch_log_group.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/builtin/providers/aws/resource_aws_cloudwatch_log_group.go b/builtin/providers/aws/resource_aws_cloudwatch_log_group.go index 7bbd30621..aecc842b1 100644 --- a/builtin/providers/aws/resource_aws_cloudwatch_log_group.go +++ b/builtin/providers/aws/resource_aws_cloudwatch_log_group.go @@ -91,11 +91,13 @@ func resourceAwsCloudWatchLogGroupRead(d *schema.ResourceData, meta interface{}) d.Set("retention_in_days", lg.RetentionInDays) } - tags, err := flattenCloudWatchTags(d, conn) - if err != nil { - return err + if meta.(*AWSClient).partition != "aws-us-gov" { + tags, err := flattenCloudWatchTags(d, conn) + if err != nil { + return err + } + d.Set("tags", tags) } - d.Set("tags", tags) return nil } @@ -152,7 +154,7 @@ func resourceAwsCloudWatchLogGroupUpdate(d *schema.ResourceData, meta interface{ } } - if d.HasChange("tags") { + if meta.(*AWSClient).partition != "aws-us-gov" && d.HasChange("tags") { oraw, nraw := d.GetChange("tags") o := oraw.(map[string]interface{}) n := nraw.(map[string]interface{})