From 3b53c5ffa55a1f3822f6d2473c9cd4538a50c6ba Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Mon, 1 Jun 2026 17:11:03 -0600 Subject: [PATCH 1/7] fix: workflow --- .github/workflows/pr-tests.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 42a290d..9d48feb 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -204,19 +204,21 @@ jobs: run: sleep 60 - name: Terraform destroy + if: always() run: | cd "${{ inputs.module_source }}" set -uo pipefail set +e set -x - terraform destroy -input=false -auto-approve -no-color > >(tee /dev/tty) 2> >(tee destroy.out >&2) EXIT_CODE=$? + terraform destroy -input=false -auto-approve -no-color > >(tee /dev/tty) 2> >(tee destroy.out >&2) + EXIT_CODE=$? set -e if [ "$EXIT_CODE" -ne 0 ]; then echo "::error title=Terraform Destroy Failed::Check summary for details" - echo "## โŒ Terraform Apply Failed" >> $GITHUB_STEP_SUMMARY + echo "## โŒ Terraform Destroy Failed" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo "**Module:** ${{ inputs.module_source }} " >> $GITHUB_STEP_SUMMARY echo "**Test:** ${{ matrix.label }}" >> $GITHUB_STEP_SUMMARY @@ -225,7 +227,7 @@ jobs: echo "" >> $GITHUB_STEP_SUMMARY echo "### ๐Ÿงพ Error Output" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY - tail -n 50 apply.out >> $GITHUB_STEP_SUMMARY + tail -n 50 destroy.out >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY exit 1 From 4e60ce05e992fe913399263213c50c2335dfd504 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Mon, 1 Jun 2026 17:13:14 -0600 Subject: [PATCH 2/7] test: force change 1 --- delivery/main.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/delivery/main.tf b/delivery/main.tf index 5d0f4c9..61e95cd 100644 --- a/delivery/main.tf +++ b/delivery/main.tf @@ -15,6 +15,8 @@ locals { ) + + edge_hostnames = (var.etls && var.secure_by_default) ? [] : var.hostnames ehn_certificate = (var.etls == true && var.secure_by_default == false) ? var.certificate_id : null From fb8c3eadd1d5c3a786cb71335983fab135e191a7 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Mon, 1 Jun 2026 17:33:32 -0600 Subject: [PATCH 3/7] fix: test cert id --- delivery/tests/tfvars.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery/tests/tfvars.tpl b/delivery/tests/tfvars.tpl index 8373a10..901dbe4 100644 --- a/delivery/tests/tfvars.tpl +++ b/delivery/tests/tfvars.tpl @@ -8,7 +8,7 @@ default_origin = "flexibleorigin.rafa.cr" forward_host_header = "flexibleorigin.rafa.cr" notification_emails = ["test@akamai.com"] version_notes = "GitHub Actions test" -certificate_id = 30192 +certificate_id = 307307 peer_reviewed_by = "test@na.com" customer_email = "test@akamai.com" unit_tested = true From 3f18a872b2bf66c89ac3a9f7d8b62742e3801847 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Mon, 1 Jun 2026 18:24:35 -0600 Subject: [PATCH 4/7] test: undo changes --- delivery/main.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/delivery/main.tf b/delivery/main.tf index 61e95cd..5d0f4c9 100644 --- a/delivery/main.tf +++ b/delivery/main.tf @@ -15,8 +15,6 @@ locals { ) - - edge_hostnames = (var.etls && var.secure_by_default) ? [] : var.hostnames ehn_certificate = (var.etls == true && var.secure_by_default == false) ? var.certificate_id : null From 99ffd3dc0bfe262a444dcbea12c06490a4df637d Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Mon, 1 Jun 2026 18:36:00 -0600 Subject: [PATCH 5/7] test: force change 1 --- delivery/main.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/delivery/main.tf b/delivery/main.tf index 5d0f4c9..4d4248a 100644 --- a/delivery/main.tf +++ b/delivery/main.tf @@ -20,6 +20,8 @@ locals { ehn_certificate = (var.etls == true && var.secure_by_default == false) ? var.certificate_id : null } + + module "rules" { source = "./rules" product_id = var.product_id From ccfba463508aac25e8feab270addff6d57b333b7 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Fri, 12 Jun 2026 13:01:43 -0600 Subject: [PATCH 6/7] fix: correct default cp code flag for rules module --- delivery/main.tf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/delivery/main.tf b/delivery/main.tf index 4d4248a..c70f94a 100644 --- a/delivery/main.tf +++ b/delivery/main.tf @@ -20,14 +20,12 @@ locals { ehn_certificate = (var.etls == true && var.secure_by_default == false) ? var.certificate_id : null } - - module "rules" { source = "./rules" product_id = var.product_id etls = var.etls default_origin = var.default_origin - cpcode_id = tonumber(trimprefix(akamai_cp_code.this[0].id, "cpc_")) + cpcode_id = var.default_cpcode ? null : tonumber(trimprefix(akamai_cp_code.this[0].id, "cpc_")) cpcode_name = var.cpcode_name sure_route_test_object = var.sure_route_test_object td_region = var.td_region From 27f31157be2a0342c142c387cdc58c4567025f7e Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Fri, 12 Jun 2026 13:23:55 -0600 Subject: [PATCH 7/7] fix: default cp code output --- delivery/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery/outputs.tf b/delivery/outputs.tf index 9cfa55c..99fe18b 100644 --- a/delivery/outputs.tf +++ b/delivery/outputs.tf @@ -9,7 +9,7 @@ output "rules_errors" { } output "cpcode_id" { - value = tonumber(trimprefix(akamai_cp_code.this[0].id, "cpc_")) + value = var.default_cpcode ? 0 : tonumber(trimprefix(akamai_cp_code.this[0].id, "cpc_")) description = "The CP Code's unique identifier." }