From 39ee73d2ee5c2d6232e225c6f2829498e9c50361 Mon Sep 17 00:00:00 2001
From: oleksandr-codefresh <oleksandr.saulyak@codefresh.io>
Date: Tue, 12 Nov 2024 21:02:31 +0200
Subject: [PATCH] reposerver(repository): fixed repeated resources generation
 for ApplicationSourceTypeDirectory

---
 changelog/CHANGELOG.md              |  5 +++--
 reposerver/repository/repository.go | 15 +++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/changelog/CHANGELOG.md b/changelog/CHANGELOG.md
index f26d54ef9a0d6d..cdcea60b76fca2 100644
--- a/changelog/CHANGELOG.md
+++ b/changelog/CHANGELOG.md
@@ -1,2 +1,3 @@
-### Features
--  feat(event-reporter): multisourced apps support improvements: reporting syncOperationRevisions, detecting correct resource sourceIdx, reporting correct git commit info 
\ No newline at end of file
+### Updates
+- feat(event-reporter): multisourced apps support improvements: reporting syncOperationRevisions, detecting correct resource sourceIdx, reporting correct git commit info 
+- fix(repo-server): fixed repeated resources generation for ApplicationSourceTypeDirectory
\ No newline at end of file
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
index 62b95137c439cd..530a20f014d92b 100644
--- a/reposerver/repository/repository.go
+++ b/reposerver/repository/repository.go
@@ -1812,13 +1812,6 @@ var manifestFile = regexp.MustCompile(`^.*\.(yaml|yml|json|jsonnet)$`)
 
 // findManifests looks at all yaml files in a directory and unmarshals them into a list of unstructured objects
 func findManifests(logCtx *log.Entry, appPath string, repoRoot string, env *v1alpha1.Env, directory v1alpha1.ApplicationSourceDirectory, enabledManifestGeneration map[string]bool, maxCombinedManifestQuantity resource.Quantity) ([]manifest, error) {
-	absRepoRoot, err := filepath.Abs(repoRoot)
-	if err != nil {
-		return nil, err
-	}
-
-	var manifests []manifest
-
 	// Validate the directory before loading any manifests to save memory.
 	potentiallyValidManifests, err := getPotentiallyValidManifests(logCtx, appPath, repoRoot, directory.Recurse, directory.Include, directory.Exclude, maxCombinedManifestQuantity)
 	if err != nil {
@@ -1826,7 +1819,11 @@ func findManifests(logCtx *log.Entry, appPath string, repoRoot string, env *v1al
 		return nil, fmt.Errorf("failed to get potentially valid manifests: %w", err)
 	}
 
-	var objs []*unstructured.Unstructured
+	absRepoRoot, err := filepath.Abs(repoRoot)
+	if err != nil {
+		return nil, err
+	}
+	var manifests []manifest
 	for _, potentiallyValidManifest := range potentiallyValidManifests {
 		manifestPath := potentiallyValidManifest.path
 		manifestFileInfo := potentiallyValidManifest.fileInfo
@@ -1836,6 +1833,7 @@ func findManifests(logCtx *log.Entry, appPath string, repoRoot string, env *v1al
 		repoRelPath, _ := filepath.Rel(absRepoRoot, absPath)
 
 		if strings.HasSuffix(manifestFileInfo.Name(), ".jsonnet") {
+			var objs []*unstructured.Unstructured
 			if !discovery.IsManifestGenerationEnabled(v1alpha1.ApplicationSourceTypeDirectory, enabledManifestGeneration) {
 				continue
 			}
@@ -1875,6 +1873,7 @@ func findManifests(logCtx *log.Entry, appPath string, repoRoot string, env *v1al
 				})
 			}
 		} else {
+			var objs []*unstructured.Unstructured
 			err := getObjsFromYAMLOrJson(logCtx, manifestPath, manifestFileInfo.Name(), &objs)
 			if err != nil {
 				return nil, err