Make path determination more resilient w.r.t. including pipeline id or not

Author: alopezz

components/datadog/agent/package.go

@@ -57,12 +57,7 @@ func GetPackagePath(localPath string, flavor tifos.Flavor, agentFlavor string, a
 	packagePath := localPath
 	matches := []string{}
 	if pathInfo.IsDir() {
-		packagePath = path.Join(packagePath, subFolder)
-		packagePath = path.Join(packagePath, "pkg")
-		if flavor == tifos.WindowsServer {
-			packagePath = path.Join(packagePath, "pipeline-"+pipelineID)
-		}
-		entries, err := os.ReadDir(packagePath)
+		entries, err := getPackageFolderEntries(localPath, subFolder, pipelineID)
 		if err != nil {
 			return "", err
 		}
@@ -157,3 +152,19 @@ func GetPackagePath(localPath string, flavor tifos.Flavor, agentFlavor string, a
 	}
 	return packagePath, nil
 }
+
+// getPackageFolderEntries returns the DirEntry elements where packages are stored
+func getPackageFolderEntries(localPath string, subFolder string, pipelineID string) ([]os.DirEntry, error) {
+	packagePath := path.Join(localPath, subFolder, "pkg")
+
+	// If a dedicated pipeline-identified folder is available, use that
+	entries, err := os.ReadDir(path.Join(packagePath, "pipeline-"+pipelineID))
+	if err == nil {
+		return entries, nil
+	}
+	entries, err = os.ReadDir(packagePath)
+	if err != nil {
+		return entries, err
+	}
+	return entries, nil
+}