normalize git repo (argoproj#7)

Signed-off-by: Michael Crenshaw <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]>
similarweb · Dec 6, 2022 · 4c09eaf · 4c09eaf
1 parent 55ec032
commit 4c09eaf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
@@ -923,8 +923,8 @@ func helmTemplate(appPath string, repoRoot string, env *v1alpha1.Env, q *apiclie
 				pathStrings := strings.Split(val, "/")
 				refVar := strings.Split(val, "/")[0]
 				refSourceRepo := q.RefSources[refVar].Repo.Repo
-				repoPath, err := gitRepoPaths.GetPath(refSourceRepo)
-				if err != nil {
+				repoPath := gitRepoPaths.GetPathIfExists(git.NormalizeGitURL(refSourceRepo))
+				if repoPath == "" {
 					log.Warnf("Failed to find path for ref %s", refVar)
 					continue
 				}

diff --git a/util/io/paths.go b/util/io/paths.go
@@ -42,3 +42,13 @@ func (p *TempPaths) GetPath(key string) (string, error) {
 	p.paths[key] = repoPath
 	return repoPath, nil
 }
+
+// GetPathIfExists gets a path for the given key if it exists. Otherwise, returns an empty string.
+func (p *TempPaths) GetPathIfExists(key string) string {
+	p.lock.Lock()
+	defer p.lock.Unlock()
+	if val, ok := p.paths[key]; ok {
+		return val
+	}
+	return ""
+}