Upgrade Terragrunt Version

cmd/parse_locals.go

@@ -113,20 +113,20 @@ func parseLocals(path string, terragruntOptions *options.TerragruntOptions, incl
  }
 
  // Decode just the Base blocks. See the function docs for DecodeBaseBlocks for more info on what base blocks are.
- localsAsCty, trackInclude, err := config.DecodeBaseBlocks(terragruntOptions, parser, file, path, includeFromChild, nil)
+ createExtensions, err := config.DecodeBaseBlocks(terragruntOptions, parser, file, path, includeFromChild, nil)
  if err != nil {
  return ResolvedLocals{}, err
  }
 
  // Recurse on the parent to merge in the locals from that file
  mergedParentLocals := ResolvedLocals{}
- if trackInclude != nil && includeFromChild == nil {
- for _, includeConfig := range trackInclude.CurrentList {
+ if createExtensions.TrackInclude != nil && includeFromChild == nil {
+ for _, includeConfig := range createExtensions.TrackInclude.CurrentList {
  parentLocals, _ := parseLocals(includeConfig.Path, terragruntOptions, &includeConfig)
  mergedParentLocals = mergeResolvedLocals(mergedParentLocals, parentLocals)
  }
  }
- childLocals := resolveLocals(*localsAsCty)
+ childLocals := resolveLocals(*createExtensions.Locals)
 
  return mergeResolvedLocals(mergedParentLocals, childLocals), nil
 }

go.mod

@@ -7,7 +7,7 @@ toolchain go1.21.3
 require (
  github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
  github.com/gruntwork-io/go-commons v0.17.1
- github.com/gruntwork-io/terragrunt v0.54.1
+ github.com/gruntwork-io/terragrunt v0.54.13
  github.com/hashicorp/go-getter v1.7.4
  github.com/hashicorp/hcl/v2 v2.17.0
  github.com/hashicorp/terraform-config-inspect v0.0.0-20210625153042-09f34846faab
@@ -25,6 +25,7 @@ require (
  cloud.google.com/go/iam v1.1.3 // indirect
  cloud.google.com/go/storage v1.30.1 // indirect
  filippo.io/age v1.0.0 // indirect
+ github.com/AlecAivazis/survey/v2 v2.3.4 // indirect
  github.com/Azure/azure-sdk-for-go v63.3.0+incompatible // indirect
  github.com/Azure/go-autorest v14.2.0+incompatible // indirect
  github.com/Azure/go-autorest/autorest v0.11.26 // indirect
@@ -36,36 +37,61 @@ require (
  github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
  github.com/Azure/go-autorest/logger v0.2.1 // indirect
  github.com/Azure/go-autorest/tracing v0.6.0 // indirect
+ github.com/Masterminds/goutils v1.1.1 // indirect
+ github.com/Masterminds/semver/v3 v3.2.1 // indirect
+ github.com/Masterminds/sprig/v3 v3.2.2 // indirect
  github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5 // indirect
  github.com/agext/levenshtein v1.2.3 // indirect
+ github.com/alecthomas/chroma v0.10.0 // indirect
  github.com/apparentlymart/go-cidr v1.1.0 // indirect
  github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
  github.com/apparentlymart/go-versions v1.0.1 // indirect
  github.com/armon/go-metrics v0.3.10 // indirect
  github.com/armon/go-radix v1.0.0 // indirect
- github.com/aws/aws-sdk-go v1.46.6 // indirect
+ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
+ github.com/atomicgo/cursor v0.0.1 // indirect
+ github.com/atotto/clipboard v0.1.4 // indirect
+ github.com/aws/aws-sdk-go v1.49.17 // indirect
+ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+ github.com/aymerick/douceur v0.2.0 // indirect
  github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
  github.com/blang/semver v3.5.1+incompatible // indirect
  github.com/bmatcuk/doublestar v1.3.1 // indirect
  github.com/cenkalti/backoff/v3 v3.2.2 // indirect
+ github.com/charmbracelet/bubbles v0.16.1 // indirect
+ github.com/charmbracelet/bubbletea v0.24.2 // indirect
+ github.com/charmbracelet/glamour v0.6.0 // indirect
+ github.com/charmbracelet/lipgloss v0.9.1 // indirect
+ github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
  github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
  github.com/creack/pty v1.1.17 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/dimchansky/utfbom v1.1.1 // indirect
+ github.com/dlclark/regexp2 v1.4.0 // indirect
  github.com/fatih/color v1.15.0 // indirect
+ github.com/gitsight/go-vcsurl v1.0.1 // indirect
  github.com/go-errors/errors v1.4.2 // indirect
+ github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect
  github.com/go-test/deep v1.1.0 // indirect
  github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.3 // indirect
  github.com/golang/snappy v0.0.4 // indirect
  github.com/google/go-cmp v0.6.0 // indirect
+ github.com/google/go-github/v35 v35.3.0 // indirect
+ github.com/google/go-jsonnet v0.18.0 // indirect
+ github.com/google/go-querystring v1.1.0 // indirect
  github.com/google/s2a-go v0.1.7 // indirect
+ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
  github.com/google/uuid v1.4.0 // indirect
  github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
  github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+ github.com/gookit/color v1.5.0 // indirect
+ github.com/gorilla/css v1.0.0 // indirect
  github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
+ github.com/gruntwork-io/boilerplate v0.5.7 // indirect
  github.com/gruntwork-io/gruntwork-cli v0.7.0 // indirect
+ github.com/gruntwork-io/terratest v0.41.0 // indirect
  github.com/hashicorp/errwrap v1.1.0 // indirect
  github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
  github.com/hashicorp/go-hclog v1.5.0 // indirect
@@ -83,52 +109,88 @@ require (
  github.com/hashicorp/go-version v1.6.0 // indirect
  github.com/hashicorp/golang-lru v0.5.4 // indirect
  github.com/hashicorp/hcl v1.0.1-vault // indirect
+ github.com/hashicorp/logutils v1.0.0 // indirect
  github.com/hashicorp/terraform v0.15.3 // indirect
+ github.com/hashicorp/terraform-registry-address v0.2.0 // indirect
  github.com/hashicorp/terraform-svchost v0.0.1 // indirect
  github.com/hashicorp/vault/api v1.5.0 // indirect
  github.com/hashicorp/vault/sdk v0.4.1 // indirect
  github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
  github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef // indirect
+ github.com/huandu/xstrings v1.3.2 // indirect
  github.com/imdario/mergo v0.3.12 // indirect
+ github.com/inancgumus/screen v0.0.0-20190314163918-06e984b86ed3 // indirect
  github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/jessevdk/go-flags v1.5.0 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/jstemmer/go-junit-report v1.0.0 // indirect
+ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
  github.com/klauspost/compress v1.15.11 // indirect
  github.com/lib/pq v1.10.5 // indirect
+ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.18 // indirect
+ github.com/mattn/go-localereader v0.0.1 // indirect
+ github.com/mattn/go-runewidth v0.0.15 // indirect
  github.com/mattn/go-zglob v0.0.3 // indirect
+ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+ github.com/microcosm-cc/bluemonday v1.0.21 // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/go-testing-interface v1.14.1 // indirect
  github.com/mitchellh/go-wordwrap v1.0.1 // indirect
  github.com/mitchellh/mapstructure v1.4.3 // indirect
  github.com/mitchellh/panicwrap v1.0.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
+ github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
+ github.com/muesli/cancelreader v0.2.2 // indirect
+ github.com/muesli/reflow v0.3.0 // indirect
+ github.com/muesli/termenv v0.15.2 // indirect
  github.com/oklog/run v1.1.0 // indirect
+ github.com/olekukonko/tablewriter v0.0.5 // indirect
+ github.com/owenrumney/go-sarif v1.1.1 // indirect
  github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+ github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/posener/complete v1.2.3 // indirect
+ github.com/pterm/pterm v0.12.41 // indirect
+ github.com/rivo/uniseg v0.2.0 // indirect
  github.com/rogpeppe/go-internal v1.9.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/ryanuber/go-glob v1.0.0 // indirect
+ github.com/sahilm/fuzzy v0.1.0 // indirect
  github.com/sergi/go-diff v1.2.0 // indirect
+ github.com/shopspring/decimal v1.2.0 // indirect
+ github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d // indirect
+ github.com/sourcegraph/jsonrpc2 v0.2.0 // indirect
+ github.com/spf13/afero v1.9.5 // indirect
+ github.com/spf13/cast v1.3.1 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
+ github.com/terraform-linters/tflint v0.47.0 // indirect
+ github.com/terraform-linters/tflint-plugin-sdk v0.17.0 // indirect
+ github.com/terraform-linters/tflint-ruleset-terraform v0.4.0 // indirect
  github.com/ulikunitz/xz v0.5.11 // indirect
  github.com/urfave/cli/v2 v2.25.5 // indirect
+ github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
+ github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+ github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
  github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+ github.com/yuin/goldmark v1.5.2 // indirect
+ github.com/yuin/goldmark-emoji v1.0.1 // indirect
  github.com/zclconf/go-cty-yaml v1.0.3 // indirect
  go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a // indirect
  go.mozilla.org/sops/v3 v3.7.3 // indirect
  go.opencensus.io v0.24.0 // indirect
  go.uber.org/atomic v1.9.0 // indirect
- golang.org/x/crypto v0.14.0 // indirect
+ golang.org/x/crypto v0.17.0 // indirect
  golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
  golang.org/x/mod v0.12.0 // indirect
  golang.org/x/net v0.17.0 // indirect
  golang.org/x/oauth2 v0.13.0 // indirect
- golang.org/x/sys v0.13.0 // indirect
- golang.org/x/term v0.13.0 // indirect
- golang.org/x/text v0.13.0 // indirect
+ golang.org/x/sys v0.15.0 // indirect
+ golang.org/x/term v0.15.0 // indirect
+ golang.org/x/text v0.14.0 // indirect
  golang.org/x/time v0.3.0 // indirect
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
  google.golang.org/api v0.149.0 // indirect
@@ -144,4 +206,5 @@ require (
  gopkg.in/urfave/cli.v1 v1.20.0 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
+ sigs.k8s.io/yaml v1.2.0 // indirect
 )