From 8d8b5a1941c1175ca410cc883bbd90e8005367a5 Mon Sep 17 00:00:00 2001 From: Jin Lee Date: Wed, 10 Jan 2024 10:15:40 -0600 Subject: [PATCH] renaming consolidated scenario 1 tf pipeline --- .github/workflows/scenario1.bicep.yml | 2 +- .github/workflows/scenario1.terraform.yml | 6 +++--- .gitignore | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scenario1.bicep.yml b/.github/workflows/scenario1.bicep.yml index be398457..694299c9 100644 --- a/.github/workflows/scenario1.bicep.yml +++ b/.github/workflows/scenario1.bicep.yml @@ -41,7 +41,7 @@ on: - main paths: - '.github/workflows/_template.bicep.yml' - - '.github/workflows/ase-multitenant.bicep.yml' + - '.github/workflows/scenario1.bicep.yml' - 'scenarios/secure-baseline-multitenant/bicep/**.bicep' - 'scenarios/secure-baseline-multitenant/bicep/parameters/ase-multitenant.parameters.jsonc' - '!scenarios/secure-baseline-multitenant/**.md' diff --git a/.github/workflows/scenario1.terraform.yml b/.github/workflows/scenario1.terraform.yml index 52c00ad3..e2122a11 100644 --- a/.github/workflows/scenario1.terraform.yml +++ b/.github/workflows/scenario1.terraform.yml @@ -1,4 +1,4 @@ -name: 'Scenario 1: Terraform HUB Multi-tenant Secure Baseline' +name: 'Scenario 1: Terraform Multi-Tenant ASEv3 Secure Baseline' on: workflow_dispatch: @@ -59,7 +59,7 @@ jobs: with: modulePath: ${{ needs.prepare-environment.outputs.modulePath }}/hub terraformVersion: ${{ needs.prepare-environment.outputs.terraformVersion }} - backendStateKey: ${{ needs.prepare-environment.outputs.backendStateKey }} + backendStateKey: 'scenario1.hub.tfstate' tfvarPath: ${{ needs.prepare-environment.outputs.tfvarPath }} # Ensure this value is a boolean destroy: ${{ github.event.inputs.destroy == 'true' }} @@ -74,7 +74,7 @@ jobs: with: modulePath: ${{ needs.prepare-environment.outputs.modulePath }}/spoke terraformVersion: ${{ needs.prepare-environment.outputs.terraformVersion }} - backendStateKey: ${{ needs.prepare-environment.outputs.backendStateKey }} + backendStateKey: 'scenario1.spoke.tfstate' tfvarPath: ${{ needs.prepare-environment.outputs.tfvarPath }} # Ensure this value is a boolean destroy: ${{ github.event.inputs.destroy == 'true' }} diff --git a/.gitignore b/.gitignore index 6b9cd17e..53e3c7a8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ deployment/bicep/main.json **/.vscode/* # Local .terraform directories +.terraform **/.terraform/* *.lock.hcl # .tfstate files