Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New resource for Macie2 Findings Filter #19283

Merged
merged 18 commits into from
May 10, 2021
Merged

New resource for Macie2 Findings Filter #19283

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f3bf4ae
feat: added resource macie2 findings filter
Apr 21, 2021
56eaa7c
test: added acceptance tests for macie2 findings filter
Apr 21, 2021
eff0614
docs: added docs for macie2 findings filter
Apr 21, 2021
3871ae5
refactor: refactorized to follow the guidelines
Apr 27, 2021
9ed2b6e
refactor: refactorized to follow the guidelines
Apr 28, 2021
8eea9f2
refactor: refactorized to follow the guidelines
Apr 28, 2021
747c141
refactor: changed the validation in delete function
Apr 29, 2021
d060b7e
refactor: refactorized to follow the guidelines
May 5, 2021
d288477
test: added steps for findings filter
May 5, 2021
3a03640
refactor: refactorized to follow the guidelines
May 5, 2021
8d996d0
refactor: refactorized to follow the guidelines
May 6, 2021
c03709d
refactor: refactorized to follow the guidelines
May 7, 2021
aa4dd2c
added changelog file
May 7, 2021
bce03d6
refactor: changed validation by allowing negative numbers, changed to…
May 9, 2021
fc0f357
test: added more func for testing and steps
May 9, 2021
84c5608
docs: changed aws to amazon
May 9, 2021
deae5bc
refactor: reused the validation and changed the return err in update …
May 10, 2021
b04b2fa
added more context for returning an error in create func
May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 73 additions & 32 deletions aws/resource_aws_macie2_findings_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log"
"regexp"
"time"

"github.com/aws/aws-sdk-go/aws"
Expand Down Expand Up @@ -34,9 +35,9 @@ func resourceAwsMacie2FindingsFilter() *schema.Resource {
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"criterion": {
Type: schema.TypeList,
Type: schema.TypeSet,
Optional: true,
MaxItems: 1,
MinItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"field": {
Expand All @@ -59,20 +60,36 @@ func resourceAwsMacie2FindingsFilter() *schema.Resource {
Elem: &schema.Schema{Type: schema.TypeString},
},
"lt": {
Type: schema.TypeInt,
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.IsRFC3339Time,
validation.StringMatch(regexp.MustCompile(`-?[0-9]{0,10}`), "must be a positive integer value"),
),
gdavison marked this conversation as resolved.
Show resolved Hide resolved
},
"lte": {
Type: schema.TypeInt,
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.IsRFC3339Time,
validation.StringMatch(regexp.MustCompile(`-?[0-9]{0,10}`), "must be a positive integer value"),
),
},
"gt": {
Type: schema.TypeInt,
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.IsRFC3339Time,
validation.StringMatch(regexp.MustCompile(`-?[0-9]{0,10}`), "must be a positive integer value"),
),
},
"gte": {
Type: schema.TypeInt,
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.IsRFC3339Time,
validation.StringMatch(regexp.MustCompile(`-?[0-9]{0,10}`), "must be a positive integer value"),
),
},
},
},
Expand Down Expand Up @@ -126,10 +143,15 @@ func resourceMacie2FindingsFilterCreate(ctx context.Context, d *schema.ResourceD
tags := defaultTagsConfig.MergeTags(keyvaluetags.New(d.Get("tags").(map[string]interface{})))

input := &macie2.CreateFindingsFilterInput{
ClientToken: aws.String(resource.UniqueId()),
FindingCriteria: expandFindingCriteriaFilter(d.Get("finding_criteria").([]interface{})),
Name: aws.String(naming.Generate(d.Get("name").(string), d.Get("name_prefix").(string))),
Action: aws.String(d.Get("action").(string)),
ClientToken: aws.String(resource.UniqueId()),
Name: aws.String(naming.Generate(d.Get("name").(string), d.Get("name_prefix").(string))),
Action: aws.String(d.Get("action").(string)),
}

var err error
input.FindingCriteria, err = expandFindingCriteriaFilter(d.Get("finding_criteria").([]interface{}))
if err != nil {
return diag.FromErr(err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed this one last time: this should have some context for the error as well

}

if v, ok := d.GetOk("description"); ok {
Expand All @@ -142,7 +164,6 @@ func resourceMacie2FindingsFilterCreate(ctx context.Context, d *schema.ResourceD
input.Tags = tags.IgnoreAws().Macie2Tags()
}

var err error
var output *macie2.CreateFindingsFilterOutput
err = resource.RetryContext(ctx, 4*time.Minute, func() *resource.RetryError {
output, err = conn.CreateFindingsFilterWithContext(ctx, input)
Expand Down Expand Up @@ -221,8 +242,12 @@ func resourceMacie2FindingsFilterUpdate(ctx context.Context, d *schema.ResourceD
Id: aws.String(d.Id()),
}

var err error
if d.HasChange("finding_criteria") {
input.FindingCriteria = expandFindingCriteriaFilter(d.Get("finding_criteria").([]interface{}))
input.FindingCriteria, err = expandFindingCriteriaFilter(d.Get("finding_criteria").([]interface{}))
if err != nil {
return diag.FromErr(err)
gdavison marked this conversation as resolved.
Show resolved Hide resolved
}
}
if d.HasChange("name") {
input.Name = aws.String(naming.Generate(d.Get("name").(string), d.Get("name_prefix").(string)))
Expand All @@ -240,7 +265,7 @@ func resourceMacie2FindingsFilterUpdate(ctx context.Context, d *schema.ResourceD
input.Position = aws.Int64(int64(d.Get("position").(int)))
}

_, err := conn.UpdateFindingsFilterWithContext(ctx, input)
_, err = conn.UpdateFindingsFilterWithContext(ctx, input)
if err != nil {
return diag.FromErr(fmt.Errorf("error updating Macie FindingsFilter (%s): %w", d.Id(), err))
}
Expand All @@ -266,14 +291,14 @@ func resourceMacie2FindingsFilterDelete(ctx context.Context, d *schema.ResourceD
return nil
}

func expandFindingCriteriaFilter(findingCriterias []interface{}) *macie2.FindingCriteria {
func expandFindingCriteriaFilter(findingCriterias []interface{}) (*macie2.FindingCriteria, error) {
if len(findingCriterias) == 0 {
return nil
return nil, nil
}

criteria := map[string]*macie2.CriterionAdditionalProperties{}
findingCriteria := findingCriterias[0].(map[string]interface{})
inputFindingCriteria := findingCriteria["criterion"].([]interface{})
inputFindingCriteria := findingCriteria["criterion"].(*schema.Set).List()

for _, criterion := range inputFindingCriteria {
crit := criterion.(map[string]interface{})
Expand Down Expand Up @@ -304,22 +329,38 @@ func expandFindingCriteriaFilter(findingCriterias []interface{}) *macie2.Finding
}
conditional.EqExactMatch = foo
}
if v, ok := crit["lt"].(int); ok && v != 0 {
conditional.Lt = aws.Int64(int64(v))
if v, ok := crit["lt"].(string); ok && v != "" {
i, err := expandConditionIntField(field, v)
if err != nil {
return nil, fmt.Errorf("error parsing condition %q for field %q: %w", "lt", field, err)
}
conditional.Lt = aws.Int64(i)
}
if v, ok := crit["lte"].(int); ok && v != 0 {
conditional.Lte = aws.Int64(int64(v))
if v, ok := crit["lte"].(string); ok && v != "" {
i, err := expandConditionIntField(field, v)
if err != nil {
return nil, fmt.Errorf("error parsing condition %q for field %q: %w", "lte", field, err)
}
conditional.Lte = aws.Int64(i)
}
if v, ok := crit["gt"].(int); ok && v != 0 {
conditional.Gt = aws.Int64(int64(v))
if v, ok := crit["gt"].(string); ok && v != "" {
i, err := expandConditionIntField(field, v)
if err != nil {
return nil, fmt.Errorf("error parsing condition %q for field %q: %w", "gt", field, err)
}
conditional.Gt = aws.Int64(i)
}
if v, ok := crit["gte"].(int); ok && v != 0 {
conditional.Gte = aws.Int64(int64(v))
if v, ok := crit["gte"].(string); ok && v != "" {
i, err := expandConditionIntField(field, v)
if err != nil {
return nil, fmt.Errorf("error parsing condition %q for field %q: %w", "gte", field, err)
}
conditional.Gte = aws.Int64(i)
}
criteria[field] = &conditional
}

return &macie2.FindingCriteria{Criterion: criteria}
return &macie2.FindingCriteria{Criterion: criteria}, nil
}

func flattenFindingCriteriaFindingsFilter(findingCriteria *macie2.FindingCriteria) []interface{} {
Expand All @@ -343,16 +384,16 @@ func flattenFindingCriteriaFindingsFilter(findingCriteria *macie2.FindingCriteri
criterion["eq_exact_match"] = aws.StringValueSlice(conditions.EqExactMatch)
}
if v := aws.Int64Value(conditions.Lt); v != 0 {
criterion["lt"] = aws.Int64Value(conditions.Lt)
criterion["lt"] = flattenConditionIntField(field, v)
}
if v := aws.Int64Value(conditions.Lt); v != 0 {
criterion["lte"] = aws.Int64Value(conditions.Lte)
if v := aws.Int64Value(conditions.Lte); v != 0 {
criterion["lte"] = flattenConditionIntField(field, v)
}
if v := aws.Int64Value(conditions.Lt); v != 0 {
criterion["gt"] = aws.Int64Value(conditions.Gt)
if v := aws.Int64Value(conditions.Gt); v != 0 {
criterion["gt"] = flattenConditionIntField(field, v)
}
if v := aws.Int64Value(conditions.Lt); v != 0 {
criterion["gte"] = aws.Int64Value(conditions.Gte)
if v := aws.Int64Value(conditions.Gte); v != 0 {
criterion["gte"] = flattenConditionIntField(field, v)
}
flatCriteria = append(flatCriteria, criterion)
}
Expand Down
Loading