Merge pull request #12414 from jmcarp/govcloud-cloudwatchlogs-tags

Skip tag operations on cloudwatch logs in govcloud partition.
pull/14262/merge
Jake Champlin 9 years ago committed by GitHub
commit 7b05d7f050

@ -109,11 +109,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
}
@ -170,7 +172,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{})

Loading…
Cancel
Save