protect against more nil maps

zapier · Dec 8, 2023 · 0cc8484 · 0cc8484
1 parent 5d7bee6
commit 0cc8484
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 33 deletions.
diff --git a/pkg/affected_apps/argocd_matcher.go b/pkg/affected_apps/argocd_matcher.go
@@ -39,10 +39,7 @@ func getKustomizeApps(vcsToArgoMap config.VcsToArgoMap, repo *repo.Repo, repoPat
 	log.Debug().Msgf("creating fs for %s", repoPath)
 	fs := os.DirFS(repoPath)
 	log.Debug().Msg("following kustomize apps")
-	kustomizeAppFiles, err := vcsToArgoMap.WalkKustomizeApps(repo, fs)
-	if err != nil {
-		log.Warn().Err(err).Msgf("failed to follow kustomize files")
-	}
+	kustomizeAppFiles := vcsToArgoMap.WalkKustomizeApps(repo, fs)
 
 	logCounts(kustomizeAppFiles)
 	return kustomizeAppFiles

diff --git a/pkg/affected_apps/argocd_matcher_test.go b/pkg/affected_apps/argocd_matcher_test.go
@@ -13,17 +13,18 @@ import (
 func TestCreateNewMatcherWithNilVcsMap(t *testing.T) {
 	// setup
 	var (
-		vcsMap config.VcsToArgoMap
-		repo   repo2.Repo
-		path   string
+		repo repo2.Repo
+		path string
+
+		vcsMap = config.NewVcsToArgoMap()
 	)
 
 	// run test
 	matcher, err := NewArgocdMatcher(vcsMap, &repo, path)
 	require.NoError(t, err)
 
 	// verify results
-	require.Nil(t, matcher.appsDirectory)
+	require.NotNil(t, matcher.appsDirectory)
 }
 
 func TestFindAffectedAppsWithNilAppsDirectory(t *testing.T) {

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -47,21 +47,8 @@ func (v2a *VcsToArgoMap) AddApp(app v1alpha1.Application) {
 		return
 	}
 
-	rawRepoUrl := app.Spec.Source.RepoURL
-	cleanRepoUrl, err := normalizeRepoUrl(rawRepoUrl)
-	if err != nil {
-		log.Warn().Err(err).Msgf("%s/%s: failed to parse %s", app.Namespace, app.Name, rawRepoUrl)
-		return
-	}
-
-	log.Debug().Msgf("%s/%s: %s => %s", app.Namespace, app.Name, rawRepoUrl, cleanRepoUrl)
-
-	appDirectory := v2a.appDirByRepo[cleanRepoUrl]
-	if appDirectory == nil {
-		appDirectory = NewAppDirectory()
-	}
+	appDirectory := v2a.GetAppsInRepo(app.Spec.Source.RepoURL)
 	appDirectory.ProcessApp(app)
-	v2a.appDirByRepo[cleanRepoUrl] = appDirectory
 }
 
 type ServerConfig struct {

diff --git a/pkg/config/vcstoargomap.go b/pkg/config/vcstoargomap.go
@@ -3,8 +3,8 @@ package config
 import (
 	"io/fs"
 
-	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+
 	"github.com/zapier/kubechecks/pkg/repo"
 )
 
@@ -24,24 +24,30 @@ func (v2a *VcsToArgoMap) GetAppsInRepo(repoCloneUrl string) *AppDirectory {
 		log.Warn().Err(err).Msgf("failed to parse %s", repoCloneUrl)
 	}
 
-	return v2a.appDirByRepo[repoUrl]
+	appdir := v2a.appDirByRepo[repoUrl]
+	if appdir == nil {
+		appdir = new(AppDirectory)
+		v2a.appDirByRepo[repoUrl] = appdir
+	}
+
+	return appdir
 }
 
-func (v2a *VcsToArgoMap) WalkKustomizeApps(repo *repo.Repo, fs fs.FS) (*AppDirectory, error) {
-	repoUrl, err := normalizeRepoUrl(repo.CloneURL)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to parse %s", repo.CloneURL)
-	}
+func (v2a *VcsToArgoMap) WalkKustomizeApps(repo *repo.Repo, fs fs.FS) *AppDirectory {
 
-	appdir := v2a.appDirByRepo[repoUrl]
-	apps := appdir.GetApps(nil)
+	var (
+		result AppDirectory
+		err    error
+
+		appdir = v2a.GetAppsInRepo(repo.CloneURL)
+		apps   = appdir.GetApps(nil)
+	)
 
-	var result AppDirectory
 	for _, app := range apps {
 		if err = walkKustomizeFiles(&result, fs, app.Name, app.Path); err != nil {
 			log.Error().Err(err).Msgf("failed to parse kustomize.yaml in %s", app.Path)
 		}
 	}
 
-	return &result, nil
+	return &result
 }