Merge branch 'master' into ncc-module

terraform-google-modules · Sep 23, 2024 · 8515030 · 8515030
2 parents 51db90a + 8abb57b
commit 8515030
Show file tree

Hide file tree

Showing 34 changed files with 77 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+## [9.2.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v9.1.0...v9.2.0) (2024-08-29)
+
+
+### Features
+
+* Change serverless-connector input type and update metadata ([#568](https://github.com/terraform-google-modules/terraform-google-network/issues/568)) ([830b09c](https://github.com/terraform-google-modules/terraform-google-network/commit/830b09c7566f32cbbbf25d557912e5013357a43e))
+* **deps:** Update Terraform Google Provider to v6 (major) ([#574](https://github.com/terraform-google-modules/terraform-google-network/issues/574)) ([c90da25](https://github.com/terraform-google-modules/terraform-google-network/commit/c90da2594f488ad0c433931deb29bf9d96cb76a5))
+
 ## [9.1.0](https://github.com/terraform-google-modules/terraform-google-network/compare/v9.0.0...v9.1.0) (2024-04-15)
 
 

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ You can go to the [examples](./examples/) folder, however the usage of the modul
 ```hcl
 module "vpc" {
     source  = "terraform-google-modules/network/google"
-    version = "~> 9.1"
+    version = "~> 9.2"
 
     project_id   = "<PROJECT ID>"
     network_name = "example-vpc"

diff --git a/metadata.yaml b/metadata.yaml
@@ -24,7 +24,7 @@ spec:
     source:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"

diff --git a/modules/fabric-net-firewall/metadata.yaml b/modules/fabric-net-firewall/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/fabric-net-firewall
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"

diff --git a/modules/fabric-net-firewall/versions.tf b/modules/fabric-net-firewall/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 2.12, < 6"
+      version = ">= 2.12, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:fabric-net-firewall/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:fabric-net-firewall/v9.2.0"
   }
 }
diff --git a/modules/fabric-net-svpc-access/metadata.yaml b/modules/fabric-net-svpc-access/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/fabric-net-svpc-access
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: 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 = ">= 2.12, < 6"
+      version = ">= 2.12, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 2.12, < 6"
+      version = ">= 2.12, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v9.2.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:fabric-net-svpc-access/v9.2.0"
   }
 }
diff --git a/modules/firewall-rules/metadata.yaml b/modules/firewall-rules/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/firewall-rules
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3.0"

diff --git a/modules/firewall-rules/versions.tf b/modules/firewall-rules/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.33, < 6"
+      version = ">= 3.33, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:firewall-rules/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:firewall-rules/v9.2.0"
   }
 }
diff --git a/modules/hierarchical-firewall-policy/README.md b/modules/hierarchical-firewall-policy/README.md
@@ -31,7 +31,7 @@ There are examples included for [hierarchical firewall policy](../../examples/hi
 ```hcl
 module "firewal_policy" {
   source  = "terraform-google-modules/network/google//modules/hierarchical-firewall-policy"
-  version = "~> 9.1"
+  version = "~> 9.2"
 
   parent_node    = "folders/123456789012"
   policy_name    = "test-policy"

diff --git a/modules/hierarchical-firewall-policy/metadata.yaml b/modules/hierarchical-firewall-policy/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/hierarchical-firewall-policy
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3.0"

diff --git a/modules/hierarchical-firewall-policy/versions.tf b/modules/hierarchical-firewall-policy/versions.tf
@@ -20,15 +20,15 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.64, < 6"
+      version = ">= 4.64, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.64, < 6"
+      version = ">= 4.64, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:hierarchical-firewall-policy/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:hierarchical-firewall-policy/v9.2.0"
   }
 }
diff --git a/modules/network-firewall-policy/metadata.yaml b/modules/network-firewall-policy/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/network-firewall-policy
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3.0"

diff --git a/modules/network-firewall-policy/versions.tf b/modules/network-firewall-policy/versions.tf
@@ -20,15 +20,15 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.64, < 6"
+      version = ">= 4.64, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.64, < 6"
+      version = ">= 4.64, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:network-firewall-policy/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:network-firewall-policy/v9.2.0"
   }
 }
diff --git a/modules/network-peering/metadata.yaml b/modules/network-peering/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/network-peering
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 0.13.0"

diff --git a/modules/network-peering/versions.tf b/modules/network-peering/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.65, < 6"
+      version = ">= 4.65, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.65, < 6"
+      version = ">= 4.65, < 7"
     }
     random = {
       source  = "hashicorp/random"
@@ -37,6 +37,6 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:network-peering/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:network-peering/v9.2.0"
   }
 }
diff --git a/modules/private-service-connect/README.md b/modules/private-service-connect/README.md
@@ -57,6 +57,7 @@ If you have a firewall rule blocking egress traffic, you will need to configure
 | private\_service\_connect\_ip | The internal IP to be used for the private service connect. | `string` | n/a | yes |
 | private\_service\_connect\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip` | `string` | `"global-psconnect-ip"` | no |
 | project\_id | Project ID for Private Service Connect. | `string` | n/a | yes |
+| psc\_global\_access | This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false` | `bool` | `false` | no |
 | service\_directory\_namespace | Service Directory namespace to register the forwarding rule under. | `string` | `null` | no |
 | service\_directory\_region | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined. | `string` | `null` | no |
 

diff --git a/modules/private-service-connect/main.tf b/modules/private-service-connect/main.tf
@@ -31,13 +31,14 @@ resource "google_compute_global_address" "private_service_connect" {
 }
 
 resource "google_compute_global_forwarding_rule" "forwarding_rule_private_service_connect" {
-  provider              = google-beta
-  project               = var.project_id
-  name                  = var.forwarding_rule_name
-  target                = var.forwarding_rule_target
-  network               = var.network_self_link
-  ip_address            = google_compute_global_address.private_service_connect.id
-  load_balancing_scheme = ""
+  provider                = google-beta
+  project                 = var.project_id
+  name                    = var.forwarding_rule_name
+  target                  = var.forwarding_rule_target
+  network                 = var.network_self_link
+  ip_address              = google_compute_global_address.private_service_connect.id
+  load_balancing_scheme   = ""
+  allow_psc_global_access = var.psc_global_access
 
   dynamic "service_directory_registrations" {
     for_each = var.service_directory_namespace != null || var.service_directory_region != null ? [1] : []

diff --git a/modules/private-service-connect/metadata.yaml b/modules/private-service-connect/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/private-service-connect
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 0.13"

diff --git a/modules/private-service-connect/variables.tf b/modules/private-service-connect/variables.tf
@@ -68,3 +68,9 @@ variable "service_directory_region" {
   type        = string
   default     = null
 }
+
+variable "psc_global_access" {
+  description = "This is used in PSC consumer ForwardingRule to control whether the PSC endpoint can be accessed from another region. Defaults to `false`"
+  type        = bool
+  default     = false
+}
diff --git a/modules/private-service-connect/versions.tf b/modules/private-service-connect/versions.tf
@@ -19,19 +19,19 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.8, < 6"
+      version = ">= 5.8, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.8, < 6"
+      version = ">= 5.8, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:private-service-connect/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:private-service-connect/v9.2.0"
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-network:private-service-connect/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:private-service-connect/v9.2.0"
   }
 }
diff --git a/modules/routes-beta/metadata.yaml b/modules/routes-beta/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/routes-beta
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 0.13.0"

diff --git a/modules/routes-beta/versions.tf b/modules/routes-beta/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.0, < 6"
+      version = ">= 3.0, < 7"
     }
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-network:routes-beta/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:routes-beta/v9.2.0"
   }
 }
diff --git a/modules/routes/metadata.yaml b/modules/routes/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/routes
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 0.13.0"

diff --git a/modules/routes/versions.tf b/modules/routes/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.83, < 6"
+      version = ">= 3.83, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:routes/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:routes/v9.2.0"
   }
 }
diff --git a/modules/subnets-beta/metadata.yaml b/modules/subnets-beta/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/subnets-beta
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 0.13.0"

diff --git a/modules/subnets-beta/versions.tf b/modules/subnets-beta/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 2.19, < 6"
+      version = ">= 2.19, < 7"
     }
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-network:subnets-beta/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:subnets-beta/v9.2.0"
   }
 }
diff --git a/modules/subnets/metadata.yaml b/modules/subnets/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/subnets
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 0.13.0"

diff --git a/modules/subnets/versions.tf b/modules/subnets/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.25.0, < 6"
+      version = ">= 4.25.0, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-network:subnets/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:subnets/v9.2.0"
   }
 }
diff --git a/modules/vpc-serverless-connector-beta/metadata.yaml b/modules/vpc-serverless-connector-beta/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-network.git
       sourceType: git
       dir: /modules/vpc-serverless-connector-beta
-    version: 9.1.0
+    version: 9.2.0
     actuationTool:
       flavor: Terraform
       version: ">= 0.13.0"

diff --git a/modules/vpc-serverless-connector-beta/versions.tf b/modules/vpc-serverless-connector-beta/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.62, < 6"
+      version = ">= 3.62, < 7"
     }
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v9.1.0"
+    module_name = "blueprints/terraform/terraform-google-network:vpc-serverless-connector-beta/v9.2.0"
   }
 }