feat: Update TPG version constraints to allow 4.0 (#50)

* Update: provider versions contraints Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> * Update: provider versions contraints Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> * Update: refactoring examples code Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> * Fix: lint Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
terraform-google-modules · Feb 2, 2022 · 1aebd31 · 1aebd31
1 parent 9792215
commit 1aebd31
Show file tree

Hide file tree

Showing 14 changed files with 146 additions and 74 deletions.
diff --git a/examples/gh-org-runner-mig-native-simple/providers.tf b/examples/gh-org-runner-mig-native-simple/providers.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Google LLC
+ * 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.
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-
-provider "google" {
-  version = "~> 3.16"
-}
-
-provider "google-beta" {
-  version = "~> 3.16"
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53, < 5.0.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.53, < 5.0.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/examples/gh-runner-gke-dind/providers.tf b/examples/gh-runner-gke-dind/providers.tf
@@ -14,17 +14,6 @@
  * limitations under the License.
  */
 
-/*****************************************
-  Google Provider Configuration
- *****************************************/
-provider "google" {
-  version = "~> 3.1"
-}
-
-provider "google-beta" {
-  version = "~> 3.1"
-}
-
 /*****************************************
   Kubernetes provider configuration
  *****************************************/

diff --git a/examples/gh-runner-gke-dind/versions.tf b/examples/gh-runner-gke-dind/versions.tf
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2020 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.1"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.1"
+    }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = "~> 1.10"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/gh-runner-gke-simple/providers.tf b/examples/gh-runner-gke-simple/providers.tf
@@ -14,17 +14,6 @@
  * limitations under the License.
  */
 
-/*****************************************
-  Google Provider Configuration
- *****************************************/
-provider "google" {
-  version = "~> 3.1"
-}
-
-provider "google-beta" {
-  version = "~> 3.1"
-}
-
 /*****************************************
   Kubernetes provider configuration
  *****************************************/

diff --git a/examples/gh-runner-gke-simple/versions.tf b/examples/gh-runner-gke-simple/versions.tf
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2020 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.1"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.1"
+    }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = "~> 1.10"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/...runner-mig-container-vm-dind/providers.tf → ...-runner-mig-container-vm-dind/versions.tf b/...runner-mig-container-vm-dind/providers.tf → ...-runner-mig-container-vm-dind/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Google LLC
+ * 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.
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-
-provider "google" {
-  version = "~> 3.16"
-}
-
-provider "google-beta" {
-  version = "~> 3.16"
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53, < 5.0.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.53, < 5.0.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/...nner-mig-container-vm-simple/providers.tf → ...unner-mig-container-vm-simple/versions.tf b/...nner-mig-container-vm-simple/providers.tf → ...unner-mig-container-vm-simple/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Google LLC
+ * 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.
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-
-provider "google" {
-  version = "~> 3.16"
-}
-
-provider "google-beta" {
-  version = "~> 3.16"
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53, < 5.0.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.53, < 5.0.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/.../gh-runner-mig-native-simple/providers.tf → ...s/gh-runner-mig-native-simple/versions.tf b/.../gh-runner-mig-native-simple/providers.tf → ...s/gh-runner-mig-native-simple/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Google LLC
+ * 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.
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-
-provider "google" {
-  version = "~> 3.16"
-}
-
-provider "google-beta" {
-  version = "~> 3.16"
+terraform {
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53, < 5.0.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.53, < 5.0.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/examples/oidc-simple/providers.tf → examples/oidc-simple/versions.tf b/examples/oidc-simple/providers.tf → examples/oidc-simple/versions.tf
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-
-provider "google" {
-  version = "~> 3.16"
-}
-
-provider "google-beta" {
-  version = "~> 3.16"
+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/modules/gh-oidc/versions.tf b/modules/gh-oidc/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.64"
+      version = ">= 3.64, < 5.0.0"
     }
   }
 

diff --git a/modules/gh-runner-gke/versions.tf b/modules/gh-runner-gke/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = "~> 3.53, < 5.0.0"
     }
   }
 

diff --git a/modules/gh-runner-mig-container-vm/versions.tf b/modules/gh-runner-mig-container-vm/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = "~> 3.53, < 5.0.0"
     }
   }
 

diff --git a/modules/gh-runner-mig-vm/versions.tf b/modules/gh-runner-mig-vm/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = "~> 3.53, < 5.0.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.53"
+      version = "~> 3.53, < 5.0.0"
     }
   }
 

diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 Google LLC
+ * 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.
@@ -16,12 +16,15 @@
 
 terraform {
   required_version = ">= 0.12"
-}
-
-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"
+    }
+  }
 }