Skip to content

Commit 95c9742

Browse files
authored
chore: Adding config testing (#5653)
chore: Adding external testing for config fix: Fixing lints
1 parent 5b4d2d6 commit 95c9742

10 files changed

Lines changed: 676 additions & 13 deletions

File tree

internal/configbridge/bridge.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
// NewParsingContext creates a config.ParsingContext populated from TerragruntOptions.
2020
func NewParsingContext(ctx context.Context, l log.Logger, opts *options.TerragruntOptions) (context.Context, *config.ParsingContext) {
21-
ctx, pctx := config.NewParsingContext(ctx, l, opts.StrictControls)
21+
ctx, pctx := config.NewParsingContext(ctx, l, config.WithStrictControls(opts.StrictControls))
2222
populateFromOpts(pctx, opts)
2323

2424
return ctx, pctx

pkg/config/catalog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func findCatalogConfig(ctx context.Context, l log.Logger, outerPctx *ParsingCont
114114
default: // continue
115115
}
116116

117-
parseCtx, pctx := NewParsingContext(ctx, l, outerPctx.StrictControls)
117+
parseCtx, pctx := NewParsingContext(ctx, l, WithStrictControls(outerPctx.StrictControls))
118118
pctx.TerragruntConfigPath = filepath.Join(filepath.Dir(configPath), util.UniqueID(), configName)
119119
pctx.MaxFoldersToCheck = outerPctx.MaxFoldersToCheck
120120

pkg/config/config_helpers.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,10 @@ func getTerraformCliArgs(ctx context.Context, pctx *ParsingContext, l log.Logger
913913
var result []string
914914

915915
err := telemetry.TelemeterFromContext(ctx).Collect(ctx, "hcl_fn_get_terraform_cli_args", attrs, func(childCtx context.Context) error {
916-
result = pctx.TerraformCliArgs.Slice()
916+
if pctx.TerraformCliArgs != nil {
917+
result = pctx.TerraformCliArgs.Slice()
918+
}
919+
917920
return nil
918921
})
919922

pkg/config/config_helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ func newTestParsingContext(tb testing.TB, configPath string) (context.Context, *
737737
tb.Helper()
738738

739739
l := logger.CreateLogger()
740-
ctx, pctx := config.NewParsingContext(tb.Context(), l, controls.New())
740+
ctx, pctx := config.NewParsingContext(tb.Context(), l, config.WithStrictControls(controls.New()))
741741

742742
workingDir, downloadDir := util.DefaultWorkingAndDownloadDirs(configPath)
743743

pkg/config/dependency.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,11 +704,19 @@ func isAwsS3NoSuchKey(err error) bool {
704704

705705
// isRenderJSONCommand This function will true if terragrunt was invoked with render-json
706706
func isRenderJSONCommand(pctx *ParsingContext) bool {
707+
if pctx.TerraformCliArgs == nil {
708+
return false
709+
}
710+
707711
return pctx.TerraformCliArgs.Contains(renderJSONCommand)
708712
}
709713

710714
// isRenderCommand will return true if terragrunt was invoked with render
711715
func isRenderCommand(pctx *ParsingContext) bool {
716+
if pctx.TerraformCliArgs == nil {
717+
return false
718+
}
719+
712720
return pctx.TerraformCliArgs.Contains(renderCommand)
713721
}
714722

0 commit comments

Comments
 (0)