chore(setup): pass collector fields as variable

deploy/helm/sumologic/conf/setup/resources.tf

@@ -1,12 +1,7 @@
 resource "sumologic_collector" "collector" {
     name  = var.collector_name
-    description = {{ printf "Sumo Logic Kubernetes Collection\nversion: %s" .Chart.Version | quote }}
-    fields  = {
-      {{- $fields := .Values.sumologic.collector.fields }}
-      {{- range $name, $value := $fields }}
-      {{ include "terraform.generate-key" (dict "Name" $name "Value" $value "KeyLength" (include "terraform.max-key-length" $fields)) }}
-      {{- end}}
-    }
+    description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+    fields  = var.collector_fields
 }
 
 resource "kubernetes_secret" "sumologic_collection_secret" {

deploy/helm/sumologic/conf/setup/terraform.tfvars.json

@@ -1,3 +1,4 @@
 {{- $fields := concat .Values.sumologic.logs.fields .Values.sumologic.logs.additionalFields -}}
-{{- $variables := dict "fields" $fields -}}
+{{- $collectorFields := .Values.sumologic.collector.fields -}}
+{{- $variables := dict "fields" $fields "collector_fields" $collectorFields -}}
 {{- toPrettyJson $variables | nindent 2 }}

deploy/helm/sumologic/conf/setup/variables.tf

@@ -17,3 +17,13 @@ variable "fields" {
   description = "Log fields to create."
   type = list(string)
 }
+
+variable "collector_fields" {
+  description = "Fields to set on the collector."
+  type = map(string)
+}
+
+variable "chart_version" {
+  description = "The Helm Chart version."
+  type = string
+}

deploy/helm/sumologic/templates/_helpers/_setup.tpl

@@ -85,44 +85,6 @@ Example usage:
 {{- if .Values.sumologic.collectorName }}{{ .Values.sumologic.collectorName }}{{- else}}{{ template "sumologic.clusterNameReplaceSpaceWithDash" . }}{{- end}}
 {{- end -}}
 
-{{- define "terraform.max-key-length" -}}
-{{- $max := 0 -}}
-{{- range $key, $value := . -}}
-{{- if gt (len $key) $max -}}
-{{- $max = (len $key) -}}
-{{- end -}}
-{{- end -}}
-{{ $max }}
-{{- end -}}
-
-{{/*
-Generate key for Terraform object. Default behaviour is to print:
-
-{{ name }} = {{ value }}
-
-If this is key for list, prints only value.
-
-This template takes care about indentation using Indent key
-
-Example usage:
-
-{{- include "terraform.generate-object" (dict "Name" "my_key" "Value" "my_value" "Indent" 8 "List" true) }}
-*/}}
-{{- define "terraform.generate-key" -}}
-{{- $indent := int .Indent -}}
-{{- $name := .Name -}}
-{{- $keyLength := int .KeyLength -}}
-{{- $format := printf "%%-%ss" (toString $keyLength) -}}
-{{- $value := .Value -}}
-{{- if and ( eq (kindOf $value) "string") (not .SkipEscaping) -}}
-{{- $value = printf "\"%s\"" $value -}}
-{{- end -}}
-{{- if .SkipPadding -}}
-{{- $format = "%s" -}}
-{{- end -}}
-{{ indent (int $indent) "" }}{{ if not .SkipName }}{{ printf $format (toString $name) }} {{ if not .SkipEqual }}= {{ end }}{{ end }}{{ (toString $value) }}{{ if .AddComma }},{{ end }}
-{{- end -}}
-
 {{/*
 get configuration variable name for sources confg map
 

tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml

@@ -332,9 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -816,6 +815,7 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {},
       "fields": [
         "cluster",
         "container",
@@ -849,3 +849,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }

tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml

@@ -332,11 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-          here_is_very_long_field_name = "another_value"
-          test_fields                  = "test_value"
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -718,6 +715,10 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {
+        "here_is_very_long_field_name": "another_value",
+        "test_fields": "test_value"
+      },
       "fields": [
         "cluster",
         "container",
@@ -751,3 +752,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }

tests/helm/testdata/goldenfile/terraform/conditional_sources.output.yaml

@@ -332,9 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -515,6 +514,7 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {},
       "fields": [
         "cluster",
         "container",
@@ -548,3 +548,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }

tests/helm/testdata/goldenfile/terraform/custom.output.yaml

@@ -332,9 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -515,6 +514,7 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {},
       "fields": [
         "cluster",
         "container",
@@ -548,3 +548,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }

tests/helm/testdata/goldenfile/terraform/default.output.yaml

@@ -332,9 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -716,6 +715,7 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {},
       "fields": [
         "cluster",
         "container",
@@ -749,3 +749,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }

tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml

@@ -332,9 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -706,6 +705,7 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {},
       "fields": [
         "cluster",
         "container",
@@ -739,3 +739,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }

tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml

@@ -332,9 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -718,6 +717,7 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {},
       "fields": [
         "cluster",
         "container",
@@ -751,3 +751,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }

tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml

@@ -332,9 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -718,6 +717,7 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {},
       "fields": [
         "cluster",
         "container",
@@ -751,3 +751,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }

tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml

@@ -332,9 +332,8 @@ data:
   resources.tf: |
     resource "sumologic_collector" "collector" {
         name  = var.collector_name
-        description = "Sumo Logic Kubernetes Collection\nversion: %CURRENT_CHART_VERSION%"
-        fields  = {
-        }
+        description = format("Sumo Logic Kubernetes Collection\nversion: %s", var.chart_version)
+        fields  = var.collector_fields
     }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
@@ -716,6 +715,7 @@ data:
     }
   terraform.tfvars.json: |
     {
+      "collector_fields": {},
       "fields": [
         "cluster",
         "container",
@@ -751,3 +751,13 @@ data:
       description = "Log fields to create."
       type = list(string)
     }
+
+    variable "collector_fields" {
+      description = "Fields to set on the collector."
+      type = map(string)
+    }
+
+    variable "chart_version" {
+      description = "The Helm Chart version."
+      type = string
+    }