New Resource: aws_ecrpublic_repository

.changelog/16865.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_ecrpublic_repository
+```

aws/provider.go

@@ -621,6 +621,7 @@ func Provider() *schema.Provider {
 			"aws_ec2_transit_gateway_vpc_attachment":                  resourceAwsEc2TransitGatewayVpcAttachment(),
 			"aws_ec2_transit_gateway_vpc_attachment_accepter":         resourceAwsEc2TransitGatewayVpcAttachmentAccepter(),
 			"aws_ecr_lifecycle_policy":                                resourceAwsEcrLifecyclePolicy(),
+			"aws_ecrpublic_repository":                                resourceAwsEcrPublicRepository(),
 			"aws_ecr_repository":                                      resourceAwsEcrRepository(),
 			"aws_ecr_repository_policy":                               resourceAwsEcrRepositoryPolicy(),
 			"aws_ecs_capacity_provider":                               resourceAwsEcsCapacityProvider(),

aws/resource_aws_ecrpublic_repository.go

@@ -0,0 +1,371 @@
+package aws
+
+import (
+	"encoding/base64"
+	"fmt"
+	"log"
+	"regexp"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ecrpublic"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func resourceAwsEcrPublicRepository() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsEcrPublicRepositoryCreate,
+		Read:   resourceAwsEcrPublicRepositoryRead,
+		Update: resourceAwsEcrPublicRepositoryUpdate,
+		Delete: resourceAwsEcrPublicRepositoryDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Delete: schema.DefaultTimeout(20 * time.Minute),
+		},
+
+		Schema: map[string]*schema.Schema{
+			"repository_name": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+				ValidateFunc: validation.All(
+					validation.StringLenBetween(2, 205),
+					validation.StringMatch(regexp.MustCompile(`(?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*`), "see: https://docs.aws.amazon.com/AmazonECRPublic/latest/APIReference/API_CreateRepository.html#API_CreateRepository_RequestSyntax"),
+				),
+			},
+			"catalog_data": {
+				Type:     schema.TypeList,
+				MaxItems: 1,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"about_text": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringLenBetween(0, 10240),
+						},
+						"architectures": {
+							Type:     schema.TypeSet,
+							Optional: true,
+							MaxItems: 50,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"description": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringLenBetween(0, 1024),
+						},
+						"logo_image_blob": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+						},
+						"operating_systems": {
+							Type:     schema.TypeSet,
+							Optional: true,
+							MaxItems: 50,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"usage_text": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringLenBetween(0, 10240),
+						},
+					},
+				},
+				DiffSuppressFunc: suppressMissingOptionalConfigurationBlock,
+			},
+			"force_destroy": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+			"registry_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"repository_uri": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func resourceAwsEcrPublicRepositoryCreate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).ecrpublicconn
+
+	input := ecrpublic.CreateRepositoryInput{
+		RepositoryName: aws.String(d.Get("repository_name").(string)),
+	}
+
+	if v, ok := d.GetOk("catalog_data"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
+		input.CatalogData = expandEcrPublicRepositoryCatalogData(v.([]interface{})[0].(map[string]interface{}))
+	}
+
+	log.Printf("[DEBUG] Creating ECR Public repository: %#v", input)
+
+	out, err := conn.CreateRepository(&input)
+	if err != nil {
+		return fmt.Errorf("error creating ECR Public repository: %s", err)
+	}
+
+	if out == nil {
+		return fmt.Errorf("error creating ECR Public Repository: empty response")
+	}
+
+	repository := out.Repository
+
+	log.Printf("[DEBUG] ECR Public repository created: %q", aws.StringValue(repository.RepositoryArn))
+
+	d.SetId(aws.StringValue(repository.RepositoryName))
+
+	return resourceAwsEcrPublicRepositoryRead(d, meta)
+}
+
+func resourceAwsEcrPublicRepositoryRead(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).ecrpublicconn
+
+	log.Printf("[DEBUG] Reading ECR Public repository %s", d.Id())
+	var out *ecrpublic.DescribeRepositoriesOutput
+	input := &ecrpublic.DescribeRepositoriesInput{
+		RepositoryNames: aws.StringSlice([]string{d.Id()}),
+	}
+
+	var err error
+	err = resource.Retry(1*time.Minute, func() *resource.RetryError {
+		out, err = conn.DescribeRepositories(input)
+		if d.IsNewResource() && isAWSErr(err, ecrpublic.ErrCodeRepositoryNotFoundException, "") {
+			return resource.RetryableError(err)
+		}
+		if err != nil {
+			return resource.NonRetryableError(err)
+		}
+		return nil
+	})
+
+	if isResourceTimeoutError(err) {
+		out, err = conn.DescribeRepositories(input)
+	}
+
+	if !d.IsNewResource() && isAWSErr(err, ecrpublic.ErrCodeRepositoryNotFoundException, "") {
+		log.Printf("[WARN] ECR Public Repository (%s) not found, removing from state", d.Id())
+		d.SetId("")
+		return nil
+	}
+
+	if err != nil {
+		return fmt.Errorf("error reading ECR Public repository: %s", err)
+	}
+
+	if out == nil || len(out.Repositories) == 0 || out.Repositories[0] == nil {
+		return fmt.Errorf("error reading ECR Public Repository (%s): empty response", d.Id())
+	}
+
+	repository := out.Repositories[0]
+
+	d.Set("repository_name", d.Id())
+	d.Set("registry_id", repository.RegistryId)
+	d.Set("arn", repository.RepositoryArn)
+	d.Set("repository_uri", repository.RepositoryUri)
+
+	if v, ok := d.GetOk("force_destroy"); ok {
+		d.Set("force_destroy", v.(bool))
+	} else {
+		d.Set("force_destroy", false)
+	}
+
+	var catalogOut *ecrpublic.GetRepositoryCatalogDataOutput
+	catalogInput := &ecrpublic.GetRepositoryCatalogDataInput{
+		RepositoryName: aws.String(d.Id()),
+		RegistryId:     repository.RegistryId,
+	}
+
+	catalogOut, err = conn.GetRepositoryCatalogData(catalogInput)
+
+	if err != nil {
+		return fmt.Errorf("error reading catalog data for ECR Public repository: %s", err)
+	}
+
+	if catalogOut != nil {
+		flatCatalogData := flattenEcrPublicRepositoryCatalogData(catalogOut)
+		if catalogData, ok := d.GetOk("catalog_data"); ok && len(catalogData.([]interface{})) > 0 && catalogData.([]interface{})[0] != nil {
+			catalogDataMap := catalogData.([]interface{})[0].(map[string]interface{})
+			if v, ok := catalogDataMap["logo_image_blob"].(string); ok && len(v) > 0 {
+				flatCatalogData["logo_image_blob"] = v
+			}
+		}
+		d.Set("catalog_data", []interface{}{flatCatalogData})
+	} else {
+		d.Set("catalog_data", nil)
+	}
+
+	return nil
+}
+
+func resourceAwsEcrPublicRepositoryDelete(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).ecrpublicconn
+
+	deleteInput := &ecrpublic.DeleteRepositoryInput{
+		RepositoryName: aws.String(d.Id()),
+		RegistryId:     aws.String(d.Get("registry_id").(string)),
+	}
+
+	if v, ok := d.GetOk("force_destroy"); ok {
+		deleteInput.Force = aws.Bool(v.(bool))
+	}
+
+	_, err := conn.DeleteRepository(deleteInput)
+
+	if err != nil {
+		if isAWSErr(err, ecrpublic.ErrCodeRepositoryNotFoundException, "") {
+			return nil
+		}
+		return fmt.Errorf("error deleting ECR Public repository: %s", err)
+	}
+
+	log.Printf("[DEBUG] Waiting for ECR Public Repository %q to be deleted", d.Id())
+	input := &ecrpublic.DescribeRepositoriesInput{
+		RepositoryNames: aws.StringSlice([]string{d.Id()}),
+	}
+	err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
+		_, err = conn.DescribeRepositories(input)
+		if err != nil {
+			if isAWSErr(err, ecrpublic.ErrCodeRepositoryNotFoundException, "") {
+				return nil
+			}
+			return resource.NonRetryableError(err)
+		}
+
+		return resource.RetryableError(fmt.Errorf("%q: Timeout while waiting for the ECR Public Repository to be deleted", d.Id()))
+	})
+	if isResourceTimeoutError(err) {
+		_, err = conn.DescribeRepositories(input)
+	}
+
+	if isAWSErr(err, ecrpublic.ErrCodeRepositoryNotFoundException, "") {
+		return nil
+	}
+
+	if err != nil {
+		return fmt.Errorf("error deleting ECR Public repository: %s", err)
+	}
+
+	log.Printf("[DEBUG] repository %q deleted.", d.Get("repository_name").(string))
+
+	return nil
+}
+
+func resourceAwsEcrPublicRepositoryUpdate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).ecrpublicconn
+
+	if d.HasChange("catalog_data") {
+		if err := resourceAwsEcrPublicRepositoryUpdateCatalogData(conn, d); err != nil {
+			return err
+		}
+	}
+
+	return resourceAwsEcrPublicRepositoryRead(d, meta)
+}
+
+func flattenEcrPublicRepositoryCatalogData(apiObject *ecrpublic.GetRepositoryCatalogDataOutput) map[string]interface{} {
+	if apiObject == nil {
+		return nil
+	}
+
+	catalogData := apiObject.CatalogData
+
+	tfMap := map[string]interface{}{}
+
+	if v := catalogData.AboutText; v != nil {
+		tfMap["about_text"] = aws.StringValue(v)
+	}
+
+	if v := catalogData.Architectures; v != nil {
+		tfMap["architectures"] = aws.StringValueSlice(v)
+	}
+
+	if v := catalogData.Description; v != nil {
+		tfMap["description"] = aws.StringValue(v)
+	}
+
+	if v := catalogData.OperatingSystems; v != nil {
+		tfMap["operating_systems"] = aws.StringValueSlice(v)
+	}
+
+	if v := catalogData.UsageText; v != nil {
+		tfMap["usage_text"] = aws.StringValue(v)
+	}
+
+	return tfMap
+}
+
+func expandEcrPublicRepositoryCatalogData(tfMap map[string]interface{}) *ecrpublic.RepositoryCatalogDataInput {
+	if tfMap == nil {
+		return nil
+	}
+
+	repositoryCatalogDataInput := &ecrpublic.RepositoryCatalogDataInput{}
+
+	if v, ok := tfMap["about_text"].(string); ok && v != "" {
+		repositoryCatalogDataInput.AboutText = aws.String(v)
+	}
+
+	if v, ok := tfMap["architectures"].(*schema.Set); ok {
+		repositoryCatalogDataInput.Architectures = expandStringSet(v)
+	}
+
+	if v, ok := tfMap["description"].(string); ok && v != "" {
+		repositoryCatalogDataInput.Description = aws.String(v)
+	}
+
+	if v, ok := tfMap["logo_image_blob"].(string); ok && len(v) > 0 {
+		data, _ := base64.StdEncoding.DecodeString(v)
+		repositoryCatalogDataInput.LogoImageBlob = data
+	}
+
+	if v, ok := tfMap["operating_systems"].(*schema.Set); ok {
+		repositoryCatalogDataInput.OperatingSystems = expandStringSet(v)
+	}
+
+	if v, ok := tfMap["usage_text"].(string); ok && v != "" {
+		repositoryCatalogDataInput.UsageText = aws.String(v)
+	}
+
+	return repositoryCatalogDataInput
+}
+
+func resourceAwsEcrPublicRepositoryUpdateCatalogData(conn *ecrpublic.ECRPublic, d *schema.ResourceData) error {
+
+	if d.HasChange("catalog_data") {
+
+		if v, ok := d.GetOk("catalog_data"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
+			input := ecrpublic.PutRepositoryCatalogDataInput{
+				RepositoryName: aws.String(d.Id()),
+				RegistryId:     aws.String(d.Get("registry_id").(string)),
+				CatalogData:    expandEcrPublicRepositoryCatalogData(v.([]interface{})[0].(map[string]interface{})),
+			}
+
+			_, err := conn.PutRepositoryCatalogData(&input)
+
+			if err != nil {
+				return fmt.Errorf("error updating catalog data for repository(%s): %s", d.Id(), err)
+			}
+		}
+	}
+
+	return nil
+}