ensure commands for all services

extensions/ocdav/pkg/command/health.go

@@ -0,0 +1,57 @@
+package command
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/logging"
+	"github.com/urfave/cli/v2"
+)
+
+// Health is the entrypoint for the health command.
+func Health(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:     "health",
+		Usage:    "check health status",
+		Category: "info",
+		Before: func(c *cli.Context) error {
+			err := parser.ParseConfig(cfg)
+			if err != nil {
+				fmt.Printf("%v", err)
+			}
+			return err
+		},
+		Action: func(c *cli.Context) error {
+			logger := logging.Configure(cfg.Service.Name, cfg.Log)
+
+			resp, err := http.Get(
+				fmt.Sprintf(
+					"http://%s/healthz",
+					cfg.Debug.Addr,
+				),
+			)
+
+			if err != nil {
+				logger.Fatal().
+					Err(err).
+					Msg("Failed to request health check")
+			}
+
+			defer resp.Body.Close()
+
+			if resp.StatusCode != http.StatusOK {
+				logger.Fatal().
+					Int("code", resp.StatusCode).
+					Msg("Health seems to be in bad state")
+			}
+
+			logger.Debug().
+				Int("code", resp.StatusCode).
+				Msg("Health got a good state")
+
+			return nil
+		},
+	}
+}

extensions/ocdav/pkg/command/ocdav.go

@@ -1,142 +0,0 @@
-package command
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/cs3org/reva/v2/pkg/micro/ocdav"
-	"github.com/oklog/run"
-	"github.com/owncloud/ocis/extensions/ocdav/pkg/config"
-	"github.com/owncloud/ocis/extensions/ocdav/pkg/config/parser"
-	"github.com/owncloud/ocis/extensions/ocdav/pkg/server/debug"
-	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/ocis-pkg/sync"
-	"github.com/owncloud/ocis/ocis-pkg/tracing"
-	"github.com/thejerf/suture/v4"
-	"github.com/urfave/cli/v2"
-)
-
-// OCDav is the entrypoint for the ocdav command.
-// TODO move ocdav cmd to a separate service
-func OCDav(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:  "ocdav",
-		Usage: "start ocdav service",
-		Before: func(ctx *cli.Context) error {
-			err := parser.ParseConfig(cfg)
-			if err != nil {
-				fmt.Printf("%v", err)
-			}
-			return err
-		},
-		Action: func(c *cli.Context) error {
-			logCfg := cfg.Logging
-			logger := log.NewLogger(
-				log.Level(logCfg.Level),
-				log.File(logCfg.File),
-				log.Pretty(logCfg.Pretty),
-				log.Color(logCfg.Color),
-			)
-			tracing.Configure(cfg.Tracing.Enabled, cfg.Tracing.Type, logger)
-
-			gr := run.Group{}
-			ctx, cancel := context.WithCancel(context.Background())
-			//metrics     = metrics.New()
-
-			defer cancel()
-
-			gr.Add(func() error {
-				s, err := ocdav.Service(
-					ocdav.Context(ctx),
-					ocdav.Logger(logger.Logger),
-					ocdav.Address(cfg.HTTP.Addr),
-					ocdav.FilesNamespace(cfg.FilesNamespace),
-					ocdav.WebdavNamespace(cfg.WebdavNamespace),
-					ocdav.SharesNamespace(cfg.SharesNamespace),
-					ocdav.Timeout(cfg.Timeout),
-					ocdav.Insecure(cfg.Insecure),
-					ocdav.PublicURL(cfg.PublicURL),
-					ocdav.Prefix(cfg.HTTP.Prefix),
-					ocdav.GatewaySvc(cfg.Reva.Address),
-					ocdav.JWTSecret(cfg.TokenManager.JWTSecret),
-					// ocdav.FavoriteManager() // FIXME needs a proper persistence implementation
-					// ocdav.LockSystem(), // will default to the CS3 lock system
-					// ocdav.TLSConfig() // tls config for the http server
-				)
-				if err != nil {
-					return err
-				}
-
-				return s.Run()
-			}, func(err error) {
-				logger.Info().Err(err).Str("server", c.Command.Name).Msg("Shutting down server")
-				cancel()
-			})
-
-			{
-				server, err := debug.Server(
-					debug.Logger(logger),
-					debug.Context(ctx),
-					debug.Config(cfg),
-				)
-
-				if err != nil {
-					logger.Info().
-						Err(err).
-						Str("server", "debug").
-						Msg("Failed to initialize server")
-
-					return err
-				}
-
-				gr.Add(server.ListenAndServe, func(_ error) {
-					cancel()
-				})
-			}
-
-			if !cfg.Supervised {
-				sync.Trap(&gr, cancel)
-			}
-
-			return gr.Run()
-		},
-	}
-}
-
-// OCDavSutureService allows for the ocdav command to be embedded and supervised by a suture supervisor tree.
-type OCDavSutureService struct {
-	cfg *config.Config
-}
-
-// NewOCDav creates a new ocdav.OCDavSutureService
-func NewOCDav(cfg *ociscfg.Config) suture.Service {
-	cfg.OCDav.Commons = cfg.Commons
-	return OCDavSutureService{
-		cfg: cfg.OCDav,
-	}
-}
-
-func (s OCDavSutureService) Serve(ctx context.Context) error {
-	// s.cfg.Reva.Frontend.Context = ctx
-	cmd := OCDav(s.cfg)
-	f := &flag.FlagSet{}
-	cmdFlags := cmd.Flags
-	for k := range cmdFlags {
-		if err := cmdFlags[k].Apply(f); err != nil {
-			return err
-		}
-	}
-	cliCtx := cli.NewContext(nil, f, nil)
-	if cmd.Before != nil {
-		if err := cmd.Before(cliCtx); err != nil {
-			return err
-		}
-	}
-	if err := cmd.Action(cliCtx); err != nil {
-		return err
-	}
-
-	return nil
-}

extensions/ocdav/pkg/command/root.go

@@ -0,0 +1,64 @@
+package command
+
+import (
+	"context"
+	"os"
+
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/clihelper"
+	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/thejerf/suture/v4"
+	"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 ocis-ocdav command.
+func Execute(cfg *config.Config) error {
+	app := clihelper.DefaultApp(&cli.App{
+		Name:     "ocis-ocdav",
+		Usage:    "Provide a WebDav API for oCIS",
+		Commands: GetCommands(cfg),
+	})
+
+	cli.HelpFlag = &cli.BoolFlag{
+		Name:  "help,h",
+		Usage: "Show the help",
+	}
+
+	return app.Run(os.Args)
+}
+
+// SutureService allows for the ocdav command to be embedded and supervised by a suture supervisor tree.
+type SutureService struct {
+	cfg *config.Config
+}
+
+// NewSutureService creates a new ocdav.SutureService
+func NewSutureService(cfg *ociscfg.Config) suture.Service {
+	cfg.OCDav.Commons = cfg.Commons
+	return SutureService{
+		cfg: cfg.OCDav,
+	}
+}
+
+func (s SutureService) Serve(ctx context.Context) error {
+	s.cfg.Context = ctx
+	if err := Execute(s.cfg); err != nil {
+		return err
+	}
+
+	return nil
+}

extensions/ocdav/pkg/command/server.go

@@ -0,0 +1,98 @@
+package command
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/cs3org/reva/v2/pkg/micro/ocdav"
+	"github.com/oklog/run"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/logging"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/server/debug"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/tracing"
+	"github.com/urfave/cli/v2"
+)
+
+// Server is the entry point for the server command.
+func Server(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:     "server",
+		Usage:    fmt.Sprintf("start %s extension without runtime (unsupervised mode)", cfg.Service.Name),
+		Category: "server",
+		Before: func(c *cli.Context) error {
+			err := parser.ParseConfig(cfg)
+			if err != nil {
+				fmt.Printf("%v", err)
+			}
+			return err
+		},
+		Action: func(c *cli.Context) error {
+			logger := logging.Configure(cfg.Service.Name, cfg.Log)
+			err := tracing.Configure(cfg, logger)
+			if err != nil {
+				return err
+			}
+			gr := run.Group{}
+			ctx, cancel := defineContext(cfg)
+
+			defer cancel()
+
+			gr.Add(func() error {
+				s, err := ocdav.Service(
+					ocdav.Context(ctx),
+					ocdav.Logger(logger.Logger),
+					ocdav.Address(cfg.HTTP.Addr),
+					ocdav.FilesNamespace(cfg.FilesNamespace),
+					ocdav.WebdavNamespace(cfg.WebdavNamespace),
+					ocdav.SharesNamespace(cfg.SharesNamespace),
+					ocdav.Timeout(cfg.Timeout),
+					ocdav.Insecure(cfg.Insecure),
+					ocdav.PublicURL(cfg.PublicURL),
+					ocdav.Prefix(cfg.HTTP.Prefix),
+					ocdav.GatewaySvc(cfg.Reva.Address),
+					ocdav.JWTSecret(cfg.TokenManager.JWTSecret),
+					// ocdav.FavoriteManager() // FIXME needs a proper persistence implementation
+					// ocdav.LockSystem(), // will default to the CS3 lock system
+					// ocdav.TLSConfig() // tls config for the http server
+				)
+				if err != nil {
+					return err
+				}
+
+				return s.Run()
+			}, func(err error) {
+				logger.Info().Err(err).Str("server", c.Command.Name).Msg("Shutting down server")
+				cancel()
+			})
+
+			debugServer, err := debug.Server(
+				debug.Logger(logger),
+				debug.Context(ctx),
+				debug.Config(cfg),
+			)
+
+			if err != nil {
+				logger.Info().Err(err).Str("server", "debug").Msg("Failed to initialize server")
+				return err
+			}
+
+			gr.Add(debugServer.ListenAndServe, func(_ error) {
+				cancel()
+			})
+
+			return gr.Run()
+		},
+	}
+}
+
+// defineContext sets the context for the extension. If there is a context configured it will create a new child from it,
+// if not, it will create a root context that can be cancelled.
+func defineContext(cfg *config.Config) (context.Context, context.CancelFunc) {
+	return func() (context.Context, context.CancelFunc) {
+		if cfg.Context == nil {
+			return context.WithCancel(context.Background())
+		}
+		return context.WithCancel(cfg.Context)
+	}()
+}

extensions/ocdav/pkg/command/version.go

@@ -0,0 +1,50 @@
+package command
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/owncloud/ocis/ocis-pkg/registry"
+	"github.com/owncloud/ocis/ocis-pkg/version"
+
+	tw "github.com/olekukonko/tablewriter"
+	"github.com/owncloud/ocis/extensions/ocdav/pkg/config"
+	"github.com/urfave/cli/v2"
+)
+
+// Version prints the service versions of all running instances.
+func Version(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:     "version",
+		Usage:    "print the version of this binary and the running extension instances",
+		Category: "info",
+		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 %s services from the registry: %v", cfg.Service.Name, err))
+				return err
+			}
+
+			if len(services) == 0 {
+				fmt.Println("No running " + cfg.Service.Name + " service found.")
+				return nil
+			}
+
+			table := tw.NewWriter(os.Stdout)
+			table.SetHeader([]string{"Version", "Address", "Id"})
+			table.SetAutoFormatHeaders(false)
+			for _, s := range services {
+				for _, n := range s.Nodes {
+					table.Append([]string{s.Version, n.Address, n.Id})
+				}
+			}
+			table.Render()
+			return nil
+		},
+	}
+}