feat: Combine files in a multisource repo (#12471 #12485)

assets/swagger.json

@@ -6251,6 +6251,13 @@
         "directory": {
           "$ref": "#/definitions/v1alpha1ApplicationSourceDirectory"
         },
+        "from": {
+          "description": "From is a list of filesystem objects that is to be copied into this source's tree. Only used within a `sources` tag.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/v1alpha1CopyFromSpec"
+          }
+        },
         "helm": {
           "$ref": "#/definitions/v1alpha1ApplicationSourceHelm"
         },
@@ -6987,6 +6994,24 @@
         }
       }
     },
+    "v1alpha1CopyFromSpec": {
+      "type": "object",
+      "title": "CopyFromSpec defines a copy declaration from another source into this one",
+      "properties": {
+        "destinationPath": {
+          "description": "DestinationPath is the destination directory at the current repository where the object will be copied to.",
+          "type": "string"
+        },
+        "failOnOutOfBoundsSymlink": {
+          "type": "boolean",
+          "title": "FailOnOutOfBoundsSymlink mode makes the complete operation error out if a single symlink is out-of-bound within the subtree"
+        },
+        "sourcePath": {
+          "type": "string",
+          "title": "SourcePath is the path from the Ref'd repository, the source of the copy operation.\nIt's syntax is matching helmValue's, $ref/path"
+        }
+      }
+    },
     "v1alpha1DuckTypeGenerator": {
       "description": "DuckType defines a generator to match against clusters registered with ArgoCD.",
       "type": "object",

pkg/apis/application/v1alpha1/types.go

@@ -188,6 +188,8 @@ type ApplicationSource struct {
 	Chart string `json:"chart,omitempty" protobuf:"bytes,12,opt,name=chart"`
 	// Ref is reference to another source within sources field. This field will not be used if used with a `source` tag.
 	Ref string `json:"ref,omitempty" protobuf:"bytes,13,opt,name=ref"`
+	// From is a list of filesystem objects that is to be copied into this source's tree. Only used within a `sources` tag.
+	From CopyFromSpecs `json:"from,omitempty" protobuf:"bytes,14,rep,name=from"`
 }
 
 // ApplicationSources contains list of required information about the sources of an application
@@ -905,6 +907,23 @@ func (c *ApplicationSourcePlugin) RemoveEnvEntry(key string) error {
 	return fmt.Errorf("unable to find env variable with key %q for plugin %q", key, c.Name)
 }
 
+// CopyFromSpec defines a copy declaration from another source into this one
+type CopyFromSpec struct {
+	// SourcePath is the path from the Ref'd repository, the source of the copy operation.
+	// It's syntax is matching helmValue's, $ref/path
+	SourcePath string `json:"sourcePath" protobuf:"bytes,1,name=sourcePath"`
+	// DestinationPath is the destination directory at the current repository where the object will be copied to.
+	DestinationPath string `json:"destinationPath" protobuf:"bytes,2,name=destinationPath"`
+	// FailOnOutOfBoundsSymlink mode makes the complete operation error out if a single symlink is out-of-bound within the subtree
+	FailOnOutOfBoundsSymlink bool `json:"failOnOutOfBoundsSymlink,omitempty" protobuf:"bytes,3,name=failOnOutOfBoundsSymlink"`
+}
+
+type CopyFromSpecs []CopyFromSpec
+
+func (c CopyFromSpecs) String() string {
+	return fmt.Sprintf("%v", []CopyFromSpec(c))
+}
+
 // ApplicationDestination holds information about the application's destination
 type ApplicationDestination struct {
 	// Server specifies the URL of the target cluster's Kubernetes control plane API. This must be set if Name is not set.