alihan/faas-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove regex from error message and re-format it

Browse Source 
Signed-off-by: Vivek Singh <vivekkmr45@yahoo.in>
This commit is contained in:
Vivek Singh
2019-03-09 20:16:26 +05:30
committed by Alex Ellis
parent 528e5d82d4
commit 8dfe6ac321
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands/secret_create.go
View File

@@ -124,14 +124,14 @@ func readSecretFromFile(secretFile string) (string, error) {
const (
dns1123LabelFmt string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?"
dns1123SubdomainFmt string = dns1123LabelFmt + "(\\." + dns1123LabelFmt + ")*"
invalidSecretNameMessage string = `ERROR: invalid secret name: %s, secret name must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (regex used for validation is %s)`
invalidSecretNameMessage string = "ERROR: invalid secret name %s\nSecret name must start and end with an alphanumeric character \nand can only contain lower-case alphanumeric characters, '-' or '.'"
)
func validateSecretName(secretName string) (bool, error) {
var dns1123SubdomainRegexp = regexp.MustCompile("^" + dns1123SubdomainFmt + "$")
if !dns1123SubdomainRegexp.MatchString(secretName) {
return false, fmt.Errorf(invalidSecretNameMessage, secretName, dns1123SubdomainRegexp)
return false, fmt.Errorf(invalidSecretNameMessage, secretName)
}
return true, nil

5
commands/secret_create_test.go
View File

@@ -109,7 +109,6 @@ func Test_SecretCreateFromLiteral(t *testing.T) {
}
func Test_validateSecretName(t *testing.T) {
var dns1123SubdomainRegexp = regexp.MustCompile("^" + dns1123SubdomainFmt + "$")
testcases := []struct {
Name string
@@ -134,12 +133,12 @@ func Test_validateSecretName(t *testing.T) {
{
Name: "Invalid secret name",
SecretName: "api_key_@secret",
Err: fmt.Errorf(invalidSecretNameMessage, "api_key_@secret", dns1123SubdomainRegexp),
Err: fmt.Errorf(invalidSecretNameMessage, "api_key_@secret"),
},
{
Name: "Invalid secret name with number",
SecretName: "12api_key_secret",
Err: fmt.Errorf(invalidSecretNameMessage, "12api_key_secret", dns1123SubdomainRegexp),
Err: fmt.Errorf(invalidSecretNameMessage, "12api_key_secret"),
},
}