From 39e9e21313e1eb914a019c7cb77aea395d20e8c6 Mon Sep 17 00:00:00 2001
From: Kai Armstrong <karmstrong@gitlab.com>
Date: Thu, 17 Nov 2022 18:36:09 +0000
Subject: [PATCH] chore: re-add linting/formatting job to ci

---
 .gitlab-ci.yml                                |  5 ++-
 .gitlab/ci/lint.gitlab-ci.yml                 |  5 ++-
 .golangci.yml                                 | 18 +++++++--
 CONTRIBUTING.md                               | 40 +++++++++++++------
 api/client.go                                 |  3 ++
 api/client_test.go                            |  3 +-
 api/pipeline.go                               |  8 ++--
 api/repository_files.go                       |  1 -
 api/variable.go                               |  4 +-
 cmd/gen-docs/docs.go                          | 14 +++----
 commands/alias/alias.go                       |  2 +-
 commands/alias/delete/alias_delete.go         |  3 +-
 commands/alias/list/alias_list.go             |  2 +-
 commands/alias/set/alias_set.go               |  2 +-
 commands/alias/set/alias_set_test.go          | 14 ++++---
 commands/api/api.go                           |  2 +-
 commands/api/http.go                          |  1 -
 commands/api/http_test.go                     |  2 +-
 commands/auth/login/login.go                  |  1 -
 commands/auth/status/status_test.go           |  1 -
 commands/ci/artifact/artifact.go              |  5 +--
 commands/ci/ci.go                             |  2 +-
 commands/ci/ci_test.go                        |  1 -
 commands/ci/delete/delete.go                  |  4 +-
 commands/ci/get/get.go                        |  9 ++++-
 commands/ci/legacyci/pipeline_ci.go           |  2 +-
 commands/ci/legacyci/pipeline_ci_test.go      |  1 -
 commands/ci/lint/lint.go                      |  2 +-
 commands/ci/list/list.go                      |  2 +-
 commands/ci/retry/retry.go                    |  3 +-
 commands/ci/run/run.go                        |  2 +-
 commands/ci/status/status.go                  |  4 +-
 commands/ci/trace/trace.go                    |  2 +-
 commands/ci/trace/trace_test.go               |  2 -
 commands/ci/view/view.go                      | 10 +++--
 commands/ci/view/view_test.go                 |  3 +-
 commands/cmdtest/helper.go                    |  2 +-
 commands/cmdutils/cmdutils.go                 |  1 -
 commands/cmdutils/cmdutils_test.go            |  5 +--
 commands/cmdutils/factory.go                  |  1 -
 commands/completion/completion.go             |  2 +-
 commands/config/config.go                     |  2 +-
 commands/issue/board/board.go                 |  2 +-
 .../issue/board/create/issue_board_create.go  |  2 +-
 .../board/create/issue_board_create_test.go   |  1 -
 commands/issue/board/view/issue_board_view.go | 23 ++++++-----
 commands/issue/close/issue_close.go           |  2 +-
 commands/issue/close/issue_close_test.go      |  3 +-
 commands/issue/create/issue_create.go         |  2 +-
 commands/issue/create/issue_create_test.go    |  3 +-
 commands/issue/delete/issue_delete.go         |  2 +-
 commands/issue/delete/issue_delete_test.go    |  1 -
 commands/issue/issue.go                       |  2 +-
 commands/issue/issueutils/utils.go            |  7 ++--
 commands/issue/list/issue_list.go             |  4 +-
 commands/issue/list/issue_list_test.go        |  2 -
 commands/issue/note/issue_note_create.go      |  2 +-
 commands/issue/note/issue_note_create_test.go |  3 --
 commands/issue/reopen/issue_reopen.go         |  3 +-
 commands/issue/subscribe/issue_subscribe.go   |  2 +-
 .../issue/unsubscribe/issue_unsubscribe.go    |  2 +-
 commands/issue/update/issue_update.go         |  2 +-
 commands/issue/update/issue_update_test.go    |  1 -
 commands/issue/view/issue_view.go             |  5 +--
 commands/issue/view/issue_view_test.go        |  1 -
 commands/label/create/label_create.go         |  3 +-
 commands/label/label.go                       |  2 +-
 commands/label/list/label_list.go             |  3 +-
 commands/mr/approve/mr_approve.go             |  4 +-
 commands/mr/approvers/mr_approvers.go         |  2 +-
 commands/mr/checkout/mr_checkout.go           |  7 +---
 commands/mr/close/mr_close.go                 |  2 +-
 commands/mr/create/mr_create.go               |  4 +-
 commands/mr/create/mr_create_test.go          |  3 +-
 commands/mr/delete/mr_delete.go               |  2 +-
 commands/mr/delete/mr_delete_test.go          |  1 -
 commands/mr/for/mr_for.go                     |  3 +-
 commands/mr/issues/mr_issues.go               |  2 +-
 commands/mr/list/mr_list.go                   |  5 +--
 commands/mr/merge/mr_merge.go                 |  6 +--
 commands/mr/mr.go                             |  2 +-
 commands/mr/mr_test.go                        |  1 -
 commands/mr/mrutils/mrutils_test.go           |  1 -
 commands/mr/note/mr_note_create.go            |  2 +-
 commands/mr/note/mr_note_create_test.go       |  4 --
 commands/mr/rebase/mr_rebase.go               |  4 +-
 commands/mr/reopen/mr_reopen.go               |  2 +-
 commands/mr/revoke/mr_revoke.go               |  2 +-
 commands/mr/subscribe/mr_subscribe.go         |  2 +-
 commands/mr/subscribe/mr_subscribe_test.go    |  3 +-
 commands/mr/todo/mr_todo.go                   |  2 +-
 commands/mr/unsubscribe/mr_unsubscribe.go     |  2 +-
 commands/mr/update/mr_update.go               |  2 +-
 commands/mr/update/mr_update_test.go          |  6 ++-
 commands/mr/view/mr_view.go                   |  2 +-
 commands/mr/view/mr_view_test.go              |  1 -
 commands/project/archive/repo_archive.go      |  2 +-
 commands/project/clone/repo_clone.go          |  6 +--
 commands/project/clone/repo_clone_test.go     | 14 +++----
 .../project/contributors/repo_contributors.go |  2 +-
 commands/project/create/project_create.go     |  3 +-
 commands/project/delete/delete.go             |  4 +-
 commands/project/fork/fork.go                 |  8 ++--
 commands/project/list/list.go                 |  2 +-
 commands/project/mirror/project_mirror.go     |  6 +--
 commands/project/repo.go                      |  2 +-
 commands/project/repo_test.go                 |  1 -
 commands/project/search/project_search.go     |  3 +-
 commands/project/transfer/project_transfer.go |  2 +-
 commands/project/view/project_view.go         |  7 ++--
 commands/release/download/download.go         |  5 ++-
 commands/release/list/release_list.go         |  3 +-
 commands/release/list/release_list_test.go    |  2 -
 commands/release/release.go                   |  2 +-
 commands/release/releaseutils/releaseutils.go |  3 +-
 commands/release/view/view.go                 |  4 +-
 commands/root.go                              |  2 +-
 commands/snippet/create/create.go             |  2 +-
 commands/snippet/snippet.go                   |  2 +-
 commands/snippet/snippet_test.go              |  1 -
 commands/ssh-key/get/get.go                   |  2 +-
 commands/update/check_update.go               |  2 +-
 commands/user/events/events.go                |  1 -
 commands/user/user.go                         |  2 +-
 commands/variable/delete/delete.go            |  4 +-
 commands/variable/delete/delete_test.go       |  4 +-
 commands/variable/get/get.go                  |  1 -
 commands/variable/list/list.go                |  2 +-
 commands/variable/update/update.go            |  1 -
 commands/version/version.go                   |  2 +-
 internal/config/config_file.go                | 11 ++---
 internal/config/config_migration.go           |  2 +-
 internal/config/config_type.go                |  3 +-
 internal/config/config_type_test.go           |  6 +--
 internal/config/testing.go                    |  1 -
 internal/config/writefile_test.go             |  4 +-
 internal/glrepo/repo_test.go                  |  1 -
 internal/glrepo/resolver_test.go              |  1 -
 pkg/git/git.go                                |  3 --
 pkg/git/git_test.go                           |  1 -
 pkg/glinstance/host.go                        |  6 ++-
 pkg/httpmock/stub.go                          |  6 ++-
 pkg/iostreams/color_test.go                   |  1 -
 pkg/iostreams/iostreams_test.go               |  2 -
 pkg/text/truncate_test.go                     |  1 -
 pkg/utils/utils_test.go                       |  2 +-
 146 files changed, 253 insertions(+), 269 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a0f6632..967f6705 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,17 +20,20 @@ include:
   - template: Security/SAST.gitlab-ci.yml
   - template: Security/Dependency-Scanning.gitlab-ci.yml
   - template: Security/Secret-Detection.gitlab-ci.yml
+  - local: .gitlab/ci/*.gitlab-ci.yml
 
 
 # From: https://docs.gitlab.com/ee/ci/caching/#cache-go-dependencies
 .go-cache:
   variables:
     GOPATH: $CI_PROJECT_DIR/.go
+    GOLANGCI_LINT_CACHE: $CI_PROJECT_DIR/.golangci-lint
   before_script:
-    - mkdir -p .go
+    - mkdir -p .go .golangci-lint
   cache:
     paths:
       - .go/pkg/mod/
+      - .golangci-lint/
 
 .documentation:
   stage: documentation
diff --git a/.gitlab/ci/lint.gitlab-ci.yml b/.gitlab/ci/lint.gitlab-ci.yml
index 29ca259d..a3bd1406 100644
--- a/.gitlab/ci/lint.gitlab-ci.yml
+++ b/.gitlab/ci/lint.gitlab-ci.yml
@@ -1,13 +1,14 @@
 lint:
+  extends: .go-cache
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:golangci-lint-alpine
   stage: test
   script:
+    - golangci-lint --version
     # Use default .golangci.yml file from the image if one is not present in the project root.
     - '[ -e .golangci.yml ] || cp /golangci/.golangci.yml .'
     # Write the code coverage report to gl-code-quality-report.json
-    # and print linting issues to stdout in the format: path/to/file:line description
     # remove `--issues-exit-code 0` or set to non-zero to fail the job if linting issues are detected
-    - golangci-lint run --issues-exit-code 0 --out-format code-climate | tee gl-code-quality-report.json | jq -r '.[] | "\(.location.path):\(.location.lines.begin) \(.description)"'
+    - golangci-lint run --out-format colored-line-number:stdout,code-climate:gl-code-quality-report.json
   artifacts:
     reports:
       codequality: gl-code-quality-report.json
diff --git a/.golangci.yml b/.golangci.yml
index f3f3e90f..bddcd06a 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,17 @@
-linters:
-    enable:
-        - gofmt
-
 run:
     timeout: 5m
     modules-download-mode: readonly
+
+linters:
+    disable-all: true
+    enable:
+        - errcheck
+        - exportloopref
+        - gofumpt
+        - goimports
+        - gosimple
+        - govet
+        - ineffassign
+        - staticcheck
+        - typecheck
+        - unused
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9cd78614..77a7de4e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,5 @@
+# Contributing Guide
+
 ## Developer Certificate of Origin + License
 
 Contributions to this repository are subject to the [Developer Certificate of Origin](https://docs.gitlab.com/ee/legal/developer_certificate_of_origin.html#developer-certificate-of-origin-version-11).
@@ -16,26 +18,29 @@ Use your best judgement, and feel free to propose changes to this document in a
 
 Please do:
 
-* Check existing issues to verify that the bug or feature request has not already been submitted.
-* Open an issue if things aren't working as expected.
-* Open an issue to propose a significant change.
-* Open an issue to propose a feature.
-* Open a merge request to fix a bug.
-* Open a merge request to fix documentation about a command.
-* Open a merge request for an issue and leave a comment claiming it.
+- Check existing issues to verify that the bug or feature request has not already been submitted.
+- Open an issue if things aren't working as expected.
+- Open an issue to propose a significant change.
+- Open an issue to propose a feature.
+- Open a merge request to fix a bug.
+- Open a merge request to fix documentation about a command.
+- Open a merge request for an issue and leave a comment claiming it.
 
 Please avoid:
 
-* Opening merge requests for issues marked `blocked`.
-* Opening merge requests for documentation for a new command specifically. Manual pages are auto-generated from source after every release
+- Opening merge requests for issues marked `blocked`.
+- Opening merge requests for documentation for a new command specifically. Manual pages are auto-generated from source after every release
+
 ## Code of Conduct
 
 We want to create a welcoming environment for everyone who is interested in contributing. Visit our [Code of Conduct page](https://about.gitlab.com/community/contribute/code-of-conduct/) to learn more about our commitment to an open and welcoming environment.
 
 ## Getting Started
+
 ### Building the project
 
 Prerequisites:
+
 - Go 1.16+
 
 Build with: `make` or `go build -o bin/glab ./cmd/glab/main.go`
@@ -59,6 +64,15 @@ on [GitLab.com](https://gitlab.com).
 1. Make your change, add tests, and ensure tests pass
 1. Submit a merge request
 
+### Formatting your code
+
+We use [`golangci-lint`](https://golangci-lint.run/) to lint and format
+the code in this project. The linter configuration can be seen
+[here](https://gitlab.com/gitlab-org/cli/-/blob/main/.golangci.yml).
+
+Additional details about code style and format are in the
+[go guide](https://docs.gitlab.com/ee/development/go_guide/#code-style-and-format).
+
 ## Commit Messages
 
 ### TL;DR: Your commit message should be semantic
@@ -76,6 +90,7 @@ Any line of the commit message cannot be longer than 100 characters! This allows
 ```
 
 ### Message Header
+
 Ideally, the commit message heading which contains the description, should not be more than 50 characters
 
 The message header is a single line that contains a succinct description of the change containing a type, an optional scope, and a subject.
@@ -100,9 +115,9 @@ Scope can be anything specifying the place of the commit change. For example eve
 
 This is a very short description of the change
 
-* `use imperative, present tense: “change” not “changed” nor “changes”`
-* `don't capitalize the first letter`
-* `no dot (.) at the end`
+- `use imperative, present tense: “change” not “changed” nor “changes”`
+- `don't capitalize the first letter`
+- `no dot (.) at the end`
 
 ### Message Body
 
@@ -137,4 +152,3 @@ fix(login): allow provided user preferences to override default preferences
 
 Fixes #025
 ```
-
diff --git a/api/client.go b/api/client.go
index 263f2132..3a50a80f 100644
--- a/api/client.go
+++ b/api/client.go
@@ -78,6 +78,7 @@ func GetClient() *Client {
 
 // HTTPClient returns the httpClient instance used to initialise the gitlab api client
 func HTTPClient() *http.Client { return apiClient.HTTPClient() }
+
 func (c *Client) HTTPClient() *http.Client {
 	if c.httpClientOverride != nil {
 		return c.httpClientOverride
@@ -90,12 +91,14 @@ func (c *Client) HTTPClient() *http.Client {
 
 // OverrideHTTPClient overrides the default http client
 func OverrideHTTPClient(client *http.Client) { apiClient.OverrideHTTPClient(client) }
+
 func (c *Client) OverrideHTTPClient(client *http.Client) {
 	c.httpClientOverride = client
 }
 
 // Token returns the authentication token
 func Token() string { return apiClient.Token() }
+
 func (c *Client) Token() string {
 	return c.token
 }
diff --git a/api/client_test.go b/api/client_test.go
index f4523351..001e9b0e 100644
--- a/api/client_test.go
+++ b/api/client_test.go
@@ -11,7 +11,7 @@ func Test_tlsConfig(t *testing.T) {
 	type args struct {
 		host string
 	}
-	var tests = []struct {
+	tests := []struct {
 		name string
 		args args
 		want []uint16
@@ -38,7 +38,6 @@ func Test_tlsConfig(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			client := tlsConfig(tt.args.host)
 
 			assert.Equal(t, tt.want, client.CipherSuites)
diff --git a/api/pipeline.go b/api/pipeline.go
index 86372a67..94293e16 100644
--- a/api/pipeline.go
+++ b/api/pipeline.go
@@ -166,7 +166,6 @@ var GetPipeline = func(client *gitlab.Client, pid int, l *gitlab.RequestOptionFu
 	}
 
 	pipe, _, err := client.Pipelines.GetPipeline(repo, pid)
-
 	if err != nil {
 		return nil, err
 	}
@@ -179,13 +178,12 @@ var GetPipelineVariables = func(client *gitlab.Client, pid int, l *gitlab.Reques
 	}
 
 	pipe, _, err := client.Pipelines.GetPipeline(repo, pid)
-    if err != nil {
-        return nil, err
-    }
+	if err != nil {
+		return nil, err
+	}
 	projectID := pipe.ProjectID
 
 	pipelineVars, _, err := client.Pipelines.GetPipelineVariables(projectID, pid)
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/api/repository_files.go b/api/repository_files.go
index 62742297..1ef1081a 100644
--- a/api/repository_files.go
+++ b/api/repository_files.go
@@ -12,7 +12,6 @@ var GetFile = func(client *gitlab.Client, projectID interface{}, path string, re
 		Ref: &ref,
 	}
 	file, _, err := client.RepositoryFiles.GetFile(projectID, path, fileOpts)
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/api/variable.go b/api/variable.go
index 589f26cb..31e1bac8 100644
--- a/api/variable.go
+++ b/api/variable.go
@@ -55,7 +55,6 @@ var DeleteProjectVariable = func(client *gitlab.Client, projectID interface{}, k
 		},
 	}
 	_, err := client.ProjectVariables.RemoveVariable(projectID, key, reqOpts)
-
 	if err != nil {
 		return err
 	}
@@ -68,7 +67,7 @@ var UpdateProjectVariable = func(client *gitlab.Client, projectID interface{}, k
 		client = apiClient.Lab()
 	}
 
-	var filter = func(request *retryablehttp.Request) error {
+	filter := func(request *retryablehttp.Request) error {
 		q := request.URL.Query()
 		q.Add("filter[environment_scope]", *opts.EnvironmentScope)
 
@@ -127,7 +126,6 @@ var DeleteGroupVariable = func(client *gitlab.Client, groupID interface{}, key s
 	}
 
 	_, err := client.GroupVariables.RemoveVariable(groupID, key)
-
 	if err != nil {
 		return err
 	}
diff --git a/cmd/gen-docs/docs.go b/cmd/gen-docs/docs.go
index 589097f7..fa0e6187 100644
--- a/cmd/gen-docs/docs.go
+++ b/cmd/gen-docs/docs.go
@@ -36,7 +36,7 @@ func main() {
 		}
 		os.Exit(1)
 	}
-	err := os.MkdirAll(*path, 0755)
+	err := os.MkdirAll(*path, 0o755)
 	if err != nil {
 		fatal(err)
 	}
@@ -75,7 +75,7 @@ func genWebDocs(glabCli *cobra.Command, path string) error {
 	for _, cmd := range cmds {
 		fmt.Println("Generating docs for " + cmd.Name())
 		// create directories for parent commands
-		_ = os.MkdirAll(path+cmd.Name(), 0750)
+		_ = os.MkdirAll(path+cmd.Name(), 0o750)
 
 		// Generate parent command
 		out := new(bytes.Buffer)
@@ -88,7 +88,7 @@ func genWebDocs(glabCli *cobra.Command, path string) error {
 		for _, cmdC := range cmd.Commands() {
 			if cmdC.HasAvailableSubCommands() {
 				fmt.Println("Generating subcommand docs for " + cmdC.Name())
-				_ = os.MkdirAll(path+cmd.Name()+"/"+cmdC.Name(), 0750)
+				_ = os.MkdirAll(path+cmd.Name()+"/"+cmdC.Name(), 0o750)
 
 				// Generate parent command
 				out := new(bytes.Buffer)
@@ -97,7 +97,7 @@ func genWebDocs(glabCli *cobra.Command, path string) error {
 					return err
 				}
 
-				err = config.WriteFile(path+cmd.Name()+"/"+cmdC.Name()+"/index.md", out.Bytes(), 0755)
+				err = config.WriteFile(path+cmd.Name()+"/"+cmdC.Name()+"/index.md", out.Bytes(), 0o755)
 				if err != nil {
 					return err
 				}
@@ -119,7 +119,7 @@ func genWebDocs(glabCli *cobra.Command, path string) error {
 			}
 		}
 
-		err = config.WriteFile(path+cmd.Name()+"/index.md", out.Bytes(), 0755)
+		err = config.WriteFile(path+cmd.Name()+"/index.md", out.Bytes(), 0o755)
 		if err != nil {
 			return err
 		}
@@ -190,14 +190,14 @@ func GenMarkdownCustom(cmd *cobra.Command, w io.Writer) error {
 	buf := new(bytes.Buffer)
 	name := cmd.CommandPath()
 
-	//GitLab Specific Docs Metadata
+	// GitLab Specific Docs Metadata
 	buf.WriteString("---" + "\n")
 	buf.WriteString("stage: Create" + "\n")
 	buf.WriteString("group: Code Review" + "\n")
 	buf.WriteString("info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments" + "\n")
 	buf.WriteString("---" + "\n\n")
 
-	//Generated by a script
+	// Generated by a script
 	buf.WriteString("<!--" + "\n")
 	buf.WriteString("This documentation is auto generated by a script." + "\n")
 	buf.WriteString("Please do not edit this file directly, check cmd/gen-docs/docs.go." + "\n")
diff --git a/commands/alias/alias.go b/commands/alias/alias.go
index 0f809dec..5bce645e 100644
--- a/commands/alias/alias.go
+++ b/commands/alias/alias.go
@@ -10,7 +10,7 @@ import (
 )
 
 func NewCmdAlias(f *cmdutils.Factory) *cobra.Command {
-	var aliasCmd = &cobra.Command{
+	aliasCmd := &cobra.Command{
 		Use:   "alias [command] [flags]",
 		Short: `Create, list and delete aliases`,
 		Long:  ``,
diff --git a/commands/alias/delete/alias_delete.go b/commands/alias/delete/alias_delete.go
index ea58864a..bd938a4c 100644
--- a/commands/alias/delete/alias_delete.go
+++ b/commands/alias/delete/alias_delete.go
@@ -23,7 +23,7 @@ func NewCmdDelete(f *cmdutils.Factory, runF func(*DeleteOptions) error) *cobra.C
 		IO:     f.IO,
 	}
 
-	var aliasDeleteCmd = &cobra.Command{
+	aliasDeleteCmd := &cobra.Command{
 		Use:   "delete <alias name> [flags]",
 		Short: `Delete an alias.`,
 		Long:  ``,
@@ -54,7 +54,6 @@ func deleteRun(cmd *cobra.Command, opts *DeleteOptions) error {
 	expansion, ok := aliasCfg.Get(opts.Name)
 	if !ok {
 		return fmt.Errorf("no such alias %s", opts.Name)
-
 	}
 	err = aliasCfg.Delete(opts.Name)
 	if err != nil {
diff --git a/commands/alias/list/alias_list.go b/commands/alias/list/alias_list.go
index 2b886e01..09d8fe57 100644
--- a/commands/alias/list/alias_list.go
+++ b/commands/alias/list/alias_list.go
@@ -25,7 +25,7 @@ func NewCmdList(f *cmdutils.Factory, runF func(*ListOptions) error) *cobra.Comma
 		IO:     f.IO,
 	}
 
-	var aliasListCmd = &cobra.Command{
+	aliasListCmd := &cobra.Command{
 		Use:   "list [flags]",
 		Short: `List the available aliases.`,
 		Long:  ``,
diff --git a/commands/alias/set/alias_set.go b/commands/alias/set/alias_set.go
index d2647fbb..9e7dc7b5 100644
--- a/commands/alias/set/alias_set.go
+++ b/commands/alias/set/alias_set.go
@@ -28,7 +28,7 @@ func NewCmdSet(f *cmdutils.Factory, runF func(*SetOptions) error) *cobra.Command
 		Config: f.Config,
 	}
 
-	var aliasSetCmd = &cobra.Command{
+	aliasSetCmd := &cobra.Command{
 		Use:   "set <alias name> '<command>' [flags]",
 		Short: `Set an alias.`,
 		Long: heredoc.Doc(`
diff --git a/commands/alias/set/alias_set_test.go b/commands/alias/set/alias_set_test.go
index 252a87cd..4f851f79 100644
--- a/commands/alias/set/alias_set_test.go
+++ b/commands/alias/set/alias_set_test.go
@@ -83,7 +83,6 @@ func TestAliasSet_empty_aliases(t *testing.T) {
 	`))
 
 	output, err := runCommand(cfg, true, "co 'mr checkout'")
-
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -135,13 +134,17 @@ func TestAliasSet_arg_processing(t *testing.T) {
 
 		{`iz 'issue list'`, "- Adding alias for.*iz.*issue list", "iz: issue list"},
 
-		{`ii 'issue list --author="$1" --label="$2"'`,
+		{
+			`ii 'issue list --author="$1" --label="$2"'`,
 			`- Adding alias for.*ii.*issue list --author="\$1" --label="\$2"`,
-			`ii: issue list --author="\$1" --label="\$2"`},
+			`ii: issue list --author="\$1" --label="\$2"`,
+		},
 
-		{`ix "issue list --author='\$1' --label='\$2'"`,
+		{
+			`ix "issue list --author='\$1' --label='\$2'"`,
 			`- Adding alias for.*ix.*issue list --author='\$1' --label='\$2'`,
-			`ix: issue list --author='\$1' --label='\$2'`},
+			`ix: issue list --author='\$1' --label='\$2'`,
+		},
 	}
 
 	for _, c := range cases {
@@ -198,7 +201,6 @@ view: mr view
 
 	test.ExpectLines(t, output.Stderr(), "Adding alias for.*view.*mr view", "Added alias.")
 	assert.Equal(t, expected, mainBuf.String())
-
 }
 
 func TestAliasSet_invalid_command(t *testing.T) {
diff --git a/commands/api/api.go b/commands/api/api.go
index d3ad1f67..76c6e4f6 100644
--- a/commands/api/api.go
+++ b/commands/api/api.go
@@ -104,7 +104,7 @@ func NewCmdApi(f *cmdutils.Factory, runF func(*ApiOptions) error) *cobra.Command
 		there are no more pages of results. For GraphQL requests, this requires that the
 		original query accepts an '$endCursor: String' variable and that it fetches the
 		'pageInfo{ hasNextPage, endCursor }' set of fields from a collection.
-		`,"`"),
+		`, "`"),
 		Example: heredoc.Doc(`
 			$ glab api projects/:fullpath/releases
 
diff --git a/commands/api/http.go b/commands/api/http.go
index b8a925bf..359bf1c5 100644
--- a/commands/api/http.go
+++ b/commands/api/http.go
@@ -68,7 +68,6 @@ func httpRequest(client *api.Client, config config.Config, hostname string, meth
 
 	baseURL, _ = url.Parse(baseURLStr)
 	req, err := api.NewHTTPRequest(client, method, baseURL, body, headers, bodyIsJSON)
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/commands/api/http_test.go b/commands/api/http_test.go
index 9825e3b1..86b50525 100644
--- a/commands/api/http_test.go
+++ b/commands/api/http_test.go
@@ -100,7 +100,7 @@ hosts:
 	if envIsSet && originalEnvVarToken != "" {
 		_ = os.Setenv("GITLAB_TOKEN", "")
 	}
-	var client = &http.Client{}
+	client := &http.Client{}
 	client.Transport = roundTripFunc(func(req *http.Request) (*http.Response, error) {
 		t.Log("Tsti")
 		return &http.Response{
diff --git a/commands/auth/login/login.go b/commands/auth/login/login.go
index 3464c900..730808f0 100644
--- a/commands/auth/login/login.go
+++ b/commands/auth/login/login.go
@@ -137,7 +137,6 @@ func loginRun() error {
 				"GitLab Self-hosted Instance",
 			},
 		}, &hostType)
-
 		if err != nil {
 			return fmt.Errorf("could not prompt: %w", err)
 		}
diff --git a/commands/auth/status/status_test.go b/commands/auth/status/status_test.go
index 40f6f3e8..287128f2 100644
--- a/commands/auth/status/status_test.go
+++ b/commands/auth/status/status_test.go
@@ -282,7 +282,6 @@ git_protocol: ssh
 		IO: io,
 	}
 	t.Run("no instance authenticated", func(t *testing.T) {
-
 		err := statusRun(opts)
 		assert.Equal(t, err, cmdutils.SilentError)
 		assert.Equal(t, stdout.String(), "")
diff --git a/commands/ci/artifact/artifact.go b/commands/ci/artifact/artifact.go
index b08dbc55..86b39f6c 100644
--- a/commands/ci/artifact/artifact.go
+++ b/commands/ci/artifact/artifact.go
@@ -15,7 +15,7 @@ import (
 )
 
 func NewCmdRun(f *cmdutils.Factory) *cobra.Command {
-	var jobArtifactCmd = &cobra.Command{
+	jobArtifactCmd := &cobra.Command{
 		Use:     "artifact <refName> <jobName> [flags]",
 		Short:   `Download all Artifacts from the last pipeline`,
 		Aliases: []string{"push"},
@@ -26,7 +26,6 @@ func NewCmdRun(f *cmdutils.Factory) *cobra.Command {
 		Long: ``,
 		Args: cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			repo, err := f.BaseRepo()
 			if err != nil {
 				return err
@@ -51,7 +50,7 @@ func NewCmdRun(f *cmdutils.Factory) *cobra.Command {
 			}
 
 			if !config.CheckPathExists(path) {
-				if err := os.Mkdir(path, 0755); err != nil {
+				if err := os.Mkdir(path, 0o755); err != nil {
 					return err
 				}
 			}
diff --git a/commands/ci/ci.go b/commands/ci/ci.go
index 89c816e6..44a18490 100644
--- a/commands/ci/ci.go
+++ b/commands/ci/ci.go
@@ -18,7 +18,7 @@ import (
 )
 
 func NewCmdCI(f *cmdutils.Factory) *cobra.Command {
-	var ciCmd = &cobra.Command{
+	ciCmd := &cobra.Command{
 		Use:     "ci <command> [flags]",
 		Short:   `Work with GitLab CI pipelines and jobs`,
 		Long:    ``,
diff --git a/commands/ci/ci_test.go b/commands/ci/ci_test.go
index bcd21e53..674ce1a3 100644
--- a/commands/ci/ci_test.go
+++ b/commands/ci/ci_test.go
@@ -31,5 +31,4 @@ func TestPipelineCmd(t *testing.T) {
 	out := <-outC
 
 	assert.Contains(t, out, "Use \"ci [command] --help\" for more information about a command.\n")
-
 }
diff --git a/commands/ci/delete/delete.go b/commands/ci/delete/delete.go
index 98ef93be..c0b2a1b8 100644
--- a/commands/ci/delete/delete.go
+++ b/commands/ci/delete/delete.go
@@ -15,7 +15,7 @@ import (
 )
 
 func NewCmdDelete(f *cmdutils.Factory) *cobra.Command {
-	var pipelineDeleteCmd = &cobra.Command{
+	pipelineDeleteCmd := &cobra.Command{
 		Use:   "delete <id> [flags]",
 		Short: `Delete a CI pipeline`,
 		Example: heredoc.Doc(`
@@ -25,7 +25,6 @@ func NewCmdDelete(f *cmdutils.Factory) *cobra.Command {
 		Long: ``,
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			var err error
 			c := f.IO.Color()
 			apiClient, err := f.HttpClient()
@@ -71,7 +70,6 @@ func NewCmdDelete(f *cmdutils.Factory) *cobra.Command {
 			}
 
 			return nil
-
 		},
 	}
 
diff --git a/commands/ci/get/get.go b/commands/ci/get/get.go
index 59cd55dc..8b43d59e 100644
--- a/commands/ci/get/get.go
+++ b/commands/ci/get/get.go
@@ -22,7 +22,7 @@ type PipelineMergedResponse struct {
 }
 
 func NewCmdGet(f *cmdutils.Factory) *cobra.Command {
-	var pipelineGetCmd = &cobra.Command{
+	pipelineGetCmd := &cobra.Command{
 		Use:     "get [flags]",
 		Short:   `Get JSON of a running CI pipeline on current or other branch specified`,
 		Aliases: []string{"stats"},
@@ -64,7 +64,14 @@ func NewCmdGet(f *cmdutils.Factory) *cobra.Command {
 			}
 
 			jobs, err := api.GetPipelineJobs(apiClient, pipelineId, repo.FullName())
+			if err != nil {
+				return err
+			}
+
 			variables, err := api.GetPipelineVariables(apiClient, pipelineId, nil, repo.FullName())
+			if err != nil {
+				return err
+			}
 
 			mergedPipelineObject := &PipelineMergedResponse{
 				Pipeline:  pipeline,
diff --git a/commands/ci/legacyci/pipeline_ci.go b/commands/ci/legacyci/pipeline_ci.go
index 69dc4224..7323bbf1 100644
--- a/commands/ci/legacyci/pipeline_ci.go
+++ b/commands/ci/legacyci/pipeline_ci.go
@@ -14,7 +14,7 @@ import (
 )
 
 func NewCmdCI(f *cmdutils.Factory) *cobra.Command {
-	var pipelineCICmd = &cobra.Command{
+	pipelineCICmd := &cobra.Command{
 		Use:   "ci <command> [flags]",
 		Short: `Work with GitLab CI pipelines and jobs`,
 		Example: heredoc.Doc(`
diff --git a/commands/ci/legacyci/pipeline_ci_test.go b/commands/ci/legacyci/pipeline_ci_test.go
index ea4fc5ba..218cfbe8 100644
--- a/commands/ci/legacyci/pipeline_ci_test.go
+++ b/commands/ci/legacyci/pipeline_ci_test.go
@@ -30,5 +30,4 @@ func TestNewCmdCI(t *testing.T) {
 	assert.Contains(t, stdout.String(), "Work with GitLab CI pipelines and jobs\n")
 	assert.Contains(t, stderr.String(), "")
 	assert.Contains(t, stdout.String(), "This command is deprecated. All the commands under it has been moved to `ci` or `pipeline` command. See https://gitlab.com/gitlab-org/cli/issues/372 for more info.\n")
-
 }
diff --git a/commands/ci/lint/lint.go b/commands/ci/lint/lint.go
index eaacb987..7759e19a 100644
--- a/commands/ci/lint/lint.go
+++ b/commands/ci/lint/lint.go
@@ -17,7 +17,7 @@ import (
 )
 
 func NewCmdLint(f *cmdutils.Factory) *cobra.Command {
-	var pipelineCILintCmd = &cobra.Command{
+	pipelineCILintCmd := &cobra.Command{
 		Use:   "lint",
 		Short: "Checks if your `.gitlab-ci.yml` file is valid.",
 		Args:  cobra.MaximumNArgs(1),
diff --git a/commands/ci/list/list.go b/commands/ci/list/list.go
index 3e42ec2a..60f2fc05 100644
--- a/commands/ci/list/list.go
+++ b/commands/ci/list/list.go
@@ -14,7 +14,7 @@ import (
 )
 
 func NewCmdList(f *cmdutils.Factory) *cobra.Command {
-	var pipelineListCmd = &cobra.Command{
+	pipelineListCmd := &cobra.Command{
 		Use:   "list [flags]",
 		Short: `Get the list of CI pipelines`,
 		Example: heredoc.Doc(`
diff --git a/commands/ci/retry/retry.go b/commands/ci/retry/retry.go
index 4328550a..e1254a1b 100644
--- a/commands/ci/retry/retry.go
+++ b/commands/ci/retry/retry.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdRetry(f *cmdutils.Factory) *cobra.Command {
-	var pipelineRetryCmd = &cobra.Command{
+	pipelineRetryCmd := &cobra.Command{
 		Use:     "retry <job-id>",
 		Short:   `Retry a CI job`,
 		Aliases: []string{},
@@ -48,7 +48,6 @@ func NewCmdRetry(f *cmdutils.Factory) *cobra.Command {
 			fmt.Fprintln(f.IO.StdOut, "Retried job (id:", job.ID, "), status:", job.Status, ", ref:", job.Ref, ", weburl: ", job.WebURL, ")")
 
 			return nil
-
 		},
 	}
 
diff --git a/commands/ci/run/run.go b/commands/ci/run/run.go
index 3cc290f9..118f67c6 100644
--- a/commands/ci/run/run.go
+++ b/commands/ci/run/run.go
@@ -85,7 +85,7 @@ func extractFileVar(s string) (*gitlab.PipelineVariableOptions, error) {
 }
 
 func NewCmdRun(f *cmdutils.Factory) *cobra.Command {
-	var pipelineRunCmd = &cobra.Command{
+	pipelineRunCmd := &cobra.Command{
 		Use:     "run [flags]",
 		Short:   `Create or run a new CI pipeline`,
 		Aliases: []string{"create"},
diff --git a/commands/ci/status/status.go b/commands/ci/status/status.go
index f4bc5dde..638e81cb 100644
--- a/commands/ci/status/status.go
+++ b/commands/ci/status/status.go
@@ -17,7 +17,7 @@ import (
 )
 
 func NewCmdStatus(f *cmdutils.Factory) *cobra.Command {
-	var pipelineStatusCmd = &cobra.Command{
+	pipelineStatusCmd := &cobra.Command{
 		Use:     "status [flags]",
 		Short:   `View a running CI pipeline on current or other branch specified`,
 		Aliases: []string{"stats"},
@@ -96,7 +96,7 @@ func NewCmdStatus(f *cmdutils.Factory) *cobra.Command {
 					default:
 						status = c.Gray(s)
 					}
-					//fmt.Println(job.Tag)
+					// fmt.Println(job.Tag)
 					if compact {
 						fmt.Fprintf(writer, "(%s) • %s [%s]\n", status, job.Name, job.Stage)
 					} else {
diff --git a/commands/ci/trace/trace.go b/commands/ci/trace/trace.go
index 8a484b0f..d12aa4b2 100644
--- a/commands/ci/trace/trace.go
+++ b/commands/ci/trace/trace.go
@@ -37,7 +37,7 @@ func NewCmdTrace(f *cmdutils.Factory, runE func(traceOpts *TraceOpts) error) *co
 	opts := &TraceOpts{
 		IO: f.IO,
 	}
-	var pipelineCITraceCmd = &cobra.Command{
+	pipelineCITraceCmd := &cobra.Command{
 		Use:   "trace [<job-id>] [flags]",
 		Short: `Trace a CI job log in real time`,
 		Example: heredoc.Doc(`
diff --git a/commands/ci/trace/trace_test.go b/commands/ci/trace/trace_test.go
index 491c151d..8b45e405 100644
--- a/commands/ci/trace/trace_test.go
+++ b/commands/ci/trace/trace_test.go
@@ -116,7 +116,6 @@ hosts:
 			assert.Equal(t, tt.wantOpts.IO, actualOpts.IO)
 		})
 	}
-
 }
 
 func TestTraceRun(t *testing.T) {
@@ -182,5 +181,4 @@ func TestTraceRun(t *testing.T) {
 			tt.assertContains(t, stdout.String())
 		})
 	}
-
 }
diff --git a/commands/ci/view/view.go b/commands/ci/view/view.go
index 55d6122f..f29123b8 100644
--- a/commands/ci/view/view.go
+++ b/commands/ci/view/view.go
@@ -24,6 +24,9 @@ import (
 	"github.com/rivo/tview"
 	"github.com/spf13/cobra"
 	"github.com/xanzy/go-gitlab"
+
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 type ViewOpts struct {
@@ -38,7 +41,7 @@ type ViewOpts struct {
 
 func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 	opts := ViewOpts{}
-	var pipelineCIView = &cobra.Command{
+	pipelineCIView := &cobra.Command{
 		Use:   "view [branch/tag]",
 		Short: "View, run, trace/logs, and cancel CI jobs current pipeline",
 		Long: heredoc.Doc(`Supports viewing, running, tracing, and canceling jobs.
@@ -448,7 +451,8 @@ func jobsView(app *tview.Application, jobsCh chan []*gitlab.Job, inputCh chan st
 			x, y, w, h := boxX, maxY/6-4, maxTitle+2, 3
 			b := box(root, key, x, y, w, h)
 
-			b.SetText(strings.Title(j.Stage))
+			caser := cases.Title(language.English)
+			b.SetText(caser.String(j.Stage))
 			b.SetTextAlign(tview.AlignCenter)
 
 		}
@@ -525,8 +529,8 @@ func jobsView(app *tview.Application, jobsCh chan []*gitlab.Job, inputCh chan st
 
 	}
 	root.SendToFront("jobs-" + curJob.Name)
-
 }
+
 func box(root *tview.Pages, key string, x, y, w, h int) *tview.TextView {
 	b, ok := boxes[key]
 	if !ok {
diff --git a/commands/ci/view/view_test.go b/commands/ci/view/view_test.go
index 8190619e..12439900 100644
--- a/commands/ci/view/view_test.go
+++ b/commands/ci/view/view_test.go
@@ -23,7 +23,7 @@ func assertScreen(t *testing.T, screen tcell.Screen, expected []string) {
 			r, _, _, _ := screen.GetContent(x, y)
 			runes[x] = r
 			_ = expectedRune
-			//assert.Equal(t, expectedRune, r, "%s != %s at (%d,%d)",
+			// assert.Equal(t, expectedRune, r, "%s != %s at (%d,%d)",
 			//	strconv.QuoteRune(expectedRune), strconv.QuoteRune(r), x, y)
 		}
 
@@ -411,7 +411,6 @@ func Test_LinkJobsNegative(t *testing.T) {
 		t.Run(test.desc, func(t *testing.T) {
 			t.Parallel()
 			assert.Error(t, linkJobs(screen, test.jobs, test.boxes))
-
 		})
 	}
 }
diff --git a/commands/cmdtest/helper.go b/commands/cmdtest/helper.go
index 64611161..c505d7b8 100644
--- a/commands/cmdtest/helper.go
+++ b/commands/cmdtest/helper.go
@@ -95,7 +95,7 @@ func InitTest(m *testing.M, suffix string) {
 }
 
 func RunCommand(cmd *cobra.Command, cli string, stds ...*bytes.Buffer) (*test.CmdOut, error) {
-	//var stdin *bytes.Buffer
+	// var stdin *bytes.Buffer
 	var stderr *bytes.Buffer
 	var stdout *bytes.Buffer
 
diff --git a/commands/cmdutils/cmdutils.go b/commands/cmdutils/cmdutils.go
index 5b9042fa..212640ca 100644
--- a/commands/cmdutils/cmdutils.go
+++ b/commands/cmdutils/cmdutils.go
@@ -465,7 +465,6 @@ func (ua *UserAssignments) UsersFromAddRemove(
 	apiClient *gitlab.Client,
 	actions []string,
 ) (*[]int, []string, error) {
-
 	var assignedIDs []int
 	var usernames []string
 
diff --git a/commands/cmdutils/cmdutils_test.go b/commands/cmdutils/cmdutils_test.go
index 6b7810fa..6a59c79d 100644
--- a/commands/cmdutils/cmdutils_test.go
+++ b/commands/cmdutils/cmdutils_test.go
@@ -83,7 +83,6 @@ func Test_ParseAssignees(t *testing.T) {
 			assert.ElementsMatch(t, uaGot.ToReplace, tC.wantReplace)
 		})
 	}
-
 }
 
 func Test_VerifyAssignees(t *testing.T) {
@@ -743,7 +742,6 @@ func Test_AssigneesPrompt(t *testing.T) {
 				assert.Equal(t, tC.expectedStdErr, outErr)
 			}
 			assert.ElementsMatch(t, got, tC.output)
-
 		})
 	}
 
@@ -1114,8 +1112,8 @@ func Test_LabelsPromptPromptsFail(t *testing.T) {
 		assert.Nil(t, got)
 		assert.EqualError(t, err, "AskQuestionWithInput prompt failed")
 	})
-
 }
+
 func Test_LabelsPromptMultiSelect(t *testing.T) {
 	// mock glrepo.Remote object
 	repo := glrepo.New("foo", "bar")
@@ -1380,5 +1378,4 @@ func TestListGitLabTemplates(t *testing.T) {
 			assert.EqualValues(t, test.wantTemplates, gotTemplates, "Templates got didn't match")
 		})
 	}
-
 }
diff --git a/commands/cmdutils/factory.go b/commands/cmdutils/factory.go
index 67e78397..490975aa 100644
--- a/commands/cmdutils/factory.go
+++ b/commands/cmdutils/factory.go
@@ -107,7 +107,6 @@ func HTTPClientFactory(f *Factory) {
 }
 
 func NewFactory() *Factory {
-
 	return &Factory{
 		Config:  configFunc,
 		Remotes: remotesFunc,
diff --git a/commands/completion/completion.go b/commands/completion/completion.go
index a7eeabb8..1a117cd4 100644
--- a/commands/completion/completion.go
+++ b/commands/completion/completion.go
@@ -17,7 +17,7 @@ func NewCmdCompletion(io *iostreams.IOStreams) *cobra.Command {
 		excludeDesc = false
 	)
 
-	var completionCmd = &cobra.Command{
+	completionCmd := &cobra.Command{
 		Use:   "completion",
 		Short: "Generate shell completion scripts",
 		Long: heredoc.Docf(`
diff --git a/commands/config/config.go b/commands/config/config.go
index 29159fd4..bbe5f493 100644
--- a/commands/config/config.go
+++ b/commands/config/config.go
@@ -147,7 +147,7 @@ func NewCmdConfigInit(f *cmdutils.Factory) *cobra.Command {
 		$ glab config init
 		? Enter default GitLab Host (Current Value: https://gitlab.com):
 		%[1]s
-`,"```"),
+`, "```"),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return configInit(f)
 		},
diff --git a/commands/issue/board/board.go b/commands/issue/board/board.go
index e4eacf44..a26bab29 100644
--- a/commands/issue/board/board.go
+++ b/commands/issue/board/board.go
@@ -8,7 +8,7 @@ import (
 )
 
 func NewCmdBoard(f *cmdutils.Factory) *cobra.Command {
-	var issueCmd = &cobra.Command{
+	issueCmd := &cobra.Command{
 		Use:   "board [command] [flags]",
 		Short: `Work with GitLab Issue Boards in the given project.`,
 		Long:  ``,
diff --git a/commands/issue/board/create/issue_board_create.go b/commands/issue/board/create/issue_board_create.go
index 93bbfd2a..aec4909d 100644
--- a/commands/issue/board/create/issue_board_create.go
+++ b/commands/issue/board/create/issue_board_create.go
@@ -14,7 +14,7 @@ import (
 var boardName string
 
 func NewCmdCreate(f *cmdutils.Factory) *cobra.Command {
-	var issueCmd = &cobra.Command{
+	issueCmd := &cobra.Command{
 		Use:     "create [flags]",
 		Short:   `Create a project issue board.`,
 		Long:    ``,
diff --git a/commands/issue/board/create/issue_board_create_test.go b/commands/issue/board/create/issue_board_create_test.go
index f153b031..f6ad017f 100644
--- a/commands/issue/board/create/issue_board_create_test.go
+++ b/commands/issue/board/create/issue_board_create_test.go
@@ -76,7 +76,6 @@ func TestNewCmdCreate(t *testing.T) {
 
 			assert.Contains(t, out, tc.want)
 			assert.Contains(t, stderr.String(), "")
-
 		})
 	}
 }
diff --git a/commands/issue/board/view/issue_board_view.go b/commands/issue/board/view/issue_board_view.go
index 5c3fd16d..9518cab7 100644
--- a/commands/issue/board/view/issue_board_view.go
+++ b/commands/issue/board/view/issue_board_view.go
@@ -14,6 +14,9 @@ import (
 	"gitlab.com/gitlab-org/cli/api"
 	"gitlab.com/gitlab-org/cli/commands/cmdutils"
 	"gitlab.com/gitlab-org/cli/internal/glrepo"
+
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 var (
@@ -22,8 +25,10 @@ var (
 	repo      glrepo.Interface
 )
 
-const closed string = "closed"
-const opened string = "opened"
+const (
+	closed string = "closed"
+	opened string = "opened"
+)
 
 type issueBoardViewOptions struct {
 	assignee  string
@@ -40,8 +45,8 @@ type boardMeta struct {
 }
 
 func NewCmdView(f *cmdutils.Factory) *cobra.Command {
-	var opts = &issueBoardViewOptions{}
-	var viewCmd = &cobra.Command{
+	opts := &issueBoardViewOptions{}
+	viewCmd := &cobra.Command{
 		Use:   "view [flags]",
 		Short: `View project issue board.`,
 		Long:  ``,
@@ -149,16 +154,17 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 			}
 
 			// format table title
+			caser := cases.Title(language.English)
 			var boardType, boardContext string
 			if selectedBoard.group != nil {
-				boardType = strings.Title("group")
+				boardType = caser.String("group")
 				boardContext = project.Namespace.Name
 			} else {
-				boardType = strings.Title("project")
+				boardType = caser.String("project")
 				boardContext = project.NameWithNamespace
 			}
 			root.SetBorderPadding(1, 1, 2, 2).SetBorder(true).SetTitle(
-				fmt.Sprintf(" %s • %s ", strings.Title(boardType+" issue board"), boardContext),
+				fmt.Sprintf(" %s • %s ", caser.String(boardType+" issue board"), boardContext),
 			)
 
 			screen, err := tcell.NewScreen()
@@ -245,7 +251,7 @@ func buildLabelString(labelDetails []*gitlab.LabelDetails) string {
 		labels += fmt.Sprintf("[white:%s:-]%s[white:-:-] ", ld.Color, ld.Name)
 	}
 	if labels != "" {
-		labels = strings.TrimSpace(labels) + fmt.Sprintf("\n")
+		labels = strings.TrimSpace(labels) + "\n"
 	}
 	return labels
 }
@@ -269,7 +275,6 @@ func mapBoardData(
 	projectIssueBoards []*gitlab.IssueBoard,
 	projectGroupIssueBoards []*gitlab.GroupIssueBoard,
 ) ([]string, map[string]boardMeta) {
-
 	// find longest board name to base padding on
 	maxNameLength := 0
 	for _, board := range projectIssueBoards {
diff --git a/commands/issue/close/issue_close.go b/commands/issue/close/issue_close.go
index 9aafa7fa..67104aa8 100644
--- a/commands/issue/close/issue_close.go
+++ b/commands/issue/close/issue_close.go
@@ -13,7 +13,7 @@ import (
 )
 
 func NewCmdClose(f *cmdutils.Factory) *cobra.Command {
-	var issueCloseCmd = &cobra.Command{
+	issueCloseCmd := &cobra.Command{
 		Use:   "close <id>",
 		Short: `Close an issue`,
 		Long:  ``,
diff --git a/commands/issue/close/issue_close_test.go b/commands/issue/close/issue_close_test.go
index 2691123c..e89414a7 100644
--- a/commands/issue/close/issue_close_test.go
+++ b/commands/issue/close/issue_close_test.go
@@ -60,7 +60,6 @@ func Test_issueClose(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.Name, func(t *testing.T) {
-
 			io, _, stdout, stderr := iostreams.Test()
 			f := cmdtest.StubFactory("https://gitlab.com/glab-cli/test")
 			f.IO = io
@@ -81,7 +80,7 @@ func Test_issueClose(t *testing.T) {
 			}
 
 			out := stripansi.Strip(stdout.String())
-			//outErr := stripansi.Strip(stderr.String())
+			// outErr := stripansi.Strip(stderr.String())
 
 			for _, msg := range tc.ExpectedMsg {
 				assert.Contains(t, out, msg)
diff --git a/commands/issue/create/issue_create.go b/commands/issue/create/issue_create.go
index 37d6eb22..f1f1b305 100644
--- a/commands/issue/create/issue_create.go
+++ b/commands/issue/create/issue_create.go
@@ -61,7 +61,7 @@ func NewCmdCreate(f *cmdutils.Factory) *cobra.Command {
 		Remotes: f.Remotes,
 		Config:  f.Config,
 	}
-	var issueCreateCmd = &cobra.Command{
+	issueCreateCmd := &cobra.Command{
 		Use:     "create [flags]",
 		Short:   `Create an issue`,
 		Long:    ``,
diff --git a/commands/issue/create/issue_create_test.go b/commands/issue/create/issue_create_test.go
index 9e919762..d02a5007 100644
--- a/commands/issue/create/issue_create_test.go
+++ b/commands/issue/create/issue_create_test.go
@@ -64,7 +64,8 @@ func Test_IssueCreate(t *testing.T) {
 	cmd := NewCmdCreate(f)
 	cmd.Flags().StringP("repo", "R", "", "")
 
-	cliStr := []string{"-t", "myissuetitle",
+	cliStr := []string{
+		"-t", "myissuetitle",
 		"-d", "myissuebody",
 		"-l", "test,bug",
 		"--weight", "1",
diff --git a/commands/issue/delete/issue_delete.go b/commands/issue/delete/issue_delete.go
index a48a0e44..3fb75f67 100644
--- a/commands/issue/delete/issue_delete.go
+++ b/commands/issue/delete/issue_delete.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdDelete(f *cmdutils.Factory) *cobra.Command {
-	var issueDeleteCmd = &cobra.Command{
+	issueDeleteCmd := &cobra.Command{
 		Use:     "delete <id>",
 		Short:   `Delete an issue`,
 		Long:    ``,
diff --git a/commands/issue/delete/issue_delete_test.go b/commands/issue/delete/issue_delete_test.go
index 4d94af7d..83cc1a1c 100644
--- a/commands/issue/delete/issue_delete_test.go
+++ b/commands/issue/delete/issue_delete_test.go
@@ -68,7 +68,6 @@ func TestNewCmdDelete(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			io, _, stdout, stderr := iostreams.Test()
 			f := cmdtest.StubFactory("")
 			f.IO = io
diff --git a/commands/issue/issue.go b/commands/issue/issue.go
index 15354cbb..3ab5002c 100644
--- a/commands/issue/issue.go
+++ b/commands/issue/issue.go
@@ -19,7 +19,7 @@ import (
 )
 
 func NewCmdIssue(f *cmdutils.Factory) *cobra.Command {
-	var issueCmd = &cobra.Command{
+	issueCmd := &cobra.Command{
 		Use:   "issue [command] [flags]",
 		Short: `Work with GitLab issues`,
 		Long:  ``,
diff --git a/commands/issue/issueutils/utils.go b/commands/issue/issueutils/utils.go
index 59c45433..c7c35098 100644
--- a/commands/issue/issueutils/utils.go
+++ b/commands/issue/issueutils/utils.go
@@ -100,7 +100,6 @@ func IssuesFromArgs(apiClient *gitlab.Client, baseRepoFn func() (glrepo.Interfac
 		return nil, nil, err
 	}
 	return issues, baseRepo, nil
-
 }
 
 func IssueFromArg(apiClient *gitlab.Client, baseRepoFn func() (glrepo.Interface, error), arg string) (*gitlab.Issue, glrepo.Interface, error) {
@@ -139,8 +138,10 @@ func IssueFromArg(apiClient *gitlab.Client, baseRepoFn func() (glrepo.Interface,
 //
 //	OWNER/REPO/issues/id
 //	GROUP/NAMESPACE/REPO/issues/id
-var issueURLPersonalRE = regexp.MustCompile(`^/([^/]+)/([^/]+)/issues/(\d+)`)
-var issueURLGroupRE = regexp.MustCompile(`^/([^/]+)/([^/]+)/([^/]+)/issues/(\d+)`)
+var (
+	issueURLPersonalRE = regexp.MustCompile(`^/([^/]+)/([^/]+)/issues/(\d+)`)
+	issueURLGroupRE    = regexp.MustCompile(`^/([^/]+)/([^/]+)/([^/]+)/issues/(\d+)`)
+)
 
 func issueMetadataFromURL(s string) (int, glrepo.Interface) {
 	u, err := url.Parse(s)
diff --git a/commands/issue/list/issue_list.go b/commands/issue/list/issue_list.go
index 40e56189..2ce851d2 100644
--- a/commands/issue/list/issue_list.go
+++ b/commands/issue/list/issue_list.go
@@ -56,11 +56,11 @@ type ListOptions struct {
 }
 
 func NewCmdList(f *cmdutils.Factory, runE func(opts *ListOptions) error) *cobra.Command {
-	var opts = &ListOptions{
+	opts := &ListOptions{
 		IO: f.IO,
 	}
 
-	var issueListCmd = &cobra.Command{
+	issueListCmd := &cobra.Command{
 		Use:     "list [flags]",
 		Short:   `List project issues`,
 		Long:    ``,
diff --git a/commands/issue/list/issue_list_test.go b/commands/issue/list/issue_list_test.go
index 8fbef87e..9793e3e5 100644
--- a/commands/issue/list/issue_list_test.go
+++ b/commands/issue/list/issue_list_test.go
@@ -208,7 +208,6 @@ func TestIssueList_tty_withIssueType(t *testing.T) {
 
 func TestIssueList_tty_mine(t *testing.T) {
 	t.Run("mine with all flag and user exists", func(t *testing.T) {
-
 		fakeHTTP := httpmock.New()
 		defer fakeHTTP.Verify(t)
 
@@ -230,7 +229,6 @@ func TestIssueList_tty_mine(t *testing.T) {
 `)
 	})
 	t.Run("user does not exists", func(t *testing.T) {
-
 		fakeHTTP := httpmock.New()
 		defer fakeHTTP.Verify(t)
 
diff --git a/commands/issue/note/issue_note_create.go b/commands/issue/note/issue_note_create.go
index 9ba778a1..0264f7f8 100644
--- a/commands/issue/note/issue_note_create.go
+++ b/commands/issue/note/issue_note_create.go
@@ -15,7 +15,7 @@ import (
 )
 
 func NewCmdNote(f *cmdutils.Factory) *cobra.Command {
-	var issueNoteCreateCmd = &cobra.Command{
+	issueNoteCreateCmd := &cobra.Command{
 		Use:     "note <issue-id>",
 		Aliases: []string{"comment"},
 		Short:   "Add a comment or note to an issue on GitLab",
diff --git a/commands/issue/note/issue_note_create_test.go b/commands/issue/note/issue_note_create_test.go
index 3eddfb60..1e9283fa 100644
--- a/commands/issue/note/issue_note_create_test.go
+++ b/commands/issue/note/issue_note_create_test.go
@@ -72,7 +72,6 @@ func Test_NewCmdNote(t *testing.T) {
 	defer fakeHTTP.Verify(t)
 
 	t.Run("--message flag specified", func(t *testing.T) {
-
 		fakeHTTP.RegisterResponder("POST", "/projects/OWNER/REPO/issues/1/notes",
 			httpmock.NewStringResponse(201, `
 		{
@@ -153,7 +152,6 @@ func Test_mrNoteCreate_prompt(t *testing.T) {
 	defer fakeHTTP.Verify(t)
 
 	t.Run("message provided", func(t *testing.T) {
-
 		fakeHTTP.RegisterResponder("POST", "/projects/OWNER/REPO/issues/1/notes",
 			httpmock.NewStringResponse(201, `
 		{
@@ -190,7 +188,6 @@ func Test_mrNoteCreate_prompt(t *testing.T) {
 	})
 
 	t.Run("message is empty", func(t *testing.T) {
-
 		fakeHTTP.RegisterResponder("GET", "/projects/OWNER/REPO/issues/1",
 			httpmock.NewStringResponse(200, `
 		{
diff --git a/commands/issue/reopen/issue_reopen.go b/commands/issue/reopen/issue_reopen.go
index 5cc3927c..569bc5b2 100644
--- a/commands/issue/reopen/issue_reopen.go
+++ b/commands/issue/reopen/issue_reopen.go
@@ -13,7 +13,7 @@ import (
 )
 
 func NewCmdReopen(f *cmdutils.Factory) *cobra.Command {
-	var issueReopenCmd = &cobra.Command{
+	issueReopenCmd := &cobra.Command{
 		Use:     "reopen <id>",
 		Short:   `Reopen a closed issue`,
 		Long:    ``,
@@ -30,7 +30,6 @@ func NewCmdReopen(f *cmdutils.Factory) *cobra.Command {
 			c := f.IO.Color()
 
 			apiClient, err := f.HttpClient()
-
 			if err != nil {
 				return err
 			}
diff --git a/commands/issue/subscribe/issue_subscribe.go b/commands/issue/subscribe/issue_subscribe.go
index 4cb95edf..d2f133c7 100644
--- a/commands/issue/subscribe/issue_subscribe.go
+++ b/commands/issue/subscribe/issue_subscribe.go
@@ -11,7 +11,7 @@ import (
 )
 
 func NewCmdSubscribe(f *cmdutils.Factory) *cobra.Command {
-	var issueSubscribeCmd = &cobra.Command{
+	issueSubscribeCmd := &cobra.Command{
 		Use:     "subscribe <id>",
 		Short:   `Subscribe to an issue`,
 		Long:    ``,
diff --git a/commands/issue/unsubscribe/issue_unsubscribe.go b/commands/issue/unsubscribe/issue_unsubscribe.go
index aa24ecd9..0df790c9 100644
--- a/commands/issue/unsubscribe/issue_unsubscribe.go
+++ b/commands/issue/unsubscribe/issue_unsubscribe.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdUnsubscribe(f *cmdutils.Factory) *cobra.Command {
-	var issueUnsubscribeCmd = &cobra.Command{
+	issueUnsubscribeCmd := &cobra.Command{
 		Use:     "unsubscribe <id>",
 		Short:   `Unsubscribe to an issue`,
 		Long:    ``,
diff --git a/commands/issue/update/issue_update.go b/commands/issue/update/issue_update.go
index 2415e78e..2513871b 100644
--- a/commands/issue/update/issue_update.go
+++ b/commands/issue/update/issue_update.go
@@ -15,7 +15,7 @@ import (
 )
 
 func NewCmdUpdate(f *cmdutils.Factory) *cobra.Command {
-	var issueUpdateCmd = &cobra.Command{
+	issueUpdateCmd := &cobra.Command{
 		Use:   "update <id>",
 		Short: `Update issue`,
 		Long:  ``,
diff --git a/commands/issue/update/issue_update_test.go b/commands/issue/update/issue_update_test.go
index da1c388e..a340bd84 100644
--- a/commands/issue/update/issue_update_test.go
+++ b/commands/issue/update/issue_update_test.go
@@ -102,7 +102,6 @@ func TestNewCmdUpdate(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.Name, func(t *testing.T) {
-
 			args, _ := shlex.Split(tc.Issue)
 			cmd.SetArgs(args)
 			cmd.SetOut(ioutil.Discard)
diff --git a/commands/issue/view/issue_view.go b/commands/issue/view/issue_view.go
index dd3b45a2..210d412a 100644
--- a/commands/issue/view/issue_view.go
+++ b/commands/issue/view/issue_view.go
@@ -36,7 +36,7 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 	opts := &ViewOpts{
 		IO: f.IO,
 	}
-	var issueViewCmd = &cobra.Command{
+	issueViewCmd := &cobra.Command{
 		Use:     "view <id>",
 		Short:   `Display the title, body, and other information about an issue.`,
 		Long:    ``,
@@ -50,7 +50,6 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 		`),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			apiClient, err := f.HttpClient()
 			if err != nil {
 				return err
@@ -64,7 +63,7 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 
 			opts.Issue = issue
 
-			//open in browser if --web flag is specified
+			// open in browser if --web flag is specified
 			if opts.Web {
 				if f.IO.IsaTTY && f.IO.IsErrTTY {
 					fmt.Fprintf(opts.IO.StdErr, "Opening %s in your browser.\n", utils.DisplayURL(opts.Issue.WebURL))
diff --git a/commands/issue/view/issue_view_test.go b/commands/issue/view/issue_view_test.go
index e8da8c3b..26dbf03e 100644
--- a/commands/issue/view/issue_view_test.go
+++ b/commands/issue/view/issue_view_test.go
@@ -151,7 +151,6 @@ func TestNewCmdView(t *testing.T) {
 	}
 
 	t.Run("show", func(t *testing.T) {
-
 		cmd := NewCmdView(stubFactory)
 		cmdutils.EnableRepoOverride(cmd, stubFactory)
 		_, err := cmdtest.RunCommand(cmd, "13 -c -s -R glab-cli/test")
diff --git a/commands/label/create/label_create.go b/commands/label/create/label_create.go
index b8cdc6d1..16f33ec8 100644
--- a/commands/label/create/label_create.go
+++ b/commands/label/create/label_create.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdCreate(f *cmdutils.Factory) *cobra.Command {
-	var labelCreateCmd = &cobra.Command{
+	labelCreateCmd := &cobra.Command{
 		Use:     "create [flags]",
 		Short:   `Create labels for repository/project`,
 		Long:    ``,
@@ -24,7 +24,6 @@ func NewCmdCreate(f *cmdutils.Factory) *cobra.Command {
 		`),
 		Args: cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			var err error
 
 			apiClient, err := f.HttpClient()
diff --git a/commands/label/label.go b/commands/label/label.go
index bc4ff553..94d3912e 100644
--- a/commands/label/label.go
+++ b/commands/label/label.go
@@ -8,7 +8,7 @@ import (
 )
 
 func NewCmdLabel(f *cmdutils.Factory) *cobra.Command {
-	var labelCmd = &cobra.Command{
+	labelCmd := &cobra.Command{
 		Use:   "label <command> [flags]",
 		Short: `Manage labels on remote`,
 		Long:  ``,
diff --git a/commands/label/list/label_list.go b/commands/label/list/label_list.go
index a65d0603..700fb5b6 100644
--- a/commands/label/list/label_list.go
+++ b/commands/label/list/label_list.go
@@ -14,7 +14,7 @@ import (
 )
 
 func NewCmdList(f *cmdutils.Factory) *cobra.Command {
-	var labelListCmd = &cobra.Command{
+	labelListCmd := &cobra.Command{
 		Use:     "list [flags]",
 		Short:   `List labels in repository`,
 		Long:    ``,
@@ -76,7 +76,6 @@ func NewCmdList(f *cmdutils.Factory) *cobra.Command {
 			//}
 
 			return nil
-
 		},
 	}
 
diff --git a/commands/mr/approve/mr_approve.go b/commands/mr/approve/mr_approve.go
index 56d99630..6af07edc 100644
--- a/commands/mr/approve/mr_approve.go
+++ b/commands/mr/approve/mr_approve.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdApprove(f *cmdutils.Factory) *cobra.Command {
-	var mrApproveCmd = &cobra.Command{
+	mrApproveCmd := &cobra.Command{
 		Use:   "approve {<id> | <branch>}",
 		Short: `Approve merge requests`,
 		Long:  ``,
@@ -63,7 +63,7 @@ func NewCmdApprove(f *cmdutils.Factory) *cobra.Command {
 		},
 	}
 
-	//mrApproveCmd.Flags().StringP("password", "p", "", "Current user’s password. Required if 'Require user password to approve' is enabled in the project settings.")
+	// mrApproveCmd.Flags().StringP("password", "p", "", "Current user’s password. Required if 'Require user password to approve' is enabled in the project settings.")
 	mrApproveCmd.Flags().StringP("sha", "s", "", "SHA which must match the SHA of the HEAD commit of the merge request")
 	return mrApproveCmd
 }
diff --git a/commands/mr/approvers/mr_approvers.go b/commands/mr/approvers/mr_approvers.go
index b82b5404..1cb5dae4 100644
--- a/commands/mr/approvers/mr_approvers.go
+++ b/commands/mr/approvers/mr_approvers.go
@@ -10,7 +10,7 @@ import (
 )
 
 func NewCmdApprovers(f *cmdutils.Factory) *cobra.Command {
-	var mrApproversCmd = &cobra.Command{
+	mrApproversCmd := &cobra.Command{
 		Use:     "approvers [<id> | <branch>] [flags]",
 		Short:   `List eligible approvers for merge requests in any state`,
 		Long:    ``,
diff --git a/commands/mr/checkout/mr_checkout.go b/commands/mr/checkout/mr_checkout.go
index 2b30789e..08e19324 100644
--- a/commands/mr/checkout/mr_checkout.go
+++ b/commands/mr/checkout/mr_checkout.go
@@ -19,12 +19,10 @@ type mrCheckoutConfig struct {
 	upstream string
 }
 
-var (
-	mrCheckoutCfg mrCheckoutConfig
-)
+var mrCheckoutCfg mrCheckoutConfig
 
 func NewCmdCheckout(f *cmdutils.Factory) *cobra.Command {
-	var mrCheckoutCmd = &cobra.Command{
+	mrCheckoutCmd := &cobra.Command{
 		Use:   "checkout [<id> | <branch>]",
 		Short: "Checkout to an open merge request",
 		Long:  ``,
@@ -93,7 +91,6 @@ func NewCmdCheckout(f *cmdutils.Factory) *cobra.Command {
 				fmt.Println(err)
 			}
 			repoRemote, err := remotes.FindByRepo(repo.RepoOwner(), repo.RepoName())
-
 			if err != nil {
 				fmt.Println(err)
 			}
diff --git a/commands/mr/close/mr_close.go b/commands/mr/close/mr_close.go
index eef0cf4d..741ea212 100644
--- a/commands/mr/close/mr_close.go
+++ b/commands/mr/close/mr_close.go
@@ -13,7 +13,7 @@ import (
 )
 
 func NewCmdClose(f *cmdutils.Factory) *cobra.Command {
-	var mrCloseCmd = &cobra.Command{
+	mrCloseCmd := &cobra.Command{
 		Use:   "close [<id> | <branch>]",
 		Short: `Close merge requests`,
 		Long:  ``,
diff --git a/commands/mr/create/mr_create.go b/commands/mr/create/mr_create.go
index 87d8fe05..7038e398 100644
--- a/commands/mr/create/mr_create.go
+++ b/commands/mr/create/mr_create.go
@@ -83,7 +83,7 @@ func NewCmdCreate(f *cmdutils.Factory, runE func(opts *CreateOpts) error) *cobra
 		HeadRepo: resolvedHeadRepo(f),
 	}
 
-	var mrCreateCmd = &cobra.Command{
+	mrCreateCmd := &cobra.Command{
 		Use:     "create",
 		Short:   `Create new merge request`,
 		Long:    ``,
@@ -607,7 +607,7 @@ func mrBodyAndTitle(opts *CreateOpts) error {
 
 func handlePush(opts *CreateOpts, remote *glrepo.Remote) error {
 	if opts.ShouldPush {
-		var sourceRemote = remote
+		sourceRemote := remote
 
 		sourceBranch := opts.SourceBranch
 
diff --git a/commands/mr/create/mr_create_test.go b/commands/mr/create/mr_create_test.go
index 1d037817..7322578b 100644
--- a/commands/mr/create/mr_create_test.go
+++ b/commands/mr/create/mr_create_test.go
@@ -150,7 +150,8 @@ func TestNewCmdCreate_tty(t *testing.T) {
 		deadbeef refs/remotes/origin/feat-new-mr
 	`))
 
-	cliStr := []string{"-t", "myMRtitle",
+	cliStr := []string{
+		"-t", "myMRtitle",
 		"-d", "myMRbody",
 		"-l", "test,bug",
 		"--milestone", "1",
diff --git a/commands/mr/delete/mr_delete.go b/commands/mr/delete/mr_delete.go
index 139b755a..7139596f 100644
--- a/commands/mr/delete/mr_delete.go
+++ b/commands/mr/delete/mr_delete.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdDelete(f *cmdutils.Factory) *cobra.Command {
-	var mrDeleteCmd = &cobra.Command{
+	mrDeleteCmd := &cobra.Command{
 		Use:     "delete [<id> | <branch>]",
 		Short:   `Delete merge requests`,
 		Long:    ``,
diff --git a/commands/mr/delete/mr_delete_test.go b/commands/mr/delete/mr_delete_test.go
index a47faf5a..66d3b501 100644
--- a/commands/mr/delete/mr_delete_test.go
+++ b/commands/mr/delete/mr_delete_test.go
@@ -121,7 +121,6 @@ hosts:
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			cli := strings.Join(tt.args, " ")
 			t.Log(cli)
 			argv, err := shlex.Split(cli)
diff --git a/commands/mr/for/mr_for.go b/commands/mr/for/mr_for.go
index 72699567..d5e70708 100644
--- a/commands/mr/for/mr_for.go
+++ b/commands/mr/for/mr_for.go
@@ -17,7 +17,7 @@ import (
 )
 
 func NewCmdFor(f *cmdutils.Factory) *cobra.Command {
-	var mrForCmd = &cobra.Command{
+	mrForCmd := &cobra.Command{
 		Use:     "for",
 		Short:   `Create new merge request for an issue`,
 		Long:    ``,
@@ -84,7 +84,6 @@ func NewCmdFor(f *cmdutils.Factory) *cobra.Command {
 					_, branchErr = api.CreateBranch(apiClient, repo.FullName(), lb)
 					fmt.Println(branchErr)
 				}
-
 			}
 
 			var mergeTitle string
diff --git a/commands/mr/issues/mr_issues.go b/commands/mr/issues/mr_issues.go
index a0808575..8d7b2fd2 100644
--- a/commands/mr/issues/mr_issues.go
+++ b/commands/mr/issues/mr_issues.go
@@ -15,7 +15,7 @@ import (
 )
 
 func NewCmdIssues(f *cmdutils.Factory) *cobra.Command {
-	var mrIssuesCmd = &cobra.Command{
+	mrIssuesCmd := &cobra.Command{
 		Use:     "issues [<id> | <branch>]",
 		Short:   `Get issues related to a particular merge request.`,
 		Long:    ``,
diff --git a/commands/mr/list/mr_list.go b/commands/mr/list/mr_list.go
index 63c0014c..6f882ef3 100644
--- a/commands/mr/list/mr_list.go
+++ b/commands/mr/list/mr_list.go
@@ -53,11 +53,11 @@ type ListOptions struct {
 }
 
 func NewCmdList(f *cmdutils.Factory, runE func(opts *ListOptions) error) *cobra.Command {
-	var opts = &ListOptions{
+	opts := &ListOptions{
 		IO: f.IO,
 	}
 
-	var mrListCmd = &cobra.Command{
+	mrListCmd := &cobra.Command{
 		Use:     "list [flags]",
 		Short:   `List merge requests`,
 		Long:    ``,
@@ -230,7 +230,6 @@ func listRun(opts *ListOptions) error {
 
 	if len(assigneeIds) > 0 || len(reviewerIds) > 0 {
 		mergeRequests, err = api.ListMRsWithAssigneesOrReviewers(apiClient, repo.FullName(), l, assigneeIds, reviewerIds)
-
 	} else if opts.Group != "" {
 		mergeRequests, err = api.ListGroupMRs(apiClient, opts.Group, api.ProjectListMROptionsToGroup(l))
 		title.RepoName = opts.Group
diff --git a/commands/mr/merge/mr_merge.go b/commands/mr/merge/mr_merge.go
index d77e768f..7809f2f9 100644
--- a/commands/mr/merge/mr_merge.go
+++ b/commands/mr/merge/mr_merge.go
@@ -42,11 +42,11 @@ type MergeOpts struct {
 }
 
 func NewCmdMerge(f *cmdutils.Factory) *cobra.Command {
-	var opts = &MergeOpts{
+	opts := &MergeOpts{
 		MergeMethod: MRMergeMethodMerge,
 	}
 
-	var mrMergeCmd = &cobra.Command{
+	mrMergeCmd := &cobra.Command{
 		Use:     "merge {<id> | <branch>}",
 		Short:   `Merge/Accept merge requests`,
 		Long:    ``,
@@ -264,7 +264,7 @@ func mergeMethodSurvey() (MRMergeMethod, error) {
 		method MRMergeMethod
 	}
 
-	var mergeOpts = []mergeOption{
+	mergeOpts := []mergeOption{
 		{title: "Create a merge commit", method: MRMergeMethodMerge},
 		{title: "Rebase and merge", method: MRMergeMethodRebase},
 		{title: "Squash and merge", method: MRMergeMethodSquash},
diff --git a/commands/mr/mr.go b/commands/mr/mr.go
index 2b1925d6..a0656b0b 100644
--- a/commands/mr/mr.go
+++ b/commands/mr/mr.go
@@ -28,7 +28,7 @@ import (
 )
 
 func NewCmdMR(f *cmdutils.Factory) *cobra.Command {
-	var mrCmd = &cobra.Command{
+	mrCmd := &cobra.Command{
 		Use:   "mr <command> [flags]",
 		Short: `Create, view and manage merge requests`,
 		Long:  ``,
diff --git a/commands/mr/mr_test.go b/commands/mr/mr_test.go
index facba147..68899711 100644
--- a/commands/mr/mr_test.go
+++ b/commands/mr/mr_test.go
@@ -37,5 +37,4 @@ func TestMrCmd_noARgs(t *testing.T) {
 	out := <-outC
 
 	assert.Contains(t, out, "Use \"mr [command] --help\" for more information about a command.\n")
-
 }
diff --git a/commands/mr/mrutils/mrutils_test.go b/commands/mr/mrutils/mrutils_test.go
index dc7c5fda..99e6326f 100644
--- a/commands/mr/mrutils/mrutils_test.go
+++ b/commands/mr/mrutils/mrutils_test.go
@@ -492,7 +492,6 @@ func Test_MRFromArgsWithOpts(t *testing.T) {
 			assert.Nil(t, gotMR)
 			assert.Nil(t, gotRepo)
 			assert.EqualError(t, err, `no merge requests from branch "foo"`)
-
 		})
 		t.Run("api.GetMR", func(t *testing.T) {
 			f := *f
diff --git a/commands/mr/note/mr_note_create.go b/commands/mr/note/mr_note_create.go
index 8664fa3e..4e11ed86 100644
--- a/commands/mr/note/mr_note_create.go
+++ b/commands/mr/note/mr_note_create.go
@@ -14,7 +14,7 @@ import (
 )
 
 func NewCmdNote(f *cmdutils.Factory) *cobra.Command {
-	var mrCreateNoteCmd = &cobra.Command{
+	mrCreateNoteCmd := &cobra.Command{
 		Use:     "note [<id> | <branch>]",
 		Aliases: []string{"comment"},
 		Short:   "Add a comment or note to merge request",
diff --git a/commands/mr/note/mr_note_create_test.go b/commands/mr/note/mr_note_create_test.go
index 93d8ba0d..146ab2cf 100644
--- a/commands/mr/note/mr_note_create_test.go
+++ b/commands/mr/note/mr_note_create_test.go
@@ -77,7 +77,6 @@ func Test_NewCmdNote(t *testing.T) {
 	defer fakeHTTP.Verify(t)
 
 	t.Run("--message flag specified", func(t *testing.T) {
-
 		fakeHTTP.RegisterResponder("POST", "/projects/OWNER/REPO/merge_requests/1/notes",
 			httpmock.NewStringResponse(201, `
 		{
@@ -158,7 +157,6 @@ func Test_mrNoteCreate_prompt(t *testing.T) {
 	defer fakeHTTP.Verify(t)
 
 	t.Run("message provided", func(t *testing.T) {
-
 		fakeHTTP.RegisterResponder("POST", "/projects/OWNER/REPO/merge_requests/1/notes",
 			httpmock.NewStringResponse(201, `
 		{
@@ -195,7 +193,6 @@ func Test_mrNoteCreate_prompt(t *testing.T) {
 	})
 
 	t.Run("message is empty", func(t *testing.T) {
-
 		fakeHTTP.RegisterResponder("GET", "/projects/OWNER/REPO/merge_requests/1",
 			httpmock.NewStringResponse(200, `
 		{
@@ -224,7 +221,6 @@ func Test_mrNoteCreate_no_duplicate(t *testing.T) {
 	defer fakeHTTP.Verify(t)
 
 	t.Run("message provided", func(t *testing.T) {
-
 		fakeHTTP.RegisterResponder("GET", "/projects/OWNER/REPO/merge_requests/1",
 			httpmock.NewStringResponse(200, `
 		{
diff --git a/commands/mr/rebase/mr_rebase.go b/commands/mr/rebase/mr_rebase.go
index 2414c499..38f00054 100644
--- a/commands/mr/rebase/mr_rebase.go
+++ b/commands/mr/rebase/mr_rebase.go
@@ -9,10 +9,10 @@ import (
 )
 
 func NewCmdRebase(f *cmdutils.Factory) *cobra.Command {
-	var mrRebaseCmd = &cobra.Command{
+	mrRebaseCmd := &cobra.Command{
 		Use:   "rebase [<id> | <branch>] [flags]",
 		Short: `Automatically rebase the source_branch of the merge request against its target_branch.`,
-		Long:  heredoc.Doc(`If you don't have permissions to push to the merge request's source branch - you'll get a 403 Forbidden response.
+		Long: heredoc.Doc(`If you don't have permissions to push to the merge request's source branch - you'll get a 403 Forbidden response.
 		`),
 		Example: heredoc.Doc(`
 			glab mr rebase 123
diff --git a/commands/mr/reopen/mr_reopen.go b/commands/mr/reopen/mr_reopen.go
index 5e610dc8..cd6a222c 100644
--- a/commands/mr/reopen/mr_reopen.go
+++ b/commands/mr/reopen/mr_reopen.go
@@ -13,7 +13,7 @@ import (
 )
 
 func NewCmdReopen(f *cmdutils.Factory) *cobra.Command {
-	var mrReopenCmd = &cobra.Command{
+	mrReopenCmd := &cobra.Command{
 		Use:   "reopen [<id>... | <branch>...]",
 		Short: `Reopen merge requests`,
 		Example: heredoc.Doc(`
diff --git a/commands/mr/revoke/mr_revoke.go b/commands/mr/revoke/mr_revoke.go
index 519af2be..f230ad77 100644
--- a/commands/mr/revoke/mr_revoke.go
+++ b/commands/mr/revoke/mr_revoke.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdRevoke(f *cmdutils.Factory) *cobra.Command {
-	var mrRevokeCmd = &cobra.Command{
+	mrRevokeCmd := &cobra.Command{
 		Use:     "revoke [<id> | <branch>]",
 		Short:   `Revoke approval on a merge request`,
 		Long:    ``,
diff --git a/commands/mr/subscribe/mr_subscribe.go b/commands/mr/subscribe/mr_subscribe.go
index f6e4837b..734490bb 100644
--- a/commands/mr/subscribe/mr_subscribe.go
+++ b/commands/mr/subscribe/mr_subscribe.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdSubscribe(f *cmdutils.Factory) *cobra.Command {
-	var mrSubscribeCmd = &cobra.Command{
+	mrSubscribeCmd := &cobra.Command{
 		Use:     "subscribe [<id> | <branch>]",
 		Short:   `Subscribe to merge requests`,
 		Long:    ``,
diff --git a/commands/mr/subscribe/mr_subscribe_test.go b/commands/mr/subscribe/mr_subscribe_test.go
index 9c914158..8362263e 100644
--- a/commands/mr/subscribe/mr_subscribe_test.go
+++ b/commands/mr/subscribe/mr_subscribe_test.go
@@ -104,7 +104,8 @@ hosts:
 		{
 			Name:  "Issue on another repo",
 			Issue: "1 -R profclems/glab",
-			ExpectedMsg: []string{"- Subscribing to merge request !1",
+			ExpectedMsg: []string{
+				"- Subscribing to merge request !1",
 				"✓ You have successfully subscribed to merge request !1",
 				"https://gitlab.com/profclems/glab/-/merge_requests/1\n",
 			},
diff --git a/commands/mr/todo/mr_todo.go b/commands/mr/todo/mr_todo.go
index 16507f0c..e03662df 100644
--- a/commands/mr/todo/mr_todo.go
+++ b/commands/mr/todo/mr_todo.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdTodo(f *cmdutils.Factory) *cobra.Command {
-	var mrToDoCmd = &cobra.Command{
+	mrToDoCmd := &cobra.Command{
 		Use:     "todo [<id> | <branch>]",
 		Aliases: []string{"add-todo"},
 		Short:   "Add a ToDo to merge request",
diff --git a/commands/mr/unsubscribe/mr_unsubscribe.go b/commands/mr/unsubscribe/mr_unsubscribe.go
index 3330f9ec..00813837 100644
--- a/commands/mr/unsubscribe/mr_unsubscribe.go
+++ b/commands/mr/unsubscribe/mr_unsubscribe.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdUnsubscribe(f *cmdutils.Factory) *cobra.Command {
-	var mrUnsubscribeCmd = &cobra.Command{
+	mrUnsubscribeCmd := &cobra.Command{
 		Use:     "unsubscribe [<id> | <branch>]",
 		Short:   `Unsubscribe from merge requests`,
 		Long:    ``,
diff --git a/commands/mr/update/mr_update.go b/commands/mr/update/mr_update.go
index ee91fa8c..1fb8df47 100644
--- a/commands/mr/update/mr_update.go
+++ b/commands/mr/update/mr_update.go
@@ -15,7 +15,7 @@ import (
 )
 
 func NewCmdUpdate(f *cmdutils.Factory) *cobra.Command {
-	var mrUpdateCmd = &cobra.Command{
+	mrUpdateCmd := &cobra.Command{
 		Use:   "update [<id> | <branch>]",
 		Short: `Update merge requests`,
 		Long:  ``,
diff --git a/commands/mr/update/mr_update_test.go b/commands/mr/update/mr_update_test.go
index 73963298..a667a148 100644
--- a/commands/mr/update/mr_update_test.go
+++ b/commands/mr/update/mr_update_test.go
@@ -117,14 +117,16 @@ hosts:
 		{
 			Name: "Remove source branch",
 			Args: "1 --remove-source-branch",
-			ExpectedMsg: []string{"- Updating merge request !1",
+			ExpectedMsg: []string{
+				"- Updating merge request !1",
 				"✓ enabled removal of source branch on merge",
 			},
 		},
 		{
 			Name: "Restore remove source branch",
 			Args: "1 --remove-source-branch",
-			ExpectedMsg: []string{"- Updating merge request !1",
+			ExpectedMsg: []string{
+				"- Updating merge request !1",
 				"✓ disabled removal of source branch on merge",
 			},
 		},
diff --git a/commands/mr/view/mr_view.go b/commands/mr/view/mr_view.go
index 65b3acc6..dfb9028b 100644
--- a/commands/mr/view/mr_view.go
+++ b/commands/mr/view/mr_view.go
@@ -31,7 +31,7 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 	opts := &ViewOpts{
 		IO: f.IO,
 	}
-	var mrViewCmd = &cobra.Command{
+	mrViewCmd := &cobra.Command{
 		Use:     "view {<id> | <branch>}",
 		Short:   `Display the title, body, and other information about a merge request.`,
 		Long:    ``,
diff --git a/commands/mr/view/mr_view_test.go b/commands/mr/view/mr_view_test.go
index 8fe5d78e..9cf6417b 100644
--- a/commands/mr/view/mr_view_test.go
+++ b/commands/mr/view/mr_view_test.go
@@ -164,7 +164,6 @@ func TestMRView(t *testing.T) {
 		cmdutils.EnableRepoOverride(cmd, stubFactory)
 
 		_, err := cmdtest.RunCommand(cmd, "13 -c -s -R glab-cli/test")
-
 		if err != nil {
 			t.Error(err)
 			return
diff --git a/commands/project/archive/repo_archive.go b/commands/project/archive/repo_archive.go
index 7d665d8d..890851aa 100644
--- a/commands/project/archive/repo_archive.go
+++ b/commands/project/archive/repo_archive.go
@@ -16,7 +16,7 @@ import (
 )
 
 func NewCmdArchive(f *cmdutils.Factory) *cobra.Command {
-	var repoArchiveCmd = &cobra.Command{
+	repoArchiveCmd := &cobra.Command{
 		Use:   "archive <command> [flags]",
 		Short: `Get an archive of the repository.`,
 		Example: heredoc.Doc(`
diff --git a/commands/project/clone/repo_clone.go b/commands/project/clone/repo_clone.go
index 21fa0f16..a463b45e 100644
--- a/commands/project/clone/repo_clone.go
+++ b/commands/project/clone/repo_clone.go
@@ -60,7 +60,7 @@ func NewCmdClone(f *cmdutils.Factory, runE func(*CloneOptions, *ContextOpts) err
 
 	ctxOpts := &ContextOpts{}
 
-	var repoCloneCmd = &cobra.Command{
+	repoCloneCmd := &cobra.Command{
 		Use:   "clone <repo> [<dir>] [-- [<gitflags>...]]",
 		Short: `Clone a GitLab repository/project`,
 		Example: heredoc.Doc(`
@@ -158,7 +158,7 @@ func NewCmdClone(f *cmdutils.Factory, runE func(*CloneOptions, *ContextOpts) err
 
 func listProjects(opts *CloneOptions, ListGroupProjectOpts *gitlab.ListGroupProjectsOptions) ([]*gitlab.Project, error) {
 	var projects []*gitlab.Project
-	var hasRemaining = true
+	hasRemaining := true
 
 	for hasRemaining {
 		currentPage, resp, err := api.ListGroupProjects(opts.APIClient.Lab(), opts.GroupName, ListGroupProjectOpts)
@@ -216,7 +216,7 @@ func groupClone(opts *CloneOptions, ctxOpts *ContextOpts) error {
 		ListGroupProjectOpts.Page = opts.Page
 	}
 
-	var projects, err = listProjects(opts, ListGroupProjectOpts)
+	projects, err := listProjects(opts, ListGroupProjectOpts)
 	var finalOutput []string
 	for _, project := range projects {
 		ctxOpt := *ctxOpts
diff --git a/commands/project/clone/repo_clone_test.go b/commands/project/clone/repo_clone_test.go
index cbff00c3..25e5426a 100644
--- a/commands/project/clone/repo_clone_test.go
+++ b/commands/project/clone/repo_clone_test.go
@@ -189,20 +189,20 @@ hosts:
 }
 
 func Test_repoClone_group(t *testing.T) {
-	var names = []string{"glab-cli/test", "glab-cli/test-pv"}
-	var urls = []string{"git@gitlab.com:glab-cli/test.git", "git@gitlab.com:glab-cli/test-pv.git"}
+	names := []string{"glab-cli/test", "glab-cli/test-pv"}
+	urls := []string{"git@gitlab.com:glab-cli/test.git", "git@gitlab.com:glab-cli/test-pv.git"}
 	repoCloneTest(t, names, urls, 0, false)
 }
 
 func Test_repoClone_group_single(t *testing.T) {
-	var names = []string{"glab-cli/test"}
-	var urls = []string{"git@gitlab.com:glab-cli/test.git"}
+	names := []string{"glab-cli/test"}
+	urls := []string{"git@gitlab.com:glab-cli/test.git"}
 	repoCloneTest(t, names, urls, 1, false)
 }
 
 func Test_repoClone_group_paginate(t *testing.T) {
-	var names = []string{"glab-cli/test", "glab-cli/test-pv"}
-	var urls = []string{"git@gitlab.com:glab-cli/test.git", "git@gitlab.com:glab-cli/test-pv.git"}
+	names := []string{"glab-cli/test", "glab-cli/test-pv"}
+	urls := []string{"git@gitlab.com:glab-cli/test.git", "git@gitlab.com:glab-cli/test-pv.git"}
 	repoCloneTest(t, names, urls, 1, true)
 }
 
@@ -234,7 +234,7 @@ hosts:
 	defer restore()
 
 	cmd := NewCmdClone(fac, nil)
-	var cli = "-g glab-cli"
+	cli := "-g glab-cli"
 	if perPage != 0 {
 		cli += fmt.Sprintf(" --per-page %d", perPage)
 	}
diff --git a/commands/project/contributors/repo_contributors.go b/commands/project/contributors/repo_contributors.go
index 5dd7caa8..d3a7e8fb 100644
--- a/commands/project/contributors/repo_contributors.go
+++ b/commands/project/contributors/repo_contributors.go
@@ -29,7 +29,7 @@ func NewCmdContributors(f *cmdutils.Factory) *cobra.Command {
 	opts := &Options{
 		IO: f.IO,
 	}
-	var repoContributorsCmd = &cobra.Command{
+	repoContributorsCmd := &cobra.Command{
 		Use:   "contributors",
 		Short: `Get repository contributors list.`,
 		Example: heredoc.Doc(`
diff --git a/commands/project/create/project_create.go b/commands/project/create/project_create.go
index 3bbafd2f..2de9fa1a 100644
--- a/commands/project/create/project_create.go
+++ b/commands/project/create/project_create.go
@@ -21,7 +21,7 @@ import (
 )
 
 func NewCmdCreate(f *cmdutils.Factory) *cobra.Command {
-	var projectCreateCmd = &cobra.Command{
+	projectCreateCmd := &cobra.Command{
 		Use:   "create [path] [flags]",
 		Short: `Create a new GitLab project/repository.`,
 		Long:  ``,
@@ -237,7 +237,6 @@ func initGit(defaultBranch string) error {
 }
 
 func initialiseRepo(projectPath, remoteURL string) error {
-
 	gitInit := git.GitCommand("init", projectPath)
 	gitInit.Stdout = os.Stdout
 	gitInit.Stderr = os.Stderr
diff --git a/commands/project/delete/delete.go b/commands/project/delete/delete.go
index afdf54ad..1f932c7f 100644
--- a/commands/project/delete/delete.go
+++ b/commands/project/delete/delete.go
@@ -26,13 +26,13 @@ type DeleteOpts struct {
 }
 
 func NewCmdDelete(f *cmdutils.Factory) *cobra.Command {
-	var opts = &DeleteOpts{
+	opts := &DeleteOpts{
 		IO:       f.IO,
 		Lab:      f.HttpClient,
 		BaseRepo: f.BaseRepo,
 	}
 
-	var projectCreateCmd = &cobra.Command{
+	projectCreateCmd := &cobra.Command{
 		Use:   "delete [<NAMESPACE>/]<NAME>",
 		Short: `Delete an existing repository on GitLab.`,
 		Long:  ``,
diff --git a/commands/project/fork/fork.go b/commands/project/fork/fork.go
index a156995c..214ccb63 100644
--- a/commands/project/fork/fork.go
+++ b/commands/project/fork/fork.go
@@ -51,7 +51,7 @@ func NewCmdFork(f *cmdutils.Factory, runE func(*cmdutils.Factory) error) *cobra.
 		Config:             f.Config,
 		CurrentDirIsParent: true,
 	}
-	var forkCmd = &cobra.Command{
+	forkCmd := &cobra.Command{
 		Use:   "fork <repo>",
 		Short: "Create a fork of a GitLab repository",
 		Example: heredoc.Doc(`
@@ -152,9 +152,9 @@ func forkRun(opts *ForkOptions) error {
 	// we query the import_status for the new project.
 	importStatus := ""
 	var importError error
-	var maximumRetries = 3
-	var retries = 0
-	var skipFirstCheck = true
+	maximumRetries := 3
+	retries := 0
+	skipFirstCheck := true
 loop:
 	for {
 		if !skipFirstCheck {
diff --git a/commands/project/list/list.go b/commands/project/list/list.go
index c10528fc..f31f319f 100644
--- a/commands/project/list/list.go
+++ b/commands/project/list/list.go
@@ -32,7 +32,7 @@ func NewCmdList(f *cmdutils.Factory) *cobra.Command {
 	opts := &Options{
 		IO: f.IO,
 	}
-	var repoListCmd = &cobra.Command{
+	repoListCmd := &cobra.Command{
 		Use:   "list",
 		Short: `Get list of repositories.`,
 		Example: heredoc.Doc(`
diff --git a/commands/project/mirror/project_mirror.go b/commands/project/mirror/project_mirror.go
index 9759cd70..c8c00b8a 100644
--- a/commands/project/mirror/project_mirror.go
+++ b/commands/project/mirror/project_mirror.go
@@ -32,7 +32,7 @@ func NewCmdMirror(f *cmdutils.Factory) *cobra.Command {
 		IO: f.IO,
 	}
 
-	var projectMirrorCmd = &cobra.Command{
+	projectMirrorCmd := &cobra.Command{
 		Use:   "mirror [ID | URL | PATH] [flags]",
 		Short: "Mirror a project/repository to the specified location using pull or push method.",
 		Long:  ``,
@@ -123,7 +123,7 @@ func runProjectMirror(opts *MirrorOptions) error {
 func createPushMirror(opts *MirrorOptions) error {
 	var pm *gitlab.ProjectMirror
 	var err error
-	var pushOptions = api.CreatePushMirrorOptions{
+	pushOptions := api.CreatePushMirrorOptions{
 		Url:                   opts.URL,
 		Enabled:               opts.Enabled,
 		OnlyProtectedBranches: opts.ProtectedBranchesOnly,
@@ -147,7 +147,7 @@ func createPushMirror(opts *MirrorOptions) error {
 }
 
 func createPullMirror(opts *MirrorOptions) error {
-	var pullOptions = api.CreatePullMirrorOptions{
+	pullOptions := api.CreatePullMirrorOptions{
 		Url:                   opts.URL,
 		Enabled:               opts.Enabled,
 		OnlyProtectedBranches: opts.ProtectedBranchesOnly,
diff --git a/commands/project/repo.go b/commands/project/repo.go
index 1d4addea..b1375aa8 100644
--- a/commands/project/repo.go
+++ b/commands/project/repo.go
@@ -18,7 +18,7 @@ import (
 )
 
 func NewCmdRepo(f *cmdutils.Factory) *cobra.Command {
-	var repoCmd = &cobra.Command{
+	repoCmd := &cobra.Command{
 		Use:     "repo <command> [flags]",
 		Short:   `Work with GitLab repositories and projects`,
 		Long:    ``,
diff --git a/commands/project/repo_test.go b/commands/project/repo_test.go
index 99ec6205..a703a2d1 100644
--- a/commands/project/repo_test.go
+++ b/commands/project/repo_test.go
@@ -31,5 +31,4 @@ func Test_Repo(t *testing.T) {
 	out := <-outC
 
 	assert.Contains(t, out, "Use \"repo [command] --help\" for more information about a command.\n")
-
 }
diff --git a/commands/project/search/project_search.go b/commands/project/search/project_search.go
index a3d14ab4..cea20a68 100644
--- a/commands/project/search/project_search.go
+++ b/commands/project/search/project_search.go
@@ -14,7 +14,7 @@ import (
 )
 
 func NewCmdSearch(f *cmdutils.Factory) *cobra.Command {
-	var projectSearchCmd = &cobra.Command{
+	projectSearchCmd := &cobra.Command{
 		Use:     "search [flags]",
 		Short:   `Search for GitLab repositories and projects by name`,
 		Long:    ``,
@@ -43,7 +43,6 @@ func NewCmdSearch(f *cmdutils.Factory) *cobra.Command {
 				PerPage: perPage,
 			}
 			projects, _, err := apiClient.Search.Projects(search, &gitlab.SearchOptions{ListOptions: listOpts})
-
 			if err != nil {
 				return err
 			}
diff --git a/commands/project/transfer/project_transfer.go b/commands/project/transfer/project_transfer.go
index b0a776b8..befe3214 100644
--- a/commands/project/transfer/project_transfer.go
+++ b/commands/project/transfer/project_transfer.go
@@ -10,7 +10,7 @@ import (
 )
 
 func NewCmdTransfer(f *cmdutils.Factory) *cobra.Command {
-	var repoTransferCmd = &cobra.Command{
+	repoTransferCmd := &cobra.Command{
 		Use:   "transfer [repo] [flags]",
 		Short: `Transfer a repository to a new namespace.`,
 		Example: heredoc.Doc(`
diff --git a/commands/project/view/project_view.go b/commands/project/view/project_view.go
index 016c512c..9bb36abb 100644
--- a/commands/project/view/project_view.go
+++ b/commands/project/view/project_view.go
@@ -32,12 +32,12 @@ func NewCmdView(f *cmdutils.Factory) *cobra.Command {
 		IO: f.IO,
 	}
 
-	var projectViewCmd = &cobra.Command{
+	projectViewCmd := &cobra.Command{
 		Use:   "view [repository] [flags]",
 		Short: "View a project/repository",
-		Long:  heredoc.Doc(`Display the description and README of a project or open it in the browser.
+		Long: heredoc.Doc(`Display the description and README of a project or open it in the browser.
 		`),
-		Args:  cobra.MaximumNArgs(1),
+		Args: cobra.MaximumNArgs(1),
 		Example: heredoc.Doc(`
 			# view project information for the current directory
 			$ glab repo view
@@ -175,7 +175,6 @@ func getReadmeFile(opts *ViewOptions, project *gitlab.Project) (*gitlab.File, er
 	}
 
 	readmeFile, err := api.GetFile(opts.APIClient, project.PathWithNamespace, readmeFileName, opts.Branch)
-
 	if err != nil {
 		return nil, cmdutils.WrapError(err, fmt.Sprintf("Failed to retrieve README file on the %s branch", opts.Branch))
 	}
diff --git a/commands/release/download/download.go b/commands/release/download/download.go
index 14eb0247..8ee5953c 100644
--- a/commands/release/download/download.go
+++ b/commands/release/download/download.go
@@ -142,6 +142,7 @@ func downloadRun(opts *DownloadOpts) error {
 	}
 
 	for _, source := range release.Assets.Sources {
+		source := source
 		name := path.Base(source.URL)
 		if len(opts.AssetNames) > 0 && (!matchAny(opts.AssetNames, name)) {
 			continue
@@ -200,7 +201,7 @@ func downloadAssets(httpClient *api.Client, io *iostreams.IOStreams, toDownload
 
 func downloadAsset(client *api.Client, assetURL, destinationPath string) error {
 	var body io.Reader
-	//color := streams.Color()
+	// color := streams.Color()
 
 	baseURL, _ := url.Parse(assetURL)
 
@@ -219,7 +220,7 @@ func downloadAsset(client *api.Client, assetURL, destinationPath string) error {
 		return errors.New(resp.Status)
 	}
 
-	f, err := os.OpenFile(destinationPath, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0644)
+	f, err := os.OpenFile(destinationPath, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0o644)
 	if err != nil {
 		return err
 	}
diff --git a/commands/release/list/release_list.go b/commands/release/list/release_list.go
index 05a03f46..db8bfb4e 100644
--- a/commands/release/list/release_list.go
+++ b/commands/release/list/release_list.go
@@ -17,7 +17,7 @@ var factory *cmdutils.Factory
 
 func NewCmdReleaseList(f *cmdutils.Factory) *cobra.Command {
 	factory = f
-	var releaseListCmd = &cobra.Command{
+	releaseListCmd := &cobra.Command{
 		Use:     "list [flags]",
 		Short:   `List releases in a repository`,
 		Long:    ``,
@@ -43,7 +43,6 @@ func listReleases(cmd *cobra.Command, args []string) error {
 	l := &gitlab.ListReleasesOptions{}
 
 	tag, err := cmd.Flags().GetString("tag")
-
 	if err != nil {
 		return err
 	}
diff --git a/commands/release/list/release_list_test.go b/commands/release/list/release_list_test.go
index aaea4e60..54d68ee5 100644
--- a/commands/release/list/release_list_test.go
+++ b/commands/release/list/release_list_test.go
@@ -21,7 +21,6 @@ import (
 )
 
 func TestNewCmdReleaseList(t *testing.T) {
-
 	oldGetRelease := api.GetRelease
 	timer, _ := time.Parse(time.RFC3339, "2014-11-12T11:45:26.371Z")
 	api.GetRelease = func(client *gitlab.Client, projectID interface{}, tag string) (*gitlab.Release, error) {
@@ -123,7 +122,6 @@ func TestNewCmdReleaseList(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			cmd := NewCmdReleaseList(f)
 			cmdutils.EnableRepoOverride(cmd, f)
 
diff --git a/commands/release/release.go b/commands/release/release.go
index 35230804..3c2b93c5 100644
--- a/commands/release/release.go
+++ b/commands/release/release.go
@@ -12,7 +12,7 @@ import (
 )
 
 func NewCmdRelease(f *cmdutils.Factory) *cobra.Command {
-	var releaseCmd = &cobra.Command{
+	releaseCmd := &cobra.Command{
 		Use:   "release <command> [flags]",
 		Short: `Manage GitLab releases`,
 		Long:  ``,
diff --git a/commands/release/releaseutils/releaseutils.go b/commands/release/releaseutils/releaseutils.go
index 49829f93..c36691cd 100644
--- a/commands/release/releaseutils/releaseutils.go
+++ b/commands/release/releaseutils/releaseutils.go
@@ -36,7 +36,7 @@ func RenderReleaseAssertLinks(assets []*gitlab.ReleaseLink) string {
 	t := tableprinter.NewTablePrinter()
 	for _, asset := range assets {
 		t.AddRow(asset.Name, asset.DirectAssetURL)
-		//assetsPrint += asset.DirectAssetURL + "\n"
+		// assetsPrint += asset.DirectAssetURL + "\n"
 	}
 	return t.String()
 }
@@ -47,7 +47,6 @@ func DisplayRelease(io *iostreams.IOStreams, r *gitlab.Release, repo glrepo.Inte
 	description, err := utils.RenderMarkdown(r.Description, io.BackgroundColor())
 	if err != nil {
 		description = r.Description
-
 	}
 
 	var assetsSources string
diff --git a/commands/release/view/view.go b/commands/release/view/view.go
index 9179a058..138c6978 100644
--- a/commands/release/view/view.go
+++ b/commands/release/view/view.go
@@ -38,7 +38,7 @@ func NewCmdView(f *cmdutils.Factory, runE func(opts *ViewOpts) error) *cobra.Com
 		Long: heredoc.Doc(`View information about a GitLab Release.
 
 			Without an explicit tag name argument, the latest release in the project is shown.
-		`,),
+		`),
 		Example: heredoc.Doc(`
 			View the latest release of a GitLab repository
 			$ glab release view
@@ -105,7 +105,7 @@ func viewRun(opts *ViewOpts) error {
 		}
 	}
 
-	if opts.OpenInBrowser { //open in browser if --web flag is specified
+	if opts.OpenInBrowser { // open in browser if --web flag is specified
 		url := fmt.Sprintf("%s://%s/%s/-/releases/%s",
 			glinstance.OverridableDefaultProtocol(), glinstance.OverridableDefault(),
 			repo.FullName(), release.TagName)
diff --git a/commands/root.go b/commands/root.go
index bcc49f6f..5d78bc40 100644
--- a/commands/root.go
+++ b/commands/root.go
@@ -31,7 +31,7 @@ import (
 // NewCmdRoot is the main root/parent command
 func NewCmdRoot(f *cmdutils.Factory, version, buildDate string) *cobra.Command {
 	c := f.IO.Color()
-	var rootCmd = &cobra.Command{
+	rootCmd := &cobra.Command{
 		Use:           "glab <command> <subcommand> [flags]",
 		Short:         "A GitLab CLI Tool",
 		Long:          `GLab is an open source GitLab CLI tool bringing GitLab to your command line`,
diff --git a/commands/snippet/create/create.go b/commands/snippet/create/create.go
index 69ac995f..99e6f8ec 100644
--- a/commands/snippet/create/create.go
+++ b/commands/snippet/create/create.go
@@ -35,7 +35,7 @@ func (opts CreateOpts) isSnippetFromFile() bool {
 
 func NewCmdCreate(f *cmdutils.Factory) *cobra.Command {
 	opts := &CreateOpts{}
-	var snippetCreateCmd = &cobra.Command{
+	snippetCreateCmd := &cobra.Command{
 		Use:     "create [path]",
 		Short:   `Create new snippet`,
 		Long:    ``,
diff --git a/commands/snippet/snippet.go b/commands/snippet/snippet.go
index 9b7ad8e9..615a3791 100644
--- a/commands/snippet/snippet.go
+++ b/commands/snippet/snippet.go
@@ -8,7 +8,7 @@ import (
 )
 
 func NewCmdSnippet(f *cmdutils.Factory) *cobra.Command {
-	var snippetCmd = &cobra.Command{
+	snippetCmd := &cobra.Command{
 		Use:   "snippet <command> [flags]",
 		Short: `Create, view and manage snippets`,
 		Long:  ``,
diff --git a/commands/snippet/snippet_test.go b/commands/snippet/snippet_test.go
index e5643505..844c1706 100644
--- a/commands/snippet/snippet_test.go
+++ b/commands/snippet/snippet_test.go
@@ -31,5 +31,4 @@ func TestCmdSnippet_noARgs(t *testing.T) {
 	out := <-outC
 
 	assert.Contains(t, out, "Use \"snippet [command] --help\" for more information about a command.\n")
-
 }
diff --git a/commands/ssh-key/get/get.go b/commands/ssh-key/get/get.go
index aa60cff1..87566f02 100644
--- a/commands/ssh-key/get/get.go
+++ b/commands/ssh-key/get/get.go
@@ -29,7 +29,7 @@ func NewCmdGet(f *cmdutils.Factory, runE func(*GetOpts) error) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "get <key-id>",
 		Short: "Returns a single SSH key specified by the ID.",
-		Long: ``,
+		Long:  ``,
 		Example: heredoc.Doc(`
 		# Get ssh key with ID as argument
 		$ glab ssh-key get 7750633
diff --git a/commands/update/check_update.go b/commands/update/check_update.go
index 3142044f..68695fd3 100644
--- a/commands/update/check_update.go
+++ b/commands/update/check_update.go
@@ -14,7 +14,7 @@ import (
 const defaultProjectURL = "https://gitlab.com/gitlab-org/cli"
 
 func NewCheckUpdateCmd(f *cmdutils.Factory, version string) *cobra.Command {
-	var cmd = &cobra.Command{
+	cmd := &cobra.Command{
 		Use:     "check-update",
 		Short:   "Check for latest glab releases",
 		Long:    ``,
diff --git a/commands/user/events/events.go b/commands/user/events/events.go
index afec4129..c1c47737 100644
--- a/commands/user/events/events.go
+++ b/commands/user/events/events.go
@@ -114,5 +114,4 @@ func printEvent(w io.Writer, e *gitlab.ContributionEvent, project *gitlab.Projec
 		fmt.Fprintf(w, "%s %q", e.TargetType, e.Title)
 	}
 	fmt.Fprintln(w) // to leave a blank line
-
 }
diff --git a/commands/user/user.go b/commands/user/user.go
index 51f182bd..00bb4444 100644
--- a/commands/user/user.go
+++ b/commands/user/user.go
@@ -7,7 +7,7 @@ import (
 )
 
 func NewCmdUser(f *cmdutils.Factory) *cobra.Command {
-	var userCmd = &cobra.Command{
+	userCmd := &cobra.Command{
 		Use:   "user <command> [flags]",
 		Short: "Interact with user",
 		Long:  "",
diff --git a/commands/variable/delete/delete.go b/commands/variable/delete/delete.go
index 1d6bb35c..f6799656 100644
--- a/commands/variable/delete/delete.go
+++ b/commands/variable/delete/delete.go
@@ -1,9 +1,8 @@
 package delete
 
 import (
-	"fmt"
-
 	"errors"
+	"fmt"
 
 	"github.com/MakeNowJust/heredoc"
 	"gitlab.com/gitlab-org/cli/api"
@@ -71,7 +70,6 @@ func NewCmdSet(f *cmdutils.Factory, runE func(opts *DeleteOpts) error) *cobra.Co
 	cmd.Flags().StringVarP(&opts.Group, "group", "g", "", "Delete variable from a group")
 
 	return cmd
-
 }
 
 func deleteRun(opts *DeleteOpts) error {
diff --git a/commands/variable/delete/delete_test.go b/commands/variable/delete/delete_test.go
index abb06024..6b10a48d 100644
--- a/commands/variable/delete/delete_test.go
+++ b/commands/variable/delete/delete_test.go
@@ -105,11 +105,11 @@ func Test_deleteRun(t *testing.T) {
 		httpmock.NewStringResponse(204, " "),
 	)
 
-	var httpClient = func() (*gitlab.Client, error) {
+	httpClient := func() (*gitlab.Client, error) {
 		a, _ := api.TestClient(&http.Client{Transport: reg}, "", "gitlab.com", false)
 		return a.Lab(), nil
 	}
-	var baseRepo = func() (glrepo.Interface, error) {
+	baseRepo := func() (glrepo.Interface, error) {
 		return glrepo.FromFullName("owner/repo")
 	}
 
diff --git a/commands/variable/get/get.go b/commands/variable/get/get.go
index 2a88680b..5a00e111 100644
--- a/commands/variable/get/get.go
+++ b/commands/variable/get/get.go
@@ -36,7 +36,6 @@ func NewCmdSet(f *cmdutils.Factory, runE func(opts *GetOps) error) *cobra.Comman
             glab variable get -g GROUP VAR_KEY
 		`),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
-
 			opts.HTTPClient = f.HttpClient
 			opts.BaseRepo = f.BaseRepo
 
diff --git a/commands/variable/list/list.go b/commands/variable/list/list.go
index 11621e31..12c417ea 100644
--- a/commands/variable/list/list.go
+++ b/commands/variable/list/list.go
@@ -53,7 +53,7 @@ func NewCmdSet(f *cmdutils.Factory, runE func(opts *ListOpts) error) *cobra.Comm
 }
 
 func listRun(opts *ListOpts) error {
-	//c := opts.IO.Color()
+	// c := opts.IO.Color()
 	httpClient, err := opts.HTTPClient()
 	if err != nil {
 		return err
diff --git a/commands/variable/update/update.go b/commands/variable/update/update.go
index 9e567aa4..670af28a 100644
--- a/commands/variable/update/update.go
+++ b/commands/variable/update/update.go
@@ -152,5 +152,4 @@ func updateRun(opts *UpdateOpts) error {
 	}
 
 	return nil
-
 }
diff --git a/commands/version/version.go b/commands/version/version.go
index c72bcf67..476466fb 100644
--- a/commands/version/version.go
+++ b/commands/version/version.go
@@ -10,7 +10,7 @@ import (
 )
 
 func NewCmdVersion(s *iostreams.IOStreams, version, buildDate string) *cobra.Command {
-	var versionCmd = &cobra.Command{
+	versionCmd := &cobra.Command{
 		Use:     "version",
 		Short:   "Show glab version information",
 		Long:    ``,
diff --git a/internal/config/config_file.go b/internal/config/config_file.go
index 49841470..412f43d4 100644
--- a/internal/config/config_file.go
+++ b/internal/config/config_file.go
@@ -13,8 +13,10 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-var cachedConfig Config
-var configError error
+var (
+	cachedConfig Config
+	configError  error
+)
 
 // ConfigDir returns the config directory
 func ConfigDir() string {
@@ -69,7 +71,7 @@ var ReadConfigFile = func(filename string) ([]byte, error) {
 }
 
 var WriteConfigFile = func(filename string, data []byte) error {
-	err := os.MkdirAll(path.Dir(filename), 0750)
+	err := os.MkdirAll(path.Dir(filename), 0o750)
 	if err != nil {
 		return pathError(err)
 	}
@@ -77,7 +79,7 @@ var WriteConfigFile = func(filename string, data []byte) error {
 	if err != nil && !os.IsNotExist(err) {
 		return err
 	}
-	err = WriteFile(filename, data, 0600)
+	err = WriteFile(filename, data, 0o600)
 	return err
 }
 
@@ -160,7 +162,6 @@ func pathError(err error) error {
 		if p := findRegularFile(pathError.Path); p != "" {
 			return fmt.Errorf("remove or rename regular file `%s` (must be a directory)", p)
 		}
-
 	}
 	return err
 }
diff --git a/internal/config/config_migration.go b/internal/config/config_migration.go
index c2c40ec7..9fdffe05 100644
--- a/internal/config/config_migration.go
+++ b/internal/config/config_migration.go
@@ -244,5 +244,5 @@ func copy(src string, dst string) error {
 		return err
 	}
 	// Write data to dst
-	return WriteFile(dst, data, 0600)
+	return WriteFile(dst, data, 0o600)
 }
diff --git a/internal/config/config_type.go b/internal/config/config_type.go
index 489fb713..e4fc95b4 100644
--- a/internal/config/config_type.go
+++ b/internal/config/config_type.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"os"
 	"sort"
@@ -9,8 +10,6 @@ import (
 
 	"gitlab.com/gitlab-org/cli/pkg/glinstance"
 
-	"errors"
-
 	"gopkg.in/yaml.v3"
 )
 
diff --git a/internal/config/config_type_test.go b/internal/config/config_type_test.go
index 6c7eb0de..1390bdb0 100644
--- a/internal/config/config_type_test.go
+++ b/internal/config/config_type_test.go
@@ -19,9 +19,9 @@ func Test_fileConfig_Set(t *testing.T) {
 	assert.NoError(t, c.Set("example.com", "editor", "vim"))
 	assert.NoError(t, c.Set("gitlab.com", "username", "hubot"))
 	assert.NoError(t, c.WriteAll())
-	//a, _ := c.Aliases()
-	//assert.NoError(t, a.Set("co", "mr checkout"))
-	//assert.NoError(t, a.Write())
+	// a, _ := c.Aliases()
+	// assert.NoError(t, a.Set("co", "mr checkout"))
+	// assert.NoError(t, a.Write())
 
 	expected := heredoc.Doc(`# What protocol to use when performing git operations. Supported values: ssh, https
 git_protocol: ssh
diff --git a/internal/config/testing.go b/internal/config/testing.go
index 632e4bf9..08f9e95c 100644
--- a/internal/config/testing.go
+++ b/internal/config/testing.go
@@ -49,7 +49,6 @@ func StubConfig(main, aliases string) func() {
 		default:
 			return []byte(nil), fmt.Errorf("read from unstubbed file: %q", fn)
 		}
-
 	}
 	return func() {
 		ReadConfigFile = orig
diff --git a/internal/config/writefile_test.go b/internal/config/writefile_test.go
index 9fa1c7ab..26558416 100644
--- a/internal/config/writefile_test.go
+++ b/internal/config/writefile_test.go
@@ -23,7 +23,7 @@ func Test_WriteFile(t *testing.T) {
 
 	t.Run("regular", func(t *testing.T) {
 		require.Nilf(t,
-			WriteFile(fpath, []byte("profclems/glab"), 0644),
+			WriteFile(fpath, []byte("profclems/glab"), 0o644),
 			"unexpected error = %s", err,
 		)
 
@@ -41,7 +41,7 @@ func Test_WriteFile(t *testing.T) {
 		symPath := filepath.Join(dir, "test-symlink")
 		require.Nil(t, os.Symlink(fpath, symPath), "failed to create a symlink")
 		require.Nilf(t,
-			WriteFile(symPath, []byte("profclems/glab/symlink"), 0644),
+			WriteFile(symPath, []byte("profclems/glab/symlink"), 0o644),
 			"unexpected error = %s", err,
 		)
 
diff --git a/internal/glrepo/repo_test.go b/internal/glrepo/repo_test.go
index 2055c279..330c9387 100644
--- a/internal/glrepo/repo_test.go
+++ b/internal/glrepo/repo_test.go
@@ -346,7 +346,6 @@ hosts:
 }
 
 func TestFullNameFromURL(t *testing.T) {
-
 	tests := []struct {
 		remoteURL string
 		want      string
diff --git a/internal/glrepo/resolver_test.go b/internal/glrepo/resolver_test.go
index 88a7bb64..bfd3d483 100644
--- a/internal/glrepo/resolver_test.go
+++ b/internal/glrepo/resolver_test.go
@@ -220,7 +220,6 @@ func Test_resolveNetwork(t *testing.T) {
 
 		for i := 0; i < maxRemotesForLookup; i++ {
 			rem.remotes = append(rem.remotes, rem.remotes[i])
-
 		}
 		// Make sure we have at least one more remote than the limit set from maxRemotesForLookup
 		assert.Len(t, rem.remotes, maxRemotesForLookup+1)
diff --git a/pkg/git/git.go b/pkg/git/git.go
index fae51e17..7298e09b 100644
--- a/pkg/git/git.go
+++ b/pkg/git/git.go
@@ -119,7 +119,6 @@ func Config(name string) (string, error) {
 	}
 
 	return firstLine(output), nil
-
 }
 
 var GitCommand = func(args ...string) *exec.Cmd {
@@ -336,13 +335,11 @@ var ToplevelDir = func() (string, error) {
 	showCmd := exec.Command("git", "rev-parse", "--show-toplevel")
 	output, err := run.PrepareCmd(showCmd).Output()
 	return firstLine(output), err
-
 }
 
 func outputLines(output []byte) []string {
 	lines := strings.TrimSuffix(string(output), "\n")
 	return strings.Split(lines, "\n")
-
 }
 
 func firstLine(output []byte) string {
diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go
index 5f5165b3..7a592374 100644
--- a/pkg/git/git_test.go
+++ b/pkg/git/git_test.go
@@ -193,7 +193,6 @@ func TestParseExtraCloneArgs(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func TestReadBranchConfig(t *testing.T) {
diff --git a/pkg/glinstance/host.go b/pkg/glinstance/host.go
index 567d2761..3257f606 100644
--- a/pkg/glinstance/host.go
+++ b/pkg/glinstance/host.go
@@ -11,8 +11,10 @@ const (
 	defaultProtocol = "https"
 )
 
-var hostnameOverride string
-var protocolOverride string
+var (
+	hostnameOverride string
+	protocolOverride string
+)
 
 // Default returns the host name of the default GitLab instance
 func Default() string {
diff --git a/pkg/httpmock/stub.go b/pkg/httpmock/stub.go
index dc7cf5c6..138e657c 100644
--- a/pkg/httpmock/stub.go
+++ b/pkg/httpmock/stub.go
@@ -11,8 +11,10 @@ import (
 	"strings"
 )
 
-type Matcher func(req *http.Request) bool
-type Responder func(req *http.Request) (*http.Response, error)
+type (
+	Matcher   func(req *http.Request) bool
+	Responder func(req *http.Request) (*http.Response, error)
+)
 
 type Stub struct {
 	matched   bool
diff --git a/pkg/iostreams/color_test.go b/pkg/iostreams/color_test.go
index cdc38762..e558bcf7 100644
--- a/pkg/iostreams/color_test.go
+++ b/pkg/iostreams/color_test.go
@@ -49,5 +49,4 @@ func Test_isColorEnabled(t *testing.T) {
 		got := isColorEnabled()
 		assert.True(t, got)
 	})
-
 }
diff --git a/pkg/iostreams/iostreams_test.go b/pkg/iostreams/iostreams_test.go
index dc4a2075..13dc8918 100644
--- a/pkg/iostreams/iostreams_test.go
+++ b/pkg/iostreams/iostreams_test.go
@@ -81,7 +81,6 @@ func Test_HelperFunctions(t *testing.T) {
 				assert.False(t, got)
 			})
 		})
-
 	})
 
 	t.Run("SetPager()", func(t *testing.T) {
@@ -113,7 +112,6 @@ func Test_HelperFunctions(t *testing.T) {
 				ios.promptDisabled = true
 				got = ios.PromptEnabled()
 				assert.False(t, got)
-
 			})
 
 			t.Run("IsaTTY=false", func(t *testing.T) {
diff --git a/pkg/text/truncate_test.go b/pkg/text/truncate_test.go
index 0b2e68e2..a10aae53 100644
--- a/pkg/text/truncate_test.go
+++ b/pkg/text/truncate_test.go
@@ -12,7 +12,6 @@ func TestTruncate(t *testing.T) {
 		args args
 		want string
 	}{
-
 		{
 			name: "short",
 			args: args{
diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go
index 244f6228..79ddd791 100644
--- a/pkg/utils/utils_test.go
+++ b/pkg/utils/utils_test.go
@@ -6,7 +6,6 @@ import (
 )
 
 func Test_PrettyTimeAgo(t *testing.T) {
-
 	cases := map[string]string{
 		"1s":         "less than a minute ago",
 		"30s":        "less than a minute ago",
@@ -106,6 +105,7 @@ func Test_PresentInIntSlice(t *testing.T) {
 		})
 	}
 }
+
 func Test_CommonElementsInStringSlice(t *testing.T) {
 	testCases := []struct {
 		name   string