Fix GCVE network policy (#1948)

Co-authored-by: Luca Prete <[email protected]>
GoogleCloudPlatform · Dec 22, 2023 · 44b1115 · 44b1115
1 parent 06b2a97
commit 44b1115
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/modules/gcve-private-cloud/README.md b/modules/gcve-private-cloud/README.md
@@ -158,5 +158,6 @@ module "gcve-pc" {
 |---|---|:---:|
 | [vmw_engine_network_config](outputs.tf#L17) | VMware engine network configuration. |  |
 | [vmw_engine_network_peerings](outputs.tf#L22) | The peerings created towards the user VPC or other VMware engine networks. |  |
-| [vmw_engine_private_clouds](outputs.tf#L27) | VMware engine private cloud resources. |  |
+| [vmw_engine_network_policies](outputs.tf#L27) | The network policies associated to the VMware engine network. |  |
+| [vmw_engine_private_clouds](outputs.tf#L32) | VMware engine private cloud resources. |  |
 <!-- END TFDOC -->
diff --git a/modules/gcve-private-cloud/main.tf b/modules/gcve-private-cloud/main.tf
@@ -50,15 +50,15 @@ data "google_vmwareengine_network" "private_cloud_network" {
   location = "global"
 }
 
-resource "google_vmwareengine_network_policy" "vmw-engine-network-policy" {
+resource "google_vmwareengine_network_policy" "vmw_engine_network_policies" {
   provider              = google-beta
   for_each              = var.vmw_network_config.network_policies
   project               = var.project_id
   name                  = "${var.prefix}-${each.key}"
   description           = each.value.description
   edge_services_cidr    = each.value.edge_services_cidr
   location              = each.value.region
-  vmware_engine_network = local.vmw_network
+  vmware_engine_network = local.vmw_network.id
 
   external_ip {
     enabled = each.value.expose_on_internet

diff --git a/modules/gcve-private-cloud/outputs.tf b/modules/gcve-private-cloud/outputs.tf
@@ -24,6 +24,11 @@ output "vmw_engine_network_peerings" {
   value       = google_vmwareengine_network_peering.vmw_engine_network_peerings
 }
 
+output "vmw_engine_network_policies" {
+  description = "The network policies associated to the VMware engine network."
+  value       = google_vmwareengine_network_policy.vmw_engine_network_policies
+}
+
 output "vmw_engine_private_clouds" {
   description = "VMware engine private cloud resources."
   value       = google_vmwareengine_private_cloud.vmw_engine_private_clouds

diff --git a/tests/modules/gcve_private_cloud/examples/network-policy.yaml b/tests/modules/gcve_private_cloud/examples/network-policy.yaml
@@ -19,7 +19,7 @@ values:
     name: gcve-pc-default
     project: gcve-test-project
     type: STANDARD
-  module.gcve-pc.google_vmwareengine_network_policy.vmw-engine-network-policy["ew8"]:
+  module.gcve-pc.google_vmwareengine_network_policy.vmw_engine_network_policies["ew8"]:
     description: Terraform-managed.
     edge_services_cidr: 192.168.100.0/26
     external_ip: