Fix lint issues

coder · bryphe-coder · Feb 18, 2022 · Feb 16, 2022 · Feb 16, 2022 · Feb 16, 2022
commit 8ea29203a78b7b4d2e75b52dd44c0e7ab505bf42
diff --git a/cli/login.go b/cli/login.go
@@ -22,7 +22,6 @@ import (
 
 const (
 	goosWindows = "windows"
-	goosLinux   = "linux"
 	goosDarwin  = "darwin"
 )
 
@@ -173,7 +172,7 @@ func saveSessionToken(cmd *cobra.Command, client *codersdk.Client, sessionToken
 	client.SessionToken = sessionToken
 	resp, err := client.User(cmd.Context(), "me")
 	if err != nil {
-		return xerrors.Errorf("get user: ", err)
+		return xerrors.Errorf("get user: %w", err)
 	}
 
 	config := createConfig(cmd)
@@ -203,7 +202,7 @@ func isWSL() (bool, error) {
 }
 
 // openURL opens the provided URL via user's default browser
-func openURL(url string) error {
+func openURL(urlToOpen string) error {
 	var cmd string
 	var args []string
 
@@ -215,10 +214,10 @@ func openURL(url string) error {
 	if wsl {
 		cmd = "cmd.exe"
 		args = []string{"/c", "start"}
-		url = strings.ReplaceAll(url, "&", "^&")
-		args = append(args, url)
+		urlToOpen = strings.ReplaceAll(urlToOpen, "&", "^&")
+		args = append(args, urlToOpen)
 		return exec.Command(cmd, args...).Start()
 	}
 
-	return browser.OpenURL(url)
+	return browser.OpenURL(urlToOpen)
 }
diff --git a/cli/login_test.go b/cli/login_test.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/console"
-	"github.com/stretchr/testify/require"
 )
 
 func TestLogin(t *testing.T) {

diff --git a/cli/workspacecreate_test.go b/cli/workspacecreate_test.go
@@ -3,12 +3,13 @@ package cli_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/console"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
-	"github.com/stretchr/testify/require"
 )
 
 func TestWorkspaceCreate(t *testing.T) {

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -40,7 +40,7 @@ func New(options *Options) http.Handler {
 			r.Use(
 				httpmw.ExtractAPIKey(options.Database, nil),
 			)
-			r.Post("/", api.postApiKey)
+			r.Post("/", api.postAPIKey)
 		})
 
 		// Used for setup.

diff --git a/coderd/projectimport_test.go b/coderd/projectimport_test.go
@@ -5,13 +5,14 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/coderd"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/database"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
-	"github.com/stretchr/testify/require"
 )
 
 func TestPostProjectImportByOrganization(t *testing.T) {

diff --git a/coderd/users.go b/coderd/users.go
@@ -318,7 +318,7 @@ func (api *api) postLogin(rw http.ResponseWriter, r *http.Request) {
 }
 
 // Creates a new API key, used for logging in via the CLI
-func (api *api) postApiKey(rw http.ResponseWriter, r *http.Request) {
+func (api *api) postAPIKey(rw http.ResponseWriter, r *http.Request) {
 	apiKey := httpmw.APIKey(r)
 	userID := apiKey.UserID
 
@@ -348,10 +348,10 @@ func (api *api) postApiKey(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	// This format is consumed by the APIKey middleware.
-	generatedApiKey := fmt.Sprintf("%s-%s", keyID, keySecret)
+	generatedAPIKey := fmt.Sprintf("%s-%s", keyID, keySecret)
 
 	render.Status(r, http.StatusCreated)
-	render.JSON(rw, r, GenerateAPIKeyResponse{Key: generatedApiKey})
+	render.JSON(rw, r, GenerateAPIKeyResponse{Key: generatedAPIKey})
 }
 
 // Clear the user's session cookie

diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -129,7 +129,7 @@ func TestPostAPIKey(t *testing.T) {
 		// Clear session token
 		client.SessionToken = ""
 		// ...and request an API key
-		_, err := client.CreateApiKey(context.Background())
+		_, err := client.CreateAPIKey(context.Background())
 		var apiErr *codersdk.Error
 		require.ErrorAs(t, err, &apiErr)
 		require.Equal(t, http.StatusUnauthorized, apiErr.StatusCode())
@@ -139,7 +139,7 @@ func TestPostAPIKey(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t)
 		_ = coderdtest.CreateInitialUser(t, client)
-		apiKey, err := client.CreateApiKey(context.Background())
+		apiKey, err := client.CreateAPIKey(context.Background())
 		require.NotNil(t, apiKey)
 		require.GreaterOrEqual(t, len(apiKey.Key), 2)
 		require.NoError(t, err)

diff --git a/codersdk/projectimport_test.go b/codersdk/projectimport_test.go
@@ -5,12 +5,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/coderd"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
 )
 
 func TestCreateProjectImportJob(t *testing.T) {

diff --git a/codersdk/users.go b/codersdk/users.go
@@ -56,9 +56,9 @@ func (c *Client) CreateUser(ctx context.Context, req coderd.CreateUserRequest) (
 	return user, json.NewDecoder(res.Body).Decode(&user)
 }
 
-// CreateApiKey calls the /api-key API
-func (c *Client) CreateApiKey(ctx context.Context) (*coderd.GenerateAPIKeyResponse, error) {
-	res, err := c.request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/api-keys"), nil)
+// CreateAPIKey calls the /api-key API
+func (c *Client) CreateAPIKey(ctx context.Context) (*coderd.GenerateAPIKeyResponse, error) {
+	res, err := c.request(ctx, http.MethodPost, "/api/v2/api-keys", nil)
 	if err != nil {
 		return nil, err
 	}