Remove data source from net-vpc module (#2216)
* remove data source from net-vpc module * fix test inventories * remove data source, fix fast inventories
This commit is contained in:
parent
a74a106f8b
commit
198d90c6fc
|
@ -17,8 +17,24 @@
|
||||||
locals {
|
locals {
|
||||||
network = (
|
network = (
|
||||||
var.vpc_create
|
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 = (
|
peer_network = (
|
||||||
var.peering_config == null
|
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" {
|
resource "google_compute_network" "network" {
|
||||||
count = var.vpc_create ? 1 : 0
|
count = var.vpc_create ? 1 : 0
|
||||||
project = var.project_id
|
project = var.project_id
|
||||||
|
|
|
@ -14,4 +14,4 @@
|
||||||
|
|
||||||
counts:
|
counts:
|
||||||
modules: 29
|
modules: 29
|
||||||
resources: 153
|
resources: 151
|
||||||
|
|
|
@ -14,4 +14,4 @@
|
||||||
|
|
||||||
counts:
|
counts:
|
||||||
modules: 31
|
modules: 31
|
||||||
resources: 190
|
resources: 188
|
||||||
|
|
|
@ -22,7 +22,7 @@ counts:
|
||||||
google_compute_ha_vpn_gateway: 2
|
google_compute_ha_vpn_gateway: 2
|
||||||
google_compute_health_check: 8
|
google_compute_health_check: 8
|
||||||
google_compute_instance_template: 4
|
google_compute_instance_template: 4
|
||||||
google_compute_network: 6
|
google_compute_network: 4
|
||||||
google_compute_network_peering: 4
|
google_compute_network_peering: 4
|
||||||
google_compute_region_backend_service: 4
|
google_compute_region_backend_service: 4
|
||||||
google_compute_region_instance_group_manager: 4
|
google_compute_region_instance_group_manager: 4
|
||||||
|
@ -53,4 +53,4 @@ counts:
|
||||||
google_vpc_access_connector: 2
|
google_vpc_access_connector: 2
|
||||||
modules: 43
|
modules: 43
|
||||||
random_id: 2
|
random_id: 2
|
||||||
resources: 203
|
resources: 201
|
||||||
|
|
|
@ -14,4 +14,4 @@
|
||||||
|
|
||||||
counts:
|
counts:
|
||||||
modules: 22
|
modules: 22
|
||||||
resources: 174
|
resources: 172
|
||||||
|
|
|
@ -46,10 +46,8 @@ counts:
|
||||||
google_service_networking_connection: 1
|
google_service_networking_connection: 1
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
name: __missing__
|
|
||||||
network: __missing__
|
network: __missing__
|
||||||
project_id: test-project
|
project_id: test-project
|
||||||
self_link: __missing__
|
|
||||||
subnet_ips: {}
|
subnet_ips: {}
|
||||||
subnet_regions: {}
|
subnet_regions: {}
|
||||||
subnet_secondary_ranges: {}
|
subnet_secondary_ranges: {}
|
||||||
|
|
|
@ -46,10 +46,8 @@ counts:
|
||||||
google_service_networking_connection: 1
|
google_service_networking_connection: 1
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
name: __missing__
|
|
||||||
network: __missing__
|
network: __missing__
|
||||||
project_id: test-project
|
project_id: test-project
|
||||||
self_link: __missing__
|
|
||||||
subnet_ips: {}
|
subnet_ips: {}
|
||||||
subnet_regions: {}
|
subnet_regions: {}
|
||||||
subnet_secondary_ranges: {}
|
subnet_secondary_ranges: {}
|
||||||
|
|
|
@ -46,10 +46,7 @@ counts:
|
||||||
google_service_networking_connection: 1
|
google_service_networking_connection: 1
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
name: __missing__
|
|
||||||
network: __missing__
|
|
||||||
project_id: test-project
|
project_id: test-project
|
||||||
self_link: __missing__
|
|
||||||
subnet_ips: {}
|
subnet_ips: {}
|
||||||
subnet_regions: {}
|
subnet_regions: {}
|
||||||
subnet_secondary_ranges: {}
|
subnet_secondary_ranges: {}
|
||||||
|
|
Loading…
Reference in New Issue