Restructure project similar to hello and graph

2019-12-06 15:03:44 +01:00
parent dcac6a2735
commit 89ab7bf914
46 changed files with 1906 additions and 751 deletions
@@ -4,101 +4,100 @@ import (
 	"os"
 	"strings"

+	"github.com/micro/cli"
+	"github.com/owncloud/ocis-pkg/log"
+	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis-webdav/pkg/flagset"
 	"github.com/owncloud/ocis-webdav/pkg/version"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

-// Root is the entry point for the ocis-webdav command.
-func Root() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:     "ocis-webdav",
-		Short:   "Reva service for webdav",
-		Long:    ``,
-		Version: version.String,
-		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			setupLogger()
-			setupConfig()
+// Execute is the entry point for the ocis-webdav command.
+func Execute() error {
+	cfg := config.New()
+
+	app := &cli.App{
+		Name:     "ocis-webdav",
+		Version:  version.String,
+		Usage:    "Serve WebDAV API for oCIS",
+		Compiled: version.Compiled(),
+
+		Authors: []cli.Author{
+			{
+				Name:  "ownCloud GmbH",
+				Email: "support@owncloud.com",
+			},
+		},
+
+		Flags: flagset.RootWithConfig(cfg),
+
+		Before: func(c *cli.Context) error {
+			logger := NewLogger(cfg)
+
+			viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+			viper.SetEnvPrefix("WEBDAV")
+			viper.AutomaticEnv()
+
+			if c.IsSet("config-file") {
+				viper.SetConfigFile(c.String("config-file"))
+			} else {
+				viper.SetConfigName("webdav")
+
+				viper.AddConfigPath("/etc/ocis")
+				viper.AddConfigPath("$HOME/.ocis")
+				viper.AddConfigPath("./config")
+			}
+
+			if err := viper.ReadInConfig(); err != nil {
+				switch err.(type) {
+				case viper.ConfigFileNotFoundError:
+					logger.Info().
+						Msg("Continue without config")
+				case viper.UnsupportedConfigError:
+					logger.Fatal().
+						Err(err).
+						Msg("Unsupported config type")
+				default:
+					logger.Fatal().
+						Err(err).
+						Msg("Failed to read config")
+				}
+			}
+
+			if err := viper.Unmarshal(&cfg); err != nil {
+				logger.Fatal().
+					Err(err).
+					Msg("Failed to parse config")
+			}
+
+			return nil
+		},
+
+		Commands: []cli.Command{
+			Server(cfg),
+			Health(cfg),
 		},
 	}

-	cmd.PersistentFlags().String("log-level", "", "Set logging level")
-	viper.BindPFlag("log.level", cmd.PersistentFlags().Lookup("log-level"))
-	viper.SetDefault("log.level", "info")
-	viper.BindEnv("log.level", "WEBDAV_LOG_LEVEL")
-
-	cmd.PersistentFlags().Bool("log-pretty", false, "Enable pretty logging")
-	viper.BindPFlag("log.pretty", cmd.PersistentFlags().Lookup("log-pretty"))
-	viper.SetDefault("log.pretty", true)
-	viper.BindEnv("log.pretty", "WEBDAV_LOG_PRETTY")
-
-	cmd.PersistentFlags().Bool("log-color", false, "Enable colored logging")
-	viper.BindPFlag("log.color", cmd.PersistentFlags().Lookup("log-color"))
-	viper.SetDefault("log.color", true)
-	viper.BindEnv("log.color", "WEBDAV_LOG_COLOR")
-
-	cmd.AddCommand(Server())
-	cmd.AddCommand(Health())
-
-	return cmd
-}
-
-// setupLogger prepares the logger.
-func setupLogger() {
-	switch strings.ToLower(viper.GetString("log.level")) {
-	case "panic":
-		zerolog.SetGlobalLevel(zerolog.PanicLevel)
-	case "fatal":
-		zerolog.SetGlobalLevel(zerolog.FatalLevel)
-	case "error":
-		zerolog.SetGlobalLevel(zerolog.ErrorLevel)
-	case "warn":
-		zerolog.SetGlobalLevel(zerolog.WarnLevel)
-	case "info":
-		zerolog.SetGlobalLevel(zerolog.InfoLevel)
-	case "debug":
-		zerolog.SetGlobalLevel(zerolog.DebugLevel)
-	default:
-		zerolog.SetGlobalLevel(zerolog.InfoLevel)
+	cli.HelpFlag = &cli.BoolFlag{
+		Name:  "help,h",
+		Usage: "Show the help",
 	}

-	if viper.GetBool("log.pretty") {
-		log.Logger = log.Output(
-			zerolog.ConsoleWriter{
-				Out:     os.Stderr,
-				NoColor: !viper.GetBool("log.color"),
-			},
-		)
+	cli.VersionFlag = &cli.BoolFlag{
+		Name:  "version,v",
+		Usage: "Print the version",
 	}
+
+	return app.Run(os.Args)
 }

-// setupConfig prepares the config.
-func setupConfig() {
-	viper.SetConfigName("webdav")
-
-	viper.AddConfigPath("/etc/ocis")
-	viper.AddConfigPath("$HOME/.ocis")
-	viper.AddConfigPath("./config")
-
-	if err := viper.ReadInConfig(); err != nil {
-		switch err.(type) {
-		case viper.ConfigFileNotFoundError:
-			log.Debug().
-				Msg("Continue without config")
-		case viper.UnsupportedConfigError:
-			log.Fatal().
-				Msg("Unsupported config type")
-		default:
-			if e := log.Debug(); e.Enabled() {
-				log.Fatal().
-					Err(err).
-					Msg("Failed to read config")
-			} else {
-				log.Fatal().
-					Msg("Failed to read config")
-			}
-		}
-	}
+// NewLogger initializes a service-specific logger instance.
+func NewLogger(cfg *config.Config) log.Logger {
+	return log.NewLogger(
+		log.Name("webdav"),
+		log.Level(cfg.Log.Level),
+		log.Pretty(cfg.Log.Pretty),
+		log.Color(cfg.Log.Color),
+	)
 }