feat: update TPG version constraints to allow 4.0 (#78)

cloud-foundation-bot · bharathkkb · web-flow · commit 4b769ec7c46c · 2022-01-24T20:00:34.000-06:00
* feat: update TPG version constraints to allow 4.0

* fix example

Co-authored-by: Bharath KKB &lt;bharathkrishnakb@gmail.com&gt;
diff --git a/examples/instance_with_advanced_options/main.tf b/examples/instance_with_advanced_options/main.tf
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-}
-
 locals {
   instance_name = format("%s-%s", var.instance_name, substr(md5(module.gce-advanced-container.container.image), 0, 8))
 }
diff --git a/examples/instance_with_advanced_options/versions.tf b/examples/instance_with_advanced_options/versions.tf
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+    template = {
+      source  = "hashicorp/template"
+      version = "~> 2.1"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/instance_with_attached_disk/versions.tf b/examples/instance_with_attached_disk/versions.tf
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/instance_with_config_file/main.tf b/examples/instance_with_config_file/main.tf
@@ -16,11 +16,6 @@
 
 provider "google" {
   project = var.project_id
-  version = "~> 3.53"
-}
-
-provider "template" {
-  version = "~> 2.1"
 }
 
 locals {
diff --git a/examples/instance_with_config_file/versions.tf b/examples/instance_with_config_file/versions.tf
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    template = {
+      source  = "hashicorp/template"
+      version = "~> 2.1"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/managed_instance_group/main.tf b/examples/managed_instance_group/main.tf
@@ -24,11 +24,9 @@ locals {
 }
 provider "google" {
   project = var.project_id
-  version = "~> 3.53.0"
 }
 provider "google-beta" {
   project = var.project_id
-  version = "~> 3.53.0"
 }
 module "gce-container" {
   source = "../../"
@@ -55,15 +53,15 @@ resource "google_compute_router" "default" {
 }
 module "cloud-nat" {
   source     = "terraform-google-modules/cloud-nat/google"
-  version    = "~> 1.0.0"
+  version    = "~> 2.1"
   router     = google_compute_router.default.name
   project_id = var.project_id
   region     = var.region
   name       = "${var.network}-cloud-nat-group1"
 }
 module "mig_template" {
   source               = "terraform-google-modules/vm/google//modules/instance_template"
-  version              = "~> 6.0"
+  version              = "~> 7.3"
   network              = google_compute_network.default.self_link
   subnetwork           = google_compute_subnetwork.default.self_link
   service_account      = var.service_account
@@ -81,7 +79,7 @@ module "mig_template" {
 }
 module "mig" {
   source            = "terraform-google-modules/vm/google//modules/mig"
-  version           = "~> 6.0"
+  version           = "~> 7.3"
   instance_template = module.mig_template.self_link
   region            = var.region
   hostname          = var.network
@@ -97,7 +95,7 @@ module "mig" {
 }
 module "http-lb" {
   source  = "GoogleCloudPlatform/lb-http/google"
-  version = "~> 4.5"
+  version = "~> 6.2"
 
   project     = var.project_id
   name        = "${var.mig_name}-lb"
@@ -119,6 +117,7 @@ module "http-lb" {
       session_affinity                = null
       affinity_cookie_ttl_sec         = null
       custom_request_headers          = null
+      custom_response_headers         = null
 
       health_check = {
         check_interval_sec  = null
diff --git a/examples/managed_instance_group/versions.tf b/examples/managed_instance_group/versions.tf
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/simple_instance/versions.tf b/examples/simple_instance/versions.tf
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/modules/cos-coredns/versions.tf b/modules/cos-coredns/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 
diff --git a/modules/cos-generic/versions.tf b/modules/cos-generic/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 
diff --git a/modules/cos-mysql/versions.tf b/modules/cos-mysql/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 
diff --git a/test/fixtures/instance_with_config_file/provider.tf b/test/fixtures/instance_with_config_file/provider.tf
@@ -17,15 +17,3 @@
 provider "google" {
   project = var.project_id
 }
-
-provider "local" {
-  version = "~> 1.4"
-}
-
-provider "random" {
-  version = "~> 2.3"
-}
-
-provider "tls" {
-  version = "~> 2.2"
-}
diff --git a/test/fixtures/instance_with_config_file/versions.tf b/test/fixtures/instance_with_config_file/versions.tf
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = "~> 1.4"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.3"
+    }
+    tls = {
+      source  = "hashicorp/tls"
+      version = "~> 2.2"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -16,12 +16,14 @@
 
 terraform {
   required_version = ">= 0.13"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
-}
-
-provider "google-beta" {
-  version = "~> 3.53.0"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.53.0"
+    }
+  }
 }
diff --git a/versions.tf b/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,6 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-provider "google" {`
`18`		`-}`
`19`		`-`
`20`	`17`	`locals {`
`21`	`18`	`instance_name = format("%s-%s", var.instance_name, substr(md5(module.gce-advanced-container.container.image), 0, 8))`
`22`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ terraform {`
`20`	`20`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`		`- version = "~> 3.53"`
	`23`	`+ version = ">= 3.53, < 5.0"`
`24`	`24`	`}`
`25`	`25`	`google-beta = {`
`26`	`26`	`source = "hashicorp/google-beta"`
`27`		`- version = "~> 3.53"`
	`27`	`+ version = ">= 3.53, < 5.0"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ terraform {`
`20`	`20`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`		`- version = "~> 3.53"`
	`23`	`+ version = ">= 3.53, < 5.0"`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`