Skip to content

Commit

Permalink
Fix modules and blueprints tests
Browse files Browse the repository at this point in the history
  • Loading branch information
juliocc committed May 26, 2023
1 parent 563b5fa commit afdcea7
Show file tree
Hide file tree
Showing 39 changed files with 68 additions and 49 deletions.
2 changes: 1 addition & 1 deletion blueprints/apigee/hybrid-gke/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ module "test" {
project_id = "my-project"
hostname = "test.myorg.org"
}
# tftest modules=18 resources=59
# tftest modules=18 resources=61
```
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion blueprints/cloud-operations/adfs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,5 @@ module "test" {
project_id = "project-1"
}
# tftest modules=7 resources=21
# tftest modules=7 resources=23
```
2 changes: 1 addition & 1 deletion blueprints/cloud-operations/dns-fine-grained-iam/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,5 @@ module "test1" {
project_create = true
project_id = "test"
}
# tftest modules=9 resources=25
# tftest modules=9 resources=27
```
2 changes: 1 addition & 1 deletion blueprints/cloud-operations/dns-shared-vpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion blueprints/cloud-operations/packer-image-builder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,5 @@ module "test" {
packer_account_users = ["user:[email protected]"]
create_packer_vars = true
}
# tftest modules=7 resources=17 files=pkrvars
# tftest modules=7 resources=19 files=pkrvars
```
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,5 @@ module "test" {
billing_account = "123456-123456-123456"
project_create = true
}
# tftest modules=11 resources=35
# tftest modules=11 resources=37
```
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ module "test" {
migration_admin_users = ["user:[email protected]"]
migration_viewer_users = ["user:[email protected]"]
}
# tftest modules=5 resources=20
# tftest modules=5 resources=22
```
2 changes: 1 addition & 1 deletion blueprints/data-solutions/bq-ml/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ module "test" {
prefix = "prefix"
}
# tftest modules=9 resources=48
# tftest modules=9 resources=50
```
2 changes: 1 addition & 1 deletion blueprints/data-solutions/cloudsql-multiregion/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,5 +180,5 @@ module "test" {
}
prefix = "prefix"
}
# tftest modules=10 resources=50
# tftest modules=10 resources=52
```
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ module "test" {
}
prefix = "prefix"
}
# tftest modules=8 resources=27
# tftest modules=8 resources=29
```
2 changes: 1 addition & 1 deletion blueprints/data-solutions/composer-2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,5 @@ module "test" {
}
prefix = "prefix"
}
# tftest modules=5 resources=26
# tftest modules=5 resources=28
```
4 changes: 2 additions & 2 deletions blueprints/data-solutions/data-platform-foundations/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ module "data-platform" {
prefix = "myprefix"
}
# tftest modules=43 resources=279
# tftest modules=43 resources=285
```

## Customizations
Expand Down Expand Up @@ -307,5 +307,5 @@ module "test" {
}
prefix = "prefix"
}
# tftest modules=43 resources=279
# tftest modules=43 resources=285
```
2 changes: 1 addition & 1 deletion blueprints/data-solutions/data-platform-minimal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ module "data-platform" {
prefix = "myprefix"
}
# tftest modules=21 resources=110
# tftest modules=21 resources=112
```

## Customizations
Expand Down
2 changes: 1 addition & 1 deletion blueprints/data-solutions/data-playground/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ module "test" {
parent = "folders/467898377"
}
}
# tftest modules=8 resources=41
# tftest modules=8 resources=43
```
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,5 @@ module "test" {
project_id = "project-1"
prefix = "prefix"
}
# tftest modules=12 resources=47
# tftest modules=12 resources=49
```
2 changes: 1 addition & 1 deletion blueprints/data-solutions/sqlserver-alwayson/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
4 changes: 2 additions & 2 deletions blueprints/data-solutions/vertex-mlops/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module "test" {
project_id = "test-dev"
}
}
# tftest modules=11 resources=60
# tftest modules=11 resources=62
```
<!-- BEGIN TFDOC -->

Expand Down Expand Up @@ -127,5 +127,5 @@ module "test" {
project_id = "test-dev"
}
}
# tftest modules=13 resources=65
# tftest modules=13 resources=67
```
4 changes: 2 additions & 2 deletions blueprints/gke/autopilot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ module "test" {
}
project_id = "my-project"
}
# tftest modules=11 resources=34
```
# tftest modules=11 resources=36
```
2 changes: 1 addition & 1 deletion blueprints/gke/binauthz/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,5 @@ module "test" {
}
project_id = "my-project"
}
# tftest modules=14 resources=47
# tftest modules=14 resources=49
```
2 changes: 1 addition & 1 deletion blueprints/gke/multi-cluster-mesh-gke-fleet-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion blueprints/networking/decentralized-firewall/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ module "test" {
root_node = "organizations/0123456789"
}
# tftest modules=9 resources=50
# tftest modules=9 resources=54
```
2 changes: 1 addition & 1 deletion blueprints/networking/filtering-proxy-psc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ module "test" {
}
project_id = "test-project"
}
# tftest modules=13 resources=37
# tftest modules=13 resources=41
```
4 changes: 2 additions & 2 deletions blueprints/networking/filtering-proxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module "test1" {
prefix = "fabric"
root_node = "folders/123456789"
}
# tftest modules=14 resources=36
# tftest modules=14 resources=38
```

```hcl
Expand All @@ -58,5 +58,5 @@ module "test2" {
prefix = "fabric"
root_node = "folders/123456789"
}
# tftest modules=12 resources=30
# tftest modules=12 resources=32
```
2 changes: 1 addition & 1 deletion blueprints/networking/glb-and-armor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,5 @@ module "test" {
project_id = "project-1"
enforce_security_policy = true
}
# tftest modules=12 resources=26
# tftest modules=12 resources=28
```
2 changes: 1 addition & 1 deletion blueprints/networking/glb-hybrid-neg-internal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ module "test" {
}
}
# tftest modules=21 resources=64
# tftest modules=21 resources=70
```
2 changes: 1 addition & 1 deletion blueprints/networking/hub-and-spoke-peering/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,5 @@ module "test" {
project_id = "project-1"
}
# tftest modules=22 resources=61
# tftest modules=22 resources=67
```
2 changes: 1 addition & 1 deletion blueprints/networking/hub-and-spoke-vpn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,5 @@ module "test" {
project_id = "project-1"
}
# tftest modules=20 resources=73
# tftest modules=20 resources=79
```
2 changes: 1 addition & 1 deletion blueprints/networking/ilb-next-hop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ module "test" {
project_create = true
project_id = "project-1"
}
# tftest modules=18 resources=42
# tftest modules=18 resources=46
```
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ module "test" {
}
project_id = "test-project"
}
# tftest modules=11 resources=40
# tftest modules=11 resources=44
```
2 changes: 1 addition & 1 deletion blueprints/networking/shared-vpc-gke/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ module "test" {
prefix = "test"
root_node = "organizations/0123456789"
}
# tftest modules=11 resources=43
# tftest modules=11 resources=45
```
6 changes: 3 additions & 3 deletions blueprints/serverless/cloud-run-corporate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ module "test" {
prj_onprem_id = "onprem-project-id"
}
# tftest modules=15 resources=46
# tftest modules=15 resources=50
```

```hcl
Expand All @@ -262,7 +262,7 @@ module "test" {
tf_identity = "[email protected]"
}
# tftest modules=15 resources=32
# tftest modules=15 resources=36
```

```hcl
Expand All @@ -281,5 +281,5 @@ module "test" {
custom_domain = "cloud-run-corporate.example.org"
}
# tftest modules=14 resources=43
# tftest modules=14 resources=45
```
2 changes: 1 addition & 1 deletion modules/cloudsql-instance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions modules/gke-hub/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -314,7 +314,7 @@ module "hub" {
]
}
# tftest modules=8 resources=32
# tftest modules=8 resources=34
```
<!-- BEGIN TFDOC -->

Expand Down
2 changes: 1 addition & 1 deletion modules/net-vpc-firewall-policy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module "firewall-policy" {
}
}
}
# tftest modules=2 resources=7
# tftest modules=2 resources=9
```
<!-- BEGIN TFDOC -->

Expand Down
4 changes: 0 additions & 4 deletions tests/modules/net_vpc/examples/dns-policies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,3 @@ counts:
google_compute_network: 1
google_compute_subnetwork: 1
google_dns_policy: 1
modules: 1
resources: 3

outputs: {}
24 changes: 24 additions & 0 deletions tests/modules/net_vpc/examples/simple.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions tests/modules/net_vpc/examples/subnet-iam.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit afdcea7

Please sign in to comment.