From a2c2b955586d01a7b98ced0bc74172afda31ec97 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 2 Jan 2026 02:14:20 +0000 Subject: [PATCH] Standardize cloud bootstrap destroy process - Added bootstrap destroy module structure for aws, ali, azure, gcp, and vultr. - Moved AWS force destroy script to `terraform-hcl-standard/aws-cloud/modules/bootstrap-destroy/destroy.sh`. - Updated `iac-pipeline-mutli-cloud-bootstrap..yaml` to dynamically invoke the destroy script based on the cloud provider. - Added placeholders for other cloud providers. --- .../workflows/iac-pipeline-mutli-cloud-bootstrap..yaml | 10 +++++++++- .../ali-cloud/modules/bootstrap-destroy/destroy.sh | 6 ++++++ .../aws-cloud/modules/bootstrap-destroy/destroy.sh | 0 .../azure-cloud/modules/bootstrap-destroy/destroy.sh | 6 ++++++ .../gcp-cloud/modules/bootstrap-destroy/destroy.sh | 6 ++++++ .../vultr-vps/modules/bootstrap-destroy/destroy.sh | 6 ++++++ 6 files changed, 33 insertions(+), 1 deletion(-) create mode 100755 terraform-hcl-standard/ali-cloud/modules/bootstrap-destroy/destroy.sh rename scripts/aws-bootstrap-force-destroy.sh => terraform-hcl-standard/aws-cloud/modules/bootstrap-destroy/destroy.sh (100%) create mode 100755 terraform-hcl-standard/azure-cloud/modules/bootstrap-destroy/destroy.sh create mode 100755 terraform-hcl-standard/gcp-cloud/modules/bootstrap-destroy/destroy.sh create mode 100755 terraform-hcl-standard/vultr-vps/modules/bootstrap-destroy/destroy.sh diff --git a/.github/workflows/iac-pipeline-mutli-cloud-bootstrap..yaml b/.github/workflows/iac-pipeline-mutli-cloud-bootstrap..yaml index f4c7d674..3e75812d 100644 --- a/.github/workflows/iac-pipeline-mutli-cloud-bootstrap..yaml +++ b/.github/workflows/iac-pipeline-mutli-cloud-bootstrap..yaml @@ -84,7 +84,15 @@ jobs: - name: Force Destroy Bootstrap Resources if: env.DEPLOY_ACTION == 'destroy' run: | - ./scripts/aws-bootstrap-force-destroy.sh + CLOUD_ROOT=$(dirname ${{ env.TG_ROOT }}) + DESTROY_SCRIPT="${CLOUD_ROOT}/modules/bootstrap-destroy/destroy.sh" + if [ -f "$DESTROY_SCRIPT" ]; then + chmod +x "$DESTROY_SCRIPT" + "$DESTROY_SCRIPT" + else + echo "No destroy script found at $DESTROY_SCRIPT" + exit 1 + fi - name: Terragrunt Plan if: env.DEPLOY_ACTION == 'plan' diff --git a/terraform-hcl-standard/ali-cloud/modules/bootstrap-destroy/destroy.sh b/terraform-hcl-standard/ali-cloud/modules/bootstrap-destroy/destroy.sh new file mode 100755 index 00000000..bb7f1221 --- /dev/null +++ b/terraform-hcl-standard/ali-cloud/modules/bootstrap-destroy/destroy.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +# This script is a placeholder for Alibaba Cloud bootstrap resource cleanup +echo "Not implemented yet for Ali Cloud" +exit 0 diff --git a/scripts/aws-bootstrap-force-destroy.sh b/terraform-hcl-standard/aws-cloud/modules/bootstrap-destroy/destroy.sh similarity index 100% rename from scripts/aws-bootstrap-force-destroy.sh rename to terraform-hcl-standard/aws-cloud/modules/bootstrap-destroy/destroy.sh diff --git a/terraform-hcl-standard/azure-cloud/modules/bootstrap-destroy/destroy.sh b/terraform-hcl-standard/azure-cloud/modules/bootstrap-destroy/destroy.sh new file mode 100755 index 00000000..617984c0 --- /dev/null +++ b/terraform-hcl-standard/azure-cloud/modules/bootstrap-destroy/destroy.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +# This script is a placeholder for Azure Cloud bootstrap resource cleanup +echo "Not implemented yet for Azure Cloud" +exit 0 diff --git a/terraform-hcl-standard/gcp-cloud/modules/bootstrap-destroy/destroy.sh b/terraform-hcl-standard/gcp-cloud/modules/bootstrap-destroy/destroy.sh new file mode 100755 index 00000000..bc7e2c17 --- /dev/null +++ b/terraform-hcl-standard/gcp-cloud/modules/bootstrap-destroy/destroy.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +# This script is a placeholder for GCP Cloud bootstrap resource cleanup +echo "Not implemented yet for GCP Cloud" +exit 0 diff --git a/terraform-hcl-standard/vultr-vps/modules/bootstrap-destroy/destroy.sh b/terraform-hcl-standard/vultr-vps/modules/bootstrap-destroy/destroy.sh new file mode 100755 index 00000000..270da269 --- /dev/null +++ b/terraform-hcl-standard/vultr-vps/modules/bootstrap-destroy/destroy.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -euo pipefail + +# This script is a placeholder for Vultr VPS bootstrap resource cleanup +echo "Not implemented yet for Vultr VPS" +exit 0