Remove data source from net-vpc module (#2216)

* remove data source from net-vpc module * fix test inventories * remove data source, fix fast inventories
GoogleCloudPlatform · Apr 16, 2024 · 198d90c · 198d90c
1 parent a74a106
commit 198d90c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 20 deletions.
diff --git a/modules/net-vpc/main.tf b/modules/net-vpc/main.tf
@@ -17,8 +17,24 @@
 locals {
   network = (
     var.vpc_create
-    ? try(google_compute_network.network.0, null)
-    : try(data.google_compute_network.network.0, null)
+    ? {
+      id        = try(google_compute_network.network.0.id, null)
+      name      = try(google_compute_network.network.0.name, null)
+      self_link = try(google_compute_network.network.0.self_link, null)
+    }
+    : {
+      id = format(
+        "projects/%s/global/networks/%s",
+        var.project_id,
+        var.name
+      )
+      name = var.name
+      self_link = format(
+        "https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s",
+        var.project_id,
+        var.name
+      )
+    }
   )
   peer_network = (
     var.peering_config == null
@@ -27,12 +43,6 @@ locals {
   )
 }
 
-data "google_compute_network" "network" {
-  count   = var.vpc_create ? 0 : 1
-  project = var.project_id
-  name    = var.name
-}
-
 resource "google_compute_network" "network" {
   count                                     = var.vpc_create ? 1 : 0
   project                                   = var.project_id

diff --git a/tests/fast/stages/s2_networking_a_peering/stage.yaml b/tests/fast/stages/s2_networking_a_peering/stage.yaml
@@ -14,4 +14,4 @@
 
 counts:
   modules: 29
-  resources: 153
+  resources: 151
diff --git a/tests/fast/stages/s2_networking_b_vpn/stage.yaml b/tests/fast/stages/s2_networking_b_vpn/stage.yaml
@@ -14,4 +14,4 @@
 
 counts:
   modules: 31
-  resources: 190
+  resources: 188
diff --git a/tests/fast/stages/s2_networking_c_nva/stage.yaml b/tests/fast/stages/s2_networking_c_nva/stage.yaml
@@ -22,7 +22,7 @@ counts:
   google_compute_ha_vpn_gateway: 2
   google_compute_health_check: 8
   google_compute_instance_template: 4
-  google_compute_network: 6
+  google_compute_network: 4
   google_compute_network_peering: 4
   google_compute_region_backend_service: 4
   google_compute_region_instance_group_manager: 4
@@ -53,4 +53,4 @@ counts:
   google_vpc_access_connector: 2
   modules: 43
   random_id: 2
-  resources: 203
+  resources: 201
diff --git a/tests/fast/stages/s2_networking_d_separate_envs/stage.yaml b/tests/fast/stages/s2_networking_d_separate_envs/stage.yaml
@@ -14,4 +14,4 @@
 
 counts:
   modules: 22
-  resources: 174
+  resources: 172
diff --git a/tests/modules/net_vpc/psa_routes_export.yaml b/tests/modules/net_vpc/psa_routes_export.yaml
@@ -46,10 +46,8 @@ counts:
   google_service_networking_connection: 1
 
 outputs:
-  name: __missing__
   network: __missing__
   project_id: test-project
-  self_link: __missing__
   subnet_ips: {}
   subnet_regions: {}
   subnet_secondary_ranges: {}

diff --git a/tests/modules/net_vpc/psa_routes_import.yaml b/tests/modules/net_vpc/psa_routes_import.yaml
@@ -46,10 +46,8 @@ counts:
   google_service_networking_connection: 1
 
 outputs:
-  name: __missing__
   network: __missing__
   project_id: test-project
-  self_link: __missing__
   subnet_ips: {}
   subnet_regions: {}
   subnet_secondary_ranges: {}

diff --git a/tests/modules/net_vpc/psa_routes_import_export.yaml b/tests/modules/net_vpc/psa_routes_import_export.yaml
@@ -46,10 +46,7 @@ counts:
   google_service_networking_connection: 1
 
 outputs:
-  name: __missing__
-  network: __missing__
   project_id: test-project
-  self_link: __missing__
   subnet_ips: {}
   subnet_regions: {}
   subnet_secondary_ranges: {}