Vault CLI removed / to be reverted if needed

wttech · Nov 19, 2024 · bece1c0 · bece1c0
1 parent 6cb8222
commit bece1c0
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 182 deletions.
diff --git a/README.md b/README.md
@@ -456,9 +456,6 @@ java:
       "arm64": "x64"
       "aarch64": "x64"
 
-vault:
-  "download_url": "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
-
 base:
   # Location of temporary files (downloaded AEM packages, etc)
   tmp_dir: aem/home/tmp

diff --git a/cmd/aem/root.go b/cmd/aem/root.go
@@ -34,7 +34,6 @@ func (c *CLI) rootCmd() *cobra.Command {
 	cmd.AddCommand(c.fileCmd())
 	cmd.AddCommand(c.authCmd())
 	cmd.AddCommand(c.contentCmd())
-	cmd.AddCommand(c.vaultCmd())
 
 	c.rootFlags(cmd)
 

diff --git a/cmd/aem/vault.go b/cmd/aem/vault.go
diff --git a/cmd/aem/vendor.go b/cmd/aem/vendor.go
@@ -43,9 +43,6 @@ func (c *CLI) vendorListCmd() *cobra.Command {
 			}
 			c.SetOutput("javaExecutable", javaExecutable)
 
-			vaultExecutable := c.aem.VendorManager().VaultCLI().VltFile()
-			c.setOutput("vaultExecutable", vaultExecutable)
-
 			oakRunJar := c.aem.VendorManager().OakRun().JarFile()
 			c.setOutput("oakRunJar", oakRunJar)
 

diff --git a/examples/docker/src/aem/default/etc/aem.yml b/examples/docker/src/aem/default/etc/aem.yml
@@ -265,9 +265,6 @@ vendor:
         "arm64": "x64"
         "aarch64": "x64"
 
-  vault:
-    download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
-
   # Oak Run tool options (offline instance management)
   oak_run:
     download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"

diff --git a/pkg/project/app_classic/aem/default/etc/aem.yml b/pkg/project/app_classic/aem/default/etc/aem.yml
@@ -272,10 +272,6 @@ vendor:
     download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
     store_path: "crx-quickstart/repository/segmentstore"
 
-  # Jackrabbit Vault tool (repository content management tool)
-  vault:
-    download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
-
 # Content-related options
 content:
   clean:

diff --git a/pkg/project/app_cloud/aem/default/etc/aem.yml b/pkg/project/app_cloud/aem/default/etc/aem.yml
@@ -272,10 +272,6 @@ vendor:
     download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
     store_path: "crx-quickstart/repository/segmentstore"
 
-  # Jackrabbit Vault tool (repository content management tool)
-  vault:
-    download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
-
 # Content-related options
 content:
   clean:

diff --git a/pkg/project/instance/aem/default/etc/aem.yml b/pkg/project/instance/aem/default/etc/aem.yml
@@ -267,10 +267,6 @@ vendor:
     download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
     store_path: "crx-quickstart/repository/segmentstore"
 
-  # Jackrabbit Vault tool (repository content management tool)
-  vault:
-    download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
-
 # Content-related options
 content:
   clean:

diff --git a/pkg/vault_cli.go b/pkg/vault_cli.go
diff --git a/pkg/vendor_manager.go b/pkg/vendor_manager.go
@@ -8,7 +8,6 @@ type VendorManager struct {
 	oakRun      *OakRun
 	quickstart  *Quickstart
 	sdk         *SDK
-	vaultCLI    *VaultCLI
 }
 
 func NewVendorManager(aem *AEM) *VendorManager {
@@ -17,7 +16,6 @@ func NewVendorManager(aem *AEM) *VendorManager {
 	result.sdk = NewSDK(result)
 	result.quickstart = NewQuickstart(result)
 	result.oakRun = NewOakRun(result)
-	result.vaultCLI = NewVaultCLI(result)
 	return result
 }
 
@@ -59,12 +57,6 @@ func (vm *VendorManager) PrepareWithChanged() (bool, error) {
 		return changed, err
 	}
 
-	vaultCLIChanged, err := vm.vaultCLI.PrepareWithChanged()
-	changed = changed || vaultCLIChanged
-	if err != nil {
-		return changed, err
-	}
-
 	return changed, nil
 }
 
@@ -83,7 +75,3 @@ func (vm *VendorManager) Quickstart() *Quickstart {
 func (vm *VendorManager) SDK() *SDK {
 	return vm.sdk
 }
-
-func (vm *VendorManager) VaultCLI() *VaultCLI {
-	return vm.vaultCLI
-}