Move apps-versions CLI from instances to apps

Author: Maxime MENAGER

cmd/apps.go

@@ -9,8 +9,11 @@ import (
 	"text/tabwriter"
 
 	"github.com/cozy/cozy-stack/client"
+	"github.com/cozy/cozy-stack/pkg/apps"
 	"github.com/cozy/cozy-stack/pkg/config"
 	"github.com/cozy/cozy-stack/pkg/consts"
+	"github.com/cozy/cozy-stack/pkg/couchdb"
+	"github.com/cozy/cozy-stack/pkg/instance"
 	"github.com/spf13/cobra"
 )
 
@@ -559,6 +562,38 @@ func lsApps(cmd *cobra.Command, args []string, appType string) error {
 	return w.Flush()
 }
 
+var appsVersionsCmd = &cobra.Command{
+	Use:     "versions",
+	Short:   `Show apps versions of all instances`,
+	Example: "$ cozy-stack apps versions",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		instances, err := instance.List()
+		if err != nil {
+			return nil
+		}
+		counter := make(map[string]map[string]int)
+
+		for _, instance := range instances {
+			var apps []*apps.WebappManifest
+			req := &couchdb.AllDocsRequest{Limit: 100}
+			couchdb.GetAllDocs(instance, consts.Apps, req, &apps)
+
+			for _, app := range apps {
+				if _, ok := counter[app.Slug()]; !ok {
+					counter[app.Slug()] = map[string]int{app.Version(): 0}
+				}
+				counter[app.Slug()][app.Version()]++
+			}
+		}
+		json, err := json.MarshalIndent(counter, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(json))
+		return nil
+	},
+}
+
 func foreachDomains(predicate func(*client.Instance) error) error {
 	c := newAdminClient()
 	// TODO(pagination): Make this iteration more robust
@@ -602,6 +637,7 @@ func init() {
 	webappsCmdGroup.AddCommand(installWebappCmd)
 	webappsCmdGroup.AddCommand(updateWebappCmd)
 	webappsCmdGroup.AddCommand(uninstallWebappCmd)
+	webappsCmdGroup.AddCommand(appsVersionsCmd)
 
 	konnectorsCmdGroup.PersistentFlags().StringVar(&flagAppsDomain, "domain", domain, "specify the domain name of the instance")
 	konnectorsCmdGroup.PersistentFlags().StringVar(&flagKonnectorsParameters, "parameters", "", "override the parameters of the installed konnector")

cmd/instances.go

@@ -839,38 +839,6 @@ var showSwiftPrefixInstanceCmd = &cobra.Command{
 	},
 }
 
-var appsVersionsCmd = &cobra.Command{
-	Use:     "apps-versions",
-	Short:   `Show apps versions of all instances`,
-	Example: "$ cozy-stack instances apps-versions",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		instances, err := instance.List()
-		if err != nil {
-			return nil
-		}
-		counter := make(map[string]map[string]int)
-
-		for _, instance := range instances {
-			var apps []*apps.WebappManifest
-			req := &couchdb.AllDocsRequest{Limit: 100}
-			couchdb.GetAllDocs(instance, consts.Apps, req, &apps)
-
-			for _, app := range apps {
-				if _, ok := counter[app.Slug()]; !ok {
-					counter[app.Slug()] = map[string]int{app.Version(): 0}
-				}
-				counter[app.Slug()][app.Version()]++
-			}
-		}
-		json, err := json.MarshalIndent(counter, "", "  ")
-		if err != nil {
-			return err
-		}
-		fmt.Println(string(json))
-		return nil
-	},
-}
-
 var instanceAppVersionCmd = &cobra.Command{
 	Use:     "show-app-version [app-slug] [version]",
 	Short:   `Show instances that have a particular app version`,
@@ -933,7 +901,6 @@ func init() {
 	instanceCmdGroup.AddCommand(exportCmd)
 	instanceCmdGroup.AddCommand(importCmd)
 	instanceCmdGroup.AddCommand(showSwiftPrefixInstanceCmd)
-	instanceCmdGroup.AddCommand(appsVersionsCmd)
 	instanceCmdGroup.AddCommand(instanceAppVersionCmd)
 	addInstanceCmd.Flags().StringSliceVar(&flagDomainAliases, "domain-aliases", nil, "Specify one or more aliases domain for the instance (separated by ',')")
 	addInstanceCmd.Flags().StringVar(&flagLocale, "locale", instance.DefaultLocale, "Locale of the new cozy instance")

docs/cli/cozy-stack_apps.md

@@ -42,4 +42,5 @@ from the given source URL.
 * [cozy-stack apps show](cozy-stack_apps_show.md)	 - Show the application attributes
 * [cozy-stack apps uninstall](cozy-stack_apps_uninstall.md)	 - Uninstall the application with the specified slug name.
 * [cozy-stack apps update](cozy-stack_apps_update.md)	 - Update the application with the specified slug name.
+* [cozy-stack apps versions](cozy-stack_apps_versions.md)	 - Show apps versions of all instances
 

docs/cli/cozy-stack_instances_apps-versions.md docs/cli/cozy-stack_apps_versions.md

@@ -1,4 +1,4 @@
-## cozy-stack instances apps-versions
+## cozy-stack apps versions
 
 Show apps versions of all instances
 
@@ -7,32 +7,34 @@ Show apps versions of all instances
 Show apps versions of all instances
 
 ```
-cozy-stack instances apps-versions [flags]
+cozy-stack apps versions [flags]
 ```
 
 ### Examples
 
 ```
-$ cozy-stack instances apps-versions
+$ cozy-stack apps versions
 ```
 
 ### Options
 
 ```
-  -h, --help   help for apps-versions
+  -h, --help   help for versions
 ```
 
 ### Options inherited from parent commands
 
 ```
       --admin-host string   administration server host (default "localhost")
       --admin-port int      administration server port (default 6060)
+      --all-domains         work on all domains iterativelly
   -c, --config string       configuration file (default "$HOME/.cozy.yaml")
+      --domain string       specify the domain name of the instance (default "cozy.tools:8080")
       --host string         server host (default "localhost")
   -p, --port int            server port (default 8080)
 ```
 
 ### SEE ALSO
 
-* [cozy-stack instances](cozy-stack_instances.md)	 - Manage instances of a stack
+* [cozy-stack apps](cozy-stack_apps.md)	 - Interact with the applications
 

docs/cli/cozy-stack_instances.md

@@ -39,7 +39,6 @@ cozy-stack instances <command> [flags]
 
 * [cozy-stack](cozy-stack.md)	 - cozy-stack is the main command
 * [cozy-stack instances add](cozy-stack_instances_add.md)	 - Manage instances of a stack
-* [cozy-stack instances apps-versions](cozy-stack_instances_apps-versions.md)	 - Show apps versions of all instances
 * [cozy-stack instances client-oauth](cozy-stack_instances_client-oauth.md)	 - Register a new OAuth client
 * [cozy-stack instances debug](cozy-stack_instances_debug.md)	 - Activate or deactivate debugging of the instance
 * [cozy-stack instances destroy](cozy-stack_instances_destroy.md)	 - Remove instance