Fix linting issues

Author: afritzler

.github/workflows/publish-docker.yml

@@ -53,10 +53,6 @@ jobs:
           flavor: |
             latest=${{ github.ref == 'refs/heads/main' }}
 
-      - name: Set short git commit SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -88,5 +84,5 @@ jobs:
           target: ${{ matrix.image.target }}
           build-args: |
             VERSION=${{ steps.meta.outputs.version }}
-            GIT_COMMIT=${{ steps.vars.sha_short }}
-            BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+            GIT_COMMIT=${{ github.sha }}
+            BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"

.golangci.yml

@@ -79,6 +79,7 @@ linters:
         path: internal/provider/cisco/nxos/vrf
       - linters:
           - lll
+          - goconst
         path: internal/provider/cisco/nxos
       - linters:
           - lll

internal/provider/cisco/nxos/iface/portchannel_test.go

@@ -160,7 +160,6 @@ func Test_PortChannel_ToYGOT_GnmiClient(t *testing.T) {
 }
 
 func Test_PortChannel_ToYGOT_Updates(t *testing.T) {
-
 	tests := []struct {
 		name                    string
 		pcName                  string
@@ -272,10 +271,8 @@ func Test_PortChannel_ToYGOT_Updates(t *testing.T) {
 			updates, err := pc.ToYGOT(t.Context(), &gnmiext.ClientMock{
 				ExistsFunc: func(_ context.Context, _ string) (bool, error) { return true, nil },
 			})
-
 			if err != nil {
 				t.Fatalf("unexpected error during ToYGOT: %v", err)
-
 			}
 			if len(updates) != tt.expectedNumberOfUpdates {
 				t.Fatalf("expected %d updates, got %d", tt.expectedNumberOfUpdates, len(updates))

test/utils/util.go

@@ -4,8 +4,6 @@
 package utils
 
 import (
-	"bufio"
-	"bytes"
 	"fmt"
 	"os"
 	"os/exec"
@@ -200,55 +198,3 @@ func GetProjectDir() (string, error) {
 	wd = strings.ReplaceAll(wd, "/test/e2e", "")
 	return wd, nil
 }
-
-// UncommentCode searches for target in the file and remove the comment prefix
-// of the target content. The target content may span multiple lines.
-func UncommentCode(filename, target, prefix string) error {
-	// false positive
-	// nolint:gosec
-	content, err := os.ReadFile(filename)
-	if err != nil {
-		return fmt.Errorf("failed to read file %q: %w", filename, err)
-	}
-	strContent := string(content)
-
-	idx := strings.Index(strContent, target)
-	if idx < 0 {
-		return fmt.Errorf("unable to find the code %q to be uncomment", target)
-	}
-
-	out := new(bytes.Buffer)
-	_, err = out.Write(content[:idx])
-	if err != nil {
-		return fmt.Errorf("failed to write to output: %w", err)
-	}
-
-	scanner := bufio.NewScanner(bytes.NewBufferString(target))
-	if !scanner.Scan() {
-		return nil
-	}
-	for {
-		if _, err = out.WriteString(strings.TrimPrefix(scanner.Text(), prefix)); err != nil {
-			return fmt.Errorf("failed to write to output: %w", err)
-		}
-		// Avoid writing a newline in case the previous line was the last in target.
-		if !scanner.Scan() {
-			break
-		}
-		if _, err = out.WriteString("\n"); err != nil {
-			return fmt.Errorf("failed to write to output: %w", err)
-		}
-	}
-
-	if _, err = out.Write(content[idx+len(target):]); err != nil {
-		return fmt.Errorf("failed to write to output: %w", err)
-	}
-
-	// false positive
-	// nolint:gosec
-	if err = os.WriteFile(filename, out.Bytes(), 0o644); err != nil {
-		return fmt.Errorf("failed to write file %q: %w", filename, err)
-	}
-
-	return nil
-}