djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Capitalize "Concierge" in these error messages as well, for consistency.

Browse Source 
Signed-off-by: Matt Moyer <moyerm@vmware.com>
This commit is contained in:
Matt Moyer 2021-03-11 16:18:15 -06:00
parent 4f154100ff
commit a52455504f
No known key found for this signature in database
GPG Key ID: EAE88AD172C5AE2D
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/pinniped/cmd/login_oidc.go
View File

@ -144,7 +144,7 @@ func runOIDCLogin(cmd *cobra.Command, deps oidcLoginCommandDeps, flags oidcLogin
conciergeclient.WithAPIGroupSuffix(flags.conciergeAPIGroupSuffix), conciergeclient.WithAPIGroupSuffix(flags.conciergeAPIGroupSuffix),
) )
if err != nil { if err != nil {
return fmt.Errorf("invalid concierge parameters: %w", err) return fmt.Errorf("invalid Concierge parameters: %w", err)
} }
} }
@ -178,7 +178,7 @@ func runOIDCLogin(cmd *cobra.Command, deps oidcLoginCommandDeps, flags oidcLogin
cred, err = deps.exchangeToken(ctx, concierge, token.IDToken.Token) cred, err = deps.exchangeToken(ctx, concierge, token.IDToken.Token)
if err != nil { if err != nil {
return fmt.Errorf("could not complete concierge credential exchange: %w", err) return fmt.Errorf("could not complete Concierge credential exchange: %w", err)
} }
} }
return json.NewEncoder(cmd.OutOrStdout()).Encode(cred) return json.NewEncoder(cmd.OutOrStdout()).Encode(cred)

6
cmd/pinniped/cmd/login_oidc_test.go
View File

@ -92,7 +92,7 @@ func TestLoginOIDCCommand(t *testing.T) {
}, },
wantError: true, wantError: true,
wantStderr: here.Doc(` wantStderr: here.Doc(`
Error: invalid concierge parameters: endpoint must not be empty Error: invalid Concierge parameters: endpoint must not be empty
`), `),
}, },
{ {
@ -131,7 +131,7 @@ func TestLoginOIDCCommand(t *testing.T) {
}, },
wantError: true, wantError: true,
wantStderr: here.Doc(` wantStderr: here.Doc(`
Error: invalid concierge parameters: invalid API group suffix: a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*') Error: invalid Concierge parameters: invalid API group suffix: a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*')
`), `),
}, },
{ {
@ -161,7 +161,7 @@ func TestLoginOIDCCommand(t *testing.T) {
wantOptionsCount: 3, wantOptionsCount: 3,
wantError: true, wantError: true,
wantStderr: here.Doc(` wantStderr: here.Doc(`
Error: could not complete concierge credential exchange: some concierge error Error: could not complete Concierge credential exchange: some concierge error
`), `),
}, },
{ {

4
cmd/pinniped/cmd/login_static.go
View File

@ -93,7 +93,7 @@ func runStaticLogin(out io.Writer, deps staticLoginDeps, flags staticLoginParams
conciergeclient.WithAPIGroupSuffix(flags.conciergeAPIGroupSuffix), conciergeclient.WithAPIGroupSuffix(flags.conciergeAPIGroupSuffix),
) )
if err != nil { if err != nil {
return fmt.Errorf("invalid concierge parameters: %w", err) return fmt.Errorf("invalid Concierge parameters: %w", err)
} }
} }
@ -121,7 +121,7 @@ func runStaticLogin(out io.Writer, deps staticLoginDeps, flags staticLoginParams
var err error var err error
cred, err = deps.exchangeToken(ctx, concierge, token) cred, err = deps.exchangeToken(ctx, concierge, token)
if err != nil { if err != nil {
return fmt.Errorf("could not complete concierge credential exchange: %w", err) return fmt.Errorf("could not complete Concierge credential exchange: %w", err)
} }
} }
return json.NewEncoder(out).Encode(cred) return json.NewEncoder(out).Encode(cred)

6
cmd/pinniped/cmd/login_static_test.go
View File

@ -78,7 +78,7 @@ func TestLoginStaticCommand(t *testing.T) {
}, },
wantError: true, wantError: true,
wantStderr: here.Doc(` wantStderr: here.Doc(`
Error: invalid concierge parameters: endpoint must not be empty Error: invalid Concierge parameters: endpoint must not be empty
`), `),
}, },
{ {
@ -126,7 +126,7 @@ func TestLoginStaticCommand(t *testing.T) {
conciergeErr: fmt.Errorf("some concierge error"), conciergeErr: fmt.Errorf("some concierge error"),
wantError: true, wantError: true,
wantStderr: here.Doc(` wantStderr: here.Doc(`
Error: could not complete concierge credential exchange: some concierge error Error: could not complete Concierge credential exchange: some concierge error
`), `),
}, },
{ {
@ -141,7 +141,7 @@ func TestLoginStaticCommand(t *testing.T) {
}, },
wantError: true, wantError: true,
wantStderr: here.Doc(` wantStderr: here.Doc(`
Error: invalid concierge parameters: invalid API group suffix: a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*') Error: invalid Concierge parameters: invalid API group suffix: a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*')
`), `),
}, },
{ {