refactor

Author: Dominik Przybyl

cmd/aem/instance_list_int_test.go

@@ -57,33 +57,21 @@ func TestPublishInstances(t *testing.T) {
 }
 
 func TestInstanceByID(t *testing.T) {
-	testInstanceList(t, []string{"instance", "list", "-I", "local_author", "-I", "local_publish", "--output-value", "NONE"}, true, []string{"local_author", "local_publish"})
+	testInstanceList(t, []string{"instance", "list", "-I", "local_author", "--output-value", "NONE"}, true, []string{"local_author"})
 }
 
 func TestInstanceByURL(t *testing.T) {
 	testInstanceList(t, []string{"instance", "list", "-U", "http://admin:admin@127.0.0.1:4502", "-U", "http://admin:admin@127.0.0.1:4503", "-U", "test_author=http://admin:admin@127.0.0.1:4502", "--output-value", "NONE"}, true, []string{"remote_adhoc_1", "remote_adhoc_2", "test_author"})
 }
 
+func TestInstanceByIDOrURL(t *testing.T) {
+	testInstanceList(t, []string{"instance", "list", "-I", "local_publish", "-U", "http://admin:admin@127.0.0.1:4502", "--output-value", "NONE"}, true, []string{"local_publish", "remote_adhoc"})
+}
+
 func TestAuthorInstanceByURL(t *testing.T) {
 	testInstanceList(t, []string{"instance", "list", "-U", "dev-auth_author=http://admin:admin@127.0.0.1:4502", "-U", "dev-pub1_publish=http://admin:admin@127.0.0.1:4503", "-U", "dev-pub2_publish=http://admin:admin@127.0.0.1:4504", "-A", "--output-value", "NONE"}, true, []string{"dev-auth_author"})
 }
 
 func TestPublishInstanceByURL(t *testing.T) {
 	testInstanceList(t, []string{"instance", "list", "-U", "dev-auth_author=http://admin:admin@127.0.0.1:4502", "-U", "dev-pub1_publish=http://admin:admin@127.0.0.1:4503", "-U", "dev-pub2_publish=http://admin:admin@127.0.0.1:4504", "-P", "--output-value", "NONE"}, true, []string{"dev-pub1_publish", "dev-pub2_publish"})
 }
-
-func TestConflictAuthorAndPublish(t *testing.T) {
-	testInstanceList(t, []string{"instance", "list", "-A", "-P"}, false, []string{})
-}
-
-func TestConflictByIDAndAuthor(t *testing.T) {
-	testInstanceList(t, []string{"instance", "list", "-I", "local_author", "-A"}, false, []string{})
-}
-
-func TestConflictByIDAndPublish(t *testing.T) {
-	testInstanceList(t, []string{"instance", "list", "-I", "local_author", "-P"}, false, []string{})
-}
-
-func TestConflictIDAndURL(t *testing.T) {
-	testInstanceList(t, []string{"instance", "list", "-I", "local_author", "-U", "http://admin:admin@127.0.0.1:4502"}, false, []string{})
-}

cmd/aem/root.go

@@ -80,9 +80,6 @@ func (c *CLI) rootFlags(cmd *cobra.Command) {
 	cmd.PersistentFlags().BoolP("instance-publish", "P", cv.GetBool("instance.filter.publishes"), "Use only AEM publish instance(s)")
 	_ = cv.BindPFlag("instance.filter.publishes", cmd.PersistentFlags().Lookup("instance-publish"))
 
-	cmd.MarkFlagsMutuallyExclusive("instance-url", "instance-id")
-	cmd.MarkFlagsMutuallyExclusive("instance-id", "instance-author", "instance-publish")
-
 	cmd.PersistentFlags().String("instance-processing", cv.GetString("instance.processing_mode"), "Controls processing mode for instances ("+(strings.Join(instance.ProcessingModes(), "|")+")"))
 	_ = cv.BindPFlag("instance.processing_mode", cmd.PersistentFlags().Lookup("instance-processing"))
 }

pkg/instance_manager.go

@@ -84,33 +84,45 @@ func (im *InstanceManager) All() []Instance {
 }
 
 func (im *InstanceManager) newAdHocOrFromConfig() []Instance {
+	var result []Instance
 	if len(im.AdHocURLs) > 0 {
-		var result []Instance
 		for adHocIndex, adHocValue := range im.AdHocURLs {
 			iURL, err := im.newAdhoc(adHocValue, adHocIndex, len(im.AdHocURLs))
 			if err != nil {
 				log.Fatalf("cannot create instance from ad hoc value '%s': %s", adHocValue, err)
 			}
 			result = append(result, *iURL)
 		}
-		return result
 	}
+	var instances []Instance
 	cv := im.aem.config.Values()
 	configIDs := maps.Keys(cv.GetStringMap("instance.config"))
 	if len(configIDs) > 0 {
-		var result []Instance
 		for _, id := range configIDs {
 			cv.SetDefault(fmt.Sprintf("instance.config.%s.active", id), true)
 			active := cv.GetBool(fmt.Sprintf("instance.config.%s.active", id))
 			if active {
 				if i := im.newFromConfig(id); i != nil {
-					result = append(result, *i)
+					instances = append(instances, *i)
 				}
 			}
 		}
-		return result
+	} else {
+		instances = im.NewLocalPair()
+	}
+	if len(im.FilterIDs) > 0 {
+		for _, i := range instances {
+			for _, filterID := range im.FilterIDs {
+				if i.id == filterID {
+					result = append(result, i)
+					break
+				}
+			}
+		}
+	} else if len(im.AdHocURLs) == 0 {
+		result = instances
 	}
-	return im.NewLocalPair()
+	return result
 }
 
 func (im *InstanceManager) newAdhoc(value string, current int, total int) (*Instance, error) {
@@ -165,20 +177,9 @@ func (im *InstanceManager) newFromConfig(id string) *Instance {
 
 func (im *InstanceManager) filter(instances []Instance) []Instance {
 	result := []Instance{}
-	if len(im.FilterIDs) > 0 {
-		for _, i := range instances {
-			for _, filterID := range im.FilterIDs {
-				if i.id == filterID {
-					result = append(result, i)
-					break
-				}
-			}
-		}
-	} else {
-		for _, i := range instances {
-			if im.FilterAuthors == im.FilterPublishes || im.FilterAuthors && i.IsAuthor() || im.FilterPublishes && i.IsPublish() {
-				result = append(result, i)
-			}
+	for _, i := range instances {
+		if im.FilterAuthors == im.FilterPublishes || im.FilterAuthors && i.IsAuthor() || im.FilterPublishes && i.IsPublish() {
+			result = append(result, i)
 		}
 	}
 	sort.SliceStable(result, func(i, j int) bool {