Fixing repo directory value trimming when pkg name contains it (#289)

* fixing repo directory value trimming when pkg name contains it

* adding trimPrefix for absolute vs relative path in initial discovery of pkgs

* adding comment to explain change

* comment change to retrigger test

Author: Catalin-Stratulat-Ericsson

pkg/externalrepo/git/package_tree.go

@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"path"
+	"strings"
 	"time"
 
 	"github.com/go-git/go-git/v5/plumbing"
@@ -154,7 +155,8 @@ func (t *packageList) discoverPackages(repoKey repository.RepositoryKey, tree *o
 
 			// Found a package
 			t.packages[treePath] = &packageListEntry{
-				pkgKey:   repository.FromFullPathname(repoKey, treePath),
+				// When discovering packages the absolute path of the package is needed in relation to the root of the repo
+				pkgKey:   repository.FromFullPathname(repoKey, strings.TrimPrefix(treePath, repoKey.Path)),
 				treeHash: tree.Hash,
 				parent:   t,
 			}

pkg/repository/repository.go

@@ -160,7 +160,7 @@ func K8SName2PkgName(k8sName string) string {
 }
 
 func FromFullPathname(repoKey RepositoryKey, fullpath string) PackageKey {
-	pkgPath := strings.Trim(strings.TrimPrefix(fullpath, repoKey.Path), "/")
+	pkgPath := strings.Trim(fullpath, "/")
 	slashIndex := strings.LastIndex(pkgPath, "/")
 
 	if slashIndex >= 0 {