Merge branch 'master' into renovate/cft-developer-tools-1.x

terraform-google-modules · Oct 27, 2023 · df27025 · df27025
2 parents eddd474 + 442d027
commit df27025
Show file tree

Hide file tree

Showing 54 changed files with 113 additions and 97 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.5.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.4.0...v7.5.0) (2023-10-18)
+
+
+### Features
+
+* add stack type to peering module ([#500](https://github.com/terraform-google-modules/terraform-google-network/issues/500)) ([bc711d2](https://github.com/terraform-google-modules/terraform-google-network/commit/bc711d29657953cf596a2dec458702b5b3ac0f1f))
+
+
+### Bug Fixes
+
+* upgraded versions.tf to include minor bumps from tpg v5 ([#503](https://github.com/terraform-google-modules/terraform-google-network/issues/503)) ([4ef6a9b](https://github.com/terraform-google-modules/terraform-google-network/commit/4ef6a9b9d33a3904ff8271164dad8ce4932e5f74))
+
 ## [7.4.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v7.3.0...v7.4.0) (2023-10-02)
 
 

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ You can go to the examples folder, however the usage of the module could be like
 ```hcl
 module "vpc" {
     source  = "terraform-google-modules/network/google"
-    version = "~> 7.4"
+    version = "~> 7.5"
 
     project_id   = "<PROJECT ID>"
     network_name = "example-vpc"

diff --git a/examples/basic_auto_mode/versions.tf b/examples/basic_auto_mode/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/basic_custom_mode/versions.tf b/examples/basic_custom_mode/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/basic_firewall_rule/versions.tf b/examples/basic_firewall_rule/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/basic_secondary_ranges/versions.tf b/examples/basic_secondary_ranges/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/basic_shared_vpc/versions.tf b/examples/basic_shared_vpc/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/basic_vpc_peering/versions.tf b/examples/basic_vpc_peering/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = ">= 3.45, < 5.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/bidirectional-firewall-rules/versions.tf b/examples/bidirectional-firewall-rules/versions.tf
@@ -19,7 +19,7 @@ terraform {
 
   required_providers {
     google = {
-      version = ">= 4.0.0"
+      source = "hashicorp/google"
     }
     null = {
       version = ">= 2.1.0"

diff --git a/examples/delete_default_gateway_routes/versions.tf b/examples/delete_default_gateway_routes/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/firewall_logging/versions.tf b/examples/firewall_logging/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/global-network-firewall-policy/versions.tf b/examples/global-network-firewall-policy/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.64, < 5.0"
+      version = ">= 4.64"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.64, < 5.0"
+      version = ">= 4.64"
     }
   }
 }
diff --git a/examples/ilb_routing/versions.tf b/examples/ilb_routing/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/multi_vpc/versions.tf b/examples/multi_vpc/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/network_service_tiers/versions.tf b/examples/network_service_tiers/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/packet_mirroring/versions.tf b/examples/packet_mirroring/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }

diff --git a/examples/private_service_connect_google_apis/versions.tf b/examples/private_service_connect_google_apis/versions.tf
@@ -19,7 +19,7 @@ terraform {
 
   required_providers {
     google-beta = {
-      version = "~> 4.0"
+      source = "hashicorp/google-beta"
     }
   }
 }
diff --git a/examples/regional-network-firewall-policy/versions.tf b/examples/regional-network-firewall-policy/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.64, < 5.0"
+      version = ">= 4.64, < 6"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.64, < 5.0"
+      version = ">= 4.64, < 6"
     }
   }
 }
diff --git a/examples/routes/versions.tf b/examples/routes/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/secondary_ranges/versions.tf b/examples/secondary_ranges/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/simple_project/versions.tf b/examples/simple_project/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/simple_project_with_regional_network/versions.tf b/examples/simple_project_with_regional_network/versions.tf
@@ -19,10 +19,10 @@ terraform {
 
   required_providers {
     google = {
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
-      version = "~> 3.0"
+      version = ">= 3.0"
     }
   }
 }
diff --git a/examples/submodule_firewall/versions.tf b/examples/submodule_firewall/versions.tf
@@ -19,7 +19,7 @@ terraform {
 
   required_providers {
     google = {
-      version = ">= 4.0.0"
+      source = "hashicorp/google"
     }
     null = {
       version = ">= 2.1.0"

diff --git a/examples/submodule_network_peering/versions.tf b/examples/submodule_network_peering/versions.tf
@@ -19,6 +19,7 @@ terraform {
 
   required_providers {
     google = {
+      source  = "hashicorp/google"
       version = ">= 4.0.0"
     }
     null = {

diff --git a/examples/submodule_svpc_access/versions.tf b/examples/submodule_svpc_access/versions.tf
@@ -19,6 +19,7 @@ terraform {
 
   required_providers {
     google = {
+      source  = "hashicorp/google"
       version = ">= 4.0.0"
     }
     null = {

diff --git a/examples/submodule_vpc_serverless_connector/versions.tf b/examples/submodule_vpc_serverless_connector/versions.tf
@@ -19,9 +19,11 @@ terraform {
 
   required_providers {
     google = {
+      source  = "hashicorp/google"
       version = ">= 3.62"
     }
     google-beta = {
+      source  = "hashicorp/google-beta"
       version = ">= 3.62"
     }
     null = {

diff --git a/metadata.yaml b/metadata.yaml
@@ -23,7 +23,7 @@ spec:
   source:
     repo: https://github.com/terraform-google-modules/terraform-google-network
     sourceType: git
-  version: 7.4.0
+  version: 7.5.0
   actuationTool:
     type: Terraform
     version: '>= 0.13.0'

diff --git a/modules/fabric-net-firewall/metadata.yaml b/modules/fabric-net-firewall/metadata.yaml
@@ -23,7 +23,7 @@ spec:
   source:
     repo: https://github.com/terraform-google-modules/terraform-google-network
     sourceType: git
-  version: 7.4.0
+  version: 7.5.0
   actuationTool:
     type: Terraform
     version: '>= 0.13.0'

diff --git a/modules/fabric-net-firewall/versions.tf b/modules/fabric-net-firewall/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "<5.0,>= 2.12"
+      version = ">= 2.12, < 6"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.4.0"
+    module_name = "blueprints/terraform/terraform-google-network:fabric-net-firewall/v7.5.0"
   }
 }
diff --git a/modules/fabric-net-svpc-access/metadata.yaml b/modules/fabric-net-svpc-access/metadata.yaml
@@ -23,7 +23,7 @@ spec:
   source:
     repo: https://github.com/terraform-google-modules/terraform-google-network
     sourceType: git
-  version: 7.4.0
+  version: 7.5.0
   actuationTool:
     type: Terraform
     version: '>= 0.13.0'

diff --git a/modules/fabric-net-svpc-access/versions.tf b/modules/fabric-net-svpc-access/versions.tf
@@ -20,18 +20,18 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "<5.0,>= 2.12"
+      version = ">= 2.12, < 6"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "<5.0,>= 2.12"
+      version = ">= 2.12, < 6"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.4.0"
+    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.5.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.4.0"
+    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v7.5.0"
   }
 }
diff --git a/modules/firewall-rules/metadata.yaml b/modules/firewall-rules/metadata.yaml
@@ -23,7 +23,7 @@ spec:
   source:
     repo: https://github.com/terraform-google-modules/terraform-google-network
     sourceType: git
-  version: 7.4.0
+  version: 7.5.0
   actuationTool:
     type: Terraform
     version: '>= 0.13.0'