Skip to content

Commit e41ceb7

Browse files
authored
Merge branch 'main' into feature/CCM-13615_letter-status-source
2 parents 1613457 + c912dee commit e41ceb7

4 files changed

Lines changed: 6 additions & 16 deletions

File tree

.github/actions/trivy-iac/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ runs:
88
run: |
99
components_exit_code=0
1010
modules_exit_code=0
11-
11+
asdf plugin add trivy || true
12+
asdf install trivy || true
1213
./scripts/terraform/trivy-scan.sh --mode iac ./infrastructure/terraform/components || components_exit_code=$?
1314
./scripts/terraform/trivy-scan.sh --mode iac ./infrastructure/terraform/modules || modules_exit_code=$?
1415

.github/actions/trivy-package/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ runs:
77
shell: bash
88
run: |
99
exit_code=0
10-
10+
asdf plugin add trivy || true
11+
asdf install trivy || true
1112
./scripts/terraform/trivy-scan.sh --mode package . || exit_code=$?
1213
1314
if [ $exit_code -ne 0 ]; then

.github/workflows/stage-1-commit.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ jobs:
169169
uses: actions/checkout@v4
170170
- name: "Setup ASDF"
171171
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
172-
- name: "Repo setup"
173-
uses: ./.github/actions/node-install
174-
with:
175-
node-version: ${{ inputs.nodejs_version }}
176-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
177-
- name: "Perform Setup"
178-
uses: ./.github/actions/setup
179172
- name: "Trivy IaC Scan"
180173
uses: ./.github/actions/trivy-iac
181174
trivy-package:
@@ -191,13 +184,6 @@ jobs:
191184
uses: actions/checkout@v4
192185
- name: "Setup ASDF"
193186
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
194-
- name: "Repo setup"
195-
uses: ./.github/actions/node-install
196-
with:
197-
node-version: ${{ inputs.nodejs_version }}
198-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
199-
- name: "Perform Setup"
200-
uses: ./.github/actions/setup
201187
- name: "Trivy Package Scan"
202188
uses: ./.github/actions/trivy-package
203189
count-lines-of-code:

infrastructure/terraform/components/api/modules_eventpub.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ module "eventpub" {
1616
log_retention_in_days = var.log_retention_in_days
1717
log_level = "INFO"
1818

19+
force_destroy = var.force_destroy
20+
1921
event_cache_buffer_interval = 500
2022
enable_sns_delivery_logging = true
2123
sns_success_logging_sample_percent = 0

0 commit comments

Comments
 (0)