From 519484816d6e220f2d73f017f11eeff647331b72 Mon Sep 17 00:00:00 2001
From: Matt Moyer <moyerm@vmware.com>
Date: Tue, 4 Aug 2020 20:45:03 -0500
Subject: [PATCH] Clean up some lint errors that we missed before.

Signed-off-by: Matt Moyer <moyerm@vmware.com>
---
 pkg/client/client.go            |  2 +-
 pkg/client/client_test.go       |  3 ++-
 test/integration/client_test.go | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkg/client/client.go b/pkg/client/client.go
index d9e5bf33..843626d2 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -124,7 +124,7 @@ func ExchangeToken(ctx context.Context, token, caBundle, apiEndpoint string) (*C
 	}
 	defer func() { _ = resp.Body.Close() }()
 	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 {
diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
index ae62590d..d9b83854 100644
--- a/pkg/client/client_test.go
+++ b/pkg/client/client_test.go
@@ -72,6 +72,7 @@ func TestExchangeToken(t *testing.T) {
 		// Start a test server that doesn't do anything.
 		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)
 		require.EqualError(t, err, `could not build request: net/http: nil Context`)
 		require.Nil(t, got)
@@ -86,7 +87,7 @@ func TestExchangeToken(t *testing.T) {
 		})
 
 		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)
 	})
 
diff --git a/test/integration/client_test.go b/test/integration/client_test.go
index a9891687..0b161917 100644
--- a/test/integration/client_test.go
+++ b/test/integration/client_test.go
@@ -17,14 +17,17 @@ import (
 	"github.com/suzerain-io/placeholder-name/test/library"
 )
 
-var (
-	// Test certificate and private key that should get an authentication error. Generated with
-	// 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
+/*
+Test certificate and private key that should get an authentication error. Generated with cfssl [1], 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
+
+[1]: https://github.com/cloudflare/cfssl
+*/
+var (
 	testCert = strings.TrimSpace(`
 -----BEGIN CERTIFICATE-----
 MIICBDCCAaugAwIBAgIUeidKWlZQuoKfBGydObI1hMwzt9cwCgYIKoZIzj0EAwIw
@@ -40,7 +43,6 @@ c2VyMAoGCCqGSM49BAMCA0cAMEQCIEwPZhPpYhYHndfTEsWOxnxzJkmhAcYIMCeJ
 d9kyq/fPAiBNCJw1MCLT8LjNlyUZCfwI2zuI3e0w6vuau89oj2zvVA==
 -----END CERTIFICATE-----
 	`)
-
 	testKey = strings.TrimSpace(`
 -----BEGIN EC PRIVATE KEY-----
 MHcCAQEEIAqkBGGKTH5GzLx8XZLAHEFW2E8jT+jpy0p6w6MMR7DkoAoGCCqGSM49