diff --git a/Makefile b/Makefile index ad49c26..e8272c3 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,10 @@ refresh: ## terraform refresh output: ## terraform output (make output OUTPUT_ARGUMENT='--raw dns_dhcp_vpc_id') $(DOCKER_RUN) /bin/bash -c "terraform output -no-color ${OUTPUT_ARGUMENT}" +.PHONY: state +state: ## terraform state list + $(DOCKER_RUN) /bin/bash -c "terraform state list" + .PHONY: output-bastion-rds-admin output-bastion-rds-admin: ## terraform output (make output-bastion-rds-admin) $(DOCKER_RUN) /bin/bash -c "terraform output -no-color -json rds_bastion | jq -r .admin[][]" @@ -191,5 +195,9 @@ authorise_performance_test_clients: ## Update a config file with IPs for test cl move_script: ## terraform state move operations from within a script e.g. make move_script SCRIPT="ND-134-vpc-module" APPLY=[true|false] $(DOCKER_RUN) /bin/bash -c "./scripts/tf_mv/$$SCRIPT.sh $$APPLY" +.PHONY: trace-logs +trace-logs: ## terraform logs output + $(DOCKER_RUN) /bin/bash -c "TF_LOG=TRACE terraform apply --auto-approve 2>&1 | tee terraform_trace.log" + help: @grep -h -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' diff --git a/bootstrap/main.tf b/bootstrap/main.tf index de6fc2e..487ba55 100644 --- a/bootstrap/main.tf +++ b/bootstrap/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "5.14.0" + version = "~> 5.0" } } } diff --git a/modules/vpc_hashicorp/versions.tf b/modules/vpc_hashicorp/versions.tf index 94bd444..f005f6c 100644 --- a/modules/vpc_hashicorp/versions.tf +++ b/modules/vpc_hashicorp/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "5.14.0" + version = "~> 5.0" } } } diff --git a/versions.tf b/versions.tf index f7f24e3..54d4714 100644 --- a/versions.tf +++ b/versions.tf @@ -1,10 +1,10 @@ terraform { - required_version = "1.1.3" + required_version = "1.5.4" required_providers { aws = { source = "hashicorp/aws" - version = "5.14.0" + version = "~> 5.0" configuration_aliases = [aws.env] } }