Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Binlog_row_image needs to have lowercase value #182

Merged
merged 2 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/clickhouse/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ resource "google_dns_record_set" "psc_dns_record" {
name = "*.${var.clickhouse_region}.p.gcp.clickhouse.cloud."
managed_zone = google_dns_managed_zone.psc_dns_zone.name
type = "A"
rrdatas = [ google_compute_address.psc_endpoint_ip.address ]
rrdatas = [google_compute_address.psc_endpoint_ip.address]
ttl = 3600
}
4 changes: 2 additions & 2 deletions modules/clickhouse/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ variable "clickhouse_private_endpoint_service_name" {
default = ""

validation {
condition = can(regex("-clickhouse-cloud$", var.clickhouse_private_endpoint_service_name))
condition = can(regex("-clickhouse-cloud$", var.clickhouse_private_endpoint_service_name))
error_message = "ClickHouse Service name must end in '-clickhouse-cloud'."
}
}
Expand All @@ -31,7 +31,7 @@ variable "clickhouse_region" {
default = ""

validation {
condition = length(var.clickhouse_region) > 0
condition = length(var.clickhouse_region) > 0
error_message = "Clickhouse Region should always be set if the private endpoint service name is specified."
}
}
18 changes: 9 additions & 9 deletions modules/database/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ data "google_project" "default" {

locals {
default_flags = {
"binlog_row_image" = "MINIMAL"
"binlog_row_value_options" = "PARTIAL_JSON"
"innodb_autoinc_lock_mode" = "2"
"innodb_lru_scan_depth" = "100"
"binlog_row_image" = "minimal"
"binlog_row_value_options" = "PARTIAL_JSON"
"innodb_autoinc_lock_mode" = "2"
"innodb_lru_scan_depth" = "100"
"innodb_print_all_deadlocks" = "off"
"long_query_time" = "1"
"max_prepared_stmt_count" = "1048576"
"max_execution_time" = "60000"
"slow_query_log" = "on"
"sort_buffer_size" = var.sort_buffer_size
"long_query_time" = "1"
"max_prepared_stmt_count" = "1048576"
"max_execution_time" = "60000"
"slow_query_log" = "on"
"sort_buffer_size" = var.sort_buffer_size
}
database_flags = merge(local.default_flags, var.database_flags)
}
Expand Down
6 changes: 3 additions & 3 deletions modules/database/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ variable "database_version" {
}

variable "database_flags" {
description = "Flags to set for the database"
type = map(string)
default = {}
description = "Flags to set for the database"
type = map(string)
default = {}
}

variable "sort_buffer_size" {
Expand Down
2 changes: 1 addition & 1 deletion outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ output "sa_account_email" {

output "clickhouse_private_endpoint_id" {
description = "ClickHouse Private endpoint Endpoint ID to secure access inside VPC"
value = var.clickhouse_private_endpoint_service_name != "" ? module.clickhouse[0].psc_connection_id : null
value = var.clickhouse_private_endpoint_service_name != "" ? module.clickhouse[0].psc_connection_id : null
}
Loading