Merge branch 'issue-36-update-versions' into 'master'

update versions to allow compatibility with google provider version 4

Closes #36

See merge request !50

.gitignore

 .idea
 .DS_Store
+.terraform/*

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

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

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

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