Recovered old behavior / instance init on create/start

Author: krystian-panek-vmltech

cmd/aem/project.go

@@ -61,39 +61,20 @@ func (c *CLI) projectInitCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "init",
 		Aliases: []string{"initialize"},
-		Short:   "Initializes AEMC in the project",
+		Short:   "Prepare vendor tools for the project",
 		Run: func(cmd *cobra.Command, args []string) {
 			if !c.aem.Project().IsScaffolded() {
 				c.Fail(fmt.Sprintf("project need to be scaffolded before running initialization"))
 				return
 			}
 
-			changed := false
-
 			c.SetOutput("gettingStarted", c.aem.Project().InitGettingStartedError())
 
-			baseChanged, err := c.aem.BaseOpts().PrepareWithChanged()
-			changed = changed || baseChanged
-			if err != nil {
-				c.Error(err)
-				return
-			}
-			c.SetOutput("baseChanged", baseChanged)
-
-			// Download and prepare vendor tools (including JDK and AEM SDK)
-			vendorPrepared, err := c.aem.VendorManager().PrepareWithChanged()
-			changed = changed || vendorPrepared
+			changed, err := c.aem.Project().InitWithChanged()
 			if err != nil {
 				c.Error(err)
 				return
 			}
-			c.SetOutput("vendorPrepared", vendorPrepared)
-
-			// Validate AEM instance files and prepared SDK
-			if err := c.aem.InstanceManager().LocalOpts.Validate(); err != nil {
-				c.Error(err)
-				return
-			}
 
 			c.SetOutput("gettingStarted", c.aem.Project().InitGettingStartedSuccess())
 

pkg/local_instance_manager.go

@@ -35,17 +35,17 @@ func NewLocalOpts(manager *InstanceManager) *LocalOpts {
 	return result
 }
 
-func (o *LocalOpts) Validate() error {
-	// validate phase (fast feedback)
+func (o *LocalOpts) Initialize() error {
+	// pre-validation phase (fast feedback)
 	if err := o.validateUnpackDir(); err != nil {
 		return err
 	}
-	sdk, err := o.manager.aem.vendorManager.Quickstart().IsDistSDK()
+	sdk, err := o.manager.aem.vendorManager.quickstart.IsDistSDK()
 	if err != nil {
 		return err
 	}
 	if !sdk {
-		_, err = o.manager.aem.vendorManager.Quickstart().FindLicenseFile()
+		_, err = o.manager.aem.vendorManager.quickstart.FindLicenseFile()
 		if err != nil {
 			return err
 		}
@@ -55,9 +55,24 @@ func (o *LocalOpts) Validate() error {
 			return err
 		}
 	}
-	// preparation phase
+	// initialization phase (heavy work)
+	if _, err := o.manager.aem.baseOpts.PrepareWithChanged(); err != nil {
+		return err
+	}
+	if _, err := o.manager.aem.vendorManager.javaManager.PrepareWithChanged(); err != nil {
+		return err
+	}
+	if sdk {
+		if _, err := o.manager.aem.vendorManager.sdk.PrepareWithChanged(); err != nil {
+			return err
+		}
+	}
+	if _, err := o.manager.aem.vendorManager.oakRun.PrepareWithChanged(); err != nil {
+		return err
+	}
+	// post-validation phase
 	for _, instance := range o.manager.Locals() {
-		if err := instance.Local().CheckRecreationNeeded(); err != nil { // depends on sdk prepare
+		if err := instance.Local().CheckRecreationNeeded(); err != nil { // depends on SDK prepare
 			return err
 		}
 	}
@@ -116,7 +131,7 @@ func (im *InstanceManager) CreateAll() ([]Instance, error) {
 
 func (im *InstanceManager) Create(instances []Instance) ([]Instance, error) {
 	created := []Instance{}
-	if err := im.LocalOpts.Validate(); err != nil {
+	if err := im.LocalOpts.Initialize(); err != nil {
 		return created, err
 	}
 	log.Info(InstancesMsg(instances, "creating"))
@@ -191,7 +206,7 @@ func (im *InstanceManager) Start(instances []Instance) ([]Instance, error) {
 		log.Debugf("no instances to start")
 		return []Instance{}, nil
 	}
-	if err := im.LocalOpts.Validate(); err != nil {
+	if err := im.LocalOpts.Initialize(); err != nil {
 		return []Instance{}, err
 	}
 

pkg/project.go

@@ -249,3 +249,21 @@ func (p Project) InitGettingStartedSuccess() string {
 	}, "\n"))
 	return text
 }
+
+func (p Project) InitWithChanged() (bool, error) {
+	changed := false
+
+	baseChanged, err := p.aem.BaseOpts().PrepareWithChanged()
+	changed = changed || baseChanged
+	if err != nil {
+		return changed, err
+	}
+
+	vendorPrepared, err := p.aem.VendorManager().PrepareWithChanged()
+	changed = changed || vendorPrepared
+	if err != nil {
+		return changed, err
+	}
+
+	return changed, nil
+}