Merge pull request #1512 from apichick/dns-logging-fix
enable-logging flag can only be true for public zones
This commit is contained in:
commit
cb560064ca
|
@ -150,7 +150,7 @@ module "public-dns" {
|
||||||
| [description](variables.tf#L21) | Domain description. | <code>string</code> | | <code>"Terraform managed."</code> |
|
| [description](variables.tf#L21) | Domain description. | <code>string</code> | | <code>"Terraform managed."</code> |
|
||||||
| [iam](variables.tf#L27) | IAM bindings in {ROLE => [MEMBERS]} format. | <code>map(list(string))</code> | | <code>null</code> |
|
| [iam](variables.tf#L27) | IAM bindings in {ROLE => [MEMBERS]} format. | <code>map(list(string))</code> | | <code>null</code> |
|
||||||
| [recordsets](variables.tf#L43) | Map of DNS recordsets in \"type name\" => {ttl, [records]} format. | <code title="map(object({ ttl = optional(number, 300) records = optional(list(string)) geo_routing = optional(list(object({ location = string records = list(string) }))) wrr_routing = optional(list(object({ weight = number records = list(string) }))) }))">map(object({…}))</code> | | <code>{}</code> |
|
| [recordsets](variables.tf#L43) | Map of DNS recordsets in \"type name\" => {ttl, [records]} format. | <code title="map(object({ ttl = optional(number, 300) records = optional(list(string)) geo_routing = optional(list(object({ location = string records = list(string) }))) wrr_routing = optional(list(object({ weight = number records = list(string) }))) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||||
| [zone_config](variables.tf#L78) | DNS zone configuration. | <code title="object({ domain = string enable_logging = optional(bool, false) forwarding = optional(object({ forwarders = optional(map(string)) client_networks = list(string) })) peering = optional(object({ client_networks = list(string) peer_network = string })) public = optional(object({ dnssec_config = optional(object({ non_existence = optional(string, "nsec3") state = string key_signing_key = optional(object( { algorithm = string, key_length = number }), { algorithm = "rsasha256", key_length = 2048 } ) zone_signing_key = optional(object( { algorithm = string, key_length = number }), { algorithm = "rsasha256", key_length = 1024 } ) })) })) private = optional(object({ client_networks = list(string) service_directory_namespace = optional(string) })) })">object({…})</code> | | <code>null</code> |
|
| [zone_config](variables.tf#L78) | DNS zone configuration. | <code title="object({ domain = string forwarding = optional(object({ forwarders = optional(map(string)) client_networks = list(string) })) peering = optional(object({ client_networks = list(string) peer_network = string })) public = optional(object({ dnssec_config = optional(object({ non_existence = optional(string, "nsec3") state = string key_signing_key = optional(object( { algorithm = string, key_length = number }), { algorithm = "rsasha256", key_length = 2048 } ) zone_signing_key = optional(object( { algorithm = string, key_length = number }), { algorithm = "rsasha256", key_length = 1024 } ) })) enable_logging = optional(bool, false) })) private = optional(object({ client_networks = list(string) service_directory_namespace = optional(string) })) })">object({…})</code> | | <code>null</code> |
|
||||||
|
|
||||||
## Outputs
|
## Outputs
|
||||||
|
|
||||||
|
|
|
@ -139,7 +139,7 @@ resource "google_dns_managed_zone" "dns_managed_zone" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cloud_logging_config {
|
cloud_logging_config {
|
||||||
enable_logging = try(var.zone_config.enable_logging, false)
|
enable_logging = try(var.zone_config.public.enable_logging, false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -78,8 +78,7 @@ variable "recordsets" {
|
||||||
variable "zone_config" {
|
variable "zone_config" {
|
||||||
description = "DNS zone configuration."
|
description = "DNS zone configuration."
|
||||||
type = object({
|
type = object({
|
||||||
domain = string
|
domain = string
|
||||||
enable_logging = optional(bool, false)
|
|
||||||
forwarding = optional(object({
|
forwarding = optional(object({
|
||||||
forwarders = optional(map(string))
|
forwarders = optional(map(string))
|
||||||
client_networks = list(string)
|
client_networks = list(string)
|
||||||
|
@ -101,6 +100,7 @@ variable "zone_config" {
|
||||||
{ algorithm = "rsasha256", key_length = 1024 }
|
{ algorithm = "rsasha256", key_length = 1024 }
|
||||||
)
|
)
|
||||||
}))
|
}))
|
||||||
|
enable_logging = optional(bool, false)
|
||||||
}))
|
}))
|
||||||
private = optional(object({
|
private = optional(object({
|
||||||
client_networks = list(string)
|
client_networks = list(string)
|
||||||
|
|
Loading…
Reference in New Issue