diff --git a/blueprints/networking/decentralized-firewall/main.tf b/blueprints/networking/decentralized-firewall/main.tf index ab42b649..a05a104f 100644 --- a/blueprints/networking/decentralized-firewall/main.tf +++ b/blueprints/networking/decentralized-firewall/main.tf @@ -84,7 +84,7 @@ module "dns-api-prod" { domain = "googleapis.com." client_networks = [module.vpc-prod.self_link] recordsets = { - "CNAME *" = { ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } @@ -96,7 +96,7 @@ module "dns-api-dev" { domain = "googleapis.com." client_networks = [module.vpc-dev.self_link] recordsets = { - "CNAME *" = { ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/blueprints/networking/hub-and-spoke-vpn/net-dev.tf b/blueprints/networking/hub-and-spoke-vpn/net-dev.tf index 5fe08acc..7d1c0835 100644 --- a/blueprints/networking/hub-and-spoke-vpn/net-dev.tf +++ b/blueprints/networking/hub-and-spoke-vpn/net-dev.tf @@ -63,7 +63,7 @@ module "dev-dns-zone" { domain = "dev.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A test-r2" = { ttl = 300, records = [module.dev-r2-vm.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A test-r2" = { records = [module.dev-r2-vm.internal_ip] } } } diff --git a/blueprints/networking/hub-and-spoke-vpn/net-landing.tf b/blueprints/networking/hub-and-spoke-vpn/net-landing.tf index 24d17ef4..c70e2295 100644 --- a/blueprints/networking/hub-and-spoke-vpn/net-landing.tf +++ b/blueprints/networking/hub-and-spoke-vpn/net-landing.tf @@ -53,7 +53,7 @@ module "landing-dns-zone" { domain = "example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A test-r1" = { ttl = 300, records = [module.landing-r1-vm.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A test-r1" = { records = [module.landing-r1-vm.internal_ip] } } } diff --git a/blueprints/networking/hub-and-spoke-vpn/net-prod.tf b/blueprints/networking/hub-and-spoke-vpn/net-prod.tf index a7700aeb..aeb62019 100644 --- a/blueprints/networking/hub-and-spoke-vpn/net-prod.tf +++ b/blueprints/networking/hub-and-spoke-vpn/net-prod.tf @@ -63,7 +63,7 @@ module "prod-dns-zone" { domain = "prd.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A test-r1" = { ttl = 300, records = [module.prod-r1-vm.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A test-r1" = { records = [module.prod-r1-vm.internal_ip] } } } diff --git a/blueprints/networking/onprem-google-access-dns/main.tf b/blueprints/networking/onprem-google-access-dns/main.tf index 18159080..4a78f2ca 100644 --- a/blueprints/networking/onprem-google-access-dns/main.tf +++ b/blueprints/networking/onprem-google-access-dns/main.tf @@ -169,9 +169,9 @@ module "dns-gcp" { domain = "gcp.example.org." client_networks = [module.vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A test-1" = { ttl = 300, records = [module.vm-test1.internal_ip] } - "A test-2" = { ttl = 300, records = [module.vm-test2.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A test-1" = { records = [module.vm-test1.internal_ip] } + "A test-2" = { records = [module.vm-test2.internal_ip] } } } @@ -183,9 +183,9 @@ module "dns-api" { domain = "googleapis.com." client_networks = [module.vpc.self_link] recordsets = { - "CNAME *" = { ttl = 300, records = ["private.googleapis.com."] } - "A private" = { ttl = 300, records = local.vips.private } - "A restricted" = { ttl = 300, records = local.vips.restricted } + "CNAME *" = { records = ["private.googleapis.com."] } + "A private" = { records = local.vips.private } + "A restricted" = { records = local.vips.restricted } } } diff --git a/blueprints/networking/private-cloud-function-from-onprem/main.tf b/blueprints/networking/private-cloud-function-from-onprem/main.tf index 528cabe0..e2f23f1f 100644 --- a/blueprints/networking/private-cloud-function-from-onprem/main.tf +++ b/blueprints/networking/private-cloud-function-from-onprem/main.tf @@ -218,7 +218,7 @@ module "private-dns-onprem" { domain = "${var.region}-${module.project.project_id}.cloudfunctions.net." client_networks = [module.vpc-onprem.self_link] recordsets = { - "A " = { ttl = 300, records = [module.addresses.psc_addresses[local.psc_name].address] } + "A " = { records = [module.addresses.psc_addresses[local.psc_name].address] } } } diff --git a/blueprints/networking/shared-vpc-gke/main.tf b/blueprints/networking/shared-vpc-gke/main.tf index 47b2b533..9d141acc 100644 --- a/blueprints/networking/shared-vpc-gke/main.tf +++ b/blueprints/networking/shared-vpc-gke/main.tf @@ -157,8 +157,8 @@ module "host-dns" { domain = "example.com." client_networks = [module.vpc-shared.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A bastion" = { ttl = 300, records = [module.vm-bastion.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A bastion" = { records = [module.vm-bastion.internal_ip] } } } diff --git a/fast/stages/02-networking-nva/dns-dev.tf b/fast/stages/02-networking-nva/dns-dev.tf index 08c99486..4eb472a1 100644 --- a/fast/stages/02-networking-nva/dns-dev.tf +++ b/fast/stages/02-networking-nva/dns-dev.tf @@ -26,7 +26,7 @@ module "dev-dns-private-zone" { domain = "dev.gcp.example.com." client_networks = [module.landing-trusted-vpc.self_link, module.landing-untrusted-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-nva/dns-landing.tf b/fast/stages/02-networking-nva/dns-landing.tf index f177dcda..e7834405 100644 --- a/fast/stages/02-networking-nva/dns-landing.tf +++ b/fast/stages/02-networking-nva/dns-landing.tf @@ -55,7 +55,7 @@ module "gcp-example-dns-private-zone" { module.landing-trusted-vpc.self_link ] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -72,12 +72,12 @@ module "googleapis-private-zone" { module.landing-trusted-vpc.self_link ] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-nva/dns-prod.tf b/fast/stages/02-networking-nva/dns-prod.tf index 335f1508..b54609df 100644 --- a/fast/stages/02-networking-nva/dns-prod.tf +++ b/fast/stages/02-networking-nva/dns-prod.tf @@ -26,7 +26,7 @@ module "prod-dns-private-zone" { domain = "prod.gcp.example.com." client_networks = [module.landing-trusted-vpc.self_link, module.landing-untrusted-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-peering/dns-dev.tf b/fast/stages/02-networking-peering/dns-dev.tf index aad50afc..03ae0122 100644 --- a/fast/stages/02-networking-peering/dns-dev.tf +++ b/fast/stages/02-networking-peering/dns-dev.tf @@ -26,7 +26,7 @@ module "dev-dns-private-zone" { domain = "dev.gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-peering/dns-landing.tf b/fast/stages/02-networking-peering/dns-landing.tf index b1d766ab..e9a5da33 100644 --- a/fast/stages/02-networking-peering/dns-landing.tf +++ b/fast/stages/02-networking-peering/dns-landing.tf @@ -46,7 +46,7 @@ module "gcp-example-dns-private-zone" { domain = "gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -60,12 +60,12 @@ module "googleapis-private-zone" { domain = "googleapis.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-peering/dns-prod.tf b/fast/stages/02-networking-peering/dns-prod.tf index a4a916b4..5bb695fd 100644 --- a/fast/stages/02-networking-peering/dns-prod.tf +++ b/fast/stages/02-networking-peering/dns-prod.tf @@ -26,7 +26,7 @@ module "prod-dns-private-zone" { domain = "prod.gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-separate-envs/dns-dev.tf b/fast/stages/02-networking-separate-envs/dns-dev.tf index 355938b2..5811c255 100644 --- a/fast/stages/02-networking-separate-envs/dns-dev.tf +++ b/fast/stages/02-networking-separate-envs/dns-dev.tf @@ -26,7 +26,7 @@ module "dev-dns-private-zone" { domain = "dev.gcp.example.com." client_networks = [module.dev-spoke-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -58,12 +58,12 @@ module "dev-googleapis-private-zone" { domain = "googleapis.com." client_networks = [module.dev-spoke-vpc.self_link] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-separate-envs/dns-prod.tf b/fast/stages/02-networking-separate-envs/dns-prod.tf index 3dc7ff43..db38064e 100644 --- a/fast/stages/02-networking-separate-envs/dns-prod.tf +++ b/fast/stages/02-networking-separate-envs/dns-prod.tf @@ -26,7 +26,7 @@ module "prod-dns-private-zone" { domain = "prod.gcp.example.com." client_networks = [module.prod-spoke-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -59,12 +59,12 @@ module "prod-googleapis-private-zone" { domain = "googleapis.com." client_networks = [module.prod-spoke-vpc.self_link] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-vpn/dns-dev.tf b/fast/stages/02-networking-vpn/dns-dev.tf index aad50afc..03ae0122 100644 --- a/fast/stages/02-networking-vpn/dns-dev.tf +++ b/fast/stages/02-networking-vpn/dns-dev.tf @@ -26,7 +26,7 @@ module "dev-dns-private-zone" { domain = "dev.gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-vpn/dns-landing.tf b/fast/stages/02-networking-vpn/dns-landing.tf index b1d766ab..e9a5da33 100644 --- a/fast/stages/02-networking-vpn/dns-landing.tf +++ b/fast/stages/02-networking-vpn/dns-landing.tf @@ -46,7 +46,7 @@ module "gcp-example-dns-private-zone" { domain = "gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -60,12 +60,12 @@ module "googleapis-private-zone" { domain = "googleapis.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-vpn/dns-prod.tf b/fast/stages/02-networking-vpn/dns-prod.tf index a4a916b4..5bb695fd 100644 --- a/fast/stages/02-networking-vpn/dns-prod.tf +++ b/fast/stages/02-networking-vpn/dns-prod.tf @@ -26,7 +26,7 @@ module "prod-dns-private-zone" { domain = "prod.gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } }