Skip to content

fix(cue): accept '-' and '.' in variable references #235

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

Open
s3onghyun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cue): accept '-' and '.' in variable references #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion cue-test/common/datasource.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,10 @@ package common

myDsVarSelector: #datasourceSelector & { _kind: "MyDatasource" }

myDsVarSelector: #datasourceSelector & { datasource: "$dsVar" }
myDsVarSelector: #datasourceSelector & { datasource: "$dsVar" }

// Regression for perses/perses#4327: a variable name may contain '-' and '.'
// (name rule ^[a-zA-Z0-9_.-]+$), so a datasource reference to such a variable
// must validate as well.
myDsVarHyphen: #datasourceSelector & { _kind: "MyDatasource", datasource: "$ds-var" }
myDsVarDot: #datasourceSelector & { _kind: "MyDatasource", datasource: "$ds.var" }
7 changes: 6 additions & 1 deletion cue/common/variable.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@

package common

#variableSyntaxRegex: "^\\$\\w+$"
// A variable reference is a "$" followed by a variable name. The accepted
// character set must stay in sync with the variable name rule (#metadataName,
// "^[a-zA-Z0-9_.-]+$"), otherwise a validly-named variable such as
// "my-datasource" cannot be referenced as "$my-datasource".
// See perses/perses#4327.
#variableSyntaxRegex: "^\\$[a-zA-Z0-9_.-]+$"
Loading