diff --git a/.gitignore b/.gitignore index 090a1f02dfe2a86c45ebc2045a23fd0b9b1009c1..4e48cd591dea1402bffc821783cba6121e448ed5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea .DS_Store +.terraform/* diff --git a/CHANGELOG b/CHANGELOG index f58d1fc5dbb79579381a94f176d1801aa69afa4f..9c99c522680077aafbf69b8957a6ce46e4d2cc3d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [5.0.0] - 2022-05-23 ?? +### Changed + - Made permitted versions of google providers and terraform itself more broad. + ## [4.1.5] - 2022-03-30 ### Added - Ensure default -> null vpc_connector network changes are not applied on every deploy diff --git a/load_balancer.tf b/load_balancer.tf index ac0fc3506688e8b48a22e7af39c42560f05048b6..61283a5103c21b6e8ff108a3f55b8e482909afa1 100644 --- a/load_balancer.tf +++ b/load_balancer.tf @@ -24,7 +24,7 @@ module "webapp_http_load_balancer" { # The double slash is important(!) source = "GoogleCloudPlatform/lb-http/google//modules/serverless_negs" - version = "~> 5.0" + version = ">= 6.2.0, < 7.0.0" project = var.project name = var.name @@ -43,10 +43,11 @@ module "webapp_http_load_balancer" { backends = { default = { - description = null - enable_cdn = false - custom_request_headers = null - security_policy = null + description = null + enable_cdn = false + custom_request_headers = null + custom_response_headers = null + security_policy = null log_config = { enable = true diff --git a/main.tf b/main.tf index 36b7ae001f4f56ac8d9b1278d287038ce1310b1b..6a0b1c5cbd434b67d6067f9200ae3d782d2c1e57 100644 --- a/main.tf +++ b/main.tf @@ -235,7 +235,7 @@ resource "google_cloud_run_domain_mapping" "webapp" { module "uptime_monitoring" { for_each = local.monitor_hosts - source = "git::https://gitlab.developers.cam.ac.uk/uis/devops/infra/terraform/gcp-site-monitoring.git?ref=v1" + source = "git::https://gitlab.developers.cam.ac.uk/uis/devops/infra/terraform/gcp-site-monitoring.git?ref=v2" host = each.key project = var.project diff --git a/versions.tf b/versions.tf index db3608cb961d9b6df089792b79dfbd38c31c6258..c3a7d201f3b9ae91d0c352dc69826e943d453b70 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,16 @@ terraform { required_providers { - google = "~> 3.70" - google-beta = "~> 3.70" + google = { + source = "hashicorp/google" + version = ">= 3.70, < 5.0" + } + + google-beta = { + source = "hashicorp/google-beta" + version = ">= 3.70, < 5.0" + } } -} + + required_version = ">= 1.0, < 2.0" +} \ No newline at end of file