From 150a11d46df3a994785686e811f9697ecee7775d Mon Sep 17 00:00:00 2001 From: Liam Galvin Date: Mon, 13 Jul 2026 12:05:27 +0100 Subject: [PATCH] chore: Remove deprecated env-var expansion by upgrading to config v0.11.0 --- go.mod | 2 +- go.sum | 4 ++-- pkg/scanner/config.go | 10 +--------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 1a76ae4..10857cd 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/google/uuid v1.6.0 github.com/hashicorp/go-hclog v1.6.3 github.com/hashicorp/go-plugin v1.8.0 - github.com/infracost/config v0.10.0 + github.com/infracost/config v0.11.0 github.com/infracost/go-proto v1.25.1 github.com/infracost/proto v1.156.0 github.com/liamg/tml v0.7.1 diff --git a/go.sum b/go.sum index aa5ecaa..9aadad6 100644 --- a/go.sum +++ b/go.sum @@ -107,8 +107,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/infracost/config v0.10.0 h1:ogKYk2Q416ntcypADCkQWaEyPL9zZlvECHOq7M+oRt8= -github.com/infracost/config v0.10.0/go.mod h1:IfWRgSkjAuSRowYwzGEw/fYTCDEGc/XU10U3sIj/YWs= +github.com/infracost/config v0.11.0 h1:CYzIOu9bmbZVeMO6jqKn18VG55uTB/2nlgLFSsZDEX8= +github.com/infracost/config v0.11.0/go.mod h1:IfWRgSkjAuSRowYwzGEw/fYTCDEGc/XU10U3sIj/YWs= github.com/infracost/go-proto v1.25.1 h1:34bfSUVRFsbTBASShBSQ+9IGvUmEg8C89X73Hem/Asw= github.com/infracost/go-proto v1.25.1/go.mod h1:9m9zdHPl6mME24y3J0CdTBWXr+d03mfgXuy+9JzA/wU= github.com/infracost/proto v1.156.0 h1:Kmlapuqqn0POosT0L2VgoW5GSUDU4ll9EfeQeKfkuCM= diff --git a/pkg/scanner/config.go b/pkg/scanner/config.go index 5121112..ab3d295 100644 --- a/pkg/scanner/config.go +++ b/pkg/scanner/config.go @@ -6,7 +6,6 @@ import ( "io" "os" "path/filepath" - "strings" repoconfig "github.com/infracost/config" "github.com/infracost/proto/gen/go/infracost/usage" @@ -27,15 +26,9 @@ func LoadUsageData(r io.Reader, defaults *usage.Usage) (*usage.Usage, error) { // or generates one if it doesn't exist. If an infracost.yml.tmpl template exists, it is // used as the basis for generation. func LoadOrGenerateRepositoryConfig(ctx context.Context, dir string, opts ...repoconfig.GenerationOption) (*repoconfig.Config, error) { - env := make(map[string]string, len(os.Environ())) - for _, kv := range os.Environ() { - key, val, _ := strings.Cut(kv, "=") - env[key] = val - } - configPath := filepath.Join(dir, RepoConfigFilename) if fileExists(configPath) { - c, err := repoconfig.LoadConfigFile(configPath, dir, env) + c, err := repoconfig.LoadConfigFile(configPath, dir) if err != nil { return nil, fmt.Errorf("failed to load config: %w", err) } @@ -44,7 +37,6 @@ func LoadOrGenerateRepositoryConfig(ctx context.Context, dir string, opts ...rep opts = append( opts, - repoconfig.WithEnvVars(env), repoconfig.WithIgnorePermissionErrors(true), repoconfig.WithIgnoreHiddenDirs(true), repoconfig.WithSkipCDK(true),