Merge branch 'vault-cli' of github.com:wttech/aemc into vault-cli

Author: Dominik Przybyl

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.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.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

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

pkg/java/java.go

@@ -81,6 +81,21 @@ func (o *Opts) download() error {
 		log.Debugf("existing JDK '%s' is up-to-date", check.Locked.Source)
 		return nil
 	}
+	log.Infof("preparing new JDK at dir '%s'", o.jdkDir())
+	if err = o.prepare(err); err != nil {
+		return err
+	}
+	if err := lock.Lock(); err != nil {
+		return err
+	}
+	log.Infof("prepared new JDK at dir '%s'", o.jdkDir())
+	return nil
+}
+
+func (o *Opts) prepare(err error) error {
+	if err := pathx.DeleteIfExists(o.jdkDir()); err != nil {
+		return err
+	}
 	url := o.DownloadURL
 	for search, replace := range o.DownloadURLReplacements {
 		url = strings.ReplaceAll(url, search, replace)
@@ -94,10 +109,6 @@ func (o *Opts) download() error {
 	if _, err = filex.UnarchiveWithChanged(archiveFile, o.jdkDir()); err != nil {
 		return err
 	}
-	if err := lock.Lock(); err != nil {
-		return err
-	}
-	log.Infof("unarchived new JDK at dir '%s'", o.jdkDir())
 	return nil
 }
 

pkg/oak_run.go

@@ -70,6 +70,9 @@ func (or OakRun) JarFile() string {
 }
 
 func (or OakRun) prepare() error {
+	if err := pathx.DeleteIfExists(or.Dir()); err != nil {
+		return err
+	}
 	jarFile := or.JarFile()
 	log.Infof("downloading Oak Run JAR from URL '%s' to file '%s'", or.DownloadURL, jarFile)
 	if err := httpx.DownloadOnce(or.DownloadURL, jarFile); err != nil {

pkg/sdk.go

@@ -67,16 +67,13 @@ func (s SDK) Prepare() error {
 }
 
 func (s SDK) prepare(zipFile string) error {
-	err := pathx.Delete(s.Dir())
-	if err != nil {
+	if err := pathx.DeleteIfExists(s.Dir()); err != nil {
 		return err
 	}
-	err = s.unpackSdk(zipFile)
-	if err != nil {
+	if err := s.unpackSdk(zipFile); err != nil {
 		return err
 	}
-	err = s.unpackDispatcher()
-	if err != nil {
+	if err := s.unpackDispatcher(); err != nil {
 		return err
 	}
 	return nil

pkg/vault_cli.go

@@ -49,7 +49,7 @@ func (v VaultCli) lock() osx.Lock[VaultCliLock] {
 	return osx.NewLock(v.dir()+"/lock/create.yml", func() (VaultCliLock, error) { return VaultCliLock{DownloadURL: v.DownloadURL}, nil })
 }
 
-func (v VaultCli) prepare() error {
+func (v VaultCli) Prepare() error {
 	lock := v.lock()
 	check, err := lock.State()
 	if err != nil {
@@ -60,7 +60,7 @@ func (v VaultCli) prepare() error {
 		return nil
 	}
 	log.Infof("preparing new Vault '%s'", v.DownloadURL)
-	err = v.install()
+	err = v.prepare()
 	if err != nil {
 		return err
 	}
@@ -77,7 +77,10 @@ func (v VaultCli) archiveFile() string {
 	return pathx.Canonical(fmt.Sprintf("%s/%s", v.dir(), filepath.Base(v.DownloadURL)))
 }
 
-func (v VaultCli) install() error {
+func (v VaultCli) prepare() error {
+	if err := pathx.DeleteIfExists(v.dir()); err != nil {
+		return err
+	}
 	archiveFile := v.archiveFile()
 	log.Infof("downloading Vault from URL '%s' to file '%s'", v.DownloadURL, archiveFile)
 	if err := httpx.DownloadOnce(v.DownloadURL, archiveFile); err != nil {
@@ -94,8 +97,8 @@ func (v VaultCli) install() error {
 }
 
 func (v VaultCli) CommandShell(args []string) error {
-	if err := v.prepare(); err != nil {
-		return fmt.Errorf("cannot run Vault command: %w", err)
+	if err := v.Prepare(); err != nil {
+		return fmt.Errorf("cannot prepare Vault before running command: %w", err)
 	}
 	cmd := execx.CommandShell(args)
 	cmd.Dir = v.execDir()