Skip to content

Commit

Permalink
Updates from code review
Browse files Browse the repository at this point in the history
  • Loading branch information
@gdavison
gdavison committed Sep 2, 2020
1 parent 54ab4ff commit 9c8eaf2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 31 deletions.
52 changes: 28 additions & 24 deletions aws/resource_aws_guardduty_filter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func resourceAwsGuardDutyFilterCreate(d *schema.ResourceData, meta interface{})
return fmt.Errorf("error creating GuardDuty Filter: %w", err)
}

d.SetId(joinGuardDutyFilterID(d.Get("detector_id").(string), aws.StringValue(output.Name)))
d.SetId(guardDutyFilterCreateID(d.Get("detector_id").(string), aws.StringValue(output.Name)))

return resourceAwsGuardDutyFilterRead(d, meta)
}
Expand All @@ -165,7 +165,7 @@ func resourceAwsGuardDutyFilterRead(d *schema.ResourceData, meta interface{}) er

if _, ok := d.GetOk("detector_id"); !ok {
// If there is no "detector_id" passed, then it's an import.
detectorID, name, err = parseImportedId(d.Id())
detectorID, name, err = guardDutyFilterParseID(d.Id())
if err != nil {
return err
}
Expand Down Expand Up @@ -214,33 +214,35 @@ func resourceAwsGuardDutyFilterRead(d *schema.ResourceData, meta interface{}) er
d.Set("rank", filter.Rank)
ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig
d.Set("tags", keyvaluetags.GuarddutyKeyValueTags(filter.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map())
d.SetId(joinGuardDutyFilterID(detectorID, name))
d.SetId(guardDutyFilterCreateID(detectorID, name))

return nil
}

func resourceAwsGuardDutyFilterUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).guarddutyconn

input := guardduty.UpdateFilterInput{
Action: aws.String(d.Get("action").(string)),
Description: aws.String(d.Get("description").(string)),
DetectorId: aws.String(d.Get("detector_id").(string)),
FilterName: aws.String(d.Get("name").(string)),
Rank: aws.Int64(int64(d.Get("rank").(int))),
}
if d.HasChanges("action", "description", "finding_criteria", "rank") {
input := guardduty.UpdateFilterInput{
Action: aws.String(d.Get("action").(string)),
Description: aws.String(d.Get("description").(string)),
DetectorId: aws.String(d.Get("detector_id").(string)),
FilterName: aws.String(d.Get("name").(string)),
Rank: aws.Int64(int64(d.Get("rank").(int))),
}

var err error
input.FindingCriteria, err = expandFindingCriteria(d.Get("finding_criteria").([]interface{}))
if err != nil {
return err
}
var err error
input.FindingCriteria, err = expandFindingCriteria(d.Get("finding_criteria").([]interface{}))
if err != nil {
return err
}

log.Printf("[DEBUG] Updating GuardDuty Filter: %s", input)
log.Printf("[DEBUG] Updating GuardDuty Filter: %s", input)

_, err = conn.UpdateFilter(&input)
if err != nil {
return fmt.Errorf("error updating GuardDuty Filter %s: %w", d.Id(), err)
_, err = conn.UpdateFilter(&input)
if err != nil {
return fmt.Errorf("error updating GuardDuty Filter %s: %w", d.Id(), err)
}
}

if d.HasChange("tags") {
Expand Down Expand Up @@ -277,14 +279,16 @@ func resourceAwsGuardDutyFilterDelete(d *schema.ResourceData, meta interface{})
return nil
}

func joinGuardDutyFilterID(detectorID, filterName string) string {
return detectorID + "_" + filterName
const guardDutyFilterIDSeparator = ":"

func guardDutyFilterCreateID(detectorID, filterName string) string {
return detectorID + guardDutyFilterIDSeparator + filterName
}

func parseImportedId(importedId string) (string, string, error) {
parts := strings.Split(importedId, "_")
func guardDutyFilterParseID(importedId string) (string, string, error) {
parts := strings.Split(importedId, guardDutyFilterIDSeparator)
if len(parts) != 2 {
return "", "", fmt.Errorf("Error Importing aws_guardduty_filter record: '%s' Please make sure the record ID is in the form detectorId_name.", importedId)
return "", "", fmt.Errorf("GuardDuty filter ID must be of the form <Detector ID>:<Filter name>. Got %q.", importedId)
}
return parts[0], parts[1], nil
}
Expand Down
14 changes: 7 additions & 7 deletions aws/resource_aws_guardduty_filter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ func testAccCheckAwsGuardDutyFilterDestroy(s *terraform.State) error {
continue
}

detectorID, filterName, err := parseImportedId(rs.Primary.ID)
detectorID, filterName, err := guardDutyFilterParseID(rs.Primary.ID)
if err != nil {
return err
}
Expand Down Expand Up @@ -228,7 +228,7 @@ func testAccCheckAwsGuardDutyFilterExists(name string, filter *guardduty.GetFilt
return fmt.Errorf("No GuardDuty filter is set")
}

detectorID, name, err := parseImportedId(rs.Primary.ID)
detectorID, name, err := guardDutyFilterParseID(rs.Primary.ID)
if err != nil {
return err
}
Expand All @@ -250,7 +250,7 @@ func testAccCheckAwsGuardDutyFilterExists(name string, filter *guardduty.GetFilt
func testAccGuardDutyFilterConfig_full(startDate, endDate string) string {
return fmt.Sprintf(`
resource "aws_guardduty_filter" "test" {
detector_id = "${aws_guardduty_detector.test.id}"
detector_id = aws_guardduty_detector.test.id
name = "test-filter"
action = "ARCHIVE"
rank = 1
Expand Down Expand Up @@ -283,7 +283,7 @@ resource "aws_guardduty_detector" "test" {
func testAccGuardDutyFilterConfigNoop_full(startDate, endDate string) string {
return fmt.Sprintf(`
resource "aws_guardduty_filter" "test" {
detector_id = "${aws_guardduty_detector.test.id}"
detector_id = aws_guardduty_detector.test.id
name = "test-filter"
action = "NOOP"
description = "This is a NOOP"
Expand Down Expand Up @@ -317,7 +317,7 @@ resource "aws_guardduty_detector" "test" {
func testAccGuardDutyFilterConfig_multipleTags() string {
return `
resource "aws_guardduty_filter" "test" {
detector_id = "${aws_guardduty_detector.test.id}"
detector_id = aws_guardduty_detector.test.id
name = "test-filter"
action = "ARCHIVE"
rank = 1
Expand All @@ -344,7 +344,7 @@ resource "aws_guardduty_detector" "test" {
func testAccGuardDutyFilterConfig_update() string {
return `
resource "aws_guardduty_filter" "test" {
detector_id = "${aws_guardduty_detector.test.id}"
detector_id = aws_guardduty_detector.test.id
name = "test-filter"
action = "ARCHIVE"
rank = 1
Expand All @@ -371,7 +371,7 @@ resource "aws_guardduty_detector" "test" {
func testAccGuardDutyFilterConfig_updateTags() string {
return `
resource "aws_guardduty_filter" "test" {
detector_id = "${aws_guardduty_detector.test.id}"
detector_id = aws_guardduty_detector.test.id
name = "test-filter"
action = "ARCHIVE"
rank = 1
Expand Down

0 comments on commit 9c8eaf2

Please sign in to comment.