test: fix terraform tests

The tests were using the undocumented and nonexisting `sumologic.events.enabled` property in a way that collided with the changes to events configuration.
SumoLogic · Jul 5, 2022 · 4d25505 · 4d25505
1 parent 1f1bd8e
commit 4d25505
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/deploy/helm/sumologic/conf/setup/locals.tf b/deploy/helm/sumologic/conf/setup/locals.tf
@@ -1,7 +1,7 @@
 locals {
 {{- $ctx := .Values }}
 {{- range $type, $sources := .Values.sumologic.collector.sources }}
-  {{- if eq (include "terraform.sources.component_enabled" (dict "Context" $ctx "Type" $type)) "true" }}
+  {{- if eq (include "terraform.sources.component_enabled" (dict "Values" $ctx "Type" $type)) "true" }}
     {{- range $key, $source := $sources }}
       {{- if eq (include "terraform.sources.to_create" (dict "Context" $ctx "Type" $type "Name" $key)) "true" }}
   {{ template "terraform.sources.local" (dict "Name" (include "terraform.sources.name" (dict "Name" $key "Type" $type)) "Value" $source.name) }}

diff --git a/deploy/helm/sumologic/conf/setup/resources.tf b/deploy/helm/sumologic/conf/setup/resources.tf
@@ -10,7 +10,7 @@ resource "sumologic_collector" "collector" {
 
 {{- $ctx := .Values }}
 {{- range $type, $sources := .Values.sumologic.collector.sources }}
-  {{- if eq (include "terraform.sources.component_enabled" (dict "Context" $ctx "Type" $type)) "true" }}
+  {{- if eq (include "terraform.sources.component_enabled" (dict "Values" $ctx "Type" $type)) "true" }}
     {{- range $key, $source := $sources }}
       {{- if eq (include "terraform.sources.to_create" (dict "Context" $ctx "Type" $type "Name" $key)) "true" }}
 {{ include "terraform.sources.resource" (dict "Name" (include "terraform.sources.name" (dict "Name" $key "Type" $type)) "Source" $source "Context" $ctx) | nindent 2 }}
@@ -35,7 +35,7 @@ resource "kubernetes_secret" "sumologic_collection_secret" {
   data = {
     {{- $ctx := .Values }}
     {{- range $type, $sources := .Values.sumologic.collector.sources }}
-      {{- if eq (include "terraform.sources.component_enabled" (dict "Context" $ctx "Type" $type)) "true" }}
+      {{- if eq (include "terraform.sources.component_enabled" (dict "Values" $ctx "Type" $type)) "true" }}
         {{- range $key, $source := $sources }}
           {{- if eq (include "terraform.sources.to_create" (dict "Context" $ctx "Type" $type "Name" $key)) "true" }}
     {{ include "terraform.sources.data" (dict "Endpoint" (include "terraform.sources.config-map-variable" (dict "Type" $type "Context" $ctx "Name" $key)) "Name" (include "terraform.sources.name" (dict "Name" $key "Type" $type))) }}

diff --git a/deploy/helm/sumologic/conf/setup/setup.sh b/deploy/helm/sumologic/conf/setup/setup.sh
@@ -123,7 +123,7 @@ if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
 true  # prevent to render empty if; then
 {{- $ctx := .Values -}}
 {{- range $type, $sources := .Values.sumologic.collector.sources }}
-{{- if eq (include "terraform.sources.component_enabled" (dict "Context" $ctx "Type" $type)) "true" }}
+{{- if eq (include "terraform.sources.component_enabled" (dict "Values" $ctx "Type" $type)) "true" }}
 {{- range $key, $source := $sources }}
 {{- if eq (include "terraform.sources.to_create" (dict "Context" $ctx "Type" $type "Name" $key)) "true" }}
 terraform import sumologic_http_source.{{ template "terraform.sources.name" (dict "Name" $key "Type" $type) }} "${COLLECTOR_NAME}/{{ $source.name }}"

diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl
@@ -1102,18 +1102,21 @@ Example Usage:
 Check if component (source/events/logs/traces etc.) is enabled or not
 
 Example Usage:
-{{- if eq (include "terraform.sources.component_enabled" (dict "Context" .Values "Type" "metrics")) "true" }}
+{{- if eq (include "terraform.sources.component_enabled" (dict "Values" .Values "Type" "metrics")) "true" }}
 
 */}}
 {{- define "terraform.sources.component_enabled" -}}
 {{- $type := .Type -}}
-{{- $ctx := .Context -}}
+{{- $ctx := .Values -}}
 {{- $value := true -}}
 {{- if hasKey $ctx.sumologic $type -}}
 {{- if not (index $ctx.sumologic $type "enabled") -}}
 {{- $value = false -}}
 {{- end -}}
 {{- end -}}
+{{- if eq $type "events" -}}
+{{ $value = include "events.enabled" . }}
+{{- end -}}
 {{ $value }}
 {{- end -}}