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

Author: Dominik Przybyl

README.md

@@ -468,7 +468,6 @@ java:
       "arm64": "x64"
       "aarch64": "x64"
 
-# Vault-Cli tool options
 vault:
   "download_url": "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.7.2/vault-cli-3.7.2-bin.tar.gz"
 

cmd/aem/vault.go

@@ -9,7 +9,7 @@ import (
 func (c *CLI) vaultCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "vlt",
-		Short: "Executes Vault-Cli commands",
+		Short: "Executes Vault commands",
 		Run: func(cmd *cobra.Command, args []string) {
 			vaultCli := pkg.NewVaultCli(c.aem)
 			vaultCliArgs := os.Args[1:]

examples/docker/src/aem/default/etc/aem.yml

@@ -244,7 +244,6 @@ java:
       "arm64": "x64"
       "aarch64": "x64"
 
-# Vault-Cli tool options
 vault:
   "download_url": "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.7.2/vault-cli-3.7.2-bin.tar.gz"
 

pkg/package_manager.go

@@ -199,10 +199,10 @@ func copyPackageAllFiles(targetTmpDir string, opts PackageCreateOpts) error {
 type PackageCreateOpts struct {
 	PID                string
 	FilterRoots        []string
-	FilterFile         string
 	FilterRootExcludes []string
-	ContentPath        string
+	FilterFile         string
 	FilterMode         string
+	ContentPath        string
 }
 
 func (pm *PackageManager) Create(opts PackageCreateOpts) (string, error) {

pkg/project/app_classic/aem/default/etc/aem.yml

@@ -245,7 +245,6 @@ java:
       "arm64": "x64"
       "aarch64": "x64"
 
-# Vault-Cli tool options
 vault:
   "download_url": "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.7.2/vault-cli-3.7.2-bin.tar.gz"
 

pkg/project/app_cloud/aem/default/etc/aem.yml

@@ -234,7 +234,6 @@ java:
       "arm64": "x64"
       "aarch64": "x64"
 
-# Vault-Cli tool options
 vault:
   "download_url": "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.7.2/vault-cli-3.7.2-bin.tar.gz"
 

pkg/project/instance/aem/default/etc/aem.yml

@@ -246,7 +246,6 @@ java:
       "arm64": "x64"
       "aarch64": "x64"
 
-# Vault-Cli tool options
 vault:
   "download_url": "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.7.2/vault-cli-3.7.2-bin.tar.gz"
 

pkg/vault_cli.go

@@ -56,10 +56,10 @@ func (v VaultCli) prepare() error {
 		return err
 	}
 	if check.UpToDate {
-		log.Debugf("existing Vault-Cli '%s' is up-to-date", v.DownloadURL)
+		log.Debugf("existing Vault '%s' is up-to-date", v.DownloadURL)
 		return nil
 	}
-	log.Infof("preparing new Vault-Cli '%s'", v.DownloadURL)
+	log.Infof("preparing new Vault '%s'", v.DownloadURL)
 	err = v.install()
 	if err != nil {
 		return err
@@ -68,7 +68,7 @@ func (v VaultCli) prepare() error {
 	if err != nil {
 		return err
 	}
-	log.Infof("prepared new Vault-Cli '%s'", v.DownloadURL)
+	log.Infof("prepared new Vault '%s'", v.DownloadURL)
 
 	return nil
 }
@@ -79,30 +79,30 @@ func (v VaultCli) archiveFile() string {
 
 func (v VaultCli) install() error {
 	archiveFile := v.archiveFile()
-	log.Infof("downloading Vault-Cli from URL '%s' to file '%s'", v.DownloadURL, archiveFile)
+	log.Infof("downloading Vault from URL '%s' to file '%s'", v.DownloadURL, archiveFile)
 	if err := httpx.DownloadOnce(v.DownloadURL, archiveFile); err != nil {
 		return err
 	}
-	log.Infof("downloaded Vault-Cli from URL '%s' to file '%s'", v.DownloadURL, archiveFile)
+	log.Infof("downloaded Vault from URL '%s' to file '%s'", v.DownloadURL, archiveFile)
 
-	log.Infof("unarchiving Vault-Cli from file '%s'", archiveFile)
+	log.Infof("unarchiving Vault from file '%s'", archiveFile)
 	if err := filex.Unarchive(archiveFile, v.dir()); err != nil {
 		return err
 	}
-	log.Infof("unarchived Vault-Cli from file '%s'", archiveFile)
+	log.Infof("unarchived Vault from file '%s'", archiveFile)
 	return nil
 }
 
 func (v VaultCli) CommandShell(args []string) error {
 	if err := v.prepare(); err != nil {
-		return fmt.Errorf("cannot run Vault-Cli command: %w", err)
+		return fmt.Errorf("cannot run Vault command: %w", err)
 	}
 	cmd := execx.CommandShell(args)
 	cmd.Dir = v.execDir()
 	v.aem.CommandOutput(cmd)
 	err := cmd.Run()
 	if err != nil {
-		return fmt.Errorf("cannot run Vault-Cli command: %w", err)
+		return fmt.Errorf("cannot run Vault command: %w", err)
 	}
 	return nil
 }