Rename bigquery_use_partitioned_table
This commit is contained in:
Julio Castillo
parent
c7fe6da12e
commit
8fe19ad7c2
|
|
@ -192,9 +192,9 @@ module "organization" {
|
|||
}
|
||||
logging_sinks = {
|
||||
for name, attrs in var.log_sinks : name => {
|
||||
destination = local.log_sink_destinations[name].as_logging_destination
|
||||
filter = attrs.filter
|
||||
bigquery_use_partitioned_table = attrs.type == "bigquery"
|
||||
bq_partitioned_table = attrs.type == "bigquery"
|
||||
destination = local.log_sink_destinations[name].as_logging_destination
|
||||
filter = attrs.filter
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ module "folder" {
|
|||
| [iam_additive_members](variables.tf#L85) | IAM additive bindings in {MEMBERS => [ROLE]} format. This might break if members are dynamic values. | <code>map(list(string))</code> | | <code>{}</code> |
|
||||
| [id](variables.tf#L92) | Folder ID in case you use folder_create=false. | <code>string</code> | | <code>null</code> |
|
||||
| [logging_exclusions](variables.tf#L98) | Logging exclusions for this folder in the form {NAME -> FILTER}. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [logging_sinks](variables.tf#L105) | Logging sinks to create for this folder. | <code title="map(object({ bigquery_use_partitioned_table = optional(bool) description = optional(string) destination = object({ type = string target = string }) disabled = optional(bool, false) exclusions = optional(map(string), {}) filter = string include_children = optional(bool, true) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [logging_sinks](variables.tf#L105) | Logging sinks to create for this folder. | <code title="map(object({ bq_partitioned_table = optional(bool) description = optional(string) destination = object({ type = string target = string }) disabled = optional(bool, false) exclusions = optional(map(string), {}) filter = string include_children = optional(bool, true) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [name](variables.tf#L137) | Folder name. | <code>string</code> | | <code>null</code> |
|
||||
| [org_policies](variables.tf#L143) | Organization policies applied to this folder keyed by policy name. | <code title="map(object({ inherit_from_parent = optional(bool) # for list policies only. reset = optional(bool) allow = optional(object({ all = optional(bool) values = optional(list(string)) })) deny = optional(object({ all = optional(bool) values = optional(list(string)) })) enforce = optional(bool, true) # for boolean policies only. rules = optional(list(object({ allow = optional(object({ all = optional(bool) values = optional(list(string)) })) deny = optional(object({ all = optional(bool) values = optional(list(string)) })) enforce = optional(bool, true) # for boolean policies only. condition = object({ description = optional(string) expression = optional(string) location = optional(string) title = optional(string) }) })), []) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [org_policies_data_path](variables.tf#L183) | Path containing org policies in YAML format. | <code>string</code> | | <code>null</code> |
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ resource "google_logging_folder_sink" "sink" {
|
|||
disabled = each.value.disabled
|
||||
|
||||
dynamic "bigquery_options" {
|
||||
for_each = each.value.bigquery_use_partitioned_table != null ? [""] : []
|
||||
for_each = each.value.bq_partitioned_table != null ? [""] : []
|
||||
content {
|
||||
use_partitioned_tables = each.value.bigquery_use_partitioned_table
|
||||
use_partitioned_tables = each.value.bq_partitioned_table
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ variable "logging_exclusions" {
|
|||
variable "logging_sinks" {
|
||||
description = "Logging sinks to create for this folder."
|
||||
type = map(object({
|
||||
bigquery_use_partitioned_table = optional(bool)
|
||||
bq_partitioned_table = optional(bool)
|
||||
description = optional(string)
|
||||
destination = object({
|
||||
type = string
|
||||
|
|
@ -128,9 +128,9 @@ variable "logging_sinks" {
|
|||
validation {
|
||||
condition = alltrue([
|
||||
for k, v in var.logging_sinks :
|
||||
v.bigquery_use_partitioned_table != true || v.destination.type == "bigquery"
|
||||
v. != true || v.destination.type == "bigquery"
|
||||
])
|
||||
error_message = "Can only set bigquery_use_partitioned_table when destination type is `bigquery`."
|
||||
error_message = "Can only set when destination type is `bigquery`."
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -311,22 +311,22 @@ module "org" {
|
|||
|
||||
logging_sinks = {
|
||||
warnings = {
|
||||
destination = module.gcs.as_logging_destination
|
||||
filter = "severity=WARNING"
|
||||
destination = module.gcs.as_logging_destination
|
||||
filter = "severity=WARNING"
|
||||
}
|
||||
info = {
|
||||
destination = module.dataset.as_logging_destination
|
||||
filter = "severity=INFO"
|
||||
bigquery_use_partitioned_table = true
|
||||
bq_partitioned_table = true
|
||||
}
|
||||
notice = {
|
||||
destination = module.pubsub.as_logging_destination
|
||||
filter = "severity=NOTICE"
|
||||
destination = module.pubsub.as_logging_destination
|
||||
filter = "severity=NOTICE"
|
||||
}
|
||||
debug = {
|
||||
destination = module.bucket.as_logging_destination
|
||||
filter = "severity=DEBUG"
|
||||
exclusions = {
|
||||
destination = module.bucket.as_logging_destination
|
||||
filter = "severity=DEBUG"
|
||||
exclusions = {
|
||||
no-compute = "logName:compute"
|
||||
}
|
||||
}
|
||||
|
|
@ -425,7 +425,7 @@ module "org" {
|
|||
| [iam_audit_config_authoritative](variables.tf#L105) | IAM Authoritative service audit logging configuration. Service as key, map of log permission (eg DATA_READ) and excluded members as value for each service. Audit config should also be authoritative when using authoritative bindings. Use with caution. | <code>map(map(list(string)))</code> | | <code>null</code> |
|
||||
| [iam_bindings_authoritative](variables.tf#L116) | IAM authoritative bindings, in {ROLE => [MEMBERS]} format. Roles and members not explicitly listed will be cleared. Bindings should also be authoritative when using authoritative audit config. Use with caution. | <code>map(list(string))</code> | | <code>null</code> |
|
||||
| [logging_exclusions](variables.tf#L122) | Logging exclusions for this organization in the form {NAME -> FILTER}. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [logging_sinks](variables.tf#L129) | Logging sinks to create for the organization. | <code title="map(object({ bigquery_use_partitioned_table = optional(bool) description = optional(string) destination = object({ type = string target = string }) disabled = optional(bool, false) exclusions = optional(map(string), {}) filter = string include_children = optional(bool, true) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [logging_sinks](variables.tf#L129) | Logging sinks to create for the organization. | <code title="map(object({ bq_partitioned_table = optional(bool) description = optional(string) destination = object({ type = string target = string }) disabled = optional(bool, false) exclusions = optional(map(string), {}) filter = string include_children = optional(bool, true) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [org_policies](variables.tf#L161) | Organization policies applied to this organization keyed by policy name. | <code title="map(object({ inherit_from_parent = optional(bool) # for list policies only. reset = optional(bool) allow = optional(object({ all = optional(bool) values = optional(list(string)) })) deny = optional(object({ all = optional(bool) values = optional(list(string)) })) enforce = optional(bool, true) # for boolean policies only. rules = optional(list(object({ allow = optional(object({ all = optional(bool) values = optional(list(string)) })) deny = optional(object({ all = optional(bool) values = optional(list(string)) })) enforce = optional(bool, true) # for boolean policies only. condition = object({ description = optional(string) expression = optional(string) location = optional(string) title = optional(string) }) })), []) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [org_policies_data_path](variables.tf#L201) | Path containing org policies in YAML format. | <code>string</code> | | <code>null</code> |
|
||||
| [org_policy_custom_constraints](variables.tf#L207) | Organization policiy custom constraints keyed by constraint name. | <code title="map(object({ display_name = optional(string) description = optional(string) action_type = string condition = string method_types = list(string) resource_types = list(string) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ resource "google_logging_organization_sink" "sink" {
|
|||
disabled = each.value.disabled
|
||||
|
||||
dynamic "bigquery_options" {
|
||||
for_each = each.value.bigquery_use_partitioned_table != null ? [""] : []
|
||||
for_each = each.value.bq_partitioned_table != null ? [""] : []
|
||||
content {
|
||||
use_partitioned_tables = each.value.bigquery_use_partitioned_table
|
||||
use_partitioned_tables = each.value.bq_partitioned_table
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -129,8 +129,8 @@ variable "logging_exclusions" {
|
|||
variable "logging_sinks" {
|
||||
description = "Logging sinks to create for the organization."
|
||||
type = map(object({
|
||||
bigquery_use_partitioned_table = optional(bool)
|
||||
description = optional(string)
|
||||
bq_partitioned_table = optional(bool)
|
||||
description = optional(string)
|
||||
destination = object({
|
||||
type = string
|
||||
target = string
|
||||
|
|
@ -152,9 +152,9 @@ variable "logging_sinks" {
|
|||
validation {
|
||||
condition = alltrue([
|
||||
for k, v in var.logging_sinks :
|
||||
v.bigquery_use_partitioned_table != true || v.destination.type == "bigquery"
|
||||
v.bq_partitioned_table != true || v.destination.type == "bigquery"
|
||||
])
|
||||
error_message = "Can only set bigquery_use_partitioned_table when destination type is `bigquery`."
|
||||
error_message = "Can only set bq_partitioned_table when destination type is `bigquery`."
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -483,7 +483,7 @@ output "compute_robot" {
|
|||
| [labels](variables.tf#L82) | Resource labels. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [lien_reason](variables.tf#L89) | If non-empty, creates a project lien with this description. | <code>string</code> | | <code>""</code> |
|
||||
| [logging_exclusions](variables.tf#L95) | Logging exclusions for this project in the form {NAME -> FILTER}. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [logging_sinks](variables.tf#L102) | Logging sinks to create for this project. | <code title="map(object({ bigquery_use_partitioned_table = optional(bool) description = optional(string) destination = object({ type = string target = string }) disabled = optional(bool, false) exclusions = optional(map(string), {}) filter = string iam = optional(bool, true) unique_writer = optional(bool) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [logging_sinks](variables.tf#L102) | Logging sinks to create for this project. | <code title="map(object({ bq_partitioned_table = optional(bool) description = optional(string) destination = object({ type = string target = string }) disabled = optional(bool, false) exclusions = optional(map(string), {}) filter = string iam = optional(bool, true) unique_writer = optional(bool) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [metric_scopes](variables.tf#L135) | List of projects that will act as metric scopes for this project. | <code>list(string)</code> | | <code>[]</code> |
|
||||
| [org_policies](variables.tf#L147) | Organization policies applied to this project keyed by policy name. | <code title="map(object({ inherit_from_parent = optional(bool) # for list policies only. reset = optional(bool) allow = optional(object({ all = optional(bool) values = optional(list(string)) })) deny = optional(object({ all = optional(bool) values = optional(list(string)) })) enforce = optional(bool, true) # for boolean policies only. rules = optional(list(object({ allow = optional(object({ all = optional(bool) values = optional(list(string)) })) deny = optional(object({ all = optional(bool) values = optional(list(string)) })) enforce = optional(bool, true) # for boolean policies only. condition = object({ description = optional(string) expression = optional(string) location = optional(string) title = optional(string) }) })), []) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [org_policies_data_path](variables.tf#L187) | Path containing org policies in YAML format. | <code>string</code> | | <code>null</code> |
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ resource "google_logging_project_sink" "sink" {
|
|||
disabled = each.value.disabled
|
||||
|
||||
dynamic "bigquery_options" {
|
||||
for_each = each.value.bigquery_use_partitioned_table != null ? [""] : []
|
||||
for_each = each.value.bq_partitioned_table != null ? [""] : []
|
||||
content {
|
||||
use_partitioned_tables = each.value.bigquery_use_partitioned_table
|
||||
use_partitioned_tables = each.value.bq_partitioned_table
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -102,8 +102,8 @@ variable "logging_exclusions" {
|
|||
variable "logging_sinks" {
|
||||
description = "Logging sinks to create for this project."
|
||||
type = map(object({
|
||||
bigquery_use_partitioned_table = optional(bool)
|
||||
description = optional(string)
|
||||
bq_partitioned_table = optional(bool)
|
||||
description = optional(string)
|
||||
destination = object({
|
||||
type = string
|
||||
target = string
|
||||
|
|
@ -126,9 +126,9 @@ variable "logging_sinks" {
|
|||
validation {
|
||||
condition = alltrue([
|
||||
for k, v in var.logging_sinks :
|
||||
v.bigquery_use_partitioned_table != true || v.destination.type == "bigquery"
|
||||
v.bq_partitioned_table != true || v.destination.type == "bigquery"
|
||||
])
|
||||
error_message = "Can only set bigquery_use_partitioned_table when destination type is `bigquery`."
|
||||
error_message = "Can only set bq_partitioned_table when destination type is `bigquery`."
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue