Skip to content

fix(serviceaccount): allow capital letters in description #550

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

Merged
craicoverflow merged 3 commits into from
Apr 9, 2021
Merged

fix(serviceaccount): allow capital letters in description #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5623fc4
fix(serviceaccount): allow capital letters in description
Apr 9, 2021
e008fd1
fix tests
Apr 9, 2021
e456f27
fix error message
Apr 9, 2021
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 cmd/rhoas/pkged.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion locales/cmd/serviceaccount/active.en.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ one = 'service account name cannot exceed {{.MaxNameLen}} characters'
one = 'invalid service account name "{{.Name}}"; only lowercase letters (a-z), numbers, and "-" are accepted'

[serviceAccount.common.validation.description.error.invalidChars]
one = 'invalid service account description "{{.Description}}"; only lowercase letters (a-z) and numbers are accepted'
one = 'invalid service account description "{{.Description}}"; only alphanumeric characters are accepted'

[serviceAccount.common.validation.description.error.lengthError]
one = 'service account description cannot exceed {{.MaxNameLen}} characters'
2 changes: 1 addition & 1 deletion pkg/serviceaccount/validation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
maxNameLength = 50
minNameLength = 1
// description validation rules
legalDescriptionChars = "^[a-z0-9\\s]*$"
legalDescriptionChars = "^[a-zA-Z0-9\\s]*$"
maxDescriptionLength = 255
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/serviceaccount/validation/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ func TestValidateDescription(t *testing.T) {
wantErr: true,
},
{
name: "fails with capital letters",
name: "passes with capital letters",
args: args{"Hello"},
wantErr: true,
wantErr: false,
},
}
for _, tt := range tests {
Expand Down