diff --git a/modules/alloydb/README.md b/modules/alloydb/README.md index b0597f9780..29b6455725 100644 --- a/modules/alloydb/README.md +++ b/modules/alloydb/README.md @@ -29,7 +29,7 @@ module "project" { source = "./fabric/modules/project" billing_account = var.billing_account_id parent = var.folder_id - name = "alloydb-prj" + name = "alloydb" prefix = var.prefix services = [ "servicenetworking.googleapis.com", @@ -76,7 +76,7 @@ module "alloydb" { location = var.region name = "db" network_config = { - network = var.vpc.self_link + network = var.vpc.id } cross_region_replication = { enabled = true @@ -104,7 +104,7 @@ module "alloydb" { timezone = "'UTC'" } network_config = { - network = var.vpc.self_link + network = var.vpc.id } users = { # generate a password for user1 @@ -130,7 +130,7 @@ module "alloydb" { location = var.region name = "primary" network_config = { - network = var.vpc.self_link + network = var.vpc.id } encryption_config = { primary_kms_key_name = var.kms_key.id diff --git a/tests/modules/alloydb/examples/simple.yaml b/tests/modules/alloydb/examples/simple.yaml index 7f658a69c1..5a763aa5b3 100644 --- a/tests/modules/alloydb/examples/simple.yaml +++ b/tests/modules/alloydb/examples/simple.yaml @@ -32,7 +32,7 @@ values: maintenance_update_policy: [] network_config: - allocated_ip_range: null - project: test-alloydb-prj + project: test-alloydb restore_backup_source: [] restore_continuous_backup_source: [] secondary_config: [] @@ -62,29 +62,29 @@ values: billing_account: 123456-123456-123456 folder_id: '1122334455' labels: null - name: test-alloydb-prj + name: test-alloydb org_id: null - project_id: test-alloydb-prj + project_id: test-alloydb skip_delete: false timeouts: null module.project.google_project_iam_member.servicenetworking[0]: condition: [] - project: test-alloydb-prj + project: test-alloydb role: roles/servicenetworking.serviceAgent module.project.google_project_service.project_services["alloydb.googleapis.com"]: disable_dependent_services: false disable_on_destroy: false - project: test-alloydb-prj + project: test-alloydb service: alloydb.googleapis.com timeouts: null module.project.google_project_service.project_services["servicenetworking.googleapis.com"]: disable_dependent_services: false disable_on_destroy: false - project: test-alloydb-prj + project: test-alloydb service: servicenetworking.googleapis.com timeouts: null module.project.google_project_service_identity.servicenetworking[0]: - project: test-alloydb-prj + project: test-alloydb service: servicenetworking.googleapis.com timeouts: null module.vpc.google_compute_global_address.psa_ranges["servicenetworking-googleapis-com-alloydb"]: @@ -94,7 +94,7 @@ values: ip_version: null name: servicenetworking-googleapis-com-alloydb prefix_length: 16 - project: test-alloydb-prj + project: test-alloydb purpose: VPC_PEERING timeouts: null module.vpc.google_compute_network.network[0]: @@ -104,14 +104,14 @@ values: enable_ula_internal_ipv6: null name: my-network network_firewall_policy_enforcement_order: AFTER_CLASSIC_FIREWALL - project: test-alloydb-prj + project: test-alloydb routing_mode: GLOBAL timeouts: null module.vpc.google_compute_network_peering_routes_config.psa_routes["servicenetworking.googleapis.com"]: export_custom_routes: false import_custom_routes: false network: my-network - project: test-alloydb-prj + project: test-alloydb timeouts: null module.vpc.google_compute_route.gateway["private-googleapis"]: description: Terraform-managed. @@ -123,7 +123,7 @@ values: next_hop_instance: null next_hop_vpn_tunnel: null priority: 1000 - project: test-alloydb-prj + project: test-alloydb tags: null timeouts: null module.vpc.google_compute_route.gateway["restricted-googleapis"]: @@ -136,7 +136,7 @@ values: next_hop_instance: null next_hop_vpn_tunnel: null priority: 1000 - project: test-alloydb-prj + project: test-alloydb tags: null timeouts: null module.vpc.google_compute_subnetwork.psc["europe-west8/psc"]: @@ -146,7 +146,7 @@ values: log_config: [] name: psc network: my-network - project: test-alloydb-prj + project: test-alloydb purpose: PRIVATE_SERVICE_CONNECT region: europe-west8 role: null