proper support for multiple labels

cleentfaar · cleentfaar · commit 413ac9134588 · 2024-12-11T12:53:07.000+01:00
diff --git a/terraform/bigquery_scheduled_data_transfer/main.tf b/terraform/bigquery_scheduled_data_transfer/main.tf
@@ -27,7 +27,7 @@ resource "google_bigquery_data_transfer_config" "default" {
     query = templatefile(
       "${path.module}/scheduled_query_with_labels.sql",
       {
-        LABELS_STRING = join("", [for key, value in var.labels : format("SET @@query_label = \"%s:%s\";\n", key, value)])
+        LABELS_STRING = length(var.labels) > 0 ? format("SET @@query_label = \"%s\";\n", join(",", [for key, value in var.labels : format("%s:%s", key, value)])) : ""
         ORIGINAL_QUERY = templatefile(
           var.query_template,
           merge(var.query_variables, { interval = try(local.bigquery_interval_mappings[var.interval], var.interval) })

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ resource "google_bigquery_data_transfer_config" "default" {`
`27`	`27`	`query = templatefile(`
`28`	`28`	`"${path.module}/scheduled_query_with_labels.sql",`
`29`	`29`	`{`
`30`		`- LABELS_STRING = join("", [for key, value in var.labels : format("SET @@query_label = \"%s:%s\";\n", key, value)])`
	`30`	`+ LABELS_STRING = length(var.labels) > 0 ? format("SET @@query_label = \"%s\";\n", join(",", [for key, value in var.labels : format("%s:%s", key, value)])) : ""`
`31`	`31`	`ORIGINAL_QUERY = templatefile(`
`32`	`32`	`var.query_template,`
`33`	`33`	`merge(var.query_variables, { interval = try(local.bigquery_interval_mappings[var.interval], var.interval) })`