Fix modules and blueprints tests
This commit is contained in:
parent
563b5fa0cb
commit
cecbd2072c
|
@ -80,5 +80,5 @@ module "test" {
|
|||
project_id = "my-project"
|
||||
hostname = "test.myorg.org"
|
||||
}
|
||||
# tftest modules=18 resources=59
|
||||
# tftest modules=18 resources=61
|
||||
```
|
||||
|
|
|
@ -79,5 +79,5 @@ module "test" {
|
|||
onprem_project_id = "my-onprem-project"
|
||||
hostname = "test.myorg.org"
|
||||
}
|
||||
# tftest modules=14 resources=73
|
||||
# tftest modules=14 resources=77
|
||||
```
|
||||
|
|
|
@ -89,5 +89,5 @@ module "test" {
|
|||
ad_dns_domain_name = "example.com"
|
||||
adfs_dns_domain_name = "adfs.example.com"
|
||||
}
|
||||
# tftest modules=5 resources=18
|
||||
# tftest modules=5 resources=20
|
||||
```
|
||||
|
|
|
@ -82,5 +82,5 @@ module "test" {
|
|||
project_id = "project-1"
|
||||
}
|
||||
|
||||
# tftest modules=7 resources=21
|
||||
# tftest modules=7 resources=23
|
||||
```
|
||||
|
|
|
@ -128,5 +128,5 @@ module "test1" {
|
|||
project_create = true
|
||||
project_id = "test"
|
||||
}
|
||||
# tftest modules=9 resources=25
|
||||
# tftest modules=9 resources=27
|
||||
```
|
||||
|
|
|
@ -51,5 +51,5 @@ module "test" {
|
|||
shared_vpc_link = "https://www.googleapis.com/compute/v1/projects/test-dns/global/networks/default"
|
||||
teams = ["team1", "team2"]
|
||||
}
|
||||
# tftest modules=9 resources=12
|
||||
# tftest modules=9 resources=16
|
||||
```
|
||||
|
|
|
@ -115,5 +115,5 @@ module "test" {
|
|||
packer_account_users = ["user:john@example.com"]
|
||||
create_packer_vars = true
|
||||
}
|
||||
# tftest modules=7 resources=17 files=pkrvars
|
||||
# tftest modules=7 resources=19 files=pkrvars
|
||||
```
|
||||
|
|
|
@ -128,5 +128,5 @@ module "test" {
|
|||
billing_account = "123456-123456-123456"
|
||||
project_create = true
|
||||
}
|
||||
# tftest modules=11 resources=35
|
||||
# tftest modules=11 resources=37
|
||||
```
|
||||
|
|
|
@ -52,5 +52,5 @@ module "test" {
|
|||
migration_admin_users = ["user:admin@example.com"]
|
||||
migration_viewer_users = ["user:viewer@example.com"]
|
||||
}
|
||||
# tftest modules=5 resources=20
|
||||
# tftest modules=5 resources=22
|
||||
```
|
||||
|
|
|
@ -98,5 +98,5 @@ module "test" {
|
|||
prefix = "prefix"
|
||||
}
|
||||
|
||||
# tftest modules=9 resources=48
|
||||
# tftest modules=9 resources=50
|
||||
```
|
||||
|
|
|
@ -180,5 +180,5 @@ module "test" {
|
|||
}
|
||||
prefix = "prefix"
|
||||
}
|
||||
# tftest modules=10 resources=50
|
||||
# tftest modules=10 resources=52
|
||||
```
|
||||
|
|
|
@ -66,5 +66,5 @@ module "test" {
|
|||
}
|
||||
prefix = "prefix"
|
||||
}
|
||||
# tftest modules=8 resources=27
|
||||
# tftest modules=8 resources=29
|
||||
```
|
||||
|
|
|
@ -125,5 +125,5 @@ module "test" {
|
|||
}
|
||||
prefix = "prefix"
|
||||
}
|
||||
# tftest modules=5 resources=26
|
||||
# tftest modules=5 resources=28
|
||||
```
|
||||
|
|
|
@ -226,7 +226,7 @@ module "data-platform" {
|
|||
prefix = "myprefix"
|
||||
}
|
||||
|
||||
# tftest modules=43 resources=279
|
||||
# tftest modules=43 resources=285
|
||||
```
|
||||
|
||||
## Customizations
|
||||
|
@ -307,5 +307,5 @@ module "test" {
|
|||
}
|
||||
prefix = "prefix"
|
||||
}
|
||||
# tftest modules=43 resources=279
|
||||
# tftest modules=43 resources=285
|
||||
```
|
||||
|
|
|
@ -203,7 +203,7 @@ module "data-platform" {
|
|||
prefix = "myprefix"
|
||||
}
|
||||
|
||||
# tftest modules=21 resources=110
|
||||
# tftest modules=21 resources=112
|
||||
```
|
||||
|
||||
## Customizations
|
||||
|
|
|
@ -86,5 +86,5 @@ module "test" {
|
|||
parent = "folders/467898377"
|
||||
}
|
||||
}
|
||||
# tftest modules=8 resources=41
|
||||
# tftest modules=8 resources=43
|
||||
```
|
||||
|
|
|
@ -228,5 +228,5 @@ module "test" {
|
|||
project_id = "project-1"
|
||||
prefix = "prefix"
|
||||
}
|
||||
# tftest modules=12 resources=47
|
||||
# tftest modules=12 resources=49
|
||||
```
|
||||
|
|
|
@ -87,5 +87,5 @@ module "test" {
|
|||
ad_domain_fqdn = "ad.example.com"
|
||||
ad_domain_netbios = "ad"
|
||||
}
|
||||
# tftest modules=12 resources=38
|
||||
# tftest modules=12 resources=40
|
||||
```
|
||||
|
|
|
@ -72,7 +72,7 @@ module "test" {
|
|||
project_id = "test-dev"
|
||||
}
|
||||
}
|
||||
# tftest modules=11 resources=60
|
||||
# tftest modules=11 resources=62
|
||||
```
|
||||
<!-- BEGIN TFDOC -->
|
||||
|
||||
|
@ -127,5 +127,5 @@ module "test" {
|
|||
project_id = "test-dev"
|
||||
}
|
||||
}
|
||||
# tftest modules=13 resources=65
|
||||
# tftest modules=13 resources=67
|
||||
```
|
||||
|
|
|
@ -91,5 +91,5 @@ module "test" {
|
|||
}
|
||||
project_id = "my-project"
|
||||
}
|
||||
# tftest modules=11 resources=34
|
||||
```
|
||||
# tftest modules=11 resources=36
|
||||
```
|
||||
|
|
|
@ -138,5 +138,5 @@ module "test" {
|
|||
}
|
||||
project_id = "my-project"
|
||||
}
|
||||
# tftest modules=14 resources=47
|
||||
# tftest modules=14 resources=49
|
||||
```
|
||||
|
|
|
@ -103,5 +103,5 @@ module "test" {
|
|||
mgmt_subnet_cidr_block = "10.0.0.0/24"
|
||||
istio_version = "1.14.1-asm.3"
|
||||
}
|
||||
# tftest modules=13 resources=57
|
||||
# tftest modules=13 resources=59
|
||||
```
|
||||
|
|
|
@ -51,5 +51,5 @@ module "test" {
|
|||
root_node = "organizations/0123456789"
|
||||
}
|
||||
|
||||
# tftest modules=9 resources=50
|
||||
# tftest modules=9 resources=54
|
||||
```
|
||||
|
|
|
@ -40,5 +40,5 @@ module "test" {
|
|||
}
|
||||
project_id = "test-project"
|
||||
}
|
||||
# tftest modules=13 resources=37
|
||||
# tftest modules=13 resources=41
|
||||
```
|
||||
|
|
|
@ -47,7 +47,7 @@ module "test1" {
|
|||
prefix = "fabric"
|
||||
root_node = "folders/123456789"
|
||||
}
|
||||
# tftest modules=14 resources=36
|
||||
# tftest modules=14 resources=38
|
||||
```
|
||||
|
||||
```hcl
|
||||
|
@ -58,5 +58,5 @@ module "test2" {
|
|||
prefix = "fabric"
|
||||
root_node = "folders/123456789"
|
||||
}
|
||||
# tftest modules=12 resources=30
|
||||
# tftest modules=12 resources=32
|
||||
```
|
||||
|
|
|
@ -151,5 +151,5 @@ module "test" {
|
|||
project_id = "project-1"
|
||||
enforce_security_policy = true
|
||||
}
|
||||
# tftest modules=12 resources=26
|
||||
# tftest modules=12 resources=28
|
||||
```
|
||||
|
|
|
@ -96,5 +96,5 @@ module "test" {
|
|||
}
|
||||
}
|
||||
|
||||
# tftest modules=21 resources=64
|
||||
# tftest modules=21 resources=70
|
||||
```
|
||||
|
|
|
@ -115,5 +115,5 @@ module "test" {
|
|||
project_id = "project-1"
|
||||
}
|
||||
|
||||
# tftest modules=22 resources=61
|
||||
# tftest modules=22 resources=67
|
||||
```
|
||||
|
|
|
@ -114,5 +114,5 @@ module "test" {
|
|||
project_id = "project-1"
|
||||
}
|
||||
|
||||
# tftest modules=20 resources=73
|
||||
# tftest modules=20 resources=79
|
||||
```
|
||||
|
|
|
@ -96,5 +96,5 @@ module "test" {
|
|||
project_create = true
|
||||
project_id = "project-1"
|
||||
}
|
||||
# tftest modules=18 resources=42
|
||||
# tftest modules=18 resources=46
|
||||
```
|
||||
|
|
|
@ -45,5 +45,5 @@ module "test" {
|
|||
}
|
||||
project_id = "test-project"
|
||||
}
|
||||
# tftest modules=11 resources=40
|
||||
# tftest modules=11 resources=44
|
||||
```
|
||||
|
|
|
@ -80,5 +80,5 @@ module "test" {
|
|||
prefix = "test"
|
||||
root_node = "organizations/0123456789"
|
||||
}
|
||||
# tftest modules=11 resources=43
|
||||
# tftest modules=11 resources=45
|
||||
```
|
||||
|
|
|
@ -238,7 +238,7 @@ module "test" {
|
|||
prj_onprem_id = "onprem-project-id"
|
||||
}
|
||||
|
||||
# tftest modules=15 resources=46
|
||||
# tftest modules=15 resources=50
|
||||
```
|
||||
|
||||
```hcl
|
||||
|
@ -262,7 +262,7 @@ module "test" {
|
|||
tf_identity = "user@example.org"
|
||||
}
|
||||
|
||||
# tftest modules=15 resources=32
|
||||
# tftest modules=15 resources=36
|
||||
```
|
||||
|
||||
```hcl
|
||||
|
@ -281,5 +281,5 @@ module "test" {
|
|||
custom_domain = "cloud-run-corporate.example.org"
|
||||
}
|
||||
|
||||
# tftest modules=14 resources=43
|
||||
# tftest modules=14 resources=45
|
||||
```
|
||||
|
|
|
@ -39,7 +39,7 @@ module "db" {
|
|||
database_version = "POSTGRES_13"
|
||||
tier = "db-g1-small"
|
||||
}
|
||||
# tftest modules=3 resources=9 inventory=simple.yaml
|
||||
# tftest modules=3 resources=11 inventory=simple.yaml
|
||||
```
|
||||
|
||||
## Cross-regional read replica
|
||||
|
|
|
@ -119,7 +119,7 @@ module "hub" {
|
|||
}
|
||||
}
|
||||
|
||||
# tftest modules=4 resources=16 inventory=full.yaml
|
||||
# tftest modules=4 resources=18 inventory=full.yaml
|
||||
```
|
||||
|
||||
## Multi-cluster mesh on GKE
|
||||
|
@ -314,7 +314,7 @@ module "hub" {
|
|||
]
|
||||
}
|
||||
|
||||
# tftest modules=8 resources=32
|
||||
# tftest modules=8 resources=34
|
||||
```
|
||||
<!-- BEGIN TFDOC -->
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ module "firewall-policy" {
|
|||
}
|
||||
}
|
||||
}
|
||||
# tftest modules=2 resources=7
|
||||
# tftest modules=2 resources=9
|
||||
```
|
||||
<!-- BEGIN TFDOC -->
|
||||
|
||||
|
|
|
@ -36,7 +36,3 @@ counts:
|
|||
google_compute_network: 1
|
||||
google_compute_subnetwork: 1
|
||||
google_dns_policy: 1
|
||||
modules: 1
|
||||
resources: 3
|
||||
|
||||
outputs: {}
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
# Copyright 2023 Google LLC
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
values:
|
||||
module.vpc.google_compute_route.gateway["private-6-googleapis"]:
|
||||
dest_range: 2600:2d00:0002:2000::/64
|
||||
name: my-vpc-private-6-googleapis
|
||||
next_hop_gateway: default-internet-gateway
|
||||
next_hop_ilb: null
|
||||
next_hop_instance: null
|
||||
next_hop_vpn_tunnel: null
|
||||
priority: 1000
|
||||
project: my-project
|
||||
tags: null
|
||||
module.vpc.google_compute_route.gateway["restricted-6-googleapis"]:
|
||||
dest_range: 2600:2d00:0002:1000::/64
|
||||
name: my-vpc-restricted-6-googleapis
|
||||
next_hop_gateway: default-internet-gateway
|
||||
next_hop_ilb: null
|
||||
next_hop_instance: null
|
||||
next_hop_vpn_tunnel: null
|
||||
priority: 1000
|
||||
project: my-project
|
||||
tags: null
|
||||
|
||||
counts:
|
||||
google_compute_network: 1
|
||||
google_compute_route: 2
|
|
@ -44,7 +44,31 @@ values:
|
|||
region: europe-west2
|
||||
role: null
|
||||
secondary_ip_range: []
|
||||
module.vpc.google_compute_route.gateway["private-googleapis"]:
|
||||
dest_range: 199.36.153.8/30
|
||||
name: my-network-private-googleapis
|
||||
next_hop_gateway: default-internet-gateway
|
||||
next_hop_ilb: null
|
||||
next_hop_instance: null
|
||||
next_hop_vpn_tunnel: null
|
||||
priority: 1000
|
||||
project: my-project
|
||||
tags: null
|
||||
timeouts: null
|
||||
module.vpc.google_compute_route.gateway["restricted-googleapis"]:
|
||||
description: Terraform-managed.
|
||||
dest_range: 199.36.153.4/30
|
||||
name: my-network-restricted-googleapis
|
||||
next_hop_gateway: default-internet-gateway
|
||||
next_hop_ilb: null
|
||||
next_hop_instance: null
|
||||
next_hop_vpn_tunnel: null
|
||||
priority: 1000
|
||||
project: my-project
|
||||
tags: null
|
||||
timeouts: null
|
||||
|
||||
counts:
|
||||
google_compute_network: 1
|
||||
google_compute_subnetwork: 2
|
||||
google_compute_route: 2
|
||||
|
|
|
@ -54,5 +54,4 @@ counts:
|
|||
google_compute_subnetwork: 2
|
||||
google_compute_subnetwork_iam_binding: 1
|
||||
google_compute_subnetwork_iam_member: 2
|
||||
|
||||
outputs: {}
|
||||
google_compute_route: 2
|
||||
|
|
Loading…
Reference in New Issue