From 968cf3e4c730705bbf283930f0af189fc10d1dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Tue, 18 Jun 2024 14:24:55 +0200 Subject: [PATCH] chore(setup): run terraform fmt on manifests --- deploy/helm/sumologic/conf/setup/fields.tf | 6 ++--- deploy/helm/sumologic/conf/setup/resources.tf | 10 +++---- deploy/helm/sumologic/conf/setup/variables.tf | 10 +++---- .../terraform/all_fields.output.yaml | 26 +++++++++---------- .../terraform/collector_fields.output.yaml | 26 +++++++++---------- .../terraform/conditional_sources.output.yaml | 26 +++++++++---------- .../goldenfile/terraform/custom.output.yaml | 26 +++++++++---------- .../goldenfile/terraform/default.output.yaml | 26 +++++++++---------- .../disable_default_metrics.output.yaml | 26 +++++++++---------- .../terraform/disabled_dashboards.output.yaml | 26 +++++++++---------- .../terraform/disabled_monitors.output.yaml | 26 +++++++++---------- .../terraform/logs_fields.output.yaml | 26 +++++++++---------- ...itors_with_email_notifications.output.yaml | 26 +++++++++---------- .../monitors_with_single_email.output.yaml | 26 +++++++++---------- .../terraform/strip_extrapolation.output.yaml | 26 +++++++++---------- .../goldenfile/terraform/traces.output.yaml | 26 +++++++++---------- .../tracing-metrics-disabled.output.yaml | 26 +++++++++---------- 17 files changed, 195 insertions(+), 195 deletions(-) diff --git a/deploy/helm/sumologic/conf/setup/fields.tf b/deploy/helm/sumologic/conf/setup/fields.tf index d5d8e022c..ae678eb60 100644 --- a/deploy/helm/sumologic/conf/setup/fields.tf +++ b/deploy/helm/sumologic/conf/setup/fields.tf @@ -7,7 +7,7 @@ resource "sumologic_field" "collection_field" { ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } diff --git a/deploy/helm/sumologic/conf/setup/resources.tf b/deploy/helm/sumologic/conf/setup/resources.tf index 3e7351d0d..0479d4cc6 100644 --- a/deploy/helm/sumologic/conf/setup/resources.tf +++ b/deploy/helm/sumologic/conf/setup/resources.tf @@ -1,12 +1,12 @@ resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -14,6 +14,6 @@ resource "kubernetes_secret" "sumologic_collection_secret" { for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } diff --git a/deploy/helm/sumologic/conf/setup/variables.tf b/deploy/helm/sumologic/conf/setup/variables.tf index d0d048512..be68f2466 100644 --- a/deploy/helm/sumologic/conf/setup/variables.tf +++ b/deploy/helm/sumologic/conf/setup/variables.tf @@ -1,9 +1,9 @@ variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -18,15 +18,15 @@ variable "create_fields" { variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } diff --git a/tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml b/tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml index 880f69cc2..fcd5a11ec 100644 --- a/tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml b/tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml index f48ed026c..e5f65f04e 100644 --- a/tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/conditional_sources.output.yaml b/tests/helm/testdata/goldenfile/terraform/conditional_sources.output.yaml index 8208cfee9..36f4244d6 100644 --- a/tests/helm/testdata/goldenfile/terraform/conditional_sources.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/conditional_sources.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/custom.output.yaml b/tests/helm/testdata/goldenfile/terraform/custom.output.yaml index 8208cfee9..36f4244d6 100644 --- a/tests/helm/testdata/goldenfile/terraform/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/custom.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/default.output.yaml b/tests/helm/testdata/goldenfile/terraform/default.output.yaml index 4e0460aa3..d787769a3 100644 --- a/tests/helm/testdata/goldenfile/terraform/default.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/default.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml b/tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml index 674269317..3ef8be253 100644 --- a/tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml b/tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml index 4e0460aa3..d787769a3 100644 --- a/tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml b/tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml index 4e0460aa3..d787769a3 100644 --- a/tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml b/tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml index 84b299510..ee8f71e9f 100644 --- a/tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml b/tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml index 4e0460aa3..d787769a3 100644 --- a/tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml b/tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml index 4e0460aa3..d787769a3 100644 --- a/tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml b/tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml index e4e531b9e..3c4b505dc 100644 --- a/tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/traces.output.yaml b/tests/helm/testdata/goldenfile/terraform/traces.output.yaml index 9cf289ee2..abec43942 100644 --- a/tests/helm/testdata/goldenfile/terraform/traces.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/traces.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | { diff --git a/tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml b/tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml index 4e0460aa3..d787769a3 100644 --- a/tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml @@ -220,9 +220,9 @@ data: ignore_changes = [field_name, data_type] } - field_name = "${ each.key }" - data_type = "String" - state = "Enabled" + field_name = each.key + data_type = "String" + state = "Enabled" } main.tf: | terraform { @@ -339,14 +339,14 @@ data: fi resources.tf: | resource "sumologic_collector" "collector" { - name = var.collector_name - description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) - fields = var.collector_fields + name = var.collector_name + description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version) + fields = var.collector_fields } resource "kubernetes_secret" "sumologic_collection_secret" { metadata { - name = var.secret_name + name = var.secret_name namespace = var.namespace_name } @@ -354,7 +354,7 @@ data: for name, config in local.source_configs : config["config-name"] => lookup(local.sources, name).url } - type = "Opaque" + type = "Opaque" wait_for_service_account_token = false } setup.sh: | @@ -531,11 +531,11 @@ data: bash /etc/terraform/custom.sh variables.tf: | variable "collector_name" { - type = string + type = string } variable "namespace_name" { - type = string + type = string } variable "secret_name" { @@ -550,17 +550,17 @@ data: variable "fields" { description = "Log fields to create." - type = list(string) + type = list(string) } variable "collector_fields" { description = "Fields to set on the collector." - type = map(string) + type = map(string) } variable "chart_version" { description = "The Helm Chart version." - type = string + type = string } providers.tf.json: | {