builder: Copy file to existing dir

Signed-off-by: Stefan Prodan <[email protected]>

Author: stefanprodan

config/testdata/decomposition/generators.yaml

@@ -1,22 +1,22 @@
----
 apiVersion: source.extensions.fluxcd.io/v1beta1
 kind: ArtifactGenerator
 metadata:
   name: app-gen
 spec:
   sources:
-    - alias: oci
-      kind: OCIRepository
-      name: podinfo-oci
-    - alias: repo
+    - alias: git
       kind: GitRepository
       name: podinfo-repo
   artifacts:
-    - name: podinfo-svc
+    - name: podinfo-frontend
       copy:
-        - from: "@repo/kustomize/service.yaml"
-          to: "@artifact/service.yaml"
-    - name: podinfo-deploy
+        - from: "@git/deploy/bases/frontend/"
+          to: "@artifact/"
+    - name: podinfo-backend
       copy:
-        - from: "@repo/kustomize/deployment.yaml"
-          to: "@artifact/deployment.yaml"
+        - from: "@git/deploy/bases/backend/*.yaml"
+          to: "@artifact/"
+    - name: podinfo-cache
+      copy:
+        - from: "@git/deploy/bases/cache/**"
+          to: "@artifact/"

config/testdata/decomposition/sources.yaml

@@ -1,20 +1,10 @@
 ---
 apiVersion: source.toolkit.fluxcd.io/v1
-kind: OCIRepository
-metadata:
-  name: podinfo-oci
-spec:
-  interval: 10m
-  url: oci://ghcr.io/stefanprodan/manifests/podinfo
-  ref:
-    semver: ">=6.9.0"
----
-apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
   name: podinfo-repo
 spec:
   interval: 10m
   url: https://github.com/stefanprodan/podinfo
   ref:
-    semver: ">=6.9.0"
+    semver: "*"

internal/builder/builder.go

@@ -225,7 +225,7 @@ func applySingleSourceCopy(ctx context.Context,
 }
 
 // applySingleFileCopy handles copying a single file using cp-like semantics:
-// - file -> dest (no slash) = copy to dest as filename
+// - file -> dest (no slash) = copy to dest as filename or dest/filename if dest is an existing directory
 // - file -> dest/ (with slash) = copy to dest/filename
 func applySingleFileCopy(ctx context.Context,
 	srcRoot *os.Root,
@@ -240,8 +240,14 @@ func applySingleFileCopy(ctx context.Context,
 		srcFileName := filepath.Base(srcPath)
 		finalDestPath = filepath.Join(destPath, srcFileName)
 	} else {
-		// Destination is the target filename
-		finalDestPath = destPath
+		// Check if destination path already exists as a directory
+		if destInfo, err := stagingRoot.Stat(destPath); err == nil && destInfo.IsDir() {
+			srcFileName := filepath.Base(srcPath)
+			finalDestPath = filepath.Join(destPath, srcFileName)
+		} else {
+			// Destination is the target filename
+			finalDestPath = destPath
+		}
 	}
 
 	return copyFileWithRoots(ctx, srcRoot, srcPath, stagingRoot, finalDestPath)