Merge pull request #246 from wttech/bugfix/fix-instance-location-mism…

…atch

Remove creating Instance structs by URL alone

README.md

@@ -201,16 +201,19 @@ import aemc "github.com/wttech/aemc/pkg"
 
 func main() {
     aem := aemc.DefaultAEM()
-    instance, _ := aem.InstanceManager().NewByURL("http://admin:[email protected]:4502")
+    instance, _ := aem.InstanceManager().NewByIDAndURL("remote_author", "http://admin:[email protected]:4502")
     changed, err := instance.PackageManager().DeployWithChanged("/tmp/my-package.zip")
     if err != nil {
         fmt.Printf("cannot deploy package: %s\n", err)
         os.Exit(1)
     }
     if changed {
-      aem.InstanceManager().AwaitStartedOne(*instance)
+      if err := aem.InstanceManager().AwaitStartedOne(*instance); err != nil {
+		  fmt.Printf("instance not stable after deploying package: %s\n", err)
+		  os.Exit(1)
+      }
     }
-    fmt.Printf("package deployed properly\n")
+    fmt.Println("package deployed properly")
     os.Exit(0)
 }
 ```

pkg/instance.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/fatih/color"
-	"github.com/samber/lo"
 	log "github.com/sirupsen/logrus"
 	"github.com/wttech/aemc/pkg/common/fmtx"
 	"github.com/wttech/aemc/pkg/instance"
@@ -181,13 +180,6 @@ func (i Instance) IsAdHoc() bool {
 	return i.IDInfo().Role == instance.RoleAdHoc
 }
 
-func locationByURL(config *nurl.URL) string {
-	if lo.Contains(localHosts(), config.Hostname()) {
-		return instance.LocationLocal
-	}
-	return instance.LocationRemote
-}
-
 func roleByURL(config *nurl.URL) instance.Role {
 	if strings.HasSuffix(config.Port(), instance.RoleAuthorPortSuffix) {
 		return instance.RoleAuthor

pkg/instance_manager.go

@@ -134,7 +134,7 @@ func (im *InstanceManager) newFromConfig(id string) *Instance {
 		return nil
 	}
 
-	i, err := im.NewByURL(httpURL)
+	i, err := im.NewByIDAndURL(id, httpURL)
 	if err != nil {
 		log.Fatalf("cannot create instance from config with ID '%s' using URL '%s': %s", id, httpURL, err)
 		return nil
@@ -223,12 +223,12 @@ func (im *InstanceManager) Publishes() []Instance {
 }
 
 func (im *InstanceManager) NewLocalAuthor() Instance {
-	i, _ := im.NewByURL(instance.URLLocalAuthor)
+	i, _ := im.NewByIDAndURL(instance.LocationLocal+instance.IDDelimiter+string(instance.RoleAuthor), instance.URLLocalAuthor)
 	return *i
 }
 
 func (im *InstanceManager) NewLocalPublish() Instance {
-	i, _ := im.NewByURL(instance.URLLocalPublish)
+	i, _ := im.NewByIDAndURL(instance.LocationLocal+instance.IDDelimiter+string(instance.RolePublish), instance.URLLocalPublish)
 	return *i
 }
 
@@ -240,18 +240,6 @@ func (im *InstanceManager) NewByID(id string) *Instance {
 	return im.newFromConfig(id)
 }
 
-func (im *InstanceManager) NewByURL(url string) (*Instance, error) {
-	urlConfig, err := nurl.Parse(url)
-	if err != nil {
-		return nil, fmt.Errorf("invalid instance URL '%s': %w", url, err)
-	}
-	location := locationByURL(urlConfig)
-	role := roleByURL(urlConfig)
-	parts := []string{location, string(role)}
-	id := strings.Join(parts, instance.IDDelimiter)
-	return im.NewByIDAndURL(id, url)
-}
-
 func (im *InstanceManager) NewByIDAndURL(id string, url string) (*Instance, error) {
 	urlConfig, err := nurl.Parse(url)
 	if err != nil {

pkg/local_instance.go

@@ -687,7 +687,7 @@ func (li LocalInstance) awaitAuth() error {
 		}
 		_, err := li.instance.osgi.bundleManager.List()
 		if err != nil {
-			defaultInstance, err := li.instance.manager.NewByURL(li.instance.http.BaseURL())
+			defaultInstance, err := li.instance.manager.NewByIDAndURL(li.instance.id, li.instance.http.BaseURL())
 			if err != nil {
 				return err
 			}