tests simplification

Author: denis256

internal/remotestate/backend/gcs/config.go

@@ -6,12 +6,12 @@ import (
 
 	"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"
-
-	"github.com/gruntwork-io/terragrunt/internal/util"
 )
 
 type Config map[string]any
@@ -33,7 +33,7 @@ func (cfg Config) FilterOutTerragruntKeys() Config {
 func (cfg Config) IsEqual(targetCfg Config, logger log.Logger) bool {
 	// If other keys in config are bools, DeepEqual also will consider the maps to be different.
 	// Note: strconv.ParseBool is intentionally lenient here (accepts "1"/"0"/"t"/"f") for backward
-	// compatibility with existing configs. DecodeWithStringBoolHook uses strict "true"/"false" only.
+	// compatibility with existing configs. WeakDecode also accepts these via strconv.ParseBool.
 	for key, value := range targetCfg {
 		if util.KindOf(targetCfg[key]) == reflect.String && util.KindOf(cfg[key]) == reflect.Bool {
 			if convertedValue, err := strconv.ParseBool(value.(string)); err == nil {
@@ -57,11 +57,11 @@ func (cfg Config) ParseExtendedGCSConfig() (*ExtendedRemoteStateConfigGCS, error
 		extendedConfig ExtendedRemoteStateConfigGCS
 	)
 
-	if err := util.DecodeWithStringBoolHook(cfg, &gcsConfig); err != nil {
+	if err := mapstructure.WeakDecode(cfg, &gcsConfig); err != nil {
 		return nil, errors.New(err)
 	}
 
-	if err := util.DecodeWithStringBoolHook(cfg, &extendedConfig); err != nil {
+	if err := mapstructure.WeakDecode(cfg, &extendedConfig); err != nil {
 		return nil, errors.New(err)
 	}
 

internal/remotestate/backend/s3/config.go

@@ -6,11 +6,11 @@ import (
 
 	"github.com/gruntwork-io/terragrunt/internal/errors"
 	"github.com/gruntwork-io/terragrunt/internal/hclhelper"
+	"github.com/gruntwork-io/terragrunt/internal/util"
 	"github.com/gruntwork-io/terragrunt/pkg/log"
+	"github.com/mitchellh/mapstructure"
 
 	"maps"
-
-	"github.com/gruntwork-io/terragrunt/internal/util"
 )
 
 const (
@@ -102,11 +102,11 @@ func (cfg Config) ParseExtendedS3Config() (*ExtendedRemoteStateConfigS3, error)
 		extendedConfig ExtendedRemoteStateConfigS3
 	)
 
-	if err := util.DecodeWithStringBoolHook(cfg, &s3Config); err != nil {
+	if err := mapstructure.WeakDecode(cfg, &s3Config); err != nil {
 		return nil, errors.New(err)
 	}
 
-	if err := util.DecodeWithStringBoolHook(cfg, &extendedConfig); err != nil {
+	if err := mapstructure.WeakDecode(cfg, &extendedConfig); err != nil {
 		return nil, errors.New(err)
 	}
 

internal/remotestate/backend/s3/config_test.go

@@ -112,7 +112,7 @@ func TestParseExtendedS3Config_StringBoolCoercion(t *testing.T) {
 	}
 }
 
-// TestParseExtendedS3Config_InvalidStringBool verifies that DecodeWithStringBoolHook rejects
+// TestParseExtendedS3Config_InvalidStringBool verifies that WeakDecode rejects
 // invalid string values for bool fields (e.g. "maybe" is not a valid bool).
 func TestParseExtendedS3Config_InvalidStringBool(t *testing.T) {
 	t.Parallel()

internal/remotestate/remote_state_test.go

@@ -127,7 +127,7 @@ func TestGetTFInitArgsNoBackendConfigs(t *testing.T) {
 
 // TestGetTFInitArgs_StringBoolCoercion verifies that string boolean values
 // (from HCL ternary type unification) pass through correctly to terraform init
-// -backend-config args. Complements unit-level DecodeWithStringBoolHook coercion tests in
+// -backend-config args. Complements unit-level WeakDecode coercion tests in
 // s3/config_test.go and gcs/config_test.go. See #5475.
 func TestGetTFInitArgs_StringBoolCoercion(t *testing.T) {
 	t.Parallel()

internal/util/mapstructure.go

@@ -40,6 +40,7 @@ import (
 	"github.com/gruntwork-io/terragrunt/internal/util"
 	"github.com/gruntwork-io/terragrunt/pkg/config/hclparse"
 	"github.com/gruntwork-io/terragrunt/pkg/options"
+	"github.com/mitchellh/mapstructure"
 )
 
 const (
@@ -1679,8 +1680,8 @@ func convertToTerragruntConfig(ctx context.Context, pctx *ParsingContext, config
 		}
 
 		var config *remotestate.Config
-		// Decode with strict string->bool coercion for HCL ternary type unification. See #5475.
-		if err := util.DecodeWithStringBoolHook(remoteStateMap, &config); err != nil {
+		// WeakDecode: HCL ternary type unification sends string "true" for bool fields. See #5475.
+		if err := mapstructure.WeakDecode(remoteStateMap, &config); err != nil {
 			return nil, err
 		}
 
@@ -1791,8 +1792,8 @@ func convertToTerragruntConfig(ctx context.Context, pctx *ParsingContext, config
 
 		for name, block := range generateMap {
 			var generateBlock terragruntGenerateBlock
-			// Decode with strict string->bool coercion for HCL ternary type unification. See #5475.
-			if err := util.DecodeWithStringBoolHook(block, &generateBlock); err != nil {
+			// WeakDecode: HCL ternary type unification sends string "true" for bool fields. See #5475.
+			if err := mapstructure.WeakDecode(block, &generateBlock); err != nil {
 				return nil, err
 			}
 

internal/util/mapstructure_test.go

@@ -132,7 +132,6 @@ remote_state = {
 	ctx, pctx := config.NewParsingContext(t.Context(), l, mockOptionsForTest(t))
 	_, err := config.ParseConfigString(ctx, pctx, l, config.DefaultTerragruntConfigPath, cfg, nil)
 	require.Error(t, err)
-	assert.Contains(t, err.Error(), "invalid boolean string")
 }
 
 func TestParseTerragruntConfigGenerateAttrStringBoolCoercion(t *testing.T) {
@@ -185,7 +184,6 @@ generate = {
 	ctx, pctx := config.NewParsingContext(t.Context(), l, mockOptionsForTest(t))
 	_, err := config.ParseConfigString(ctx, pctx, l, config.DefaultTerragruntConfigPath, cfg, nil)
 	require.Error(t, err)
-	assert.Contains(t, err.Error(), "invalid boolean string")
 }
 
 func TestParseTerragruntJsonConfigRemoteStateMinimalConfig(t *testing.T) {