Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: match tfvar naming to project names #2850

Merged
merged 2 commits into from
Jan 30, 2024
Merged

feat: match tfvar naming to project names #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45a3202
feat: match tfvar naming to project names
hugorut Jan 30, 2024
874eeff
fix: use correct env matching logic with children and prefixes
hugorut Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 37 additions & 0 deletions cmd/infracost/testdata/generate/aunt_filename_matches_project/expected.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
version: 0.1

projects:
- path: infra/components/bar
name: infra-components-bar-dev
terraform_var_files:
- ../../variables/env/dev/defaults.tfvars
- ../../variables/env/dev/bar.tfvars
skip_autodetect: true
- path: infra/components/bar
name: infra-components-bar-prod
terraform_var_files:
- ../../variables/env/prod/defaults.tfvars
- ../../variables/env/prod/bar.tfvars
skip_autodetect: true
- path: infra/components/baz
name: infra-components-baz-dev
terraform_var_files:
- ../../variables/env/dev/defaults.tfvars
skip_autodetect: true
- path: infra/components/baz
name: infra-components-baz-prod
terraform_var_files:
- ../../variables/env/prod/defaults.tfvars
skip_autodetect: true
- path: infra/components/foo
name: infra-components-foo-dev
terraform_var_files:
- ../../variables/env/dev/defaults.tfvars
skip_autodetect: true
- path: infra/components/foo
name: infra-components-foo-prod
terraform_var_files:
- ../../variables/env/prod/foo.tfvars
- ../../variables/env/prod/defaults.tfvars
skip_autodetect: true

18 changes: 18 additions & 0 deletions cmd/infracost/testdata/generate/aunt_filename_matches_project/tree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.
└── infra
├── components
│ ├── foo
│ │ └── main.tf
│ ├── bar
│ │ └── main.tf
│ └── baz
│ └── main.tf
└── variables
└── env
├── prod
│ ├── defaults.tfvars
│ ├── foo.tfvars
│ └── bar.tfvars
└── dev
├── defaults.tfvars
└── bar.tfvars
79 changes: 79 additions & 0 deletions cmd/infracost/testdata/generate/aunt_filenames_with_env/expected.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
version: 0.1

projects:
- path: components/age
name: components-age-dev
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-dev/age.tfvars
- ../../variables/cko-dev/dev.tfvars
skip_autodetect: true
- path: components/age
name: components-age-mgmt
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-mgmt/age.tfvars
skip_autodetect: true
- path: components/age
name: components-age-playground
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-playground/age.tfvars
skip_autodetect: true
- path: components/age
name: components-age-prod
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-prod/age.tfvars
skip_autodetect: true
- path: components/airflow
name: components-airflow-dev
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-dev/airflow.tfvars
- ../../variables/cko-dev/dev.tfvars
skip_autodetect: true
- path: components/airflow
name: components-airflow-mgmt
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-mgmt/airflow.tfvars
skip_autodetect: true
- path: components/airflow
name: components-airflow-playground
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-playground/airflow.tfvars
skip_autodetect: true
- path: components/airflow
name: components-airflow-prod
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-prod/airflow.tfvars
skip_autodetect: true
- path: components/apm-events
name: components-apm-events-dev
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-dev/apm-events.tfvars
- ../../variables/cko-dev/dev.tfvars
skip_autodetect: true
- path: components/apm-events
name: components-apm-events-mgmt
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-mgmt/apm-events.tfvars
skip_autodetect: true
- path: components/apm-events
name: components-apm-events-playground
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-playground/apm-events.tfvars
skip_autodetect: true
- path: components/apm-events
name: components-apm-events-prod
terraform_var_files:
- ../../variables/default.tfvars
- ../../variables/cko-prod/apm-events.tfvars
skip_autodetect: true

27 changes: 27 additions & 0 deletions cmd/infracost/testdata/generate/aunt_filenames_with_env/tree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.
├── components
│ ├── age
│ │ └── main.tf
│ ├── airflow
│ │ └── main.tf
│ ├── apm-events
│ │ └── main.tf
└── variables
├── cko-dev
│ ├── age.tfvars
│ ├── airflow.tfvars
│ ├── dev.tfvars
│ └── apm-events.tfvars
├── cko-mgmt
│ ├── age.tfvars
│ ├── airflow.tfvars
│ └── apm-events.tfvars
├── cko-playground
│ ├── age.tfvars
│ ├── airflow.tfvars
│ └── apm-events.tfvars
├── cko-prod
│ ├── age.tfvars
│ ├── airflow.tfvars
│ └── apm-events.tfvars
└── default.tfvars
4 changes: 2 additions & 2 deletions cmd/infracost/testdata/generate/env_dirs/expected.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ projects:
name: infra-components-baz-dev
terraform_var_files:
- ../../variables/defaults.tfvars
- ../../variables/dev/baz.tfvars
- ../../variables/dev/bla.tfvars
skip_autodetect: true
- path: infra/components/baz
name: infra-components-baz-stag
Expand All @@ -17,7 +17,7 @@ projects:
name: infra-components-foo-dev
terraform_var_files:
- ../../variables/defaults.tfvars
- ../../variables/dev/baz.tfvars
- ../../variables/dev/bla.tfvars
skip_autodetect: true
- path: infra/components/foo
name: infra-components-foo-stag
Expand Down
2 changes: 1 addition & 1 deletion cmd/infracost/testdata/generate/env_dirs/tree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
├── stag
│ └── bop.tfvars
├── dev
│ └── baz.tfvars
│ └── bla.tfvars
└── defaults.tfvars
23 changes: 23 additions & 0 deletions cmd/infracost/testdata/generate/parent_filename_matches_project/expected.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: 0.1

projects:
- path: infra/components/bar
name: infra-components-bar
terraform_var_files:
- ../defaults.tfvars
- ../bar.tfvars
skip_autodetect: true
- path: infra/components/baz
name: infra-components-baz
terraform_var_files:
- ../../baz.tfvars
- ../defaults.tfvars
skip_autodetect: true
- path: infra/components/foo
name: infra-components-foo
terraform_var_files:
- ../../foo.tfvars
- ../foo.tfvars
- ../defaults.tfvars
skip_autodetect: true

14 changes: 14 additions & 0 deletions cmd/infracost/testdata/generate/parent_filename_matches_project/tree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.
└── infra
├── components
│ ├── foo
│ │ └── main.tf
│ ├── bar
│ │ └── main.tf
│ ├── baz
│ │ └── main.tf
│ ├── defaults.tfvars
│ ├── foo.tfvars
│ └── bar.tfvars
├── baz.tfvars
└── foo.tfvars
8 changes: 6 additions & 2 deletions cmd/infracost/testdata/generate/shared_env_var_files/expected.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@ projects:
terraform_var_files:
- ../default.tfvars
- ../dev-default.tfvars
- dev.tfvars
skip_autodetect: true
- path: apps/foo
name: apps-foo-prod
terraform_var_files:
- ../default.tfvars
- ../prod-default.tfvars
- prod.tfvars
skip_autodetect: true
- path: apps/foo
name: apps-foo-staging
terraform_var_files:
- ../default.tfvars
- ../staging-default.tfvars
skip_autodetect: true

2 changes: 0 additions & 2 deletions cmd/infracost/testdata/generate/shared_env_var_files/tree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
└── apps
├── foo
│ ├── main.tf
│ ├── dev.tfvars
│ └── prod.tfvars
├── bar
│ ├── main.tf
│ ├── staging.tfvars
Expand Down