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

Clean up some lint errors that we missed before.

Browse Source 
Signed-off-by: Matt Moyer <moyerm@vmware.com>
This commit is contained in:
Matt Moyer 2020-08-04 20:45:03 -05:00
parent 6da420d865
commit 519484816d
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/client/client.go
View File

@ -124,7 +124,7 @@ func ExchangeToken(ctx context.Context, token, caBundle, apiEndpoint string) (*C
} }
defer func() { _ = resp.Body.Close() }() defer func() { _ = resp.Body.Close() }()
if resp.StatusCode != http.StatusCreated { if resp.StatusCode != http.StatusCreated {
return nil, fmt.Errorf("could not login: server returned status %d", resp.StatusCode) return nil, fmt.Errorf("%w: server returned status %d", ErrLoginFailed, resp.StatusCode)
} }
var respBody struct { var respBody struct {

3
pkg/client/client_test.go
View File

@ -72,6 +72,7 @@ func TestExchangeToken(t *testing.T) {
// Start a test server that doesn't do anything. // Start a test server that doesn't do anything.
caBundle, endpoint := startTestServer(t, func(w http.ResponseWriter, r *http.Request) {}) caBundle, endpoint := startTestServer(t, func(w http.ResponseWriter, r *http.Request) {})
//nolint:staticcheck // ignore "do not pass a nil Context" linter error since that's what we're testing here.
got, err := ExchangeToken(nil, "", caBundle, endpoint) got, err := ExchangeToken(nil, "", caBundle, endpoint)
require.EqualError(t, err, `could not build request: net/http: nil Context`) require.EqualError(t, err, `could not build request: net/http: nil Context`)
require.Nil(t, got) require.Nil(t, got)
@ -86,7 +87,7 @@ func TestExchangeToken(t *testing.T) {
}) })
got, err := ExchangeToken(ctx, "", caBundle, endpoint) got, err := ExchangeToken(ctx, "", caBundle, endpoint)
require.EqualError(t, err, `could not login: server returned status 500`) require.EqualError(t, err, `login failed: server returned status 500`)
require.Nil(t, got) require.Nil(t, got)
}) })

18
test/integration/client_test.go
View File

@ -17,14 +17,17 @@ import (
"github.com/suzerain-io/placeholder-name/test/library" "github.com/suzerain-io/placeholder-name/test/library"
) )
var ( /*
// Test certificate and private key that should get an authentication error. Generated with Test certificate and private key that should get an authentication error. Generated with cfssl [1], like this:
// https://github.com/cloudflare/cfssl, like this:
// $ brew install cfssl
// $ cfssl print-defaults csr | cfssl genkey -initca - | cfssljson -bare ca
// $ cfssl print-defaults csr | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname=testuser - | cfssljson -bare client
// $ cat client.pem client-key.pem
$ brew install cfssl
$ cfssl print-defaults csr | cfssl genkey -initca - | cfssljson -bare ca
$ cfssl print-defaults csr | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname=testuser - | cfssljson -bare client
$ cat client.pem client-key.pem
[1]: https://github.com/cloudflare/cfssl
*/
var (
testCert = strings.TrimSpace(` testCert = strings.TrimSpace(`
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIICBDCCAaugAwIBAgIUeidKWlZQuoKfBGydObI1hMwzt9cwCgYIKoZIzj0EAwIw MIICBDCCAaugAwIBAgIUeidKWlZQuoKfBGydObI1hMwzt9cwCgYIKoZIzj0EAwIw
@ -40,7 +43,6 @@ c2VyMAoGCCqGSM49BAMCA0cAMEQCIEwPZhPpYhYHndfTEsWOxnxzJkmhAcYIMCeJ
d9kyq/fPAiBNCJw1MCLT8LjNlyUZCfwI2zuI3e0w6vuau89oj2zvVA== d9kyq/fPAiBNCJw1MCLT8LjNlyUZCfwI2zuI3e0w6vuau89oj2zvVA==
-----END CERTIFICATE----- -----END CERTIFICATE-----
`) `)
testKey = strings.TrimSpace(` testKey = strings.TrimSpace(`
-----BEGIN EC PRIVATE KEY----- -----BEGIN EC PRIVATE KEY-----
MHcCAQEEIAqkBGGKTH5GzLx8XZLAHEFW2E8jT+jpy0p6w6MMR7DkoAoGCCqGSM49 MHcCAQEEIAqkBGGKTH5GzLx8XZLAHEFW2E8jT+jpy0p6w6MMR7DkoAoGCCqGSM49