tests cleanup

Author: denis256

internal/remotestate/backend/gcs/config.go

@@ -1,17 +1,16 @@
 package gcs
 
 import (
+	"maps"
 	"reflect"
+	"slices"
 	"strconv"
 
 	"github.com/gruntwork-io/terragrunt/internal/errors"
 	"github.com/gruntwork-io/terragrunt/internal/remotestate/backend"
 	"github.com/gruntwork-io/terragrunt/internal/util"
 	"github.com/gruntwork-io/terragrunt/pkg/log"
 	"github.com/mitchellh/mapstructure"
-	"golang.org/x/exp/slices"
-
-	"maps"
 )
 
 type Config map[string]any

internal/remotestate/backend/gcs/config_test.go

@@ -3,7 +3,7 @@ package gcs_test
 import (
 	"testing"
 
-	gcs "github.com/gruntwork-io/terragrunt/internal/remotestate/backend/gcs"
+	"github.com/gruntwork-io/terragrunt/internal/remotestate/backend/gcs"
 	"github.com/gruntwork-io/terragrunt/test/helpers/logger"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

internal/remotestate/backend/s3/config.go

@@ -1,6 +1,7 @@
 package s3
 
 import (
+	"maps"
 	"reflect"
 	"slices"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/gruntwork-io/terragrunt/internal/util"
 	"github.com/gruntwork-io/terragrunt/pkg/log"
 	"github.com/mitchellh/mapstructure"
-
-	"maps"
 )
 
 const (

internal/remotestate/backend/s3/config_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	s3backend "github.com/gruntwork-io/terragrunt/internal/remotestate/backend/s3"
-	"github.com/gruntwork-io/terragrunt/pkg/log"
+	"github.com/gruntwork-io/terragrunt/test/helpers/logger"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -104,7 +104,7 @@ func TestParseExtendedS3Config_StringBoolCoercion(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			extS3Cfg, err := tc.config.Normalize(log.Default()).ParseExtendedS3Config()
+			extS3Cfg, err := tc.config.Normalize(logger.CreateLogger()).ParseExtendedS3Config()
 			require.NoError(t, err)
 
 			tc.check(t, extS3Cfg)
@@ -124,6 +124,6 @@ func TestParseExtendedS3Config_InvalidStringBool(t *testing.T) {
 		"use_lockfile": "maybe",
 	}
 
-	_, err := cfg.Normalize(log.Default()).ParseExtendedS3Config()
+	_, err := cfg.Normalize(logger.CreateLogger()).ParseExtendedS3Config()
 	require.Error(t, err)
 }

internal/remotestate/remote_state_test.go

@@ -190,6 +190,19 @@ func TestGetTFInitArgs_StringBoolCoercion(t *testing.T) {
 				"-backend-config=use_lockfile=false",
 			},
 		},
+		{
+			"gcs-string-bool-skip-versioning",
+			"gcs",
+			map[string]any{
+				"bucket":                 "my-bucket",
+				"prefix":                 "terraform.tfstate",
+				"skip_bucket_versioning": "true",
+			},
+			[]string{
+				"-backend-config=bucket=my-bucket",
+				"-backend-config=prefix=terraform.tfstate",
+			},
+		},
 	}
 
 	for _, tc := range testCases {