Skip to content

Commit ceb123d

Browse files
committed
refactor(terraform): update ECR viewer module to latest commit
1 parent f5a7338 commit ceb123d

File tree

3 files changed

+16
-20
lines changed

3 files changed

+16
-20
lines changed

IMPLEMENTATION.md

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
- [Options for Secrets Management](#options-for-secrets-management)
1111
- [Option 1: AWS Secrets Manager](#option-1-aws-secrets-manager)
1212
- [Option 2: GitHub Secrets](#option-2-github-secrets)
13-
- [Option 3: Direct Variable Injection](#option-3-direct-variable-injection)
1413
- [Common Issues and Solutions](#common-issues-and-solutions)
1514
- [Modules used in this repository](#modules-used-in-this-repository)
1615
- [Development Workflow](#development-workflow)
@@ -292,28 +291,17 @@ Configure secrets in your GitHub repository under **Settings > Secrets and varia
292291

293292
---
294293

295-
#### Option 3: Direct Variable Injection
296-
297-
You can also pass secrets directly as Terraform variables (not recommended for production).
294+
- [Return to Table of Contents](#table-of-contents)
298295

299-
**Example tfvars file:**
296+
---
300297

301-
```hcl
302-
# secrets.tfvars (keep this file out of version control)
303-
auth_client_id = "your-client-id"
304-
auth_issuer = "https://example.com"
305-
auth_secret = "your-auth-secret"
306-
auth_client_secret = "your-client-secret"
307-
secrets_manager_auth_secret_version = "arn:aws:secretsmanager:..."
308-
```
298+
## Common Issues and Solutions
309299

310-
---
300+
- [Checking DIBBS App Logs](https://github.com/CDCgov/dibbs-aws/wiki/Checking-DIBBS-App-Logs)
311301

312-
- [Return to Table of Contents](#table-of-contents)
313302

314-
---
303+
- [Manually Removing a Terraform Lock](https://github.com/CDCgov/dibbs-aws/wiki/Manually-Remove-a-Terraform-Lock)
315304

316-
## Common Issues and Solutions
317305

318306
| Issue | Solution |
319307
|-------|----------|

terraform/implementation/ecs/main.tf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module "db" {
3535
}
3636

3737
module "ecs" {
38-
source = "git::https://github.com/CDCgov/terraform-aws-dibbs-ecr-viewer.git?ref=588457a2beaa1371c1e5f01c9ece9bf83d937b00"
38+
source = "git::https://github.com/CDCgov/terraform-aws-dibbs-ecr-viewer.git?ref=ddf160866657a18711fb98286553dfc3e1240900"
3939

4040
public_subnet_ids = flatten(module.vpc.public_subnets)
4141
private_subnet_ids = flatten(module.vpc.private_subnets)
@@ -61,6 +61,12 @@ module "ecs" {
6161
# To disable autoscaling, set enable_autoscaling to false (default is true when not set)
6262
enable_autoscaling = true
6363

64+
enable_alb_deletion_protection = false
65+
66+
cw_retention_in_days = 14
67+
ecr_viewer_object_retention_days = 14
68+
logging_object_retention_days = 14
69+
6470
# If the intent is to enable alb deletion protection, set false (default is true when not set)
6571
# enable_alb_deletion_protection = false
6672

@@ -100,8 +106,6 @@ module "ecs" {
100106
target_memory = 70
101107
}
102108
}
103-
104-
cw_retention_in_days = 30
105109
}
106110

107111
resource "aws_route53_record" "alb" {

terraform/modules/oidc/_data.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ data "aws_iam_policy_document" "wildcard" {
8585
"ec2:DescribeVpcPeeringConnections",
8686
"ecr:GetAuthorizationToken",
8787
"ecr:GetLifecyclePolicy",
88+
"ecr:PutRegistryScanningConfiguration",
89+
"ecr:GetRegistryScanningConfiguration",
8890
"ecs:DeregisterTaskDefinition",
8991
"ecs:DescribeTaskDefinition",
9092
"elasticloadbalancing:DescribeListeners",
@@ -98,6 +100,8 @@ data "aws_iam_policy_document" "wildcard" {
98100
"elasticloadbalancing:SetWebACL",
99101
"iam:ListPolicies",
100102
"iam:GetRolePolicy",
103+
"inspector2:ListAccountPermissions",
104+
"inspector2:Disable",
101105
"kms:CreateKey",
102106
"kms:CreateAlias",
103107
"kms:DescribeKey",

0 commit comments

Comments
 (0)