simplify commands and version handling

graph-explorer/pkg/command/root.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
 	"github.com/owncloud/ocis/ocis-pkg/version"
@@ -13,38 +14,38 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+// GetCommands provides all commands for this service
+func GetCommands(cfg *config.Config) cli.Commands {
+	return []*cli.Command{
+		// start this service
+		Server(cfg),
+
+		// interaction with this service
+
+		// infos about this service
+		Health(cfg),
+		Version(cfg),
+	}
+}
+
 // Execute is the entry point for the graph-explorer command.
 func Execute(cfg *config.Config) error {
-	app := &cli.App{
-		Name:     "graph-explorer",
-		Version:  version.String,
-		Usage:    "Serve Graph-Explorer for oCIS",
-		Compiled: version.Compiled(),
-		Authors: []*cli.Author{
-			{
-				Name:  "ownCloud GmbH",
-				Email: "support@owncloud.com",
-			},
-		},
+	app := clihelper.DefaultApp(&cli.App{
+		Name:  "graph-explorer",
+		Usage: "Serve Graph-Explorer for oCIS",
 
 		Before: func(c *cli.Context) error {
 			cfg.Service.Version = version.String
 			return ParseConfig(c, cfg)
 		},
 
-		Commands: []*cli.Command{
-			Server(cfg),
-			Health(cfg),
-		},
-	}
+		Commands: GetCommands(cfg),
+	})
+
 	cli.HelpFlag = &cli.BoolFlag{
 		Name:  "help,h",
 		Usage: "Show the help",
 	}
-	cli.VersionFlag = &cli.BoolFlag{
-		Name:  "version,v",
-		Usage: "Print the version",
-	}
 
 	return app.Run(os.Args)
 }

graph-explorer/pkg/command/version.go

@@ -5,30 +5,32 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
+	"github.com/owncloud/ocis/ocis-pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
-// PrintVersion prints the service versions of all running instances.
-func PrintVersion(cfg *config.Config) *cli.Command {
+// Version prints the service versions of all running instances.
+func Version(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "version",
 		Usage: "Print the versions of the running instances",
-		Before: func(c *cli.Context) error {
-			return ParseConfig(c, cfg)
-		},
 		Action: func(c *cli.Context) error {
+			fmt.Println("Version: " + version.String)
+			fmt.Printf("Compiled: %s\n", version.Compiled())
+			fmt.Println("")
+
 			reg := registry.GetRegistry()
 			services, err := reg.GetService(cfg.HTTP.Namespace + "." + cfg.Service.Name)
 			if err != nil {
-				fmt.Println(fmt.Errorf("could not get graph services from the registry: %v", err))
+				fmt.Println(fmt.Errorf("could not get %s services from the registry: %v", cfg.Service.Name, err))
 				return err
 			}
 
 			if len(services) == 0 {
-				fmt.Println("No running graph service found.")
+				fmt.Println("No running " + cfg.Service.Name + " service found.")
 				return nil
 			}