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

[CLI] add new valid search attribute key cases for context header #6144

Merged
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
2 changes: 1 addition & 1 deletion tools/cli/admin_cluster_commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (

// An indirection for the prompt function so that it can be mocked in the unit tests
var promptFn = prompt
var validSearchAttributeKey = regexp.MustCompile(`^[a-zA-Z][a-zA-Z_0-9]*$`)
var validSearchAttributeKey = regexp.MustCompile(`^[a-zA-Z][a-zA-Z_.-0-9]*$`)

// AdminAddSearchAttribute to whitelist search attribute
func AdminAddSearchAttribute(c *cli.Context) {
Expand Down
2 changes: 1 addition & 1 deletion tools/cli/admin_cluster_commands_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ func TestValidSearchAttributeKey(t *testing.T) {
assert.NoError(t, validateSearchAttributeKey("cityId"))
assert.NoError(t, validateSearchAttributeKey("paymentProfileUUID"))
assert.NoError(t, validateSearchAttributeKey("job_type"))
assert.NoError(t, validateSearchAttributeKey("Header.ctx-tenancy"))

assert.Error(t, validateSearchAttributeKey("payments-biling-invoices-TransactionUUID"))
assert.Error(t, validateSearchAttributeKey("9lives"))
assert.Error(t, validateSearchAttributeKey("tax%"))
}
Loading