Skip to content

Commit 2764bd8

Browse files
authored
feat: Support private ecr pull through cache (#55)
support private ecr pull through cache
1 parent 8105d04 commit 2764bd8

File tree

12 files changed

+24
-17
lines changed

12 files changed

+24
-17
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
195195
| Name | Version |
196196
|------|---------|
197197
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
198-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
198+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.93 |
199199

200200
## Providers
201201

202202
| Name | Version |
203203
|------|---------|
204-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
204+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.93 |
205205

206206
## Modules
207207

examples/complete/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ Note that this example may create resources which will incur monetary charges on
2828
| Name | Version |
2929
|------|---------|
3030
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
31-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
31+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.93 |
3232

3333
## Providers
3434

3535
| Name | Version |
3636
|------|---------|
37-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
37+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.93 |
3838

3939
## Modules
4040

examples/complete/main.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ module "ecr_registry" {
127127
upstream_registry_url = "registry-1.docker.io"
128128
credential_arn = module.secrets_manager_dockerhub_credentials.secret_arn
129129
}
130+
priv = {
131+
ecr_repository_prefix = local.name
132+
upstream_registry_url = "${data.aws_caller_identity.current.account_id}.dkr.ecr.us-west-2.amazonaws.com"
133+
upstream_repository_prefix = "myapp"
134+
}
130135
}
131136

132137
# Registry Scanning Configuration

examples/complete/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.93"
88
}
99
}
1010
}

examples/repository-template/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ If you validate the example by using the pull-through cache, you will need to ma
2222
| Name | Version |
2323
|------|---------|
2424
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
25-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
25+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.93 |
2626

2727
## Providers
2828

2929
| Name | Version |
3030
|------|---------|
31-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
31+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.93 |
3232

3333
## Modules
3434

examples/repository-template/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.93"
88
}
99
}
1010
}

main.tf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,11 @@ resource "aws_ecr_registry_policy" "this" {
269269
resource "aws_ecr_pull_through_cache_rule" "this" {
270270
for_each = { for k, v in var.registry_pull_through_cache_rules : k => v if var.create }
271271

272-
ecr_repository_prefix = each.value.ecr_repository_prefix
273-
upstream_registry_url = each.value.upstream_registry_url
274-
credential_arn = try(each.value.credential_arn, null)
272+
ecr_repository_prefix = each.value.ecr_repository_prefix
273+
upstream_registry_url = each.value.upstream_registry_url
274+
credential_arn = try(each.value.credential_arn, null)
275+
custom_role_arn = try(each.value.custom_role_arn, null)
276+
upstream_repository_prefix = try(each.value.upstream_repository_prefix, null)
275277
}
276278

277279
################################################################################

modules/repository-template/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
9898
| Name | Version |
9999
|------|---------|
100100
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
101-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
101+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.93 |
102102

103103
## Providers
104104

105105
| Name | Version |
106106
|------|---------|
107-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
107+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.93 |
108108

109109
## Modules
110110

modules/repository-template/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.93"
88
}
99
}
1010
}

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.93"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)