Skip to content

Commit 5db1842

Browse files
krystian-panek-vmltechkrystian-panek-vmltech
authored
Merge pull request #278 from wttech/vault-cli
Vault cli
2 parents 5eaf6c3 + f1952fc commit 5db1842

File tree

2 files changed

+28
-32
lines changed

2 files changed

+28
-32
lines changed

‎cmd/aem/content.go

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ func (c *CLI) contentCleanCmd() *cobra.Command {
6262
cmd.Flags().StringP("file", "f", "", "Local file path")
6363
cmd.Flags().StringP("path", "p", "", "JCR root path or local file path")
6464
cmd.MarkFlagsOneRequired("dir", "file", "path")
65+
cmd.MarkFlagsMutuallyExclusive("dir", "file", "path")
6566
return cmd
6667
}
6768

@@ -76,16 +77,13 @@ func (c *CLI) contentDownloadCmd() *cobra.Command {
7677
c.Error(err)
7778
return
7879
}
79-
pid, _ := cmd.Flags().GetString("pid")
80-
if pid == "" {
81-
pid = fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow())
82-
}
80+
targetPID, _ := cmd.Flags().GetString("target-pid")
8381
targetFile, _ := cmd.Flags().GetString("target-file")
8482
filterRoots := determineFilterRoots(cmd)
8583
filterFile, _ := cmd.Flags().GetString("filter-file")
8684
clean, _ := cmd.Flags().GetBool("clean")
8785
if err = c.aem.ContentManager().Download(instance, targetFile, clean, pkg.PackageCreateOpts{
88-
PID: pid,
86+
PID: targetPID,
8987
FilterRoots: filterRoots,
9088
FilterFile: filterFile,
9189
}); err != nil {
@@ -96,13 +94,15 @@ func (c *CLI) contentDownloadCmd() *cobra.Command {
9694
c.Changed("content downloaded")
9795
},
9896
}
99-
cmd.Flags().String("pid", "", "ID (group:name:version) for downloaded package")
100-
cmd.Flags().StringP("target-file", "t", "", "Target file path for downloaded package")
97+
defaultTargetPID := fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow())
98+
cmd.Flags().StringP("target-pid", "p", defaultTargetPID, "ID (group:name:version) for downloaded package")
99+
cmd.Flags().StringP("target-file", "t", "", "File path for downloaded package")
101100
_ = cmd.MarkFlagRequired("target-file")
102-
cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths")
103-
cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path")
101+
cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths")
102+
cmd.Flags().StringP("filter-file", "l", "", "Vault filter file path")
104103
cmd.MarkFlagsOneRequired("filter-roots", "filter-file")
105-
cmd.Flags().Bool("clean", false, "Normalize content after downloading")
104+
cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file")
105+
cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading")
106106
return cmd
107107
}
108108

@@ -157,14 +157,15 @@ func (c *CLI) contentPullCmd() *cobra.Command {
157157
},
158158
}
159159
cmd.Flags().StringP("dir", "d", "", "JCR root path")
160-
cmd.Flags().String("file", "", "Local file path")
160+
cmd.Flags().StringP("file", "f", "", "Local file path")
161161
cmd.Flags().StringP("path", "p", "", "JCR root path or local file path")
162+
cmd.MarkFlagsOneRequired("dir", "file", "path")
162163
cmd.MarkFlagsMutuallyExclusive("dir", "file", "path")
163-
cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths")
164-
cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path")
164+
cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths")
165+
cmd.Flags().StringP("filter-file", "l", "", "Vault filter file path")
165166
cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file")
166-
cmd.Flags().Bool("clean", false, "Normalize content after downloading")
167-
cmd.Flags().Bool("replace", false, "Replace content after downloading")
167+
cmd.Flags().BoolP("clean", "c", false, "Normalize content after downloading")
168+
cmd.Flags().BoolP("replace", "r", false, "Replace content after downloading")
168169
return cmd
169170
}
170171

@@ -200,7 +201,7 @@ func (c *CLI) contentPushCmd() *cobra.Command {
200201
filterRoots := determineFilterRoots(cmd)
201202
filterRootExcludes := determineFilterRootExcludes(cmd)
202203
clean, _ := cmd.Flags().GetBool("clean")
203-
filterMode := determineFilterMode(cmd)
204+
filterMode, _ := cmd.Flags().GetString("filter-mode")
204205
if err = c.aem.ContentManager().Push(instances, clean, pkg.PackageCreateOpts{
205206
PID: fmt.Sprintf("aemc:content-push:%s-SNAPSHOT", timex.FileTimestampForNow()),
206207
FilterRoots: filterRoots,
@@ -223,8 +224,9 @@ func (c *CLI) contentPushCmd() *cobra.Command {
223224
cmd.Flags().StringP("file", "f", "", "Local file path")
224225
cmd.Flags().StringP("path", "p", "", "JCR root path or local file path")
225226
cmd.MarkFlagsOneRequired("dir", "file", "path")
226-
cmd.Flags().Bool("clean", false, "Normalize content while uploading")
227-
cmd.Flags().Bool("update", false, "Existing content on running instance is updated, new content is added and none is deleted")
227+
cmd.MarkFlagsMutuallyExclusive("dir", "file", "path")
228+
cmd.Flags().BoolP("clean", "c", false, "Normalize content while uploading")
229+
cmd.Flags().StringP("filter-mode", "m", "", "Override default filter mode")
228230
return cmd
229231
}
230232

@@ -261,10 +263,12 @@ func (c *CLI) contentCopyCmd() *cobra.Command {
261263
cmd.Flags().StringSliceP("instance-target-url", "u", []string{}, "Destination instance URL")
262264
cmd.Flags().StringSliceP("instance-target-id", "i", []string{}, "Destination instance ID")
263265
cmd.MarkFlagsOneRequired("instance-target-url", "instance-target-id")
264-
cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths")
265-
cmd.Flags().StringP("filter-file", "f", "", "Vault filter file path")
266+
cmd.MarkFlagsMutuallyExclusive("instance-target-url", "instance-target-id")
267+
cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths")
268+
cmd.Flags().StringP("filter-file", "l", "", "Vault filter file path")
266269
cmd.MarkFlagsOneRequired("filter-roots", "filter-file")
267-
cmd.Flags().Bool("clean", false, "Normalize content while copying")
270+
cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file")
271+
cmd.Flags().BoolP("clean", "c", false, "Normalize content while copying")
268272
return cmd
269273
}
270274

@@ -373,11 +377,3 @@ func determineFilterRootExcludes(cmd *cobra.Command) []string {
373377
}
374378
return filterRootExcludes
375379
}
376-
377-
func determineFilterMode(cmd *cobra.Command) string {
378-
update, _ := cmd.Flags().GetBool("update")
379-
if update {
380-
return "update"
381-
}
382-
return ""
383-
}

‎cmd/aem/package.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ func (c *CLI) pkgCreateCmd() *cobra.Command {
573573
},
574574
}
575575
cmd.Flags().String("pid", "", "ID (group:name:version)'")
576-
cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths")
577-
cmd.Flags().StringP("filter-file", "F", "", "Vault filter file path")
576+
cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths")
577+
cmd.Flags().StringP("filter-file", "l", "", "Vault filter file path")
578578
cmd.MarkFlagsMutuallyExclusive("filter-roots", "filter-file")
579579
cmd.Flags().BoolP("force", "f", false, "Create even when already created")
580580
_ = cmd.MarkFlagRequired("pid")
@@ -607,7 +607,7 @@ func (c *CLI) pkgUpdateCmd() *cobra.Command {
607607
}
608608
cmd.Flags().String("pid", "", "ID (group:name:version)'")
609609
cmd.Flags().String("path", "", "Remote repository path")
610-
cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths")
610+
cmd.Flags().StringSliceP("filter-roots", "k", []string{}, "Vault filter root paths")
611611
cmd.MarkFlagsOneRequired("pid", "path")
612612
cmd.MarkFlagsMutuallyExclusive("pid", "path")
613613
return cmd

0 commit comments

Comments
 (0)