chore: bump sumologic terraform provider to v2.11.5 (#2062) (#2066)

* chore: bump sumologic terraform provider * Update deploy/helm/sumologic/conf/cleanup/cleanup.sh Co-authored-by: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> * chore: bump sumologic terraform provider Co-authored-by: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Co-authored-by: Patryk Małek <pmalek@sumologic.com> Co-authored-by: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com>
SumoLogic · Feb 1, 2022 · 626b7e2 · 626b7e2
1 parent 7d449eb
commit 626b7e2
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,11 +12,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - chore: update the Telegraf image to 1.21.2 [#2036][#2036]
+- [Backport release-v2.4] chore: bump sumologic terraform provider to v2.11.5 [#2066][#2066]
 
 ### Fixed
 
 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.4.0...main
 [#2036]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2036
+[#2066]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2066
 
 ## [v2.4.0][v2_4_0]
 

diff --git a/deploy/helm/sumologic/conf/cleanup/cleanup.sh b/deploy/helm/sumologic/conf/cleanup/cleanup.sh
@@ -10,7 +10,9 @@ export NO_PROXY=${NO_PROXY:=""}
 cp /etc/terraform/*.tf /terraform/
 cd /terraform || exit 1
 
-terraform init
+# Fall back to init -upgrade to prevent:
+# Error: Inconsistent dependency lock file
+terraform init -input=false -get=false || terraform init -input=false -upgrade
 
 # shellcheck disable=SC1083
 terraform import sumologic_collector.collector {{ template "terraform.collector.name" . }}

diff --git a/deploy/helm/sumologic/conf/setup/main.tf b/deploy/helm/sumologic/conf/setup/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     sumologic = {
       source  = "sumologic/sumologic"
-      version = "~> 2.8.0"
+      version = "~> 2.11"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

diff --git a/deploy/helm/sumologic/conf/setup/setup.sh b/deploy/helm/sumologic/conf/setup/setup.sh
@@ -59,7 +59,9 @@ function should_create_fields() {
 cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
 cd /terraform || exit 1
 
-terraform init
+# Fall back to init -upgrade to prevent:
+# Error: Inconsistent dependency lock file
+terraform init -input=false -get=false || terraform init -input=false -upgrade
 
 # Sumo Logic fields
 if should_create_fields ; then

diff --git a/tests/helm/terraform/static/all_fields.output.yaml b/tests/helm/terraform/static/all_fields.output.yaml
@@ -137,7 +137,7 @@ data:
       required_providers {
         sumologic = {
           source  = "sumologic/sumologic"
-          version = "~> 2.8.0"
+          version = "~> 2.11"
         }
         kubernetes = {
           source  = "hashicorp/kubernetes"
@@ -343,7 +343,9 @@ data:
     cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
     cd /terraform || exit 1
   
-    terraform init
+    # Fall back to init -upgrade to prevent:
+    # Error: Inconsistent dependency lock file
+    terraform init -input=false -get=false || terraform init -input=false -upgrade
   
     # Sumo Logic fields
     if should_create_fields ; then

diff --git a/tests/helm/terraform/static/collector_fields.output.yaml b/tests/helm/terraform/static/collector_fields.output.yaml
@@ -136,7 +136,7 @@ data:
       required_providers {
         sumologic = {
           source  = "sumologic/sumologic"
-          version = "~> 2.8.0"
+          version = "~> 2.11"
         }
         kubernetes = {
           source  = "hashicorp/kubernetes"
@@ -298,7 +298,9 @@ data:
     cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
     cd /terraform || exit 1
   
-    terraform init
+    # Fall back to init -upgrade to prevent:
+    # Error: Inconsistent dependency lock file
+    terraform init -input=false -get=false || terraform init -input=false -upgrade
   
     # Sumo Logic fields
     if should_create_fields ; then

diff --git a/tests/helm/terraform/static/conditional_sources.output.yaml b/tests/helm/terraform/static/conditional_sources.output.yaml
@@ -126,7 +126,7 @@ data:
       required_providers {
         sumologic = {
           source  = "sumologic/sumologic"
-          version = "~> 2.8.0"
+          version = "~> 2.11"
         }
         kubernetes = {
           source  = "hashicorp/kubernetes"
@@ -225,7 +225,9 @@ data:
     cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
     cd /terraform || exit 1
   
-    terraform init
+    # Fall back to init -upgrade to prevent:
+    # Error: Inconsistent dependency lock file
+    terraform init -input=false -get=false || terraform init -input=false -upgrade
   
     # Sumo Logic fields
     if should_create_fields ; then

diff --git a/tests/helm/terraform/static/custom.output.yaml b/tests/helm/terraform/static/custom.output.yaml
@@ -126,7 +126,7 @@ data:
       required_providers {
         sumologic = {
           source  = "sumologic/sumologic"
-          version = "~> 2.8.0"
+          version = "~> 2.11"
         }
         kubernetes = {
           source  = "hashicorp/kubernetes"
@@ -225,7 +225,9 @@ data:
     cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
     cd /terraform || exit 1
   
-    terraform init
+    # Fall back to init -upgrade to prevent:
+    # Error: Inconsistent dependency lock file
+    terraform init -input=false -get=false || terraform init -input=false -upgrade
   
     # Sumo Logic fields
     if should_create_fields ; then

diff --git a/tests/helm/terraform/static/default.output.yaml b/tests/helm/terraform/static/default.output.yaml
@@ -136,7 +136,7 @@ data:
       required_providers {
         sumologic = {
           source  = "sumologic/sumologic"
-          version = "~> 2.8.0"
+          version = "~> 2.11"
         }
         kubernetes = {
           source  = "hashicorp/kubernetes"
@@ -296,7 +296,9 @@ data:
     cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
     cd /terraform || exit 1
   
-    terraform init
+    # Fall back to init -upgrade to prevent:
+    # Error: Inconsistent dependency lock file
+    terraform init -input=false -get=false || terraform init -input=false -upgrade
   
     # Sumo Logic fields
     if should_create_fields ; then

diff --git a/tests/helm/terraform/static/disable_default_metrics.output.yaml b/tests/helm/terraform/static/disable_default_metrics.output.yaml
@@ -135,7 +135,7 @@ data:
       required_providers {
         sumologic = {
           source  = "sumologic/sumologic"
-          version = "~> 2.8.0"
+          version = "~> 2.11"
         }
         kubernetes = {
           source  = "hashicorp/kubernetes"
@@ -289,7 +289,9 @@ data:
     cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
     cd /terraform || exit 1
   
-    terraform init
+    # Fall back to init -upgrade to prevent:
+    # Error: Inconsistent dependency lock file
+    terraform init -input=false -get=false || terraform init -input=false -upgrade
   
     # Sumo Logic fields
     if should_create_fields ; then

diff --git a/tests/helm/terraform/static/strip_extrapolation.output.yaml b/tests/helm/terraform/static/strip_extrapolation.output.yaml
@@ -136,7 +136,7 @@ data:
       required_providers {
         sumologic = {
           source  = "sumologic/sumologic"
-          version = "~> 2.8.0"
+          version = "~> 2.11"
         }
         kubernetes = {
           source  = "hashicorp/kubernetes"
@@ -297,7 +297,9 @@ data:
     cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
     cd /terraform || exit 1
   
-    terraform init
+    # Fall back to init -upgrade to prevent:
+    # Error: Inconsistent dependency lock file
+    terraform init -input=false -get=false || terraform init -input=false -upgrade
   
     # Sumo Logic fields
     if should_create_fields ; then

diff --git a/tests/helm/terraform/static/traces.output.yaml b/tests/helm/terraform/static/traces.output.yaml
@@ -127,7 +127,7 @@ data:
       required_providers {
         sumologic = {
           source  = "sumologic/sumologic"
-          version = "~> 2.8.0"
+          version = "~> 2.11"
         }
         kubernetes = {
           source  = "hashicorp/kubernetes"
@@ -233,7 +233,9 @@ data:
     cp /etc/terraform/{locals,main,providers,resources,variables,fields}.tf /terraform/
     cd /terraform || exit 1
   
-    terraform init
+    # Fall back to init -upgrade to prevent:
+    # Error: Inconsistent dependency lock file
+    terraform init -input=false -get=false || terraform init -input=false -upgrade
   
     # Sumo Logic fields
     if should_create_fields ; then

diff --git a/tests/integration/internal/stepfuncs/helm.go b/tests/integration/internal/stepfuncs/helm.go
@@ -2,11 +2,13 @@ package stepfuncs
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path"
 	"testing"
 
 	"github.com/gruntwork-io/terratest/modules/helm"
+	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
 	"sigs.k8s.io/e2e-framework/pkg/features"
@@ -51,7 +53,17 @@ func HelmDependencyUpdateOpt(path string) features.Func {
 func HelmInstallOpt(path string, releaseName string) features.Func {
 	return func(ctx context.Context, t *testing.T, envConf *envconf.Config) context.Context {
 		ctx = ctxopts.WithHelmRelease(ctx, releaseName)
-		helm.Install(t, ctxopts.HelmOptions(ctx), path, releaseName)
+
+		err := helm.InstallE(t, ctxopts.HelmOptions(ctx), path, releaseName)
+		if err != nil {
+			// Print setup job logs if installation failed.
+			k8s.RunKubectl(t, ctxopts.KubectlOptions(ctx),
+				"logs", fmt.Sprintf("-ljob-name=%s-sumologic-setup", releaseName),
+			)
+
+			require.NoError(t, err)
+		}
+
 		return ctx
 	}
 }