From 91d51d67117c811be3726d559eb440f4e6a1d3af Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 8 Jun 2020 16:27:32 -0400 Subject: [PATCH 1/2] remove unused params in waf resources --- aws/resource_aws_wafregional_web_acl_association.go | 7 +++---- aws/resource_aws_wafregional_web_acl_association_test.go | 6 +++--- aws/resource_aws_wafv2_rule_group_test.go | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/aws/resource_aws_wafregional_web_acl_association.go b/aws/resource_aws_wafregional_web_acl_association.go index c7814f654e4a..e2e22384e89f 100644 --- a/aws/resource_aws_wafregional_web_acl_association.go +++ b/aws/resource_aws_wafregional_web_acl_association.go @@ -78,7 +78,7 @@ func resourceAwsWafRegionalWebAclAssociationCreate(d *schema.ResourceData, meta func resourceAwsWafRegionalWebAclAssociationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafregionalconn - _, resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(d.Id()) + resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(d.Id()) input := &wafregional.GetWebACLForResourceInput{ ResourceArn: aws.String(resourceArn), @@ -111,7 +111,7 @@ func resourceAwsWafRegionalWebAclAssociationRead(d *schema.ResourceData, meta in func resourceAwsWafRegionalWebAclAssociationDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).wafregionalconn - _, resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(d.Id()) + resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(d.Id()) log.Printf("[INFO] Deleting WAF Regional Web ACL association: %s", resourceArn) @@ -124,9 +124,8 @@ func resourceAwsWafRegionalWebAclAssociationDelete(d *schema.ResourceData, meta return err } -func resourceAwsWafRegionalWebAclAssociationParseId(id string) (webAclId, resourceArn string) { +func resourceAwsWafRegionalWebAclAssociationParseId(id string) (resourceArn string) { parts := strings.SplitN(id, ":", 2) - webAclId = parts[0] resourceArn = parts[1] return } diff --git a/aws/resource_aws_wafregional_web_acl_association_test.go b/aws/resource_aws_wafregional_web_acl_association_test.go index c2836645abec..b515217e9c18 100644 --- a/aws/resource_aws_wafregional_web_acl_association_test.go +++ b/aws/resource_aws_wafregional_web_acl_association_test.go @@ -109,7 +109,7 @@ func testAccCheckWafRegionalWebAclAssociationDestroy(s *terraform.State) error { continue } - _, resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(rs.Primary.ID) + resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(rs.Primary.ID) input := &wafregional.GetWebACLForResourceInput{ ResourceArn: aws.String(resourceArn), @@ -142,7 +142,7 @@ func testAccCheckWafRegionalWebAclAssociationExists(n string) resource.TestCheck return fmt.Errorf("No WebACL association ID is set") } - _, resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(rs.Primary.ID) + resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(rs.Primary.ID) conn := testAccProvider.Meta().(*AWSClient).wafregionalconn @@ -169,7 +169,7 @@ func testAccCheckWafRegionalWebAclAssociationDisappears(resourceName string) res return fmt.Errorf("No WebACL association ID is set") } - _, resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(rs.Primary.ID) + resourceArn := resourceAwsWafRegionalWebAclAssociationParseId(rs.Primary.ID) conn := testAccProvider.Meta().(*AWSClient).wafregionalconn diff --git a/aws/resource_aws_wafv2_rule_group_test.go b/aws/resource_aws_wafv2_rule_group_test.go index 55ca8757e209..bf52b4e44b55 100644 --- a/aws/resource_aws_wafv2_rule_group_test.go +++ b/aws/resource_aws_wafv2_rule_group_test.go @@ -518,7 +518,7 @@ func TestAccAwsWafv2RuleGroup_IpSetReferenceStatement(t *testing.T) { computeWafv2IpSetRefStatementIndex(&v, &idx), testCheckResourceAttrWithIndexesAddr(resourceName, "rule.%d.statement.#", &idx, "1"), testCheckResourceAttrWithIndexesAddr(resourceName, "rule.%d.statement.0.ip_set_reference_statement.#", &idx, "1"), - testAccMatchResourceAttrArnWithIndexesAddr(resourceName, "rule.%d.statement.0.ip_set_reference_statement.0.arn", &idx, "wafv2", regexp.MustCompile(`regional/ipset/.+$`)), + testAccMatchResourceAttrArnWithIndexesAddr(resourceName, "rule.%d.statement.0.ip_set_reference_statement.0.arn", &idx, regexp.MustCompile(`regional/ipset/.+$`)), ), }, { @@ -649,7 +649,7 @@ func TestAccAwsWafv2RuleGroup_RegexPatternSetReferenceStatement(t *testing.T) { testCheckResourceAttrWithIndexesAddr(resourceName, "rule.%d.statement.0.regex_pattern_set_reference_statement.#", &idx, "1"), testCheckResourceAttrWithIndexesAddr(resourceName, "rule.%d.statement.0.regex_pattern_set_reference_statement.0.field_to_match.#", &idx, "1"), testCheckResourceAttrWithIndexesAddr(resourceName, "rule.%d.statement.0.regex_pattern_set_reference_statement.0.text_transformation.#", &idx, "1"), - testAccMatchResourceAttrArnWithIndexesAddr(resourceName, "rule.%d.statement.0.regex_pattern_set_reference_statement.0.arn", &idx, "wafv2", regexp.MustCompile(`regional/regexpatternset/.+$`)), + testAccMatchResourceAttrArnWithIndexesAddr(resourceName, "rule.%d.statement.0.regex_pattern_set_reference_statement.0.arn", &idx, regexp.MustCompile(`regional/regexpatternset/.+$`)), ), }, { @@ -937,7 +937,7 @@ func TestAccAwsWafv2RuleGroup_XssMatchStatement(t *testing.T) { }) } -func testAccMatchResourceAttrArnWithIndexesAddr(name, format string, idx *int, arnService string, arnResourceRegexp *regexp.Regexp) resource.TestCheckFunc { +func testAccMatchResourceAttrArnWithIndexesAddr(name, format string, idx *int, arnResourceRegexp *regexp.Regexp) resource.TestCheckFunc { return func(s *terraform.State) error { return testAccMatchResourceAttrRegionalARN(name, fmt.Sprintf(format, *idx), "wafv2", arnResourceRegexp)(s) } From 176a1aba2f5f7327378246b594c6d01b28c94aaa Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Mon, 8 Jun 2020 16:38:08 -0400 Subject: [PATCH 2/2] run go fmt --- aws/resource_aws_wafv2_rule_group_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_wafv2_rule_group_test.go b/aws/resource_aws_wafv2_rule_group_test.go index bf52b4e44b55..c434f6cd73ca 100644 --- a/aws/resource_aws_wafv2_rule_group_test.go +++ b/aws/resource_aws_wafv2_rule_group_test.go @@ -518,7 +518,7 @@ func TestAccAwsWafv2RuleGroup_IpSetReferenceStatement(t *testing.T) { computeWafv2IpSetRefStatementIndex(&v, &idx), testCheckResourceAttrWithIndexesAddr(resourceName, "rule.%d.statement.#", &idx, "1"), testCheckResourceAttrWithIndexesAddr(resourceName, "rule.%d.statement.0.ip_set_reference_statement.#", &idx, "1"), - testAccMatchResourceAttrArnWithIndexesAddr(resourceName, "rule.%d.statement.0.ip_set_reference_statement.0.arn", &idx, regexp.MustCompile(`regional/ipset/.+$`)), + testAccMatchResourceAttrArnWithIndexesAddr(resourceName, "rule.%d.statement.0.ip_set_reference_statement.0.arn", &idx, regexp.MustCompile(`regional/ipset/.+$`)), ), }, {