resource/aws_db_proxy: Address linter issues

hashicorp · Aug 3, 2020 · 00ab3d2 · 00ab3d2
1 parent 33c9d39
commit 00ab3d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/aws/resource_aws_db_proxy.go b/aws/resource_aws_db_proxy.go
@@ -263,6 +263,7 @@ func flattenDbProxyAuths(userAuthConfigs []*rds.UserAuthConfigInfo) *schema.Set
 
 func resourceAwsDbProxyRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).rdsconn
+	ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig
 
 	params := rds.DescribeDBProxiesInput{
 		DBProxyName: aws.String(d.Id()),
@@ -302,7 +303,11 @@ func resourceAwsDbProxyRead(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("Error listing tags for RDS DB Proxy (%s): %s", d.Get("arn").(string), err)
 	}
 
-	if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil {
+	// if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
+	// 	return fmt.Errorf("error setting tags: %s", err)
+	// }
+
+	if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
 		return fmt.Errorf("Error setting tags: %s", err)
 	}
 

diff --git a/aws/resource_aws_db_proxy_test.go b/aws/resource_aws_db_proxy_test.go
@@ -82,8 +82,7 @@ func TestAccAWSDBProxy_basic(t *testing.T) {
 						resourceName, "name", name),
 					resource.TestCheckResourceAttr(
 						resourceName, "engine_family", "MYSQL"),
-					resource.TestMatchResourceAttr(
-						resourceName, "arn", regexp.MustCompile(`^arn:[^:]+:rds:[^:]+:\d{12}:db-proxy:.+`)),
+					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "rds", regexp.MustCompile(`db-proxy:.+`)),
 				),
 			},
 			{