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.

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: ECR registry scanning configuration #22179

Merged
merged 8 commits into from
Dec 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/22179.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_ecr_registry_scanning_configuration
```
13 changes: 7 additions & 6 deletions internal/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -1125,12 +1125,13 @@ func Provider() *schema.Provider {
"aws_vpn_gateway_attachment": ec2.ResourceVPNGatewayAttachment(),
"aws_vpn_gateway_route_propagation": ec2.ResourceVPNGatewayRoutePropagation(),

"aws_ecr_lifecycle_policy": ecr.ResourceLifecyclePolicy(),
"aws_ecr_pull_through_cache_rule": ecr.ResourcePullThroughCacheRule(),
"aws_ecr_registry_policy": ecr.ResourceRegistryPolicy(),
"aws_ecr_replication_configuration": ecr.ResourceReplicationConfiguration(),
"aws_ecr_repository": ecr.ResourceRepository(),
"aws_ecr_repository_policy": ecr.ResourceRepositoryPolicy(),
"aws_ecr_lifecycle_policy": ecr.ResourceLifecyclePolicy(),
"aws_ecr_pull_through_cache_rule": ecr.ResourcePullThroughCacheRule(),
"aws_ecr_registry_policy": ecr.ResourceRegistryPolicy(),
"aws_ecr_registry_scanning_configuration": ecr.ResourceRegistryScanningConfiguration(),
"aws_ecr_replication_configuration": ecr.ResourceReplicationConfiguration(),
"aws_ecr_repository": ecr.ResourceRepository(),
"aws_ecr_repository_policy": ecr.ResourceRepositoryPolicy(),

"aws_ecrpublic_repository": ecrpublic.ResourceRepository(),

Expand Down
205 changes: 205 additions & 0 deletions internal/service/ecr/registry_scanning_configuration.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
package ecr

import (
"fmt"
"log"
"regexp"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ecr"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
)

func ResourceRegistryScanningConfiguration() *schema.Resource {
return &schema.Resource{
Create: resourceRegistryScanningConfigurationPut,
Read: resourceRegistryScanningConfigurationRead,
Update: resourceRegistryScanningConfigurationPut,
Delete: resourceRegistryScanningConfigurationDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
"registry_id": {
Type: schema.TypeString,
Computed: true,
},
"rule": {
Type: schema.TypeSet,
Optional: true,
MinItems: 0,
MaxItems: 100,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"repository_filter": {
Type: schema.TypeSet,
MinItems: 1,
Required: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"filter": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.All(
validation.StringLenBetween(1, 256),
validation.StringMatch(regexp.MustCompile(`^[a-z0-9*](?:[._\-/a-z0-9*]?[a-z0-9*]+)*$`), "must contain only lowercase alphanumeric, dot, underscore, hyphen, wildcard, and colon characters"),
),
},
"filter_type": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(ecr.ScanningRepositoryFilterType_Values(), false),
},
},
},
},
"scan_frequency": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(ecr.ScanFrequency_Values(), false),
},
},
},
},
"scan_type": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(ecr.ScanType_Values(), false),
},
},
}
}

func resourceRegistryScanningConfigurationPut(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*conns.AWSClient).ECRConn

input := ecr.PutRegistryScanningConfigurationInput{
ScanType: aws.String(d.Get("scan_type").(string)),
Rules: expandEcrScanningRegistryRules(d.Get("rule").(*schema.Set).List()),
}

_, err := conn.PutRegistryScanningConfiguration(&input)

if err != nil {
return fmt.Errorf("error creating ECR Registry Scanning Configuration: %w", err)
}

d.SetId(meta.(*conns.AWSClient).AccountID)

return resourceRegistryScanningConfigurationRead(d, meta)
}

func resourceRegistryScanningConfigurationRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*conns.AWSClient).ECRConn

out, err := conn.GetRegistryScanningConfiguration(&ecr.GetRegistryScanningConfigurationInput{})

if err != nil {
return fmt.Errorf("error reading ECR Registry Scanning Configuration (%s): %w", d.Id(), err)
}

d.Set("registry_id", out.RegistryId)
d.Set("scan_type", out.ScanningConfiguration.ScanType)
d.Set("rule", flattenEcrScanningConfigurationRules(out.ScanningConfiguration.Rules))

return nil
}

func resourceRegistryScanningConfigurationDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*conns.AWSClient).ECRConn

log.Printf("[DEBUG] Deleting ECR Registry Scanning Configuration: (%s)", d.Id())
_, err := conn.PutRegistryScanningConfiguration(&ecr.PutRegistryScanningConfigurationInput{
Rules: []*ecr.RegistryScanningRule{},
ScanType: aws.String(ecr.ScanTypeBasic),
})

if err != nil {
return fmt.Errorf("error deleting ECR Registry Scanning Configuration (%s): %w", d.Id(), err)
}

return nil
}

// Helper functions

func expandEcrScanningRegistryRules(l []interface{}) []*ecr.RegistryScanningRule {
if len(l) == 0 || l[0] == nil {
return nil
}

rules := make([]*ecr.RegistryScanningRule, 0)

for _, rule := range l {
if rule == nil {
continue
}
rules = append(rules, expandEcrScanningRegistryRule(rule.(map[string]interface{})))
}

return rules
}

func expandEcrScanningRegistryRule(m map[string]interface{}) *ecr.RegistryScanningRule {
if m == nil {
return nil
}

rule := &ecr.RegistryScanningRule{
RepositoryFilters: expandEcrScanningRegistryRuleRepositoryFilters(m["repository_filter"].(*schema.Set).List()),
ScanFrequency: aws.String(m["scan_frequency"].(string)),
}

return rule
}

func expandEcrScanningRegistryRuleRepositoryFilters(l []interface{}) []*ecr.ScanningRepositoryFilter {
if len(l) == 0 || l[0] == nil {
return nil
}

filters := make([]*ecr.ScanningRepositoryFilter, 0)

for _, f := range l {
if f == nil {
continue
}
m := f.(map[string]interface{})
filters = append(filters, &ecr.ScanningRepositoryFilter{
Filter: aws.String(m["filter"].(string)),
FilterType: aws.String(m["filter_type"].(string)),
})
}

return filters
}

func flattenEcrScanningConfigurationRules(r []*ecr.RegistryScanningRule) interface{} {
out := make([]map[string]interface{}, len(r))
for i, rule := range r {
m := make(map[string]interface{})
m["scan_frequency"] = aws.StringValue(rule.ScanFrequency)
m["repository_filter"] = flattenEcrScanningConfigurationFilters(rule.RepositoryFilters)
out[i] = m
}
return out
}

func flattenEcrScanningConfigurationFilters(l []*ecr.ScanningRepositoryFilter) []interface{} {
if len(l) == 0 {
return nil
}

out := make([]interface{}, len(l))
for i, filter := range l {
out[i] = map[string]interface{}{
"filter": aws.StringValue(filter.Filter),
"filter_type": aws.StringValue(filter.FilterType),
}
}

return out
}
Loading