From e4fafbb14bb426dea06a0ce2b2a82f6f0aaa50e6 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Wed, 13 Nov 2024 16:51:11 +0100 Subject: [PATCH 01/10] refactor update property, renamed to filter-mode property --- cmd/aem/content.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index 3a691ff3..c6c838e8 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -200,7 +200,7 @@ func (c *CLI) contentPushCmd() *cobra.Command { filterRoots := determineFilterRoots(cmd) filterRootExcludes := determineFilterRootExcludes(cmd) clean, _ := cmd.Flags().GetBool("clean") - filterMode := determineFilterMode(cmd) + filterMode, _ := cmd.Flags().GetString("filter-mode") if err = c.aem.ContentManager().Push(instances, clean, pkg.PackageCreateOpts{ PID: fmt.Sprintf("aemc:content-push:%s-SNAPSHOT", timex.FileTimestampForNow()), FilterRoots: filterRoots, @@ -224,7 +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") + cmd.Flags().String("filter-mode", "", "Override default filter model") return cmd } @@ -373,11 +373,3 @@ func determineFilterRootExcludes(cmd *cobra.Command) []string { } return filterRootExcludes } - -func determineFilterMode(cmd *cobra.Command) string { - update, _ := cmd.Flags().GetBool("update") - if update { - return "update" - } - return "" -} From 8ddf89bcef8a73da4c560ac2024c4fb5e9ac1559 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Wed, 13 Nov 2024 16:53:47 +0100 Subject: [PATCH 02/10] minor --- cmd/aem/content.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index c6c838e8..50f25db6 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -76,7 +76,7 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { c.Error(err) return } - pid, _ := cmd.Flags().GetString("pid") + pid, _ := cmd.Flags().GetString("target-pid") if pid == "" { pid = fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow()) } @@ -96,7 +96,7 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { c.Changed("content downloaded") }, } - cmd.Flags().String("pid", "", "ID (group:name:version)'") + cmd.Flags().String("target-pid", "", "Target package ID (group:name:version)'") cmd.Flags().StringP("target-file", "t", "", "Target file path for downloaded package") _ = cmd.MarkFlagRequired("target-file") cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") From 766481d73dfd3deee14654b38896ea2f91e1d6c6 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Wed, 13 Nov 2024 21:11:26 +0100 Subject: [PATCH 03/10] minor --- cmd/aem/content.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index 50f25db6..afd64416 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -96,13 +96,13 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { c.Changed("content downloaded") }, } - cmd.Flags().String("target-pid", "", "Target package ID (group:name:version)'") - cmd.Flags().StringP("target-file", "t", "", "Target file path for downloaded package") + cmd.Flags().StringP("target-pid", "p", "", "Target package ID (group:name:version)'") + cmd.Flags().StringP("target-file", "t", "", "File path for downloaded package") _ = cmd.MarkFlagRequired("target-file") cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") - cmd.Flags().Bool("clean", false, "Normalize content after downloading") + cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") return cmd } @@ -163,7 +163,7 @@ func (c *CLI) contentPullCmd() *cobra.Command { cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") - cmd.Flags().Bool("clean", false, "Normalize content after downloading") + cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") cmd.Flags().Bool("replace", false, "Replace content after downloading") return cmd } @@ -223,8 +223,8 @@ func (c *CLI) contentPushCmd() *cobra.Command { cmd.Flags().StringP("file", "f", "", "Local file path") 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().String("filter-mode", "", "Override default filter model") + cmd.Flags().BoolP("clean", "c", false, "Normalize content while uploading") + cmd.Flags().StringP("filter-mode", "m", "", "Override default filter model") return cmd } @@ -264,7 +264,7 @@ func (c *CLI) contentCopyCmd() *cobra.Command { cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") - cmd.Flags().Bool("clean", false, "Normalize content while copying") + cmd.Flags().BoolP("clean", "c", false, "Normalize content while copying") return cmd } From 5c8d72cefc1c01d8bac8ac32506112b93f2572f2 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Wed, 13 Nov 2024 21:28:38 +0100 Subject: [PATCH 04/10] minor --- cmd/aem/content.go | 16 ++++++++-------- cmd/aem/package.go | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index 8e45c28a..f8525a52 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -99,8 +99,8 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { cmd.Flags().StringP("target-pid", "p", "", "ID (group:name:version) for downloaded package") cmd.Flags().StringP("target-file", "t", "", "File path for downloaded package") _ = cmd.MarkFlagRequired("target-file") - cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") return cmd @@ -157,14 +157,14 @@ func (c *CLI) contentPullCmd() *cobra.Command { }, } cmd.Flags().StringP("dir", "d", "", "JCR root path") - cmd.Flags().String("file", "", "Local file path") + cmd.Flags().StringP("file", "f", "", "Local file path") cmd.Flags().StringP("path", "p", "", "JCR root path or local file path") cmd.MarkFlagsMutuallyExclusive("dir", "file", "path") - cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") - cmd.Flags().Bool("replace", false, "Replace content after downloading") + cmd.Flags().BoolP("replace", "r", false, "Replace content after downloading") return cmd } @@ -261,8 +261,8 @@ func (c *CLI) contentCopyCmd() *cobra.Command { cmd.Flags().StringSliceP("instance-target-url", "u", []string{}, "Destination instance URL") cmd.Flags().StringSliceP("instance-target-id", "i", []string{}, "Destination instance ID") cmd.MarkFlagsOneRequired("instance-target-url", "instance-target-id") - cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content while copying") return cmd diff --git a/cmd/aem/package.go b/cmd/aem/package.go index a96d7e23..2600bff0 100644 --- a/cmd/aem/package.go +++ b/cmd/aem/package.go @@ -573,7 +573,7 @@ func (c *CLI) pkgCreateCmd() *cobra.Command { }, } cmd.Flags().String("pid", "", "ID (group:name:version)'") - cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") + cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("force", "f", false, "Create even when already created") @@ -607,7 +607,7 @@ func (c *CLI) pkgUpdateCmd() *cobra.Command { } cmd.Flags().String("pid", "", "ID (group:name:version)'") cmd.Flags().String("path", "", "Remote repository path") - cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths") + cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") cmd.MarkFlagsOneRequired("pid", "path") cmd.MarkFlagsMutuallyExclusive("pid", "path") return cmd From 820ff749936256fe786a748739f358785b2f6d74 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Wed, 13 Nov 2024 21:30:56 +0100 Subject: [PATCH 05/10] minor --- cmd/aem/content.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index f8525a52..99720986 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -76,16 +76,16 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { c.Error(err) return } - pid, _ := cmd.Flags().GetString("target-pid") - if pid == "" { - pid = fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow()) + targetPID, _ := cmd.Flags().GetString("target-pid") + if targetPID == "" { + targetPID = fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow()) } targetFile, _ := cmd.Flags().GetString("target-file") filterRoots := determineFilterRoots(cmd) filterFile, _ := cmd.Flags().GetString("filter-file") clean, _ := cmd.Flags().GetBool("clean") if err = c.aem.ContentManager().Download(instance, targetFile, clean, pkg.PackageCreateOpts{ - PID: pid, + PID: targetPID, FilterRoots: filterRoots, FilterFile: filterFile, }); err != nil { From 3aa031b7dd303f9d50ee47cc9fa07139d5f55022 Mon Sep 17 00:00:00 2001 From: Krystian Panek Date: Thu, 14 Nov 2024 07:56:44 +0100 Subject: [PATCH 06/10] Minor --- cmd/aem/content.go | 12 ++++++------ cmd/aem/package.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index 99720986..32b3c80e 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -99,8 +99,8 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { cmd.Flags().StringP("target-pid", "p", "", "ID (group:name:version) for downloaded package") cmd.Flags().StringP("target-file", "t", "", "File path for downloaded package") _ = cmd.MarkFlagRequired("target-file") - cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "h", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") return cmd @@ -160,8 +160,8 @@ func (c *CLI) contentPullCmd() *cobra.Command { cmd.Flags().StringP("file", "f", "", "Local file path") cmd.Flags().StringP("path", "p", "", "JCR root path or local file path") cmd.MarkFlagsMutuallyExclusive("dir", "file", "path") - cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "h", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") cmd.Flags().BoolP("replace", "r", false, "Replace content after downloading") @@ -261,8 +261,8 @@ func (c *CLI) contentCopyCmd() *cobra.Command { cmd.Flags().StringSliceP("instance-target-url", "u", []string{}, "Destination instance URL") cmd.Flags().StringSliceP("instance-target-id", "i", []string{}, "Destination instance ID") cmd.MarkFlagsOneRequired("instance-target-url", "instance-target-id") - cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "h", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content while copying") return cmd diff --git a/cmd/aem/package.go b/cmd/aem/package.go index 2600bff0..5d533ebb 100644 --- a/cmd/aem/package.go +++ b/cmd/aem/package.go @@ -573,8 +573,8 @@ func (c *CLI) pkgCreateCmd() *cobra.Command { }, } cmd.Flags().String("pid", "", "ID (group:name:version)'") - cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "h", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("force", "f", false, "Create even when already created") _ = cmd.MarkFlagRequired("pid") @@ -607,7 +607,7 @@ func (c *CLI) pkgUpdateCmd() *cobra.Command { } cmd.Flags().String("pid", "", "ID (group:name:version)'") cmd.Flags().String("path", "", "Remote repository path") - cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") + cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") cmd.MarkFlagsOneRequired("pid", "path") cmd.MarkFlagsMutuallyExclusive("pid", "path") return cmd From f7f4a7ef896da07910e53c80d6efc7a6a7791772 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Thu, 14 Nov 2024 09:23:26 +0100 Subject: [PATCH 07/10] fixed pull command --- cmd/aem/content.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index 99720986..4257f538 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -159,7 +159,7 @@ func (c *CLI) contentPullCmd() *cobra.Command { cmd.Flags().StringP("dir", "d", "", "JCR root path") cmd.Flags().StringP("file", "f", "", "Local file path") cmd.Flags().StringP("path", "p", "", "JCR root path or local file path") - cmd.MarkFlagsMutuallyExclusive("dir", "file", "path") + cmd.MarkFlagsOneRequired("dir", "file", "path") cmd.Flags().StringSliceP("filter-roots", "R", []string{}, "Vault filter root paths") cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") From 5112e43cd3722d1d5d7590acbb8281d2bb95ffb8 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Thu, 14 Nov 2024 09:36:36 +0100 Subject: [PATCH 08/10] renamed shorten aliases from filter-roots, filter-file properties --- cmd/aem/content.go | 12 ++++++------ cmd/aem/package.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index 0dcaff1e..312e3dde 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -99,8 +99,8 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { cmd.Flags().StringP("target-pid", "p", "", "ID (group:name:version) for downloaded package") cmd.Flags().StringP("target-file", "t", "", "File path for downloaded package") _ = cmd.MarkFlagRequired("target-file") - cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "h", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "z", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") return cmd @@ -160,8 +160,8 @@ func (c *CLI) contentPullCmd() *cobra.Command { cmd.Flags().StringP("file", "f", "", "Local file path") cmd.Flags().StringP("path", "p", "", "JCR root path or local file path") cmd.MarkFlagsOneRequired("dir", "file", "path") - cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "h", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "z", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") cmd.Flags().BoolP("replace", "r", false, "Replace content after downloading") @@ -261,8 +261,8 @@ func (c *CLI) contentCopyCmd() *cobra.Command { cmd.Flags().StringSliceP("instance-target-url", "u", []string{}, "Destination instance URL") cmd.Flags().StringSliceP("instance-target-id", "i", []string{}, "Destination instance ID") cmd.MarkFlagsOneRequired("instance-target-url", "instance-target-id") - cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "h", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "z", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content while copying") return cmd diff --git a/cmd/aem/package.go b/cmd/aem/package.go index 5d533ebb..bd7be1b1 100644 --- a/cmd/aem/package.go +++ b/cmd/aem/package.go @@ -573,8 +573,8 @@ func (c *CLI) pkgCreateCmd() *cobra.Command { }, } cmd.Flags().String("pid", "", "ID (group:name:version)'") - cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "h", "", "Vault filter file path") + cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") + cmd.Flags().StringP("filter-file", "z", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("force", "f", false, "Create even when already created") _ = cmd.MarkFlagRequired("pid") @@ -607,7 +607,7 @@ func (c *CLI) pkgUpdateCmd() *cobra.Command { } cmd.Flags().String("pid", "", "ID (group:name:version)'") cmd.Flags().String("path", "", "Remote repository path") - cmd.Flags().StringSliceP("filter-roots", "g", []string{}, "Vault filter root paths") + cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") cmd.MarkFlagsOneRequired("pid", "path") cmd.MarkFlagsMutuallyExclusive("pid", "path") return cmd From ed783dd2370c529b62d4c244e9f4e69b9f8ffb06 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Thu, 14 Nov 2024 10:15:26 +0100 Subject: [PATCH 09/10] fixed content command properties --- cmd/aem/content.go | 14 ++++++++++---- cmd/aem/package.go | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index 312e3dde..59cbf966 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -62,6 +62,7 @@ func (c *CLI) contentCleanCmd() *cobra.Command { cmd.Flags().StringP("file", "f", "", "Local file path") cmd.Flags().StringP("path", "p", "", "JCR root path or local file path") cmd.MarkFlagsOneRequired("dir", "file", "path") + cmd.MarkFlagsMutuallyExclusive("dir", "file", "path") return cmd } @@ -100,8 +101,9 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { cmd.Flags().StringP("target-file", "t", "", "File path for downloaded package") _ = cmd.MarkFlagRequired("target-file") cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "z", "", "Vault filter file path") + cmd.Flags().StringP("filter-file", "l", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") + cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") return cmd } @@ -160,8 +162,9 @@ func (c *CLI) contentPullCmd() *cobra.Command { cmd.Flags().StringP("file", "f", "", "Local file path") cmd.Flags().StringP("path", "p", "", "JCR root path or local file path") cmd.MarkFlagsOneRequired("dir", "file", "path") + cmd.MarkFlagsMutuallyExclusive("dir", "file", "path") cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "z", "", "Vault filter file path") + cmd.Flags().StringP("filter-file", "l", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading") cmd.Flags().BoolP("replace", "r", false, "Replace content after downloading") @@ -223,8 +226,9 @@ func (c *CLI) contentPushCmd() *cobra.Command { cmd.Flags().StringP("file", "f", "", "Local file path") cmd.Flags().StringP("path", "p", "", "JCR root path or local file path") cmd.MarkFlagsOneRequired("dir", "file", "path") + cmd.MarkFlagsMutuallyExclusive("dir", "file", "path") cmd.Flags().BoolP("clean", "c", false, "Normalize content while uploading") - cmd.Flags().StringP("filter-mode", "m", "", "Override default filter model") + cmd.Flags().StringP("filter-mode", "m", "", "Override default filter mode") return cmd } @@ -261,9 +265,11 @@ func (c *CLI) contentCopyCmd() *cobra.Command { cmd.Flags().StringSliceP("instance-target-url", "u", []string{}, "Destination instance URL") cmd.Flags().StringSliceP("instance-target-id", "i", []string{}, "Destination instance ID") cmd.MarkFlagsOneRequired("instance-target-url", "instance-target-id") + cmd.MarkFlagsMutuallyExclusive("instance-target-url", "instance-target-id") cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "z", "", "Vault filter file path") + cmd.Flags().StringP("filter-file", "l", "", "Vault filter file path") cmd.MarkFlagsOneRequired("filter-roots", "filter-file") + cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("clean", "c", false, "Normalize content while copying") return cmd } diff --git a/cmd/aem/package.go b/cmd/aem/package.go index bd7be1b1..57a8544e 100644 --- a/cmd/aem/package.go +++ b/cmd/aem/package.go @@ -574,7 +574,7 @@ func (c *CLI) pkgCreateCmd() *cobra.Command { } cmd.Flags().String("pid", "", "ID (group:name:version)'") cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths") - cmd.Flags().StringP("filter-file", "z", "", "Vault filter file path") + cmd.Flags().StringP("filter-file", "l", "", "Vault filter file path") cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file") cmd.Flags().BoolP("force", "f", false, "Create even when already created") _ = cmd.MarkFlagRequired("pid") From f1952fc54bb00ec443ddbb3d033977ad3d44caf4 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Thu, 14 Nov 2024 11:53:25 +0100 Subject: [PATCH 10/10] minor --- cmd/aem/content.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/aem/content.go b/cmd/aem/content.go index 59cbf966..04aa1cb1 100644 --- a/cmd/aem/content.go +++ b/cmd/aem/content.go @@ -78,9 +78,6 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { return } targetPID, _ := cmd.Flags().GetString("target-pid") - if targetPID == "" { - targetPID = fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow()) - } targetFile, _ := cmd.Flags().GetString("target-file") filterRoots := determineFilterRoots(cmd) filterFile, _ := cmd.Flags().GetString("filter-file") @@ -97,7 +94,8 @@ func (c *CLI) contentDownloadCmd() *cobra.Command { c.Changed("content downloaded") }, } - cmd.Flags().StringP("target-pid", "p", "", "ID (group:name:version) for downloaded package") + defaultTargetPID := fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow()) + cmd.Flags().StringP("target-pid", "p", defaultTargetPID, "ID (group:name:version) for downloaded package") cmd.Flags().StringP("target-file", "t", "", "File path for downloaded package") _ = cmd.MarkFlagRequired("target-file") cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths")