Dont add -upgrade of the lock file exists & dedupe extra args #1651
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
nishkrishnan
approved these changes
Jun 23, 2021
Comment on lines
+41
to
69
| // work if any of the core args have been overridden | ||
| finalArgs := []string{} | ||
| usedExtraArgs := []string{} | ||
| for _, arg := range terraformInitArgs { | ||
| override := "" | ||
| prefix := arg | ||
| argSplit := strings.Split(arg, "=") | ||
| if len(argSplit) == 2 { | ||
| prefix = argSplit[0] | ||
| } | ||
| for _, extraArg := range extraArgs { | ||
| if strings.HasPrefix(extraArg, prefix) { | ||
| override = extraArg | ||
| } | ||
| } | ||
| if override != "" { | ||
| finalArgs = append(finalArgs, override) | ||
| usedExtraArgs = append(usedExtraArgs, override) | ||
| } else { | ||
| finalArgs = append(finalArgs, arg) | ||
| } | ||
| } | ||
| // add any extra args that are not overrides | ||
| for _, extraArg := range extraArgs { | ||
| if !stringInSlice(usedExtraArgs, extraArg) { | ||
| finalArgs = append(finalArgs, extraArg) | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Mind moving this to another function? Would be useful to use for the conftest extra args implementation as well also this function will be a bit cleaner that way.
|
Going to merge this now so it makes it into the release, but the follow up would be nice! |
This was referenced Jul 12, 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.
Seems I messed up with git and the previous PR got closed #1644 and I dont have the option to re-open So this PR replaces it
It will only omit the
-upgradeflag if TF version > 0,14 and the.terraform.lock.hclexistsI also attempt to de-duplicate the args (but there must be a more efficient way of doing this than what I have)