New Resource: aws_wafregional_sql_injection_match_set #1013

DennyLoko · 2017-06-29T16:42:18Z

This PR implements the aws_wafregional_sql_injection_match_set resource.

resource "aws_wafregional_sql_injection_match_set" "sql_injection_match_set" {
  name = "tf-sql_injection_match_set"
  sql_injection_match_tuples {
    text_transformation = "URL_DECODE"
    field_to_match {
      type = "QUERY_STRING"
    }
  }
}

radeksimko

Thanks for the PR, I left you some comments there. Let me know if you have any questions.

radeksimko · 2017-07-18T16:52:32Z

aws/resource_aws_wafregional_sql_injection_match_set.go

+				Required: true,
+				ForceNew: true,
+			},
+			"sql_injection_match_tuples": &schema.Schema{


As we discussed in the other resource do you mind renaming this field to singular? i.e. sql_injection_match_tuple?

radeksimko · 2017-07-18T16:53:47Z

aws/resource_aws_wafregional_sql_injection_match_set.go

+		return err
+	}
+
+	d.Set("name", resp.SqlInjectionMatchSet.Name)


I think we're missing some fields here, specifically sql_injection_match_tuples and all nested fields under it. The expectation from the Terraform user is that for any resource Terraform will detect drifts from the configuration. In order to do that we need to set all the available data from the API via d.Set() here in Read func.

radeksimko · 2017-07-18T16:57:56Z

aws/resource_aws_wafregional_sql_injection_match_set_test.go

+		},
+	})
+}
+


Because there has been a bug in the past affecting all WAF resources I'd like to see 2 more tests here, specifically with no tuples and another one changing tuples, see https://github.com/terraform-providers/terraform-provider-aws/blob/master/aws/resource_aws_waf_sql_injection_match_set_test.go#L103-L173 for inspiration and eacece2 for context (bugfix).

radeksimko · 2017-07-18T16:59:08Z

aws/resource_aws_wafregional_sql_injection_match_set.go

+
+func resourceAwsWafRegionalSqlInjectionMatchSetUpdate(d *schema.ResourceData, meta interface{}) error {
+	log.Printf("[INFO] Updating SqlInjectionMatchSet: %s", d.Get("name").(string))
+	err := updateSqlInjectionMatchSetResourceWR(d, meta, waf.ChangeActionInsert)


I think this isn't right, because during update we may be both inserting and deleting tuples, not just inserting. See eacece2 for more context.

radeksimko · 2017-07-18T17:01:13Z

website/docs/r/wafregional_sql_injection_match_set.html.markdown

+The following arguments are supported:
+
+* `name` - (Required) The name or description of the SizeConstraintSet.
+* `sql_injection_match_tuples` - The parts of web requests that you want AWS WAF to inspect for malicious SQL code and, if you want AWS WAF to inspect a header, the name of the header.


Do you mind documenting the nested fields here, too?

radeksimko · 2017-07-18T17:01:39Z

aws/resource_aws_wafregional_sql_injection_match_set_test.go

+
+func testAccCheckAWSWafRegionalSqlInjectionMatchSetDestroy(s *terraform.State) error {
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_wafregional_byte_match_set" {


I think this is typo 👀

DennyLoko · 2017-07-24T16:38:54Z

Hello, please for review my PR. I'll make the changes during this week.

radeksimko · 2017-08-14T12:46:30Z

Hi @DennyLoko
let me know if there's anything I can help you with.

Eventually if you don't have time to invest into these WAF PRs do let me know too. I'm happy to finish it (while keeping your authorship in existing commits).

radeksimko · 2017-10-05T14:04:05Z

FYI - As this PR has been stale for a couple of months I will take it over in coming week(s) unless you tell me not to.

BSick7 · 2018-01-30T14:51:59Z

@radeksimko I am trying to finalize this PR @ #3199

Implemented feedback

radeksimko · 2018-03-14T09:37:01Z

I believe I addressed all things I saw myself as blockers, I think it's worth one more review from someone with a fresh eye though.

==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAWSWafRegionalSqlInjectionMatchSet_ -timeout 120m
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_basic
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_basic (46.09s)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_changeNameForceNew
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_changeNameForceNew (78.77s)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_disappears
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_disappears (38.74s)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_changeTuples
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_changeTuples (75.93s)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_noTuples
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_noTuples (38.09s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	277.655s

bflad

Overall in pretty awesome shape as usual! Few nitpicks then its good to ship!

5 tests passed (all tests)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_disappears
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_disappears (10.55s)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_noTuples
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_noTuples (19.74s)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_changeTuples
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_changeTuples (22.75s)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_changeNameForceNew
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_changeNameForceNew (23.86s)
=== RUN   TestAccAWSWafRegionalSqlInjectionMatchSet_basic
--- PASS: TestAccAWSWafRegionalSqlInjectionMatchSet_basic (25.59s)

bflad · 2018-03-15T02:19:16Z

aws/resource_aws_wafregional_sql_injection_match_set.go

+		Delete: resourceAwsWafRegionalSqlInjectionMatchSetDelete,
+
+		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{


Minor nitpick: Extraneous &schema.Schema

bflad · 2018-03-15T02:22:05Z

aws/resource_aws_wafregional_sql_injection_match_set.go

+		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,


Something up for discussion: should we automatically be adding ValidateFunc: validation.NoZeroValues, for Required: true and Type: schema.TypeString where it makes sense?

Hm, I'm not sure - it sounds like something that should be solved at higher (schema) level. I mean if from provider-dev perspective I say "it's required" I'd just assume that's enough to say there are no empty strings allowed.

Maybe there are edge cases when we do not want that though? 🤷‍♂️

I agree that it likely should be fixed upstream 😄 The only weird edge cases I can think of are module usage somehow, but even that sounds pretty far fetched.

bflad · 2018-03-15T02:35:00Z

website/docs/r/wafregional_sql_injection_match_set.html.markdown

+  Provides a AWS WAF Regional SqlInjectionMatchSet resource for use with ALB.
+---
+
+# aws\_wafregional\_sql\_injection\_match\_set


Minor nitpick: Extraneous backslashes

bflad · 2018-03-15T02:36:29Z

website/docs/r/wafregional_sql_injection_match_set.html.markdown

+  See [docs](https://docs.aws.amazon.com/waf/latest/APIReference/API_regional_FieldToMatch.html)
+  for all supported values.
+
+## Remarks


Nitpick: Extraneous header

bflad · 2018-03-15T02:37:25Z

website/docs/r/wafregional_sql_injection_match_set.html.markdown

+
+## Example Usage
+
+```


Nitpick: Should define syntax as hcl

bflad · 2018-03-15T02:38:33Z

aws/resource_aws_wafregional_sql_injection_match_set_test.go

+}`, name)
+}
+
+func testAccAWSWafRegionalSqlInjectionMatchSetConfigChangeName(name string) string {


Nitpick: this function looks like it duplicates the above one

bflad · 2018-03-15T02:39:24Z

aws/resource_aws_wafregional_sql_injection_match_set_test.go

+			return conn.UpdateSqlInjectionMatchSet(req)
+		})
+		if err != nil {
+			return errwrap.Wrapf("[ERROR] Error updating SqlInjectionMatchSet: {{err}}", err)


Minor nitpick: errwrap.Wrapf() usage instead of fmt.Errorf() (same with below)

bflad · 2018-03-23T21:03:05Z

This has been released in version 1.12.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

ghost · 2020-04-04T17:28:17Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

DennyLoko changed the title ~~Add support for resource_aws_wafregional_sql_injection_match_set~~ Add support for aws_wafregional_sql_injection_match_set Jun 29, 2017

radeksimko added the new-resource Introduces a new resource. label Jul 3, 2017

DennyLoko force-pushed the resource_aws_wafregional_sql_injection_match_set branch from b6260c8 to 2991e59 Compare July 4, 2017 17:16

radeksimko previously requested changes Jul 18, 2017

View reviewed changes

radeksimko added the waiting-response Maintainers are waiting on response from community or contributor. label Jul 18, 2017

This was referenced Jul 18, 2017

New Resource: aws_wafregional_rule #1045

Closed

New Resource: aws_wafregional_web_acl #1046

Closed

New Resource: aws_wafregional_web_acl_association #1047

Closed

grubernaut added enhancement Requests to existing resources that expand the functionality or scope. and removed waiting-response Maintainers are waiting on response from community or contributor. labels Jul 25, 2017

radeksimko added the waiting-response Maintainers are waiting on response from community or contributor. label Jul 25, 2017

radeksimko mentioned this pull request Oct 5, 2017

New Resource: aws_wafregional_rule #1753

Closed

apparentlymart mentioned this pull request Oct 31, 2017

[WIP] provider/aws: AWS WAF Regional SqlInjectionMatchSet support hashicorp/terraform#13708

Closed

radeksimko added the size/L Managed by automation to categorize the size of a PR. label Nov 15, 2017

radeksimko added the service/waf Issues and PRs that pertain to the waf service. label Jan 12, 2018

radeksimko changed the title ~~Add support for aws_wafregional_sql_injection_match_set~~ New Resource: aws_wafregional_sql_injection_match_set Jan 16, 2018

radeksimko added this to the v1.12.0 milestone Jan 16, 2018

giuliocalzolari mentioned this pull request Jan 22, 2018

AWS WAF regional support #1333

Closed

Add support for resource_aws_wafregional_sql_injection_match_set

2817df5

radeksimko force-pushed the resource_aws_wafregional_sql_injection_match_set branch from 2991e59 to a747666 Compare March 14, 2018 09:32

ghost added size/XL Managed by automation to categorize the size of a PR. and removed size/L Managed by automation to categorize the size of a PR. labels Mar 14, 2018

radeksimko removed the waiting-response Maintainers are waiting on response from community or contributor. label Mar 14, 2018

radeksimko requested a review from bflad March 14, 2018 09:37

bflad approved these changes Mar 15, 2018

View reviewed changes

Implement feedback and clean up code

f5ee8a9

radeksimko force-pushed the resource_aws_wafregional_sql_injection_match_set branch from a747666 to f5ee8a9 Compare March 15, 2018 08:39

ghost added the size/XL Managed by automation to categorize the size of a PR. label Mar 15, 2018

radeksimko merged commit f617d80 into hashicorp:master Mar 15, 2018

ghost locked and limited conversation to collaborators Apr 4, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Resource: aws_wafregional_sql_injection_match_set #1013

New Resource: aws_wafregional_sql_injection_match_set #1013

DennyLoko commented Jun 29, 2017 •

edited

Loading

radeksimko left a comment

radeksimko Jul 18, 2017

radeksimko Jul 18, 2017

radeksimko Jul 18, 2017

radeksimko Jul 18, 2017

radeksimko Jul 18, 2017

radeksimko Jul 18, 2017

DennyLoko commented Jul 24, 2017

radeksimko commented Aug 14, 2017

radeksimko commented Oct 5, 2017

BSick7 commented Jan 30, 2018

radeksimko commented Mar 14, 2018

bflad left a comment

bflad Mar 15, 2018

bflad Mar 15, 2018

radeksimko Mar 15, 2018

bflad Mar 15, 2018

bflad Mar 15, 2018

bflad Mar 15, 2018

bflad Mar 15, 2018

bflad Mar 15, 2018

bflad Mar 15, 2018

bflad commented Mar 23, 2018

ghost commented Apr 4, 2020

New Resource: aws_wafregional_sql_injection_match_set #1013

New Resource: aws_wafregional_sql_injection_match_set #1013

Conversation

DennyLoko commented Jun 29, 2017 • edited Loading

radeksimko left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DennyLoko commented Jul 24, 2017

radeksimko commented Aug 14, 2017

radeksimko commented Oct 5, 2017

BSick7 commented Jan 30, 2018

radeksimko commented Mar 14, 2018

bflad left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bflad commented Mar 23, 2018

ghost commented Apr 4, 2020

DennyLoko commented Jun 29, 2017 •

edited

Loading