diff --git a/.gitignore b/.gitignore index cb629703..7283d018 100755 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,9 @@ docs/dce/ *.tfstate *.tfstate.* +# lock file +*.lock.hcl + # Crash log files crash.log @@ -89,4 +92,4 @@ venv.bak/ # mkdocs documentation /site -tests/integration/test.cfg \ No newline at end of file +tests/integration/test.cfg diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ba80ca1..97902c9b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v0.37.0 + +- Update pipelines to use latest terraform +- Update terraform required version to be 0.13.7 as minimum viable to run module + ## v0.36.1 - Fix: Remove default 25 scan limit when querying for leases diff --git a/modules/main.tf b/modules/main.tf index de9ae701..a31a7927 100755 --- a/modules/main.tf +++ b/modules/main.tf @@ -1,5 +1,6 @@ terraform { - required_version = "~>0.13.7" + # Tested up to 1.7.4 + required_version = ">= 0.13.7" required_providers { aws = { diff --git a/pipelines/destroy-pr-env.yml b/pipelines/destroy-pr-env.yml index ec2acb49..1b50ee52 100644 --- a/pipelines/destroy-pr-env.yml +++ b/pipelines/destroy-pr-env.yml @@ -44,7 +44,7 @@ steps: # Install Terraform - task: TerraformInstaller@0 inputs: - terraformVersion: "0.13.7" + terraformVersion: "1.7.4" displayName: "Install Terraform" # terraform init diff --git a/pipelines/pipeline.yml b/pipelines/pipeline.yml index ff8900e8..b6f73bfa 100644 --- a/pipelines/pipeline.yml +++ b/pipelines/pipeline.yml @@ -9,7 +9,7 @@ trigger: variables: GO_VERSION: 1.21.0 - TERRAFORM_VERSION: 0.13.7 + TERRAFORM_VERSION: 1.7.4 # Run builds for PRs against `master` pr: @@ -216,6 +216,7 @@ stages: # terraform init - bash: | + set -ex cd modules cat ./backend.tf terraform init -input=false @@ -347,13 +348,12 @@ stages: - bash: | set -ex - namespace=$(cat ./namespace.txt) + export TF_VAR_namespace=$(cat ./namespace.txt) + export TF_VAR_budget_notification_from_email=$(NOTIFY_EMAIL) cd modules terraform init -input=false - terraform destroy -force \ - -var="namespace=$(namespace)" \ - -var="budget_notification_from_email=$(NOTIFY_EMAIL)" + terraform destroy -auto-approve displayName: "Terraform destroy" # End the DCE lease