bump go, add comments to CI workflows, update golangci lint, fix lint…

…er errors

.github/workflows/PR.yaml

@@ -18,7 +18,7 @@ jobs:
         uses: golangci/[email protected]
         with:
           args: --timeout=10m
-          version: v1.59
+          version: v1.60
 
   test:
     strategy:
@@ -31,6 +31,8 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    # This step is required otherwise the 'mage'
+    # command cannot be used in subsequent steps
     - name: Install Go
       uses: actions/setup-go@v5
       with:
@@ -39,7 +41,7 @@ jobs:
     - name: Install Dependencies
       run: |
         go install github.com/magefile/[email protected]
-        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
+        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.0
 
     - name: Run E2E tests
       shell: pwsh

.github/workflows/merge.yaml

@@ -20,6 +20,8 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
+      # This step is required otherwise the 'mage'
+      # command cannot be used in subsequent steps
     - name: Install Go
       uses: actions/setup-go@v5
       with:
@@ -28,7 +30,7 @@ jobs:
     - name: Install Dependencies
       run: |
         go install github.com/magefile/[email protected]
-        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
+        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.0
 
     - name: Run E2E tests
       shell: pwsh

.github/workflows/release.yaml

@@ -39,7 +39,7 @@ jobs:
       - name: Install Dependencies
         run: |
           go install github.com/magefile/[email protected]
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.0
 
       - name: build-binary
         run: |
@@ -82,6 +82,8 @@ jobs:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_PASSWORD }}
 
+      # This step is required otherwise the 'mage'
+      # command cannot be used in subsequent steps
       - name: Install Go
         uses: actions/setup-go@v5
         with:
@@ -90,7 +92,7 @@ jobs:
       - name: Install Dependencies
         run: |
           go install github.com/magefile/[email protected]
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.0
 
       - name: build-binary
         run: |
@@ -126,7 +128,7 @@ jobs:
       - name: Install Dependencies
         run: |
           go install github.com/magefile/[email protected]
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.0
 
       - name: build-binary
         run: |

.golangci.json

@@ -16,7 +16,8 @@
       "tests",
       "scripts",
       "charts",
-      "package"
+      "package",
+      "pkg/powershell/powershell.go"
     ]
   }
 }

pkg/converters/byte_test.go

@@ -7,15 +7,15 @@ import (
 func TestUnsafeStringToBytes(t *testing.T) {
 	want := "hello world"
 	got := string(UnsafeStringToBytes("hello world"))
-	if string(got) != string(want) {
+	if got != want {
 		t.Errorf("error, should be %s, but got %s", want, got)
 	}
 }
 
 func TestUnsafeBytesToString(t *testing.T) {
 	want := "hello world"
 	got := UnsafeBytesToString([]byte("hello world"))
-	if string(got) != string(want) {
+	if got != want {
 		t.Errorf("error, should be %s, but got %s", want, got)
 	}
 }
@@ -30,7 +30,7 @@ func TestUnsafeUTF16BytesToString(t *testing.T) {
 		'l',
 		'o',
 		0x00})
-	if string(got) != string(want) {
-		t.Errorf("error, should be " + want + ", but got " + got)
+	if got != want {
+		t.Errorf("error, should be %s, but got %s", want, got)
 	}
 }

pkg/converters/json_test.go

@@ -20,11 +20,11 @@ func TestToJson(t *testing.T) {
 
 	got, err := ToJSON(json)
 	if err != nil {
-		t.Errorf("error occurred, " + err.Error())
+		t.Errorf("error occurred, %v", err)
 	}
 
 	if got != want {
-		t.Errorf("error, should be " + want + ", but got " + got)
+		t.Errorf("error, should be %s, but got %s", want, got)
 	}
 }
 
@@ -43,10 +43,10 @@ func TestToYaml(t *testing.T) {
 
 	got, err := ToYaml(yaml)
 	if err != nil {
-		t.Errorf("error occurred, " + err.Error())
+		t.Errorf("error occurred, %v", err)
 	}
 
 	if strings.TrimSpace(got) != want {
-		t.Errorf("error, should be " + want + ", but got " + got)
+		t.Errorf("error, should be %s, but got %s", want, got)
 	}
 }

pkg/npipes/npipe_test.go

@@ -41,10 +41,10 @@ func TestCreatePipe(t *testing.T) {
 			_, err := New(tt.args.name, tt.args.sddl, tt.args.bufferSize)
 			if err != nil {
 				if !tt.error {
-					t.Errorf("error occurred, " + err.Error())
+					t.Errorf("error occurred, %v", err)
 				}
 				if !strings.Contains(err.Error(), tt.want) {
-					t.Errorf("error, should be " + tt.want + ", but got " + err.Error())
+					t.Errorf("error, should be %s, but got %s", tt.want, err.Error())
 				}
 			}
 		})

suc/pkg/service/configure.go

@@ -97,10 +97,10 @@ func ConfigureDelayedStart() error {
 			return fmt.Errorf("failed to update %s service configuration while configuring service start type: %w", defaults.WindowsServiceName, err)
 		}
 		return nil
-	} else {
-		logrus.Infof("%s delayed start already set to %t", defaults.WindowsServiceName, delayedStart)
 	}
 
+	logrus.Infof("%s delayed start already set to %t", defaults.WindowsServiceName, delayedStart)
+
 	return nil
 }