Multiple var files #6
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
msurovcak
force-pushed
the
multiple-var-files
branch
from
0f49b09
to
faccbf3
Compare
shihanng
reviewed
Dec 4, 2020
Makefile
Outdated
| @@ -9,7 +9,7 @@ test: ## Run tests | |||
| go test -covermode atomic -coverprofile=profile.cov -race -v ./... -count=1 | |||
|
|
|||
| lint: ## Run GolangCI-Lint | |||
| docker run --rm -v $$(pwd):/app -w /app golangci/golangci-lint:latest golangci-lint run -v | |||
| docker run --rm -v $$(pwd):/app -w /app golangci/golangci-lint:latest golangci-lint run -v --timeout 120s | |||
There was a problem hiding this comment.
Any reason why we need to specify timeout here? Did you face any issue running make lint?
cmd/cmd.go
Outdated
| @@ -52,7 +52,7 @@ variable definitions files e.g. terraform.tfvars[.json] *.auto.tfvars[.json]`) | |||
| rootCmd.PersistentFlags().Bool(flagNoDefault, false, "Do not use defined default values") | |||
| rootCmd.PersistentFlags().StringArray(flagVar, []string{}, `Set a variable in the generated definitions. | |||
| This flag can be set multiple times.`) | |||
| rootCmd.PersistentFlags().String(flagVarFile, "", `Set variables from a file.`) | |||
| rootCmd.PersistentFlags().StringArray(flagVarFile, []string{}, `Set variables from a file.`) | |||
There was a problem hiding this comment.
How about the following? To be consistent with --var above.
Suggested change
| rootCmd.PersistentFlags().StringArray(flagVarFile, []string{}, `Set variables from a file.`) | |
| rootCmd.PersistentFlags().StringArray(flagVarFile, []string{}, `Set variables from a file. | |
| This flag can be set multiple times.`) |
cmd/testdata/other.tfvars
Outdated
| @@ -0,0 +1 @@ | |||
| image_id = "abc" | |||
There was a problem hiding this comment.
Could you add a newline here? Then the ⛔ symbol should be gone 😄
|
Added some commits to address minor points. Going to merge this. Thank you for the PR @msurovcak. |
shihanng
approved these changes
Jan 14, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
I am using "hierarchical" structure of
tfvarsfiles to say DRY. This change allows using multiple files to support multiple files the same as Terraform does with-var-file.I also added/fixed help and added timeout to lint.
Thanks for the
tfvartool, it makes my life easier.