From fdcfdb5b8b71e2605eaca43e2546126e87582857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20G=C3=B3mez=20Escandell?=
 <edu.gomez.escandell@canonical.com>
Date: Thu, 14 Sep 2023 16:01:45 +0200
Subject: [PATCH 1/6] Enable duplword linter

---
 .golangci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.golangci.yaml b/.golangci.yaml
index d948928e8..fa7285ecc 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -5,6 +5,7 @@ linters:
   # linters to run in addition to default ones
   enable:
     - dupl
+    - dupword
     - durationcheck
     - errname
     - errorlint

From e563e1a125c4d2eb328769c32757ef9574339a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20G=C3=B3mez=20Escandell?=
 <edu.gomez.escandell@canonical.com>
Date: Thu, 14 Sep 2023 16:26:40 +0200
Subject: [PATCH 2/6] Fix duplword errors

---
 agentapi/generator_windows.go                                 | 2 +-
 windows-agent/internal/config/config_test.go                  | 2 +-
 windows-agent/internal/distros/worker/worker_test.go          | 4 ++--
 .../proservices/landscape/distroinstall/distroinstall.go      | 2 +-
 windows-agent/internal/proservices/ui/ui_test.go              | 2 +-
 wsl-pro-service/internal/daemon/daemon.go                     | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/agentapi/generator_windows.go b/agentapi/generator_windows.go
index 8e9044498..fcbd86848 100644
--- a/agentapi/generator_windows.go
+++ b/agentapi/generator_windows.go
@@ -3,4 +3,4 @@ package agentapi
 
 //go:generate wsl -- bash -c "source ~/.profile && ./generate.sh"
 
-// Sourcing.profile because wsl -- <SCRIPT> does not not do it automatically
+// Sourcing.profile because wsl -- <SCRIPT> does not do it automatically
diff --git a/windows-agent/internal/config/config_test.go b/windows-agent/internal/config/config_test.go
index 389aa2df3..74358bfe7 100644
--- a/windows-agent/internal/config/config_test.go
+++ b/windows-agent/internal/config/config_test.go
@@ -371,7 +371,7 @@ func TestFetchMicrosoftStoreSubscription(t *testing.T) {
 	}
 }
 
-// is is a convenience function to check if a registryState matches a certain state.
+// is defines equality between flags. It is convenience function to check if a registryState matches a certain state.
 func (state registryState) is(flag registryState) bool {
 	return state&flag == flag
 }
diff --git a/windows-agent/internal/distros/worker/worker_test.go b/windows-agent/internal/distros/worker/worker_test.go
index bd52d7324..e514dc371 100644
--- a/windows-agent/internal/distros/worker/worker_test.go
+++ b/windows-agent/internal/distros/worker/worker_test.go
@@ -246,7 +246,7 @@ func TestTaskProcessing(t *testing.T) {
 				time.Sleep(clientTickPeriod)
 			}
 
-			// Testing task with with active connection
+			// Testing task with active connection
 			w.SetConnection(conn)
 
 			if !tc.wantExecuteCalled {
@@ -470,7 +470,7 @@ func TestTaskDeferral(t *testing.T) {
 			queuedTask := emptyTask{ID: uuid.NewString()}
 			deferredTask := emptyTask{ID: uuid.NewString()}
 
-			// Testing task with with active connection
+			// Testing task with active connection
 			wslInstanceService := newTestService(t)
 			conn := wslInstanceService.newClientConnection(t)
 			w.SetConnection(conn)
diff --git a/windows-agent/internal/proservices/landscape/distroinstall/distroinstall.go b/windows-agent/internal/proservices/landscape/distroinstall/distroinstall.go
index bb0af6246..9a233f389 100644
--- a/windows-agent/internal/proservices/landscape/distroinstall/distroinstall.go
+++ b/windows-agent/internal/proservices/landscape/distroinstall/distroinstall.go
@@ -41,7 +41,7 @@ func CreateUser(ctx context.Context, d gowsl.Distro, userName string, userFullNa
 	}
 
 	if valid := UsernameIsValid(userName); !valid {
-		return 0, errors.New("username is is not valid")
+		return 0, errors.New("username is not valid")
 	}
 
 	// strip any punctuation or any math symbols, currency signs, dingbats, box-drawing characters, etc
diff --git a/windows-agent/internal/proservices/ui/ui_test.go b/windows-agent/internal/proservices/ui/ui_test.go
index e564ccd18..a7c04d507 100644
--- a/windows-agent/internal/proservices/ui/ui_test.go
+++ b/windows-agent/internal/proservices/ui/ui_test.go
@@ -133,7 +133,7 @@ func TestGetSubscriptionInfo(t *testing.T) {
 		"Success with a store subscription":           {config: mockConfig{source: config.SubscriptionMicrosoftStore}, wantType: store},
 		"Success with a read-only store subscription": {config: mockConfig{source: config.SubscriptionMicrosoftStore, registryReadOnly: true}, wantType: store, wantImmutable: true},
 
-		"Error when the the read-only check fails":        {config: mockConfig{isReadOnlyErr: true}, wantErr: true},
+		"Error when the read-only check fails":            {config: mockConfig{isReadOnlyErr: true}, wantErr: true},
 		"Error when the subscription cannot be retreived": {config: mockConfig{subscriptionErr: true}, wantErr: true},
 	}
 
diff --git a/wsl-pro-service/internal/daemon/daemon.go b/wsl-pro-service/internal/daemon/daemon.go
index 2fcee20ae..115d3b6c5 100644
--- a/wsl-pro-service/internal/daemon/daemon.go
+++ b/wsl-pro-service/internal/daemon/daemon.go
@@ -154,7 +154,7 @@ func connectToControlStream(ctx context.Context, agentPortFilePath string, s sys
 
 func getControlStreamAddress(agentPortFilePath string, s system.System) (string, error) {
 	/*
-		We parse the the port from the file written by the windows agent.
+		We parse the port from the file written by the windows agent.
 	*/
 	addr, err := os.ReadFile(agentPortFilePath)
 	if err != nil {
@@ -171,7 +171,7 @@ func getControlStreamAddress(agentPortFilePath string, s system.System) (string,
 
 	/*
 		We parse the IP address of the Windows host /etc/resolv.conf to know. We cannot use localhost
-		because WSL localhost forwarding only works for for Linux-side servers.
+		because WSL localhost forwarding only works for Linux-side servers.
 
 		# This file was automatically generated by WSL. To stop automatic generation of this file, add the following entry to /etc/wsl.conf:
 		# [network]

From a4cf6a3882097104ce18d2fa8c1a470f2a29aaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20G=C3=B3mez=20Escandell?=
 <edu.gomez.escandell@canonical.com>
Date: Thu, 14 Sep 2023 16:09:40 +0200
Subject: [PATCH 3/6] Enable gocheckcompilerdirectives linter

---
 .golangci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.golangci.yaml b/.golangci.yaml
index fa7285ecc..8a712acc3 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -13,6 +13,7 @@ linters:
     - forbidigo
     - forcetypeassert
     - gci
+    - gocheckcompilerdirectives
     - godot
     - gofmt
     - gosec

From 19ce377eb3c335f6040343d4f01ab66832b8a867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20G=C3=B3mez=20Escandell?=
 <edu.gomez.escandell@canonical.com>
Date: Thu, 14 Sep 2023 16:09:52 +0200
Subject: [PATCH 4/6] Fix gocheckcompilerdirectives errors

---
 windows-agent/generate/generate-locales.go   | 2 +-
 wsl-pro-service/generate/generate-locales.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/windows-agent/generate/generate-locales.go b/windows-agent/generate/generate-locales.go
index 05ea767f9..a2d3590d1 100644
--- a/windows-agent/generate/generate-locales.go
+++ b/windows-agent/generate/generate-locales.go
@@ -1,4 +1,4 @@
-//go:build: tools
+//go:build tools
 
 // Package generate generates the i18n files
 package generate
diff --git a/wsl-pro-service/generate/generate-locales.go b/wsl-pro-service/generate/generate-locales.go
index 05ea767f9..a2d3590d1 100644
--- a/wsl-pro-service/generate/generate-locales.go
+++ b/wsl-pro-service/generate/generate-locales.go
@@ -1,4 +1,4 @@
-//go:build: tools
+//go:build tools
 
 // Package generate generates the i18n files
 package generate

From 8d9e124563111d8d9c730cc358f112f6e45d58d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20G=C3=B3mez=20Escandell?=
 <edu.gomez.escandell@canonical.com>
Date: Thu, 14 Sep 2023 16:22:28 +0200
Subject: [PATCH 5/6] Enable usestdlibvars linter

---
 .golangci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.golangci.yaml b/.golangci.yaml
index 8a712acc3..30e8a7065 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -25,6 +25,7 @@ linters:
     - tparallel
     - unconvert
     - unparam
+    - usestdlibvars
     - whitespace
 
 run:

From 53c6de8187176d649009e952b9db538b7b4feca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20G=C3=B3mez=20Escandell?=
 <edu.gomez.escandell@canonical.com>
Date: Thu, 14 Sep 2023 16:23:02 +0200
Subject: [PATCH 6/6] Fix usestdlibvars errors

---
 windows-agent/internal/contracts/contractclient/client.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/windows-agent/internal/contracts/contractclient/client.go b/windows-agent/internal/contracts/contractclient/client.go
index 58c08c1d9..cd879e50e 100644
--- a/windows-agent/internal/contracts/contractclient/client.go
+++ b/windows-agent/internal/contracts/contractclient/client.go
@@ -57,7 +57,7 @@ func (c *Client) GetServerAccessToken(ctx context.Context) (token string, err er
 	}
 
 	defer res.Body.Close()
-	if res.StatusCode != 200 {
+	if res.StatusCode != http.StatusOK {
 		body, err := io.ReadAll(res.Body)
 		if err != nil {
 			return "", fmt.Errorf("server replied with an error: Code %d, %v", res.StatusCode, err)
@@ -109,9 +109,9 @@ func (c *Client) GetProToken(ctx context.Context, userJWT string) (token string,
 
 	defer res.Body.Close()
 	switch res.StatusCode { // add other error codes as CS team documents them.
-	case 401:
+	case http.StatusUnauthorized:
 		return "", fmt.Errorf("bad user ID key: %v", userJWT)
-	case 500:
+	case http.StatusInternalServerError:
 		return "", errors.New("couldn't validate the user entitlement against MS Store")
 	default:
 		body, err := io.ReadAll(res.Body)
@@ -119,7 +119,7 @@ func (c *Client) GetProToken(ctx context.Context, userJWT string) (token string,
 			return "", fmt.Errorf("unknown error from the contracts server: Code %d, %v", res.StatusCode, err)
 		}
 		return "", fmt.Errorf("unknown error from the contracts server: Code %d, %s", res.StatusCode, body)
-	case 200:
+	case http.StatusOK:
 	}
 
 	var data map[string]string