Merge branch 'api-key-prettyprint' into 'develop'

fix duplicated "apikey." prefix when creating an API key See merge request open-source/bytemark-client!304
BytemarkHosting · Jan 9, 2019 · 0f5252f · 0f5252f
2 parents ced6ab6 + 53a27fa
commit 0f5252f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cmd/bytemark/commands/add/api_key_test.go b/cmd/bytemark/commands/add/api_key_test.go
@@ -100,7 +100,7 @@ func TestAddApiKey(t *testing.T) {
 			Name: "all defaults",
 			Args: "test-api-key",
 			OutputMustMatch: []*regexp.Regexp{
-				regexp.MustCompile("Successfully created an api key:\ntest-api-key\n  Expires: never\n  Key: apikey.apikey.ay1pee2eye3key\n"),
+				regexp.MustCompile("Successfully created an api key:\ntest-api-key\n  Expires: never\n  Key: apikey.ay1pee2eye3key\n"),
 			},
 		},
 		user: brain.User{

diff --git a/lib/brain/api_key.go b/lib/brain/api_key.go
@@ -63,7 +63,7 @@ func (key APIKey) PrettyPrint(wr io.Writer, detail prettyprint.DetailLevel) erro
 {{ define "apikey_full" }}{{ template "apikey_sgl" . }}
   Expire{{ if .Expired }}d{{ else }}s{{ end }}: {{ if eq .ExpiresAt "" }}never{{ else }}{{ .ExpiresAt }}{{ end -}}
 {{ if .APIKey}}
-  Key: apikey.{{ .APIKey }}{{ end -}}
+  Key: {{ .APIKey }}{{ end -}}
 {{ if len .Privileges | le 1 }}
 
   Privileges:

diff --git a/lib/brain/api_key_test.go b/lib/brain/api_key_test.go
@@ -67,7 +67,7 @@ func TestAPIKeyPrettyPrint(t *testing.T) {
 			level: prettyprint.Full,
 			in: brain.APIKey{
 				Label:     "jeff",
-				APIKey:    "abcdefgh",
+				APIKey:    "apikey.abcdefgh",
 				ExpiresAt: "3006-01-01T01:01:01-0000",
 			},
 			out: `jeff