Skip to content

Commit

Permalink
WAF bug fix (#341)
Browse files Browse the repository at this point in the history
* amended owner email in tags

* added ignore changes to tags for waf acl

* WAF bug fix

* removed log files
  • Loading branch information
laurentb4 authored Nov 14, 2024
1 parent b6d27a2 commit b1e98f8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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[][]"
Expand Down Expand Up @@ -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}'
2 changes: 1 addition & 1 deletion bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.14.0"
version = "~> 5.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/vpc_hashicorp/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.14.0"
version = "~> 5.0"
}
}
}
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -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]
}
}
Expand Down

0 comments on commit b1e98f8

Please sign in to comment.