From c60f8e7f804a381caf9f4b541536a61c8d06306e Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Fri, 30 Aug 2024 14:20:10 -0700 Subject: [PATCH 1/9] Update .github/workflows/terraform-plan.yaml --- .github/workflows/terraform-plan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-plan.yaml b/.github/workflows/terraform-plan.yaml index 1e87682..a61562d 100644 --- a/.github/workflows/terraform-plan.yaml +++ b/.github/workflows/terraform-plan.yaml @@ -17,7 +17,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" + AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION }}" # Steps represent a sequence of tasks that will be executed as part of the job From a7c3440550f06ec4f1ddfe6078cadf37b80a3ae4 Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Fri, 30 Aug 2024 14:20:12 -0700 Subject: [PATCH 2/9] Update .github/workflows/terraform-apply.yaml --- .github/workflows/terraform-apply.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-apply.yaml b/.github/workflows/terraform-apply.yaml index 4ce33c8..4d6f010 100644 --- a/.github/workflows/terraform-apply.yaml +++ b/.github/workflows/terraform-apply.yaml @@ -18,7 +18,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" + AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION # Steps represent a sequence of tasks that will be executed as part of the job From 88446fd840386ca8194094968ba7457e16ac270c Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 3 Sep 2024 09:05:43 -0700 Subject: [PATCH 3/9] Update terraform-apply.yaml --- .github/workflows/terraform-apply.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-apply.yaml b/.github/workflows/terraform-apply.yaml index 4d6f010..4ce33c8 100644 --- a/.github/workflows/terraform-apply.yaml +++ b/.github/workflows/terraform-apply.yaml @@ -18,7 +18,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION + AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" # Steps represent a sequence of tasks that will be executed as part of the job From c6764a25464cb93ca30caace8aa0226cb120de4f Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 3 Sep 2024 09:05:59 -0700 Subject: [PATCH 4/9] Delete terraform-apply.yml --- .github/workflows/terraform-apply.yml | 59 --------------------------- 1 file changed, 59 deletions(-) delete mode 100644 .github/workflows/terraform-apply.yml diff --git a/.github/workflows/terraform-apply.yml b/.github/workflows/terraform-apply.yml deleted file mode 100644 index e1289f6..0000000 --- a/.github/workflows/terraform-apply.yml +++ /dev/null @@ -1,59 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Terraform Apply - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the "main" branch - push: - branches: [ "main" ] - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -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 ] - env: - AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" - AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" - - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - - - uses: CSVD/gh-actions-setup-node@v3 - with: - node-version: 16 - - - uses: CSVD/gh-actions-setup-terraform@v2 - with: - terraform_wrapper: false - terraform_version: "1.9.1" - - - name: Terraform Format - id: fmt - run: | - terraform fmt -check - - - name: Autoformat Halt - if: env.auto_format == 'true' - run: exit 1 - - - name: Terraform Init - id: init - run: terraform init -upgrade - - - name: Terraform Validate - id: validate - run: terraform validate - - - name: Terraform Auto Apply - uses: HappyPathway/terraform-apply@1.0.0 - From 49065c1df45e2a9d6a1face07470c6d794c52e7e Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 3 Sep 2024 09:06:27 -0700 Subject: [PATCH 5/9] Update terraform-plan.yaml --- .github/workflows/terraform-plan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-plan.yaml b/.github/workflows/terraform-plan.yaml index a61562d..1e87682 100644 --- a/.github/workflows/terraform-plan.yaml +++ b/.github/workflows/terraform-plan.yaml @@ -17,7 +17,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION }}" + AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" # Steps represent a sequence of tasks that will be executed as part of the job From 17556e84eb174e38fd3409ea7c2dbb80142acea0 Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 3 Sep 2024 09:14:42 -0700 Subject: [PATCH 6/9] Update .github/workflows/terraform-apply.yaml --- .github/workflows/terraform-apply.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-apply.yaml b/.github/workflows/terraform-apply.yaml index 4ce33c8..4d6f010 100644 --- a/.github/workflows/terraform-apply.yaml +++ b/.github/workflows/terraform-apply.yaml @@ -18,7 +18,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" + AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION # Steps represent a sequence of tasks that will be executed as part of the job From aafd98e626f0efd653cd898a7d4997c29cc8598f Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 3 Sep 2024 09:14:44 -0700 Subject: [PATCH 7/9] Update .github/workflows/terraform-plan.yaml --- .github/workflows/terraform-plan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-plan.yaml b/.github/workflows/terraform-plan.yaml index 1e87682..a61562d 100644 --- a/.github/workflows/terraform-plan.yaml +++ b/.github/workflows/terraform-plan.yaml @@ -17,7 +17,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" + AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION }}" # Steps represent a sequence of tasks that will be executed as part of the job From 10a61fc4f482142807cdea542dfa67a2b7b4a6c7 Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 3 Sep 2024 09:39:39 -0700 Subject: [PATCH 8/9] Update .github/workflows/terraform-plan.yaml --- .github/workflows/terraform-plan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-plan.yaml b/.github/workflows/terraform-plan.yaml index a61562d..1e87682 100644 --- a/.github/workflows/terraform-plan.yaml +++ b/.github/workflows/terraform-plan.yaml @@ -17,7 +17,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION }}" + AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" # Steps represent a sequence of tasks that will be executed as part of the job From b5a460f8f48a5f5261aa446a96da6584cfc3f88c Mon Sep 17 00:00:00 2001 From: David John Arnold Jr Date: Tue, 3 Sep 2024 09:39:40 -0700 Subject: [PATCH 9/9] Update .github/workflows/terraform-apply.yaml --- .github/workflows/terraform-apply.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-apply.yaml b/.github/workflows/terraform-apply.yaml index 4d6f010..4ce33c8 100644 --- a/.github/workflows/terraform-apply.yaml +++ b/.github/workflows/terraform-apply.yaml @@ -18,7 +18,7 @@ jobs: env: AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}" AWS_ACCESS_KEY_ID: "${{ vars.AWS_ACCESS_KEY_ID }}" - AWS_DEFAULT_REGION: "${{ vars.AWS_DEFAULT_REGION + AWS_SESSION_TOKEN: "${{ secrets.AWS_SESSION_TOKEN }}" # Steps represent a sequence of tasks that will be executed as part of the job