chore: standardize temporary dir name prefix

Avoids passing in an unnecessary param. Addresses helm#11258 (comment) Signed-off-by: Dominykas Blyžė <hello@dominykas.com>
dominykas · Dec 20, 2023 · 68d4268 · 68d4268
1 parent f42ea6b
commit 68d4268
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/internal/gitutil/gitutil.go b/internal/gitutil/gitutil.go
@@ -27,8 +27,8 @@ import (
 var gitRepositoryURLRe = regexp.MustCompile(`^git(\+\w+)?://`)
 
 // HasGitReference returns true if a git repository contains a specified ref (branch/tag)
-func HasGitReference(gitRepo, ref, repoName string) (bool, error) {
-	local, err := os.MkdirTemp("", repoName)
+func HasGitReference(gitRepo, ref string) (bool, error) {
+	local, err := os.MkdirTemp("", "helm-git-")
 	if err != nil {
 		return false, err
 	}

diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go
@@ -117,7 +117,7 @@ func (r *Resolver) Resolve(reqs []*chart.Dependency, repoNames map[string]string
 
 		if gitutil.IsGitRepository(d.Repository) {
 
-			found, err := hasGitReference(gitutil.RepositoryURLToGitURL(d.Repository), d.Version, d.Name)
+			found, err := hasGitReference(gitutil.RepositoryURLToGitURL(d.Repository), d.Version)
 
 			if err != nil {
 				return nil, err

diff --git a/internal/resolver/resolver_test.go b/internal/resolver/resolver_test.go
@@ -24,7 +24,7 @@ import (
 	"helm.sh/helm/v3/pkg/registry"
 )
 
-func fakeGitReference(gitRepo, ref, repoName string) (bool, error) {
+func fakeGitReference(gitRepo, ref string) (bool, error) {
 	gitRefs := map[string]string{
 		"1.0.0": "",
 		"main":  "",

diff --git a/pkg/getter/gitgetter.go b/pkg/getter/gitgetter.go
@@ -66,7 +66,7 @@ func (g *GitGetter) get(href string) (*bytes.Buffer, error) {
 	if version == "" {
 		return nil, fmt.Errorf("the version must be a valid tag or branch name for the git repo, not nil")
 	}
-	tmpDir, err := os.MkdirTemp("", "helm")
+	tmpDir, err := os.MkdirTemp("", "helm-git-")
 	if err != nil {
 		return nil, err
 	}