Skip to content

Commit 5fbaf81

Browse files
authored
rename the configuration option (#2249)
* rename the configuration option * rename struct also
1 parent bce8baf commit 5fbaf81

File tree

7 files changed

+15
-18
lines changed

7 files changed

+15
-18
lines changed

go.work.sum

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
958958
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
959959
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
960960
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
961+
github.com/diggerhq/digger/next v0.0.0-20241111115930-58349692eece h1:j1miy/isUst5H9G71BCk9HjRRfrqSb1wySzORzk17dw=
962+
github.com/diggerhq/digger/next v0.0.0-20241111115930-58349692eece/go.mod h1:YfKfkPnlfuNn93i7iCyayMY/KqHNpt4DhVaWJMbCXz8=
961963
github.com/djherbis/atime v1.1.0 h1:rgwVbP/5by8BvvjBNrbh64Qz33idKT3pSnMSJsxhi0g=
962964
github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE=
963965
github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
@@ -1412,7 +1414,6 @@ github.com/pterm/pterm v0.12.41/go.mod h1:LW/G4J2A42XlTaPTAGRPvbBfF4UXvHWhC6SN7u
14121414
github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b h1:aUNXCGgukb4gtY99imuIeoh8Vr0GSwAlYxPAhqZrpFc=
14131415
github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg=
14141416
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
1415-
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
14161417
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
14171418
github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
14181419
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
@@ -1511,15 +1512,11 @@ github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=
15111512
github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
15121513
github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
15131514
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
1514-
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
1515-
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
15161515
github.com/valyala/fasthttp v1.40.0 h1:CRq/00MfruPGFLTQKY8b+8SfdK60TxNztjRMnH0t1Yc=
15171516
github.com/valyala/fasthttp v1.40.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
15181517
github.com/valyala/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7gU0=
15191518
github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ=
15201519
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
1521-
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
1522-
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
15231520
github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
15241521
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
15251522
github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=

libs/digger_config/terragrunt/tac/generate.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ func getDependencies(ignoreParentTerragrunt bool, ignoreDependencyBlocks bool, g
170170
//locals := ResolvedLocals{}
171171

172172
// Get deps from locals
173-
if locals.ExtraAtlantisDependencies != nil {
174-
dependencies = sliceUnion(dependencies, locals.ExtraAtlantisDependencies)
173+
if locals.ExtraDiggerDependencies != nil {
174+
dependencies = sliceUnion(dependencies, locals.ExtraDiggerDependencies)
175175
}
176176

177177
// Get deps from `dependencies` and `dependency` blocks
@@ -501,8 +501,8 @@ func createHclProject(defaultWorkflow string, defaultApplyRequirements []string,
501501
return nil, nil
502502
}
503503

504-
if locals.ExtraAtlantisDependencies != nil {
505-
for _, dep := range locals.ExtraAtlantisDependencies {
504+
if locals.ExtraDiggerDependencies != nil {
505+
for _, dep := range locals.ExtraDiggerDependencies {
506506
relDep, err := filepath.Rel(workingDir, dep)
507507
if err != nil {
508508
return nil, err

libs/digger_config/terragrunt/tac/parse_locals.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type ResolvedLocals struct {
2626
ApplyRequirements []string
2727

2828
// Extra dependencies that can be hardcoded in digger_config
29-
ExtraAtlantisDependencies []string
29+
ExtraDiggerDependencies []string
3030

3131
// If set, a single module will have autoplan turned to this setting
3232
AutoPlan *bool
@@ -95,7 +95,7 @@ func mergeResolvedLocals(parent ResolvedLocals, child ResolvedLocals) ResolvedLo
9595
parent.ApplyRequirements = child.ApplyRequirements
9696
}
9797

98-
parent.ExtraAtlantisDependencies = append(parent.ExtraAtlantisDependencies, child.ExtraAtlantisDependencies...)
98+
parent.ExtraDiggerDependencies = append(parent.ExtraDiggerDependencies, child.ExtraDiggerDependencies...)
9999

100100
return parent
101101
}
@@ -183,13 +183,13 @@ func resolveLocals(localsAsCty cty.Value) ResolvedLocals {
183183
resolved.markedProject = &hasValue
184184
}
185185

186-
extraDependenciesAsCty, ok := rawLocals["extra_atlantis_dependencies"]
186+
extraDependenciesAsCty, ok := rawLocals["extra_digger_dependencies"]
187187
if ok {
188188
it := extraDependenciesAsCty.ElementIterator()
189189
for it.Next() {
190190
_, val := it.Element()
191-
resolved.ExtraAtlantisDependencies = append(
192-
resolved.ExtraAtlantisDependencies,
191+
resolved.ExtraDiggerDependencies = append(
192+
resolved.ExtraDiggerDependencies,
193193
filepath.ToSlash(val.AsString()),
194194
)
195195
}

libs/digger_config/terragrunt/tac/test_examples/parent_with_extra_deps/deep/child/terragrunt.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
}
88

99
locals {
10-
extra_atlantis_dependencies = [
10+
extra_digger_dependencies = [
1111
"some_child_dep",
1212
]
1313
}

libs/digger_config/terragrunt/tac/test_examples/parent_with_extra_deps/deep_with_local_tags_file/child/terragrunt.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
}
88

99
locals {
10-
extra_atlantis_dependencies = [
10+
extra_digger_dependencies = [
1111
"some_child_dep",
1212
]
1313
}

libs/digger_config/terragrunt/tac/test_examples/parent_with_extra_deps/parent/terragrunt.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
locals {
2-
extra_atlantis_dependencies = [
2+
extra_digger_dependencies = [
33
# A relative file to the child should work
44
"some_parent_dep",
55

libs/digger_config/terragrunt/tac/test_examples/terragrunt-infrastructure-live-example/terragrunt.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# ---------------------------------------------------------------------------------------------------------------------
66

77
locals {
8-
extra_atlantis_dependencies = [
8+
extra_digger_dependencies = [
99
find_in_parent_folders("account.hcl"),
1010
find_in_parent_folders("region.hcl"),
1111
find_in_parent_folders("env.hcl"),

0 commit comments

Comments
 (0)