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

cloud-foundation-bot · web-flow · commit 112482afc066 · 2022-01-17T16:05:31.000-06:00
diff --git a/examples/automatic-labelling-folder/main.tf b/examples/automatic-labelling-folder/main.tf
@@ -14,26 +14,6 @@
  * limitations under the License.
  */
 
-terraform {
-  required_version = ">= 0.12"
-}
-
-provider "archive" {
-  version = "~> 1.0"
-}
-
-provider "google" {
-  version = "~> 3.39"
-}
-
-provider "random" {
-  version = "~> 2.0"
-}
-
-provider "null" {
-  version = "~> 2.1"
-}
-
 resource "random_pet" "main" {
   length    = 2
   separator = "-"
diff --git a/examples/automatic-labelling-folder/versions.tf b/examples/automatic-labelling-folder/versions.tf
@@ -0,0 +1,37 @@
+/**
+ * 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 {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "~> 1.0"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/automatic-labelling-from-localhost/main.tf b/examples/automatic-labelling-from-localhost/main.tf
@@ -14,26 +14,6 @@
  * limitations under the License.
  */
 
-terraform {
-  required_version = ">= 0.12"
-}
-
-provider "archive" {
-  version = "~> 1.0"
-}
-
-provider "google" {
-  version = "~> 3.39"
-}
-
-provider "random" {
-  version = "~> 2.0"
-}
-
-provider "null" {
-  version = "~> 2.1"
-}
-
 resource "random_pet" "main" {
   separator = "-"
 }
diff --git a/examples/automatic-labelling-from-localhost/versions.tf b/examples/automatic-labelling-from-localhost/versions.tf
@@ -0,0 +1,37 @@
+/**
+ * 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 {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "~> 1.0"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/automatic-labelling-from-repository/main.tf b/examples/automatic-labelling-from-repository/main.tf
@@ -14,26 +14,6 @@
  * limitations under the License.
  */
 
-terraform {
-  required_version = ">= 0.12"
-}
-
-provider "archive" {
-  version = "~> 1.0"
-}
-
-provider "google" {
-  version = "~> 3.39"
-}
-
-provider "random" {
-  version = "~> 2.0"
-}
-
-provider "null" {
-  version = "~> 2.1"
-}
-
 resource "random_pet" "main" {
   separator = "-"
 }
diff --git a/examples/automatic-labelling-from-repository/versions.tf b/examples/automatic-labelling-from-repository/versions.tf
@@ -0,0 +1,37 @@
+/**
+ * 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 {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "~> 1.0"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/delete-vms-without-cmek/main.tf b/examples/delete-vms-without-cmek/main.tf
@@ -19,15 +19,12 @@ terraform {
 }
 
 provider "archive" {
-  version = "~> 1.0"
 }
 
 provider "google" {
-  version = "~> 3.39"
 }
 
 provider "random" {
-  version = "~> 2.0"
 }
 
 resource "random_pet" "main" {
diff --git a/examples/delete-vms-without-cmek/versions.tf b/examples/delete-vms-without-cmek/versions.tf
@@ -0,0 +1,33 @@
+/**
+ * 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 {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "~> 1.0"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/dynamic-files/versions.tf b/examples/dynamic-files/versions.tf
@@ -15,5 +15,19 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+    }
+    local = {
+      source = "hashicorp/local"
+    }
+    null = {
+      source = "hashicorp/null"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/modules/event-folder-log-entry/versions.tf b/modules/event-folder-log-entry/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 
diff --git a/modules/event-project-log-entry/versions.tf b/modules/event-project-log-entry/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 
diff --git a/modules/repository-function/versions.tf b/modules/repository-function/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.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
`@@ -19,15 +19,12 @@ terraform {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "archive" {`
`22`		`- version = "~> 1.0"`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`provider "google" {`
`26`		`- version = "~> 3.39"`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`provider "random" {`
`30`		`- version = "~> 2.0"`
`31`	`28`	`}`
`32`	`29`
`33`	`30`	`resource "random_pet" "main" {`
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`