feat!: update TPG version constraints to allow 4.0, add Terraform 0.1…

…3 constraint (#258) Co-authored-by: Bharath KKB <bharathkrishnakb@gmail.com>
terraform-google-modules · Jan 28, 2022 · 9cff52a · 9cff52a
1 parent bf1fc2f
commit 9cff52a
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 40 deletions.
diff --git a/examples/mssql-public/versions.tf b/examples/mssql-public/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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.
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/examples/mysql-ha/versions.tf b/examples/mysql-ha/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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.
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/examples/mysql-private/versions.tf b/examples/mysql-private/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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.
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/examples/mysql-public/versions.tf b/examples/mysql-public/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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.
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/examples/postgresql-ha/versions.tf b/examples/postgresql-ha/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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.
@@ -15,6 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
-
diff --git a/examples/postgresql-public-iam/versions.tf b/examples/postgresql-public-iam/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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.
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/examples/postgresql-public/versions.tf b/examples/postgresql-public/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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.
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 0.13"
 }
diff --git a/modules/mssql/versions.tf b/modules/mssql/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 3.60"
+      version = ">= 3.60, < 5.0"
     }
   }
 

diff --git a/modules/mysql/versions.tf b/modules/mysql/versions.tf
@@ -27,7 +27,7 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.60"
+      version = ">= 3.60, < 5.0"
     }
   }
 

diff --git a/modules/postgresql/versions.tf b/modules/postgresql/versions.tf
@@ -27,7 +27,7 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.60"
+      version = ">= 3.60, < 5.0"
     }
   }
 

diff --git a/modules/private_service_access/versions.tf b/modules/private_service_access/versions.tf
@@ -23,11 +23,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/safer_mysql/versions.tf b/modules/safer_mysql/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.60"
+      version = ">= 3.60, < 5.0"
     }
   }
 

diff --git a/test/setup/versions.tf b/test/setup/versions.tf