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

Error when data.aws_ecr_repository cannot find repository #10520

Merged
merged 3 commits into from
Jul 16, 2020
Merged

Error when data.aws_ecr_repository cannot find repository #10520

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
467a1bd
Error when data.aws_ecr_repository cannot find repository
tomelliff Oct 16, 2019
32ad2f6
Merge branch 'master' into error-when-ecr-repo-not-found-by-data-source
anGie44 Jul 16, 2020
37613c3
adjust error messaging
anGie44 Jul 16, 2020
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
13 changes: 6 additions & 7 deletions aws/data_source_aws_ecr_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,17 @@ func dataSourceAwsEcrRepositoryRead(d *schema.ResourceData, meta interface{}) er
conn := meta.(*AWSClient).ecrconn
ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig

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

repository := out.Repositories[0]
Expand All @@ -66,11 +65,11 @@ func dataSourceAwsEcrRepositoryRead(d *schema.ResourceData, meta interface{}) er
tags, err := keyvaluetags.EcrListTags(conn, arn)

if err != nil {
return fmt.Errorf("error listing tags for ECR Repository (%s): %s", arn, err)
return fmt.Errorf("error listing tags for ECR Repository (%s): %w", arn, err)
}

if err := d.Set("tags", tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
return fmt.Errorf("error setting tags: %s", err)
return fmt.Errorf("error setting tags: %w", err)
}

return nil
Expand Down