added update property to push command

Author: Dominik Przybyl

cmd/aem/content.go

@@ -200,11 +200,13 @@ func (c *CLI) contentPushCmd() *cobra.Command {
 			filterRoots := determineFilterRoots(cmd)
 			excludePatterns := determineExcludePatterns(cmd)
 			clean, _ := cmd.Flags().GetBool("clean")
+			filterMode := determineFilterMode(cmd)
 			if err = c.aem.ContentManager().Push(instances, clean, pkg.PackageCreateOpts{
 				PID:             fmt.Sprintf("aemc:content-push:%s-SNAPSHOT", timex.FileTimestampForNow()),
 				FilterRoots:     filterRoots,
 				ExcludePatterns: excludePatterns,
 				ContentPath:     path,
+				FilterMode:      filterMode,
 			}); err != nil {
 				c.Error(err)
 				return
@@ -222,6 +224,7 @@ func (c *CLI) contentPushCmd() *cobra.Command {
 	cmd.Flags().StringP("path", "p", "", "JCR root path or local file path")
 	cmd.MarkFlagsOneRequired("dir", "file", "path")
 	cmd.Flags().Bool("clean", false, "Normalize content while uploading")
+	cmd.Flags().Bool("update", false, "Existing content on running instance is updated, new content is added and none is deleted")
 	return cmd
 }
 
@@ -370,3 +373,11 @@ func determineExcludePatterns(cmd *cobra.Command) []string {
 	}
 	return excludePatterns
 }
+
+func determineFilterMode(cmd *cobra.Command) string {
+	update, _ := cmd.Flags().GetBool("update")
+	if update {
+		return "update"
+	}
+	return ""
+}

pkg/package_manager.go

@@ -166,6 +166,7 @@ func copyPackageAllFiles(targetTmpDir string, opts PackageCreateOpts) error {
 		"Version":         pidConfig.Version,
 		"FilterRoots":     opts.FilterRoots,
 		"ExcludePatterns": opts.ExcludePatterns,
+		"FilterMode":      opts.FilterMode,
 	}
 	if err = pathx.DeleteIfExists(targetTmpDir); err != nil {
 		return fmt.Errorf("cannot delete temporary dir '%s': %w", targetTmpDir, err)
@@ -201,6 +202,7 @@ type PackageCreateOpts struct {
 	FilterFile      string
 	ExcludePatterns []string
 	ContentPath     string
+	FilterMode      string
 }
 
 func (pm *PackageManager) Create(opts PackageCreateOpts) (string, error) {

pkg/pkg/vault/META-INF/vault/filter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">[[if .ExcludePatterns]]
-    <filter root="[[index .FilterRoots 0]]">[[range .ExcludePatterns]]
+    <filter root="[[index .FilterRoots 0]]"[[if .FilterMode]] mode="[[.FilterMode]]"[[end]]>[[range .ExcludePatterns]]
         <exclude pattern="[[.]]"/>[[end]]
     </filter>[[else]][[range .FilterRoots]]
-    <filter root="[[.]]"/>[[end]][[end]]
+    <filter root="[[.]]"[[if $.FilterMode]] mode="[[$.FilterMode]]"[[end]]/>[[end]][[end]]
 </workspaceFilter>

test/filter_file_test.go

@@ -39,3 +39,22 @@ func TestExcludePatterns(t *testing.T) {
 		},
 	)
 }
+
+func TestFilterRootsUpdate(t *testing.T) {
+	testFilterFile(t, "vault/META-INF/vault/filter.xml", "resources/filter_roots_update.xml",
+		map[string]any{
+			"FilterRoots": []string{"/apps/my_site", "/content/my_site"},
+			"FilterMode":  "update",
+		},
+	)
+}
+
+func TestExcludePatternsUpdate(t *testing.T) {
+	testFilterFile(t, "vault/META-INF/vault/filter.xml", "resources/exclude_patterns_update.xml",
+		map[string]any{
+			"FilterRoots":     []string{"/apps/my_site", "/content/my_site"},
+			"ExcludePatterns": []string{"/apps/my_site/cq:dialog(/.*)?", "/apps/my_site/rep:policy(/.*)?"},
+			"FilterMode":      "update",
+		},
+	)
+}

test/resources/exclude_patterns_update.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspaceFilter version="1.0">
+    <filter root="/apps/my_site" mode="update">
+        <exclude pattern="/apps/my_site/cq:dialog(/.*)?"/>
+        <exclude pattern="/apps/my_site/rep:policy(/.*)?"/>
+    </filter>
+</workspaceFilter>

test/resources/filter_roots_update.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspaceFilter version="1.0">
+    <filter root="/apps/my_site" mode="update"/>
+    <filter root="/content/my_site" mode="update"/>
+</workspaceFilter>