-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
fix(turborepo):Support distinguishing unset env vars #5086
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
84e5397
Rename fields, add globalEnv and env to respective hashes.
70739ea
Update hashes.
e57a133
Remove the inclusion of literals.
57e710a
Improve summary output of environment variable information.
94a9426
Update hashes again.
7188aa7
Sort order issue.
3cb79c0
Properly bookkeep for custom marshaled env.
5064843
env resolves to empty array, not nil
65fe023
Change method for presentational empty array.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -130,10 +130,8 @@ const wildcard = '*' | |
const wildcardEscape = '\\' | ||
const regexWildcardSegment = ".*" | ||
|
||
func wildcardToRegexPattern(pattern string) (*string, string) { | ||
hasWildcard := false | ||
func wildcardToRegexPattern(pattern string) string { | ||
var regexString []string | ||
var literalString []string | ||
|
||
var previousIndex int | ||
var previousRune rune | ||
|
@@ -144,11 +142,9 @@ func wildcardToRegexPattern(pattern string) (*string, string) { | |
// Found a literal * | ||
|
||
// Replace the trailing "\*" with just "*" before adding the segment. | ||
literalString = append(literalString, pattern[previousIndex:i-1]+"*") | ||
regexString = append(regexString, regexp.QuoteMeta(pattern[previousIndex:i-1]+"*")) | ||
} else { | ||
// Found a wildcard | ||
hasWildcard = true | ||
|
||
// Add in the static segment since the last wildcard. Can be zero length. | ||
regexString = append(regexString, regexp.QuoteMeta(pattern[previousIndex:i])) | ||
|
@@ -166,17 +162,9 @@ func wildcardToRegexPattern(pattern string) (*string, string) { | |
} | ||
|
||
// Add the last static segment. Can be zero length. | ||
literalString = append(literalString, pattern[previousIndex:]) | ||
regexString = append(regexString, regexp.QuoteMeta(pattern[previousIndex:])) | ||
|
||
// We need the computed literal env value because FOO= is meaningful. | ||
var literalValue string | ||
if !hasWildcard { | ||
literalValue = strings.Join(literalString, "") | ||
return &literalValue, strings.Join(regexString, "") | ||
} | ||
|
||
return nil, strings.Join(regexString, "") | ||
return strings.Join(regexString, "") | ||
} | ||
|
||
// fromWildcards returns a wildcardSet after processing wildcards against it. | ||
|
@@ -194,20 +182,14 @@ func (evm EnvironmentVariableMap) fromWildcards(wildcardPatterns []string) (Wild | |
isLiteralLeadingExclamation := strings.HasPrefix(wildcardPattern, "\\!") | ||
|
||
if isExclude { | ||
_, excludePattern := wildcardToRegexPattern(wildcardPattern[1:]) | ||
excludePattern := wildcardToRegexPattern(wildcardPattern[1:]) | ||
excludePatterns = append(excludePatterns, excludePattern) | ||
} else if isLiteralLeadingExclamation { | ||
includeLiteral, includePattern := wildcardToRegexPattern(wildcardPattern[1:]) | ||
if includeLiteral != nil { | ||
output.Inclusions[*includeLiteral] = "" | ||
} | ||
includePattern := wildcardToRegexPattern(wildcardPattern[1:]) | ||
includePatterns = append(includePatterns, includePattern) | ||
} else { | ||
includeLiteral, includePattern := wildcardToRegexPattern(wildcardPattern[0:]) | ||
includePattern := wildcardToRegexPattern(wildcardPattern[0:]) | ||
includePatterns = append(includePatterns, includePattern) | ||
if includeLiteral != nil { | ||
output.Inclusions[*includeLiteral] = "" | ||
} | ||
Comment on lines
-208
to
-210
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is how I forced previously-literal env vars to be resolved to |
||
} | ||
} | ||
|
||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the most-significant change in this PR.