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.

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 9 commits into from
May 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 5 additions & 23 deletions cli/internal/env/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]))
Expand All @@ -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, "")
}
Comment on lines -172 to -177
Copy link
Contributor Author

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.


return nil, strings.Join(regexString, "")
return strings.Join(regexString, "")
}

// fromWildcards returns a wildcardSet after processing wildcards against it.
Expand All @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The 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 "" whether specified or not. That matches the 1.9 behavior.

}
}

Expand Down
Loading