From b9369db5298dabd3ba110e32a911a494ec64f0ba Mon Sep 17 00:00:00 2001 From: shanice-skylight Date: Thu, 19 Sep 2024 23:23:04 -0400 Subject: [PATCH] upgraded TF to 1.9.6 and setup-terraform to 3.1.2 --- .github/actions/db-actions/action.yml | 4 ++-- .github/actions/tf-deploy/action.yml | 4 ++-- .github/workflows/terraformChecks.yml | 12 ++++++------ .github/workflows/terraformPlan.yml | 4 ++-- ops/demo/_config.tf | 2 +- ops/demo/persistent/_config.tf | 2 +- ops/dev/_config.tf | 2 +- ops/dev/persistent/_config.tf | 2 +- ops/dev2/_config.tf | 2 +- ops/dev2/persistent/_config.tf | 2 +- ops/dev3/_config.tf | 2 +- ops/dev3/persistent/_config.tf | 2 +- ops/dev4/_config.tf | 2 +- ops/dev4/persistent/_config.tf | 2 +- ops/dev5/_config.tf | 2 +- ops/dev5/persistent/_config.tf | 2 +- ops/dev6/_config.tf | 2 +- ops/dev6/persistent/_config.tf | 2 +- ops/global/_config.tf | 2 +- ops/pentest/_config.tf | 2 +- ops/pentest/persistent/_config.tf | 2 +- ops/prod/_config.tf | 2 +- ops/prod/persistent/_config.tf | 2 +- .../report_stream_batched_publisher/infra/_config.tf | 2 +- ops/services/okta-app/_config.tf | 2 +- ops/services/okta-global/_config.tf | 2 +- ops/services/pagerduty/_config.tf | 2 +- ops/stg/_config.tf | 2 +- ops/stg/persistent/_config.tf | 2 +- ops/test/_config.tf | 2 +- ops/test/persistent/_config.tf | 2 +- ops/training/_config.tf | 2 +- ops/training/persistent/_config.tf | 2 +- 33 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/actions/db-actions/action.yml b/.github/actions/db-actions/action.yml index 2bd48e3289..d4259c99e3 100644 --- a/.github/actions/db-actions/action.yml +++ b/.github/actions/db-actions/action.yml @@ -85,9 +85,9 @@ runs: run: ./build_and_push.sh - name: Terraform setup - uses: hashicorp/setup-terraform@v3.1.1 + uses: hashicorp/setup-terraform@v3.1.2 with: - terraform_version: 1.9.5 + terraform_version: 1.9.6 - name: Terraform init shell: bash diff --git a/.github/actions/tf-deploy/action.yml b/.github/actions/tf-deploy/action.yml index bef0d5dbc8..f11b211e91 100644 --- a/.github/actions/tf-deploy/action.yml +++ b/.github/actions/tf-deploy/action.yml @@ -29,9 +29,9 @@ runs: - uses: azure/login@v1 with: creds: ${{ inputs.azure_creds }} - - uses: hashicorp/setup-terraform@v3.1.1 + - uses: hashicorp/setup-terraform@v3.1.2 with: - terraform_version: 1.9.5 + terraform_version: 1.9.6 - name: Build ReportStream function app uses: ./.github/actions/build-reportstream-functions with: diff --git a/.github/workflows/terraformChecks.yml b/.github/workflows/terraformChecks.yml index 4b9ee50d73..234e0f76fc 100644 --- a/.github/workflows/terraformChecks.yml +++ b/.github/workflows/terraformChecks.yml @@ -18,9 +18,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: hashicorp/setup-terraform@v3.1.1 + - uses: hashicorp/setup-terraform@v3.1.2 with: - terraform_version: 1.9.5 + terraform_version: 1.9.6 - name: Terraform fmt run: terraform fmt -check -recursive @@ -35,9 +35,9 @@ jobs: global steps: - uses: actions/checkout@v4 - - uses: hashicorp/setup-terraform@v3.1.1 + - uses: hashicorp/setup-terraform@v3.1.2 with: - terraform_version: 1.9.5 + terraform_version: 1.9.6 - name: Terraform Init run: | for d in $TERRAFORM_DIRS @@ -72,10 +72,10 @@ jobs: if: ${{ github.actor != 'dependabot[bot]' }} with: creds: ${{ secrets.AZURE_CREDENTIALS }} - - uses: hashicorp/setup-terraform@v3.1.1 + - uses: hashicorp/setup-terraform@v3.1.2 if: ${{ github.actor != 'dependabot[bot]' }} with: - terraform_version: 1.9.5 + terraform_version: 1.9.6 - name: Terraform Init Prod if: ${{ github.actor != 'dependabot[bot]' }} run: make init-prod diff --git a/.github/workflows/terraformPlan.yml b/.github/workflows/terraformPlan.yml index 55b83296a8..85d7a30382 100644 --- a/.github/workflows/terraformPlan.yml +++ b/.github/workflows/terraformPlan.yml @@ -63,9 +63,9 @@ jobs: if: ${{ matrix.env == 'prod' || matrix.env == 'stg' || matrix.env == 'training' }} run: | echo "OKTA_API_TOKEN=${{ secrets.OKTA_API_TOKEN }}" >> "$GITHUB_ENV" - - uses: hashicorp/setup-terraform@v3.1.1 + - uses: hashicorp/setup-terraform@v3.1.2 with: - terraform_version: 1.9.5 + terraform_version: 1.9.6 - name: Terraform Init run: make init-${{ matrix.env }} - name: Build ReportStream function app diff --git a/ops/demo/_config.tf b/ops/demo/_config.tf index cf151b25d4..2b649bc7be 100644 --- a/ops/demo/_config.tf +++ b/ops/demo/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/demo/persistent/_config.tf b/ops/demo/persistent/_config.tf index fc282937e0..5202fc723d 100644 --- a/ops/demo/persistent/_config.tf +++ b/ops/demo/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/dev/_config.tf b/ops/dev/_config.tf index 0ea517e93e..e832395cdb 100644 --- a/ops/dev/_config.tf +++ b/ops/dev/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/dev/persistent/_config.tf b/ops/dev/persistent/_config.tf index 50617f53c6..3c1330a936 100644 --- a/ops/dev/persistent/_config.tf +++ b/ops/dev/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/dev2/_config.tf b/ops/dev2/_config.tf index d0c3767b4d..28a84ac1f2 100644 --- a/ops/dev2/_config.tf +++ b/ops/dev2/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/dev2/persistent/_config.tf b/ops/dev2/persistent/_config.tf index c4cf4ec9a0..949d036949 100644 --- a/ops/dev2/persistent/_config.tf +++ b/ops/dev2/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/dev3/_config.tf b/ops/dev3/_config.tf index 3499e38216..044906bafa 100644 --- a/ops/dev3/_config.tf +++ b/ops/dev3/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/dev3/persistent/_config.tf b/ops/dev3/persistent/_config.tf index 1100101aae..cf47bd2472 100644 --- a/ops/dev3/persistent/_config.tf +++ b/ops/dev3/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/dev4/_config.tf b/ops/dev4/_config.tf index 52bb166ba3..87eb379b19 100644 --- a/ops/dev4/_config.tf +++ b/ops/dev4/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/dev4/persistent/_config.tf b/ops/dev4/persistent/_config.tf index c16bb50d60..e89c1cc5af 100644 --- a/ops/dev4/persistent/_config.tf +++ b/ops/dev4/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/dev5/_config.tf b/ops/dev5/_config.tf index 6c34fec469..2b8598bec9 100644 --- a/ops/dev5/_config.tf +++ b/ops/dev5/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/dev5/persistent/_config.tf b/ops/dev5/persistent/_config.tf index 8399f5c7fa..ca16bc21db 100644 --- a/ops/dev5/persistent/_config.tf +++ b/ops/dev5/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/dev6/_config.tf b/ops/dev6/_config.tf index d608ff972a..04c6a9d161 100644 --- a/ops/dev6/_config.tf +++ b/ops/dev6/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/dev6/persistent/_config.tf b/ops/dev6/persistent/_config.tf index d538641334..7c07de4a54 100644 --- a/ops/dev6/persistent/_config.tf +++ b/ops/dev6/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/global/_config.tf b/ops/global/_config.tf index cab0d792b8..868ff1756b 100644 --- a/ops/global/_config.tf +++ b/ops/global/_config.tf @@ -19,7 +19,7 @@ terraform { version = "~> 2.14" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/pentest/_config.tf b/ops/pentest/_config.tf index 09a4838d9c..1b20e63180 100644 --- a/ops/pentest/_config.tf +++ b/ops/pentest/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/pentest/persistent/_config.tf b/ops/pentest/persistent/_config.tf index d5f108a459..a429fe13d0 100644 --- a/ops/pentest/persistent/_config.tf +++ b/ops/pentest/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/prod/_config.tf b/ops/prod/_config.tf index d9df1192c2..50b2dc3068 100644 --- a/ops/prod/_config.tf +++ b/ops/prod/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/prod/persistent/_config.tf b/ops/prod/persistent/_config.tf index 2b314715bb..81cc375d5a 100644 --- a/ops/prod/persistent/_config.tf +++ b/ops/prod/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/services/app_functions/report_stream_batched_publisher/infra/_config.tf b/ops/services/app_functions/report_stream_batched_publisher/infra/_config.tf index 672eeeff1c..d21f2ead3c 100644 --- a/ops/services/app_functions/report_stream_batched_publisher/infra/_config.tf +++ b/ops/services/app_functions/report_stream_batched_publisher/infra/_config.tf @@ -5,5 +5,5 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/services/okta-app/_config.tf b/ops/services/okta-app/_config.tf index 69d61a66ec..cb69267031 100644 --- a/ops/services/okta-app/_config.tf +++ b/ops/services/okta-app/_config.tf @@ -5,5 +5,5 @@ terraform { version = "~> 4.3.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/services/okta-global/_config.tf b/ops/services/okta-global/_config.tf index 69d61a66ec..cb69267031 100644 --- a/ops/services/okta-global/_config.tf +++ b/ops/services/okta-global/_config.tf @@ -5,5 +5,5 @@ terraform { version = "~> 4.3.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/services/pagerduty/_config.tf b/ops/services/pagerduty/_config.tf index 48dc4fb09e..4eda65e888 100644 --- a/ops/services/pagerduty/_config.tf +++ b/ops/services/pagerduty/_config.tf @@ -5,5 +5,5 @@ terraform { version = "~> 2.14" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/stg/_config.tf b/ops/stg/_config.tf index e16457584c..4986bb79fe 100644 --- a/ops/stg/_config.tf +++ b/ops/stg/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/stg/persistent/_config.tf b/ops/stg/persistent/_config.tf index aa2f9c1c71..a5a0a2fde8 100644 --- a/ops/stg/persistent/_config.tf +++ b/ops/stg/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/test/_config.tf b/ops/test/_config.tf index 6e5dc55ec7..43334165bf 100644 --- a/ops/test/_config.tf +++ b/ops/test/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/test/persistent/_config.tf b/ops/test/persistent/_config.tf index d9249bd1e9..8f6eb4f99e 100644 --- a/ops/test/persistent/_config.tf +++ b/ops/test/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } diff --git a/ops/training/_config.tf b/ops/training/_config.tf index 7e9c868d9f..df23882e44 100644 --- a/ops/training/_config.tf +++ b/ops/training/_config.tf @@ -11,7 +11,7 @@ terraform { version = "~> 3.100.0" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" } provider "azurerm" { diff --git a/ops/training/persistent/_config.tf b/ops/training/persistent/_config.tf index ae747b9062..1810cc45d1 100644 --- a/ops/training/persistent/_config.tf +++ b/ops/training/persistent/_config.tf @@ -18,7 +18,7 @@ terraform { version = "~> 3.5" } } - required_version = "~> 1.9.5" + required_version = "~> 1.9.6" }