Merge pull request #14319 from hashicorp/f-update-partition-check

provider/aws: Use helper methods for checking partition
hashicorp · May 9, 2017 · 4677aca · 4677aca
2 parents 88c2e29 + 67ea7a3
commit 4677aca
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/builtin/providers/aws/resource_aws_cloudwatch_log_group.go b/builtin/providers/aws/resource_aws_cloudwatch_log_group.go
@@ -109,7 +109,7 @@ func resourceAwsCloudWatchLogGroupRead(d *schema.ResourceData, meta interface{})
 		d.Set("retention_in_days", lg.RetentionInDays)
 	}
 
-	if meta.(*AWSClient).partition != "aws-us-gov" {
+	if !meta.(*AWSClient).IsChinaCloud() && !meta.(*AWSClient).IsGovCloud() {
 		tags, err := flattenCloudWatchTags(d, conn)
 		if err != nil {
 			return err
@@ -172,7 +172,9 @@ func resourceAwsCloudWatchLogGroupUpdate(d *schema.ResourceData, meta interface{
 		}
 	}
 
-	if meta.(*AWSClient).partition != "aws-us-gov" && d.HasChange("tags") {
+	restricted := meta.(*AWSClient).IsChinaCloud() || meta.(*AWSClient).IsGovCloud()
+
+	if !restricted && d.HasChange("tags") {
 		oraw, nraw := d.GetChange("tags")
 		o := oraw.(map[string]interface{})
 		n := nraw.(map[string]interface{})