Skip to content

Commit

Permalink
Shanice/upgrade terraform (#8102)
Browse files Browse the repository at this point in the history
* initial commit for tf upgrade to 4.0.1

* initial commit for tf upgrade to 4.0.1

* modifying required_version to previous version

* changed the provider version back to original and only changed terraform version

* modified terraform actions in remaining github workflows

* modified the setup-terraform version for all github actions

* modified okta-global version

* modified all config.tf versions to 1.9.5 except for global

* fixed find and replace glitch

* modified global

* removed the attribute retention_policy due to it being deprecated and data.log_analytics_workspace_id covers this configuration

* removed attribute from azurerm_log_analytics_workspace

* ran script upgradetf.sh to upgrade the lock file for all environments

* upgraded TF to 1.9.6 and setup-terraform to 3.1.2

* re added the retention_policy
  • Loading branch information
shanice-skylight authored Oct 10, 2024
1 parent b43eb16 commit 0fc7b5b
Show file tree
Hide file tree
Showing 61 changed files with 328 additions and 332 deletions.
4 changes: 2 additions & 2 deletions .github/actions/db-actions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ runs:
run: ./build_and_push.sh

- name: Terraform setup
uses: hashicorp/setup-terraform@v2.0.3
uses: hashicorp/setup-terraform@v3.1.2
with:
terraform_version: 1.3.3
terraform_version: 1.9.6

- name: Terraform init
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/tf-deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ runs:
- uses: azure/login@v1
with:
creds: ${{ inputs.azure_creds }}
- uses: hashicorp/setup-terraform@v2.0.3
- uses: hashicorp/setup-terraform@v3.1.2
with:
terraform_version: 1.3.3
terraform_version: 1.9.6
- name: Build ReportStream function app
uses: ./.github/actions/build-reportstream-functions
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/terraformChecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: hashicorp/[email protected].1
- uses: hashicorp/[email protected].2
with:
terraform_version: 1.3.3
terraform_version: 1.9.6
- name: Terraform fmt
run: terraform fmt -check -recursive

Expand All @@ -35,9 +35,9 @@ jobs:
global
steps:
- uses: actions/checkout@v4
- uses: hashicorp/[email protected].1
- uses: hashicorp/[email protected].2
with:
terraform_version: 1.3.3
terraform_version: 1.9.6
- name: Terraform Init
run: |
for d in $TERRAFORM_DIRS
Expand Down Expand Up @@ -72,10 +72,10 @@ jobs:
if: ${{ github.actor != 'dependabot[bot]' }}
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}
- uses: hashicorp/[email protected].1
- uses: hashicorp/[email protected].2
if: ${{ github.actor != 'dependabot[bot]' }}
with:
terraform_version: 1.3.3
terraform_version: 1.9.6
- name: Terraform Init Prod
if: ${{ github.actor != 'dependabot[bot]' }}
run: make init-prod
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/terraformPlan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].1
- uses: hashicorp/[email protected].2
with:
terraform_version: 1.3.3
terraform_version: 1.9.6
- name: Terraform Init
run: make init-${{ matrix.env }}
- name: Build ReportStream function app
Expand Down
2 changes: 1 addition & 1 deletion ops/demo/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ops/demo/_config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ terraform {
version = "~> 3.100.0"
}
}
required_version = "~> 1.3.3"
required_version = "~> 1.9.6"
}

provider "azurerm" {
Expand Down
30 changes: 15 additions & 15 deletions ops/demo/persistent/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ops/demo/persistent/_config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
version = "~> 3.5"
}
}
required_version = "~> 1.3.3"
required_version = "~> 1.9.6"
}


Expand Down
28 changes: 14 additions & 14 deletions ops/dev/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ops/dev/_config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ terraform {
version = "~> 3.100.0"
}
}
required_version = "~> 1.3.3"
required_version = "~> 1.9.6"
}

provider "azurerm" {
Expand Down
30 changes: 15 additions & 15 deletions ops/dev/persistent/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ops/dev/persistent/_config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
version = "~> 3.5"
}
}
required_version = "~> 1.3.3"
required_version = "~> 1.9.6"
}


Expand Down
28 changes: 14 additions & 14 deletions ops/dev2/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ops/dev2/_config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ terraform {
version = "~> 3.100.0"
}
}
required_version = "~> 1.3.3"
required_version = "~> 1.9.6"
}

provider "azurerm" {
Expand Down
30 changes: 15 additions & 15 deletions ops/dev2/persistent/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ops/dev2/persistent/_config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
version = "~> 3.5"
}
}
required_version = "~> 1.3.3"
required_version = "~> 1.9.6"
}


Expand Down
Loading

0 comments on commit 0fc7b5b

Please sign in to comment.