Skip to content

Commit

Permalink
Merge pull request #6911 from ewbankkit/issue-6896
Browse files Browse the repository at this point in the history 
Amazon ECR Repository tags
  • Loading branch information
@bflad
bflad committed Dec 18, 2018
2 parents b83071f + a49d29f commit 660ccf1
Show file tree
Hide file tree
Showing 8 changed files with 366 additions and 34 deletions.
16 changes: 10 additions & 6 deletions aws/data_source_aws_ecr_repository.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aws

import (
"fmt"
"log"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/ecr"
"github.com/hashicorp/terraform/helper/schema"
)
Expand All @@ -31,37 +31,41 @@ func dataSourceAwsEcrRepository() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"tags": tagsSchemaComputed(),
},
}
}

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

repositoryName := d.Get("name").(string)
params := &ecr.DescribeRepositoriesInput{
RepositoryNames: []*string{aws.String(repositoryName)},
RepositoryNames: aws.StringSlice([]string{d.Get("name").(string)}),
}
log.Printf("[DEBUG] Reading ECR repository: %s", params)
out, err := conn.DescribeRepositories(params)
if err != nil {
if ecrerr, ok := err.(awserr.Error); ok && ecrerr.Code() == "RepositoryNotFoundException" {
if isAWSErr(err, ecr.ErrCodeRepositoryNotFoundException, "") {
log.Printf("[WARN] ECR Repository %s not found, removing from state", d.Id())
d.SetId("")
return nil
}
return err
return fmt.Errorf("error reading ECR repository: %s", err)
}

repository := out.Repositories[0]

log.Printf("[DEBUG] Received ECR repository %s", out)

d.SetId(*repository.RepositoryName)
d.SetId(aws.StringValue(repository.RepositoryName))
d.Set("arn", repository.RepositoryArn)
d.Set("registry_id", repository.RegistryId)
d.Set("name", repository.RepositoryName)
d.Set("repository_url", repository.RepositoryUri)

if err := getTagsECR(conn, d); err != nil {
return fmt.Errorf("error getting ECR repository tags: %s", err)
}

return nil
}
26 changes: 19 additions & 7 deletions aws/data_source_aws_ecr_repository_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,40 @@ import (
)

func TestAccAWSEcrDataSource_ecrRepository(t *testing.T) {
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "data.aws_ecr_repository.default"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: testAccCheckAwsEcrRepositoryDataSourceConfig,
Config: testAccCheckAwsEcrRepositoryDataSourceConfig(rName),
Check: resource.ComposeTestCheckFunc(
resource.TestMatchResourceAttr("data.aws_ecr_repository.default", "arn", regexp.MustCompile(`^arn:aws:ecr:[a-zA-Z]+-[a-zA-Z]+-\d+:\d+:repository/foo-repository-terraform-\d+$`)),
resource.TestCheckResourceAttrSet("data.aws_ecr_repository.default", "registry_id"),
resource.TestMatchResourceAttr("data.aws_ecr_repository.default", "repository_url", regexp.MustCompile(`^\d+\.dkr\.ecr\.[a-zA-Z]+-[a-zA-Z]+-\d+\.amazonaws\.com/foo-repository-terraform-\d+$`)),
resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(`^arn:aws:ecr:[a-zA-Z]+-[a-zA-Z]+-\d+:\d+:repository/tf-acc-test-\d+$`)),
resource.TestCheckResourceAttrSet(resourceName, "registry_id"),
resource.TestMatchResourceAttr(resourceName, "repository_url", regexp.MustCompile(`^\d+\.dkr\.ecr\.[a-zA-Z]+-[a-zA-Z]+-\d+\.amazonaws\.com/tf-acc-test-\d+$`)),
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
resource.TestCheckResourceAttr(resourceName, "tags.Usage", "original"),
),
},
},
})
}

var testAccCheckAwsEcrRepositoryDataSourceConfig = fmt.Sprintf(`
func testAccCheckAwsEcrRepositoryDataSourceConfig(rName string) string {
return fmt.Sprintf(`
resource "aws_ecr_repository" "default" {
name = "foo-repository-terraform-%d"
name = %q
tags = {
Environment = "production"
Usage = "original"
}
}
data "aws_ecr_repository" "default" {
name = "${aws_ecr_repository.default.name}"
}
`, acctest.RandInt())
`, rName)
}
52 changes: 32 additions & 20 deletions aws/resource_aws_ecr_repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/ecr"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
Expand All @@ -17,6 +16,7 @@ func resourceAwsEcrRepository() *schema.Resource {
return &schema.Resource{
Create: resourceAwsEcrRepositoryCreate,
Read: resourceAwsEcrRepositoryRead,
Update: resourceAwsEcrRepositoryUpdate,
Delete: resourceAwsEcrRepositoryDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
Expand All @@ -32,6 +32,7 @@ func resourceAwsEcrRepository() *schema.Resource {
Required: true,
ForceNew: true,
},
"tags": tagsSchema(),
"arn": {
Type: schema.TypeString,
Computed: true,
Expand All @@ -55,30 +56,34 @@ func resourceAwsEcrRepositoryCreate(d *schema.ResourceData, meta interface{}) er
RepositoryName: aws.String(d.Get("name").(string)),
}

log.Printf("[DEBUG] Creating ECR resository: %s", input)
log.Printf("[DEBUG] Creating ECR repository: %#v", input)
out, err := conn.CreateRepository(&input)
if err != nil {
return err
return fmt.Errorf("error creating ECR repository: %s", err)
}

repository := *out.Repository

log.Printf("[DEBUG] ECR repository created: %q", *repository.RepositoryArn)

d.SetId(*repository.RepositoryName)
d.SetId(aws.StringValue(repository.RepositoryName))
// ARN required for setting any tags.
d.Set("arn", repository.RepositoryArn)
d.Set("registry_id", repository.RegistryId)

if err := setTagsECR(conn, d); err != nil {
return fmt.Errorf("error setting ECR repository tags: %s", err)
}

return resourceAwsEcrRepositoryRead(d, meta)
}

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

log.Printf("[DEBUG] Reading repository %s", d.Id())
log.Printf("[DEBUG] Reading ECR repository %s", d.Id())
var out *ecr.DescribeRepositoriesOutput
input := &ecr.DescribeRepositoriesInput{
RepositoryNames: []*string{aws.String(d.Id())},
RepositoryNames: aws.StringSlice([]string{d.Id()}),
}

err := resource.Retry(1*time.Minute, func() *resource.RetryError {
Expand All @@ -100,7 +105,7 @@ func resourceAwsEcrRepositoryRead(d *schema.ResourceData, meta interface{}) erro
}

if err != nil {
return err
return fmt.Errorf("error reading ECR repository: %s", err)
}

repository := out.Repositories[0]
Expand All @@ -110,9 +115,23 @@ func resourceAwsEcrRepositoryRead(d *schema.ResourceData, meta interface{}) erro
d.Set("registry_id", repository.RegistryId)
d.Set("repository_url", repository.RepositoryUri)

if err := getTagsECR(conn, d); err != nil {
return fmt.Errorf("error getting ECR repository tags: %s", err)
}

return nil
}

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

if err := setTagsECR(conn, d); err != nil {
return fmt.Errorf("error setting ECR repository tags: %s", err)
}

return resourceAwsEcrRepositoryRead(d, meta)
}

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

Expand All @@ -122,36 +141,29 @@ func resourceAwsEcrRepositoryDelete(d *schema.ResourceData, meta interface{}) er
Force: aws.Bool(true),
})
if err != nil {
if ecrerr, ok := err.(awserr.Error); ok && ecrerr.Code() == "RepositoryNotFoundException" {
if isAWSErr(err, ecr.ErrCodeRepositoryNotFoundException, "") {
return nil
}
return err
return fmt.Errorf("error deleting ECR repository: %s", err)
}

log.Printf("[DEBUG] Waiting for ECR Repository %q to be deleted", d.Id())
err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
_, err := conn.DescribeRepositories(&ecr.DescribeRepositoriesInput{
RepositoryNames: []*string{aws.String(d.Id())},
RepositoryNames: aws.StringSlice([]string{d.Id()}),
})

if err != nil {
awsErr, ok := err.(awserr.Error)
if !ok {
return resource.NonRetryableError(err)
}

if awsErr.Code() == "RepositoryNotFoundException" {
if isAWSErr(err, ecr.ErrCodeRepositoryNotFoundException, "") {
return nil
}

return resource.NonRetryableError(err)
}

return resource.RetryableError(
fmt.Errorf("%q: Timeout while waiting for the ECR Repository to be deleted", d.Id()))
})
if err != nil {
return err
return fmt.Errorf("error deleting ECR repository: %s", err)
}

log.Printf("[DEBUG] repository %q deleted.", d.Get("name").(string))
Expand Down
58 changes: 57 additions & 1 deletion aws/resource_aws_ecr_repository_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,37 @@ func TestAccAWSEcrRepository_basic(t *testing.T) {
})
}

func TestAccAWSEcrRepository_tags(t *testing.T) {
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_ecr_repository.default"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSEcrRepositoryDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSEcrRepositoryConfig_tags(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEcrRepositoryExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
resource.TestCheckResourceAttr(resourceName, "tags.Usage", "original"),
),
},
{
Config: testAccAWSEcrRepositoryConfig_tagsChanged(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSEcrRepositoryExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(resourceName, "tags.Usage", "changed"),
),
},
},
})
}

func testAccCheckAWSEcrRepositoryDestroy(s *terraform.State) error {
conn := testAccProvider.Meta().(*AWSClient).ecrconn

Expand Down Expand Up @@ -99,7 +130,32 @@ func testAccCheckAWSEcrRepositoryRepositoryURL(resourceName, repositoryName stri
func testAccAWSEcrRepositoryConfig(rName string) string {
return fmt.Sprintf(`
resource "aws_ecr_repository" "default" {
name = %q
name = %q
}
`, rName)
}

func testAccAWSEcrRepositoryConfig_tags(rName string) string {
return fmt.Sprintf(`
resource "aws_ecr_repository" "default" {
name = %q
tags = {
Environment = "production"
Usage = "original"
}
}
`, rName)
}

func testAccAWSEcrRepositoryConfig_tagsChanged(rName string) string {
return fmt.Sprintf(`
resource "aws_ecr_repository" "default" {
name = %q
tags = {
Usage = "changed"
}
}
`, rName)
}
Loading

0 comments on commit 660ccf1

Please sign in to comment.