Skip to content

accept - in values of scope #160

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Oct 27, 2020
Merged

accept - in values of scope #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c497c48
accept - in values of scope
ac427 Oct 27, 2020
8d0f239
Merge branch 'master' into scope
tembleking Oct 27, 2020
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
6 changes: 3 additions & 3 deletions sdcclient/monitor/dashboard_converters/_dashboard_scope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ def convert_scope_string_to_expression(scope = None):
;

word =
| /[\w\.]+/
| '"' /[\w\.]+/ '"'
| "'" /[\w\.]+/ "'"
| /[a-zA-Z0-9-_\-\.]+/
| '"' /[a-zA-Z0-9-_\-\.]+/ '"'
| "'" /[a-zA-Z0-9-_\-\.]+/ "'"
;
"""

Expand Down
6 changes: 3 additions & 3 deletions specs/monitor/dashboard_converters/dashboard_scope_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
"value": ["foo"]
}]]))

with it('parses correctly: cluster.id-number = "foo"'):
param = 'cluster.id-number = "foo"'
with it('parses correctly: cluster.id-number = "foo-bar"'):
param = 'cluster.id-number = "foo-bar"'
res = convert_scope_string_to_expression(param)
expect(res).to(equal([True, [{
"displayName": "",
"isVariable": False,
"operand": "cluster.id-number",
"operator": "equals",
"value": ["foo"]
"value": ["foo-bar"]
}]]))

with it("parses correctly: agent.id = 'foo'"):
Expand Down