Added guardduty filter resource #10676

kzonov · 2019-10-30T13:48:59Z

Community Note

Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
Please do not leave "+1" comments, they generate extra noise for pull request followers and do not help prioritize the request

Relates OR Closes #0000 (Sorry, I didn't get, shall I create an issue for this PR or the PR on its own is enough?)

Release note for CHANGELOG:

Added a GuardDuty Filter resource.

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAWSGuardDuty/Filter'
    --- PASS: TestAccAWSGuardDuty/Filter (34.36s)
        --- PASS: TestAccAWSGuardDuty/Filter/basic (16.44s)
        --- PASS: TestAccAWSGuardDuty/Filter/import (17.92s)
...

kzonov · 2019-11-20T07:55:10Z

Hi there! I see you have hundreds of pull requests, folks :( Is there any chance I can speed up a review for this one?

gdavison

Thanks for the PR, @graffzon, it looks good. I have a few changes for you to make

website/docs/r/guardduty_filter.html.markdown

aws/resource_aws_guardduty_filter.go

gdavison · 2020-02-19T00:42:34Z

aws/resource_aws_guardduty_filter_test.go

+				Config: testAccGuardDutyFilterConfig_full(),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsGuardDutyFilterExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "detector_id"),


Use resource.TestCheckResourceAttrPair to verify that the correct value is set

gdavison · 2020-03-09T19:25:18Z

Hi @graffzon, are you still interested in working on this PR?

suzuki-shunsuke · 2020-06-30T00:54:00Z

@graffzon @gdavison
Thank you for your great work.
I'm interested in this pull request, but this seems to be pending.

Can I contribute to this pull request?
If I can, how should I do?

I checked out this pull request and added some commits according to the review comments.

master...suzuki-shunsuke:added-guardduty-filter-resource

Should I create a new pull request? Or is there any other way?

Thank you.

kzonov · 2020-07-06T16:15:23Z

Hi folks, my apologies for keeping silence. @suzuki-shunsuke if you have time and willingness to contribute to this PR - I'd be happy. Unfortunately I don't have a prepared setup to test the GuardDuty resources anymore. However, if it will hang for a couple more months, I might have time to come back to it 😅

kzonov · 2020-07-06T16:18:15Z

@suzuki-shunsuke I found a way to merge your changes into this PR, thanks a lot for your work.
@gdavison could you please take another look at the PR after the changes made by @suzuki-shunsuke ?

suzuki-shunsuke · 2020-07-07T00:24:08Z

@graffzon Thanks a lot.
I add commits to fix the failure of CI.
Would you merge these commits too? 6d1a03f 045794d 53d0e17

Merging master into feature branch

kzonov · 2020-07-07T07:59:58Z

@suzuki-shunsuke Thanks for being that quick :)
I didn't manage to merge your PR because it contained an update from upstream and produced a weird changes for me, so I just updated my fork from the upstream and added the code you implemented in your commits, tagging you in the commits' description. By some reason it still fails, I will have a look later today

suzuki-shunsuke · 2020-07-07T08:26:09Z

@graffzon

I didn't manage to merge your PR because it contained an update from upstream and produced a weird changes for me

Would you cherry pick 045794d and 53d0e17 instead of bb3819c 255ff95?

$ git remote add suzuki-shunsuke https://github.com/suzuki-shunsuke/terraform-provider-aws 
$ git remote -v
origin	https://github.com/graffzon/terraform-provider-aws (fetch)
origin	https://github.com/graffzon/terraform-provider-aws (push)
suzuki-shunsuke	https://github.com/suzuki-shunsuke/terraform-provider-aws (fetch)
suzuki-shunsuke	https://github.com/suzuki-shunsuke/terraform-provider-aws (push)

$ git fetch suzuki-shunsuke
$ git reset HEAD~2 --hard # remove bb3819c 255ff95
$ git cherry-pick 045794d 53d0e17
$ git push origin added-guardduty-filter-resource --force

gdavison

Thanks for the updates, @graffzon and @suzuki-shunsuke. I've done a deeper review of the PR and have a number of changes to make

aws/resource_aws_guardduty_filter.go

gdavison · 2020-07-16T00:22:44Z

aws/resource_aws_guardduty_filter.go

+
+	criteria := make(map[string]*schema.Set)
+
+	criteria["criterion"] = schema.NewSet(schema.HashResource(criterionResource()), flatCriteria)


criterionResource() should not redefine the schema here. The best option is probably to define a hash function that can be used here and set it on the schema as well.

gdavison · 2020-07-16T00:26:29Z

aws/resource_aws_guardduty_filter.go

+	flatCriterion["field"] = field
+	flatCriterion["condition"] = conditionName
+	flatCriterion["values"] = make([]interface{}, 1)
+	flatCriterion["values"].([]interface{})[0] = strconv.FormatInt(*conditionValue, 10)


strconv.Itoa() would be a simpler function to use here, since we don't need to specify the base.

https://github.com/suzuki-shunsuke/terraform-provider-aws/commit/ee392bd4d8555f2f45a87f9ddc58b04cfe327803 -> I removed this commit. #10676 (comment)

The type of *conditionValue is int64 but the type of the argument strconv.Itoa is int.
So strconv.FormatInt isn't wrong.

gdavison · 2020-07-16T00:30:53Z

aws/resource_aws_guardduty_filter.go

+
+	for field, conditions := range findingCriteriaRemote.Criterion {
+		if len(conditions.Equals) > 0 {
+			flatCriteria = append(flatCriteria, flattenStringCondition(field, "equals", conditions.Equals))


The two flattenStringCondition() calls here could take a []string parameter, and have the dereference happen here

Suggested change

flatCriteria = append(flatCriteria, flattenStringCondition(field, "equals", conditions.Equals))

flatCriteria = append(flatCriteria, flattenStringCondition(field, "equals", aws.StringValueSlice(conditions.Equals)))

https://github.com/suzuki-shunsuke/terraform-provider-aws/commit/59db7dd4624918589b69266026dd266bf44fa71a

gdavison · 2020-07-16T00:33:53Z

aws/resource_aws_guardduty_filter.go

+			flatCriteria = append(flatCriteria, flattenStringCondition(field, "not_equals", conditions.NotEquals))
+		}
+		if conditions.GreaterThan != nil {
+			flatCriteria = append(flatCriteria, flattenIntCondition(field, "greater_than", conditions.GreaterThan))


The four flattenIntCondition() calls here could take an int parameter and have the dereference happen here

Suggested change

flatCriteria = append(flatCriteria, flattenIntCondition(field, "greater_than", conditions.GreaterThan))

flatCriteria = append(flatCriteria, flattenIntCondition(field, "greater_than", int(aws.Int64Value(conditions.GreaterThan))))

https://github.com/suzuki-shunsuke/terraform-provider-aws/commit/59db7dd4624918589b69266026dd266bf44fa71a

gdavison · 2020-07-16T00:37:57Z

aws/resource_aws_guardduty_filter.go

+					"NOOP",
+					"ARCHIVE",


These should be replaced by the constants defined in the AWS SDK

Suggested change

"NOOP",

"ARCHIVE",

guardduty.FilterActionNoop,

guardduty..FilterActionArchive,

suzuki-shunsuke · 2020-07-16T02:28:47Z

@gdavison Thank you for your review.
I'll deal with it.

gdavison · 2020-08-11T17:37:03Z

Hi @graffzon and @suzuki-shunsuke. We'd like to get this merged in. @graffzon do you want to merge @suzuki-shunsuke's changes into your PR, or @suzuki-shunsuke do you want to create a PR from your branch?

We'll also need to update the version of the Terraform SDK plugin to v2. Update references to the package github.com/hashicorp/terraform-plugin-sdk/* to github.com/hashicorp/terraform-plugin-sdk/v2/*. You may be able to Git rebase your branch against the current master branch (example below); replacing any remaining old import paths with the newer ones.

$ git fetch --all
$ git rebase origin/master

hashicorp#10676 (comment)

hashicorp#10676 (comment) hashicorp#10676 (comment)

hashicorp#10676 (comment)

…the configuration hashicorp#10676 (comment)

hashicorp#10676 (comment)

kzonov · 2020-08-11T19:16:55Z

Thanks for your tremendous effort @gdavison and @suzuki-shunsuke !!! 🙏
I merged the branch from @suzuki-shunsuke and rebased from the latest master.
Just not sure why it says only 4 checks when I'm pretty sure I saw smth like 12 before rebasing. I'm not very familiar with the Github Checks, it's a rather new feature that I haven't used yet. Might it have just skipped some checks? Like I don't actually see the tests being ran e.g.
And about the review, sorry I've dropped out from the review process, is everything incorporated now?

gdavison · 2020-08-18T17:11:02Z

Thanks again for all the work you've put in, @graffzon and @suzuki-shunsuke. There are a few remaining changes we'd like to see before merging the PR.

If one of you would like to make the changes go ahead. Otherwise, I can make the changes next week (24 August) so that we can get it in for the release that week.

ghost · 2020-09-03T19:31:57Z

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

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

ghost · 2020-10-03T17:10:02Z

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!

kzonov requested a review from a team October 30, 2019 13:48

idubinskiy mentioned this pull request Jan 30, 2020

[WIP] Add aws_guardduty_filter provider #11086

Closed

gdavison requested changes Feb 19, 2020

View reviewed changes

gdavison self-assigned this Feb 19, 2020

gdavison added the new-resource Introduces a new resource. label Feb 19, 2020

anGie44 force-pushed the master branch from 6c6566f to 081bf57 Compare June 29, 2020 16:14

kzonov requested a review from gdavison July 6, 2020 16:18

Merge pull request #2 from terraform-providers/master

dd41a64

Merging master into feature branch

gdavison requested changes Jul 16, 2020

View reviewed changes

gdavison added the waiting-response Maintainers are waiting on response from community or contributor. label Jul 16, 2020

ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Jul 16, 2020

gdavison added the waiting-response Maintainers are waiting on response from community or contributor. label Aug 11, 2020

Kirill Zonov added 3 commits August 11, 2020 22:03

Added a partially copied, partially corrected resource file

af118c7

Fixed or workarounded syntax errors

70d99dd

Made Create action uncommented and not crashing

622fe20

suzuki-shunsuke added 13 commits August 11, 2020 22:03

Fix the error handling

0199cf6

hashicorp#10676 (comment)

Fix the error handling

07490bf

hashicorp#10676 (comment)

Fix the error handling

c4df914

hashicorp#10676 (comment)

Replace strings to constants defined in the AWS SDK

cab69c1

Fix the style in document

045fb77

hashicorp#10676 (comment)

Simplify flattenFindingCriteria

9094964

Change pointer

5db310e

hashicorp#10676 (comment) hashicorp#10676 (comment)

Check for too many parts as well

fbcd71a

hashicorp#10676 (comment)

Make test data simple and move the resource under test to the top of …

a120a04

…the configuration hashicorp#10676 (comment)

Use parseImportedId

672d35f

hashicorp#10676 (comment)

Define the function to create the GuardDuty Filter's ID

88ea72d

hashicorp#10676 (comment)

Use aws.StringValue instead of direct pointer manupulation

87638fe

hashicorp#10676 (comment)

Add a variable detectorResourceName

e313e2b

hashicorp#10676 (comment)

kzonov force-pushed the added-guardduty-filter-resource branch from 54c10e1 to e313e2b Compare August 11, 2020 19:03

kzonov force-pushed the added-guardduty-filter-resource branch 2 times, most recently from 8dcad82 to e313e2b Compare August 11, 2020 19:09

ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Aug 11, 2020

gdavison added the waiting-response Maintainers are waiting on response from community or contributor. label Aug 18, 2020

gdavison mentioned this pull request Aug 27, 2020

Add GuardDuty filter resource #14876

Merged

gdavison closed this in #14876 Sep 2, 2020

gdavison added this to the v3.5.0 milestone Sep 2, 2020

kzonov deleted the added-guardduty-filter-resource branch September 7, 2020 10:28

andynelson mentioned this pull request Sep 30, 2020

cdktf get fails with aws provider @3 hashicorp/terraform-cdk#393

Closed

ghost locked as resolved and limited conversation to collaborators Oct 3, 2020

breathingdust removed the waiting-response Maintainers are waiting on response from community or contributor. label Sep 17, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added guardduty filter resource #10676

Added guardduty filter resource #10676

kzonov commented Oct 30, 2019 •

edited

Loading

kzonov commented Nov 20, 2019

gdavison left a comment

gdavison Feb 19, 2020

gdavison commented Mar 9, 2020

suzuki-shunsuke commented Jun 30, 2020

kzonov commented Jul 6, 2020

kzonov commented Jul 6, 2020

suzuki-shunsuke commented Jul 7, 2020 •

edited

Loading

kzonov commented Jul 7, 2020

suzuki-shunsuke commented Jul 7, 2020 •

edited

Loading

gdavison left a comment

gdavison Jul 16, 2020

suzuki-shunsuke Jul 19, 2020

gdavison Jul 16, 2020

suzuki-shunsuke Jul 16, 2020 •

edited

Loading

suzuki-shunsuke Jul 16, 2020

gdavison Jul 16, 2020

suzuki-shunsuke Jul 17, 2020

gdavison Jul 16, 2020

suzuki-shunsuke Jul 17, 2020

gdavison Jul 16, 2020

suzuki-shunsuke Jul 16, 2020

suzuki-shunsuke commented Jul 16, 2020

gdavison commented Aug 11, 2020 •

edited

Loading

kzonov commented Aug 11, 2020

gdavison commented Aug 18, 2020

ghost commented Sep 3, 2020

ghost commented Oct 3, 2020


		criteria := make(map[string]*schema.Set)

		criteria["criterion"] = schema.NewSet(schema.HashResource(criterionResource()), flatCriteria)

	flatCriteria = append(flatCriteria, flattenStringCondition(field, "equals", conditions.Equals))
	flatCriteria = append(flatCriteria, flattenStringCondition(field, "equals", aws.StringValueSlice(conditions.Equals)))

-					"NOOP",
-					"ARCHIVE",
+					guardduty.FilterActionNoop,
+					guardduty..FilterActionArchive,

Added guardduty filter resource #10676

Added guardduty filter resource #10676

Conversation

kzonov commented Oct 30, 2019 • edited Loading

Community Note

kzonov commented Nov 20, 2019

gdavison left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gdavison commented Mar 9, 2020

suzuki-shunsuke commented Jun 30, 2020

kzonov commented Jul 6, 2020

kzonov commented Jul 6, 2020

suzuki-shunsuke commented Jul 7, 2020 • edited Loading

kzonov commented Jul 7, 2020

suzuki-shunsuke commented Jul 7, 2020 • edited Loading

gdavison 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

suzuki-shunsuke Jul 16, 2020 • edited Loading

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

suzuki-shunsuke commented Jul 16, 2020

gdavison commented Aug 11, 2020 • edited Loading

kzonov commented Aug 11, 2020

gdavison commented Aug 18, 2020

ghost commented Sep 3, 2020

ghost commented Oct 3, 2020

kzonov commented Oct 30, 2019 •

edited

Loading

suzuki-shunsuke commented Jul 7, 2020 •

edited

Loading

suzuki-shunsuke commented Jul 7, 2020 •

edited

Loading

suzuki-shunsuke Jul 16, 2020 •

edited

Loading

gdavison commented Aug 11, 2020 •

edited

Loading