Skip to content

Commit

Permalink
fix: wrong relative path in terragrunt files (#860)
Browse files Browse the repository at this point in the history 
* fix: wrong relative path in terragrunt files

* don't reference self

* trailing newline

* don't let reference self
  • Loading branch information
@jakeyheath
jakeyheath authored May 18, 2023
1 parent 28c230f commit 0b3bf29
Show file tree
Hide file tree
Showing 47 changed files with 72 additions and 109 deletions.
20 changes: 15 additions & 5 deletions templates/templates/component/terraform/terragrunt.hcl.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
{{ $outer := . }}
{{ $outer := . -}}

dependencies {
paths = [
{{ range $component, $backend := .ComponentBackends -}}
{{ if ne $component $outer.Name}} "../{{$component}}",
{{ if avail "Env" . -}}
{{ if eq .Env "accounts" -}}
{{ range $name, $backend := .AccountBackends -}}
{{- if ne $name $outer.Name }} "../{{$name}}",
{{ end -}}
{{- end -}}
{{- else if eq .Env "" -}}
{{- else -}}
{{- range $component, $backend := .ComponentBackends -}}
{{- if ne $component $outer.Name }} "../{{$component}}",
{{ end -}}
{{- end -}}
{{- range $name, $backend := .AccountBackends}} "../../../accounts/{{$name}}",
{{ end -}}
{{ range $name, $backend := .AccountBackends}} "../../../accounts/{{$name}}",
{{ end }} ]
{{- end -}}
{{- end }} ]
}
3 changes: 0 additions & 3 deletions testdata/auth0_provider_yaml/terraform/accounts/foo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@


dependencies {
paths = [
"../../../accounts/foo",
]
}
2 changes: 0 additions & 2 deletions testdata/auth0_provider_yaml/terraform/envs/bar/bam/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../../../accounts/foo",
Expand Down
2 changes: 0 additions & 2 deletions testdata/auth0_provider_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
3 changes: 0 additions & 3 deletions testdata/bless_provider_yaml/terraform/accounts/foo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@


dependencies {
paths = [
"../../../accounts/foo",
]
}
2 changes: 0 additions & 2 deletions testdata/bless_provider_yaml/terraform/envs/bar/bam/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../../../accounts/foo",
Expand Down
2 changes: 0 additions & 2 deletions testdata/bless_provider_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
2 changes: 0 additions & 2 deletions testdata/circleci/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
2 changes: 0 additions & 2 deletions testdata/github_actions/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
3 changes: 0 additions & 3 deletions testdata/github_provider_yaml/terraform/accounts/foo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@


dependencies {
paths = [
"../../../accounts/foo",
]
}
2 changes: 0 additions & 2 deletions testdata/github_provider_yaml/terraform/envs/bar/bam/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../../../accounts/foo",
Expand Down
2 changes: 0 additions & 2 deletions testdata/github_provider_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
3 changes: 0 additions & 3 deletions testdata/okta_provider_yaml/terraform/accounts/foo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@


dependencies {
paths = [
"../../../accounts/foo",
]
}
2 changes: 0 additions & 2 deletions testdata/okta_provider_yaml/terraform/envs/bar/bam/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../../../accounts/foo",
Expand Down
2 changes: 0 additions & 2 deletions testdata/okta_provider_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
3 changes: 0 additions & 3 deletions testdata/remote_backend_yaml/terraform/accounts/acct1/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@


dependencies {
paths = [
"../../../accounts/acct1",
]
}
2 changes: 0 additions & 2 deletions testdata/remote_backend_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
3 changes: 0 additions & 3 deletions testdata/snowflake_provider_yaml/terraform/accounts/foo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@


dependencies {
paths = [
"../../../accounts/foo",
]
}
2 changes: 0 additions & 2 deletions testdata/snowflake_provider_yaml/terraform/envs/bar/bam/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../../../accounts/foo",
Expand Down
2 changes: 0 additions & 2 deletions testdata/snowflake_provider_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
3 changes: 0 additions & 3 deletions testdata/tfe_config/terraform/accounts/account/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@


dependencies {
paths = [
"../../../accounts/account",
]
}
2 changes: 0 additions & 2 deletions testdata/tfe_config/terraform/envs/staging/comp1/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../../../accounts/account",
Expand Down
2 changes: 0 additions & 2 deletions testdata/tfe_config/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
2 changes: 0 additions & 2 deletions testdata/tfe_config/terraform/tfe/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
3 changes: 0 additions & 3 deletions testdata/tfe_provider_yaml/terraform/accounts/foo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@


dependencies {
paths = [
"../../../accounts/foo",
]
}
2 changes: 0 additions & 2 deletions testdata/tfe_provider_yaml/terraform/envs/bar/bam/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../../../accounts/foo",
Expand Down
2 changes: 0 additions & 2 deletions testdata/tfe_provider_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
11 changes: 9 additions & 2 deletions testdata/v2_full_yaml/fogg.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
accounts:
bar:
depends_on:
accounts:
- foo
- bar
components: []
providers:
aws:
account_id: 00456
Expand Down Expand Up @@ -79,9 +84,11 @@ envs:
sentry:
version: 1.2.3
depends_on:
accounts: []
components:
accounts:
- foo
- bar
components:
- okta
- hero
okta:
providers:
Expand Down
5 changes: 1 addition & 4 deletions testdata/v2_full_yaml/terraform/accounts/bar/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@


dependencies {
paths = [
"../../../accounts/bar",
"../../../accounts/foo",
"../foo",
]
}
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/accounts/foo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/envs/prod/datadog/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../hero",
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/envs/prod/hero/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/envs/prod/okta/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../datadog",
Expand Down
42 changes: 42 additions & 0 deletions testdata/v2_full_yaml/terraform/envs/prod/sentry/fogg.tf
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions testdata/v2_full_yaml/terraform/envs/prod/sentry/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@


dependencies {
paths = [
"../hero",
"../okta",
"../../../accounts/bar",
"../../../accounts/foo",
]
}
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/envs/prod/vpc/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../datadog",
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/envs/staging/comp1/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../comp2",
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/envs/staging/comp2/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../comp1",
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/envs/staging/vpc/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../comp1",
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_full_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_minimal_valid_yaml/terraform/global/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
]
Expand Down
5 changes: 1 addition & 4 deletions testdata/v2_no_aws_provider_yaml/terraform/accounts/bar/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@


dependencies {
paths = [
"../../../accounts/bar",
"../../../accounts/foo",
"../foo",
]
}
5 changes: 1 addition & 4 deletions testdata/v2_no_aws_provider_yaml/terraform/accounts/foo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@


dependencies {
paths = [
"../../../accounts/bar",
"../../../accounts/foo",
"../bar",
]
}
2 changes: 0 additions & 2 deletions testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp1/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../comp2",
Expand Down
2 changes: 0 additions & 2 deletions testdata/v2_no_aws_provider_yaml/terraform/envs/staging/comp2/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


dependencies {
paths = [
"../comp1",
Expand Down
Loading

0 comments on commit 0b3bf29

Please sign in to comment.