Vendor manager introduction

Author: krystian-panek-vmltech

cmd/aem/project.go

@@ -57,29 +57,29 @@ func (c *CLI) prepareCmd() *cobra.Command {
 		Aliases: []string{"prep"},
 		Short:   "Prepare vendor tools",
 		Run: func(cmd *cobra.Command, args []string) {
-			if err := c.aem.Prepare(); err != nil {
+			if err := c.aem.VendorManager().Prepare(); err != nil {
 				c.Error(err)
 				return
 			}
 
-			javaHome, err := c.aem.JavaOpts().FindHomeDir()
+			javaHome, err := c.aem.VendorManager().JavaManager().FindHomeDir()
 			if err != nil {
 				c.Error(err)
 				return
 			}
 			c.SetOutput("javaHome", javaHome)
 
-			javaExecutable, err := c.aem.JavaOpts().Executable()
+			javaExecutable, err := c.aem.VendorManager().JavaManager().Executable()
 			if err != nil {
 				c.Error(err)
 				return
 			}
 			c.SetOutput("javaExecutable", javaExecutable)
 
-			vaultJar := "<path>/bin/vlt" // TODO c.aem.VaultCLI().JarFile()
+			vaultJar := c.aem.VendorManager().VaultCLI().JarFile()
 			c.setOutput("vaultJar", vaultJar)
 
-			oakRunJar := c.aem.InstanceManager().LocalOpts.OakRun.JarFile()
+			oakRunJar := c.aem.VendorManager().OakRun().JarFile()
 			c.setOutput("oakRunJar", oakRunJar)
 
 			c.SetOutput("prepared", true)

cmd/aem/vault.go

@@ -10,16 +10,16 @@ func (c *CLI) vaultCmd() *cobra.Command {
 		Use:   "vlt",
 		Short: "Executes Vault commands",
 		Run: func(cmd *cobra.Command, args []string) {
-			argsWithVlt := os.Args[1:]                     // TODO why not 'args' from the Run function?
-			_ = c.aem.VaultCLI().CommandShell(argsWithVlt) // TODO proper error handling
+			argsWithVlt := os.Args[1:]                                     // TODO why not 'args' from the Run function?
+			_ = c.aem.VendorManager().VaultCLI().CommandShell(argsWithVlt) // TODO proper error handling
 		},
 		Args: cobra.ArbitraryArgs,
 		FParseErrWhitelist: cobra.FParseErrWhitelist{
 			UnknownFlags: true,
 		},
 	}
 	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
-		_ = c.aem.VaultCLI().CommandShell(args)
+		_ = c.aem.VendorManager().VaultCLI().CommandShell(args)
 	})
 	return cmd
 }

pkg/facade.go

@@ -4,7 +4,6 @@ package pkg
 import (
 	"github.com/wttech/aemc/pkg/base"
 	"github.com/wttech/aemc/pkg/cfg"
-	"github.com/wttech/aemc/pkg/java"
 	"github.com/wttech/aemc/pkg/project"
 	"io"
 	"os"
@@ -13,14 +12,14 @@ import (
 
 // AEM is a facade to access AEM-related API
 type AEM struct {
-	output          io.Writer
-	config          *cfg.Config
-	project         *project.Project
-	baseOpts        *base.Opts
-	javaOpts        *java.Opts
-	contentManager  *ContentManager
+	output   io.Writer
+	config   *cfg.Config
+	project  *project.Project
+	baseOpts *base.Opts
+
+	vendorManager   *VendorManager
 	instanceManager *InstanceManager
-	vaultCLI        *VaultCLI
+	contentManager  *ContentManager
 }
 
 func DefaultAEM() *AEM {
@@ -33,10 +32,9 @@ func NewAEM(config *cfg.Config) *AEM {
 	result.config = config
 	result.project = project.New(result.config)
 	result.baseOpts = base.NewOpts(result.config)
-	result.javaOpts = java.NewOpts(result.baseOpts)
-	result.contentManager = NewContentManager(result)
+	result.vendorManager = NewVendorManager(result)
 	result.instanceManager = NewInstanceManager(result)
-	result.vaultCLI = NewVaultCLI(result)
+	result.contentManager = NewContentManager(result)
 	return result
 }
 
@@ -61,53 +59,22 @@ func (a *AEM) BaseOpts() *base.Opts {
 	return a.baseOpts
 }
 
-func (a *AEM) JavaOpts() *java.Opts {
-	return a.javaOpts
+func (a *AEM) VendorManager() *VendorManager {
+	return a.vendorManager
 }
 
 func (a *AEM) InstanceManager() *InstanceManager {
 	return a.instanceManager
 }
 
-func (a *AEM) Project() *project.Project {
-	return a.project
-}
-
 func (a *AEM) ContentManager() *ContentManager {
 	return a.contentManager
 }
 
-func (a *AEM) VaultCLI() *VaultCLI {
-	return a.vaultCLI
+func (a *AEM) Project() *project.Project {
+	return a.project
 }
 
 func (a *AEM) Detached() bool {
 	return !a.config.TemplateFileExists()
 }
-
-// TODO move SDK, OakRun, Quickstart under 'vendor' key in the config and namespace in the code
-func (a *AEM) Prepare() error {
-	// validation phase (quick feedback)
-	sdk, err := a.InstanceManager().LocalOpts.Quickstart.IsDistSDK()
-	if err != nil {
-		return err
-	}
-	// preparation phase (slow feedback)
-	if err := a.BaseOpts().Prepare(); err != nil {
-		return err
-	}
-	if err := a.JavaOpts().Prepare(); err != nil {
-		return err
-	}
-	// TODO move SDK and Quickstart outside of instance manager
-	if sdk {
-		if err := a.InstanceManager().LocalOpts.SDK.Prepare(); err != nil {
-			return err
-		}
-	}
-	// TODO move OakRun outside of instance manager
-	if err := a.InstanceManager().LocalOpts.OakRun.Prepare(); err != nil {
-		return err
-	}
-	return nil
-}