fix additional lint errors and increase linter scope

Also test creds parsing in S3Getter.

Author: Abhijeet

.github/workflows/go-getter.yml

@@ -162,5 +162,3 @@ jobs:
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
       - name: Lint code
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
-        with:
-          args: --enable-only errcheck # this is temporary until the other lint errors are fixed

checksum.go

@@ -56,13 +56,13 @@ func (cerr *ChecksumError) Error() string {
 func (c *FileChecksum) checksum(source string) error {
 	f, err := os.Open(source)
 	if err != nil {
-		return fmt.Errorf("Failed to open file for checksum: %s", err)
+		return fmt.Errorf("failed to open file for checksum: %s", err)
 	}
 	defer func() { _ = f.Close() }()
 
 	c.Hash.Reset()
 	if _, err := io.Copy(c.Hash, f); err != nil {
-		return fmt.Errorf("Failed to hash: %s", err)
+		return fmt.Errorf("failed to hash: %s", err)
 	}
 
 	if actual := c.Hash.Sum(nil); !bytes.Equal(actual, c.Value) {
@@ -184,7 +184,7 @@ func newChecksumFromValue(checksumValue, filename string) (*FileChecksum, error)
 		c.Hash = sha512.New()
 		c.Type = "sha512"
 	default:
-		return nil, fmt.Errorf("Unknown type for checksum %s", checksumValue)
+		return nil, fmt.Errorf("unknown type for checksum %s", checksumValue)
 	}
 
 	return c, nil
@@ -307,7 +307,7 @@ func parseChecksumLine(line string) (*FileChecksum, error) {
 		if len(parts[1]) <= 2 ||
 			parts[1][0] != '(' || parts[1][len(parts[1])-1] != ')' {
 			return nil, fmt.Errorf(
-				"Unexpected BSD-style-checksum filename format: %s", line)
+				"unexpected BSD-style-checksum filename format: %s", line)
 		}
 		filename := parts[1][1 : len(parts[1])-1]
 		return newChecksumFromType(parts[0], parts[3], filename)

client.go

@@ -135,7 +135,7 @@ func (c *Client) Get() error {
 	if subDir != "" {
 		// Check if the subdirectory is attempting to traverse updwards, outside of
 		// the cloned repository path.
-		subDir := filepath.Clean(subDir)
+		subDir = filepath.Clean(subDir)
 		if containsDotDot(subDir) {
 			return fmt.Errorf("subdirectory component contain path traversal out of the repository")
 		}

client_option_progress_test.go

@@ -27,7 +27,7 @@ func (p *MockProgressTracking) TrackProgress(src string,
 		p.downloaded = map[string]int{}
 	}
 
-	v, _ := p.downloaded[src]
+	v := p.downloaded[src]
 	p.downloaded[src] = v + 1
 	return stream
 }

cmd/go-getter/main.go

@@ -77,7 +77,7 @@ func main() {
 		}
 	}()
 
-	c := make(chan os.Signal)
+	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
 
 	select {

decompress_testing.go

@@ -93,7 +93,7 @@ func TestDecompressor(t testing.TB, d Decompressor, cases []TestDecompressCase)
 			expected := tc.DirList
 			if runtime.GOOS == "windows" {
 				for i, v := range expected {
-					expected[i] = strings.Replace(v, "/", "\\", -1)
+					expected[i] = strings.ReplaceAll(v, "/", "\\")
 				}
 			}
 

get_gcs.go

@@ -170,7 +170,8 @@ func (g *GCSGetter) getObject(ctx context.Context, client *storage.Client, dst,
 	var rc *storage.Reader
 	var err error
 	if fragment != "" {
-		generation, err := strconv.ParseInt(fragment, 10, 64)
+		var generation int64
+		generation, err = strconv.ParseInt(fragment, 10, 64)
 		if err != nil {
 			return err
 		}

get_git.go

@@ -34,7 +34,6 @@ type GitGetter struct {
 	Timeout time.Duration
 }
 
-var defaultBranchRegexp = regexp.MustCompile(`\s->\sorigin/(.*)`)
 var lsRemoteSymRefRegexp = regexp.MustCompile(`ref: refs/heads/([^\s]+).*`)
 
 func (g *GitGetter) ClientMode(_ *url.URL) (ClientMode, error) {
@@ -83,7 +82,7 @@ func (g *GitGetter) Get(dst string, u *url.URL) error {
 		q.Del("depth")
 
 		// Copy the URL
-		var newU url.URL = *u
+		newU := *u
 		u = &newU
 		u.RawQuery = q.Encode()
 	}
@@ -313,22 +312,6 @@ func (g *GitGetter) fetchSubmodules(ctx context.Context, dst, sshKeyFile string,
 	return getRunCommand(cmd)
 }
 
-// findDefaultBranch checks the repo's origin remote for its default branch
-// (generally "master"). "master" is returned if an origin default branch
-// can't be determined.
-func findDefaultBranch(ctx context.Context, dst string) string {
-	var stdoutbuf bytes.Buffer
-	cmd := exec.CommandContext(ctx, "git", "branch", "-r", "--points-at", "refs/remotes/origin/HEAD")
-	cmd.Dir = dst
-	cmd.Stdout = &stdoutbuf
-	err := cmd.Run()
-	matches := defaultBranchRegexp.FindStringSubmatch(stdoutbuf.String())
-	if err != nil || matches == nil {
-		return "master"
-	}
-	return matches[len(matches)-1]
-}
-
 // findRemoteDefaultBranch checks the remote repo's HEAD symref to return the remote repo's
 // default branch. "master" is returned if no HEAD symref exists.
 func findRemoteDefaultBranch(ctx context.Context, u *url.URL) string {
@@ -374,7 +357,7 @@ func setupGitEnv(cmd *exec.Cmd, sshKeyFile string) {
 
 	// We have an SSH key temp file configured, tell ssh about this.
 	if runtime.GOOS == "windows" {
-		sshKeyFile = strings.Replace(sshKeyFile, `\`, `/`, -1)
+		sshKeyFile = strings.ReplaceAll(sshKeyFile, `\`, `/`)
 	}
 	sshCmd = append(sshCmd, "-i", sshKeyFile)
 	env = append(env, strings.Join(sshCmd, " "))
@@ -398,7 +381,7 @@ func checkGitVersion(ctx context.Context, min string) error {
 
 	fields := strings.Fields(string(out))
 	if len(fields) < 3 {
-		return fmt.Errorf("Unexpected 'git version' output: %q", string(out))
+		return fmt.Errorf("unexpected 'git version' output: %q", string(out))
 	}
 	v := fields[2]
 	if runtime.GOOS == "windows" && strings.Contains(v, ".windows.") {
@@ -416,7 +399,7 @@ func checkGitVersion(ctx context.Context, min string) error {
 	}
 
 	if have.LessThan(want) {
-		return fmt.Errorf("Required git version = %s, have %s", want, have)
+		return fmt.Errorf("required git version = %s, have %s", want, have)
 	}
 
 	return nil
@@ -426,13 +409,13 @@ func checkGitVersion(ctx context.Context, min string) error {
 func removeCaseInsensitiveGitDirectory(dst string) error {
 	files, err := os.ReadDir(dst)
 	if err != nil {
-		return fmt.Errorf("Failed to read the destination directory %s during git update", dst)
+		return fmt.Errorf("failed to read the destination directory %s during git update", dst)
 	}
 	for _, f := range files {
 		if strings.EqualFold(f.Name(), ".git") && f.IsDir() {
 			err := os.RemoveAll(filepath.Join(dst, f.Name()))
 			if err != nil {
-				return fmt.Errorf("Failed to remove the .git directory in the destination directory %s during git update", dst)
+				return fmt.Errorf("failed to remove the .git directory in the destination directory %s during git update", dst)
 			}
 		}
 	}

get_git_test.go

@@ -603,7 +603,7 @@ func TestGitGetter_sshSCPStyleInvalidScheme(t *testing.T) {
 
 	got := err.Error()
 	want1, want2 := `invalid source string`, `invalid port number "hashicorp"`
-	if !(strings.Contains(got, want1) || strings.Contains(got, want2)) {
+	if !strings.Contains(got, want1) && !strings.Contains(got, want2) {
 		t.Fatalf("wrong error\ngot:  %s\nwant: %q or %q", got, want1, want2)
 	}
 }
@@ -621,7 +621,7 @@ func TestGitGetter_submodule(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		return strings.Replace(relpath, `\`, `/`, -1)
+		return strings.ReplaceAll(relpath, `\`, `/`)
 		// on windows git still prefers relatives paths
 		// containing `/` for submodules
 	}
@@ -887,7 +887,7 @@ func TestGitGetter_BadGitConfig(t *testing.T) {
 
 	_, err = os.Stat(dst)
 	if err != nil && !os.IsNotExist(err) {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	if err == nil {
 		// Update the repository containing the bad git config.
@@ -897,29 +897,29 @@ func TestGitGetter_BadGitConfig(t *testing.T) {
 		// Clone a repository with a git config file
 		err = g.clone(ctx, dst, testGitToken, url, "main", 1)
 		if err != nil {
-			t.Fatalf(err.Error())
+			t.Fatal(err.Error())
 		}
 
 		// Edit the git config file to simulate a bad git config
 		gitConfigPath := filepath.Join(dst, ".git", "config")
 		err = os.WriteFile(gitConfigPath, []byte("bad config"), 0600)
 		if err != nil {
-			t.Fatalf(err.Error())
+			t.Fatal(err.Error())
 		}
 
 		// Update the repository containing the bad git config.
 		// This should remove the bad git config file and initialize a new one.
 		err = g.update(ctx, dst, testGitToken, url, "main", 1)
 	}
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 
 	// Check if the .git/config file contains "bad config"
 	gitConfigPath := filepath.Join(dst, ".git", "config")
 	configBytes, err := os.ReadFile(gitConfigPath)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	if strings.Contains(string(configBytes), "bad config") {
 		t.Fatalf("The .git/config file contains 'bad config'")
@@ -943,37 +943,37 @@ func TestGitGetter_BadGitDirName(t *testing.T) {
 
 	_, err = os.Stat(dst)
 	if err != nil && !os.IsNotExist(err) {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	if err == nil {
 		// Remove all variations of .git directories
 		err = removeCaseInsensitiveGitDirectory(dst)
 		if err != nil {
-			t.Fatalf(err.Error())
+			t.Fatal(err.Error())
 		}
 	} else {
 		// Clone a repository with a git directory
 		err = g.clone(ctx, dst, testGitToken, url, "main", 1)
 		if err != nil {
-			t.Fatalf(err.Error())
+			t.Fatal(err.Error())
 		}
 
 		// Rename the .git directory to .GIT
 		oldPath := filepath.Join(dst, ".git")
 		newPath := filepath.Join(dst, ".GIT")
 		err = os.Rename(oldPath, newPath)
 		if err != nil {
-			t.Fatalf(err.Error())
+			t.Fatal(err.Error())
 		}
 
 		// Remove all variations of .git directories
 		err = removeCaseInsensitiveGitDirectory(dst)
 		if err != nil {
-			t.Fatalf(err.Error())
+			t.Fatal(err.Error())
 		}
 	}
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 
 	// Check if the .GIT directory exists
@@ -1004,13 +1004,13 @@ func TestGitGetter_BadRef(t *testing.T) {
 
 	_, err = os.Stat(dst)
 	if err != nil && !os.IsNotExist(err) {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 
 	// Clone a repository with non-existent ref
 	err = g.clone(ctx, dst, "", url, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 0)
 	if err == nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 
 	// Expect that the dst was cleaned up after failed ref checkout

get_http.go

@@ -208,7 +208,7 @@ func (g *HttpGetter) Get(dst string, u *url.URL) error {
 	}
 
 	// Copy the URL so we can modify it
-	var newU url.URL = *u
+	newU := *u
 	u = &newU
 
 	if g.Netrc {