From 33b340c6c9fe26037d26eee9da063e1644e61631 Mon Sep 17 00:00:00 2001 From: Dave Arnold Date: Wed, 14 Aug 2024 12:42:06 -0700 Subject: [PATCH] chore: Refactor image pipeline module names and update workflows --- workflows/terraform-apply.yaml.tpl | 4 ++-- workflows/terraform-plan.yaml.tpl | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/workflows/terraform-apply.yaml.tpl b/workflows/terraform-apply.yaml.tpl index 879ba17..5b9e2b7 100644 --- a/workflows/terraform-apply.yaml.tpl +++ b/workflows/terraform-apply.yaml.tpl @@ -14,7 +14,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: [ aws-image-pipeline ] + runs-on: [ ${repo_name} ] env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" @@ -34,7 +34,7 @@ jobs: - uses: CSVD/gh-actions-setup-terraform@v2 with: terraform_wrapper: false - terraform_version: "1.9.1" + terraform_version: $${{ vars.terraform_version }} - name: Terraform Format id: fmt diff --git a/workflows/terraform-plan.yaml.tpl b/workflows/terraform-plan.yaml.tpl index ee56a9f..dd3fb0e 100644 --- a/workflows/terraform-plan.yaml.tpl +++ b/workflows/terraform-plan.yaml.tpl @@ -13,7 +13,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: [ aws-image-pipeline ] + runs-on: [ ${repo_name} ] env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" @@ -30,9 +30,10 @@ jobs: with: node-version: 16 -# - uses: CSVD/gh-actions-setup-terraform@v2 -# with: -# terraform_wrapper: false + - uses: CSVD/gh-actions-setup-terraform@v2 + with: + terraform_wrapper: false + terraform_version: $${{ vars.terraform_version }} - name: Terraform Format id: fmt