removed all flagset packages

webdav/pkg/command/health.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/flagset"
 	"github.com/urfave/cli/v2"
 )
 
@@ -14,7 +13,9 @@ func Health(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "health",
 		Usage: "Check health status",
-		Flags: flagset.HealthWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			return ParseConfig(c, cfg)
+		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 

webdav/pkg/command/version.go

@@ -8,7 +8,6 @@ import (
 
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/flagset"
 	"github.com/urfave/cli/v2"
 )
 
@@ -17,7 +16,9 @@ func PrintVersion(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "version",
 		Usage: "Print the versions of the running instances",
-		Flags: flagset.ListWebdavWithConfig(cfg),
+		Before: func(c *cli.Context) error {
+			return ParseConfig(c, cfg)
+		},
 		Action: func(c *cli.Context) error {
 			reg := registry.GetRegistry()
 			services, err := reg.GetService(cfg.Service.Namespace + "." + cfg.Service.Name)

webdav/pkg/flagset/flagset.go

@@ -1,40 +0,0 @@
-package flagset
-
-import (
-	"github.com/owncloud/ocis/ocis-pkg/flags"
-	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/urfave/cli/v2"
-)
-
-// HealthWithConfig applies cfg to the root flagset
-func HealthWithConfig(cfg *config.Config) []cli.Flag {
-	return []cli.Flag{
-		&cli.StringFlag{
-			Name:        "debug-addr",
-			Value:       flags.OverrideDefaultString(cfg.Debug.Addr, "127.0.0.1:9119"),
-			Usage:       "Address to debug endpoint",
-			EnvVars:     []string{"WEBDAV_DEBUG_ADDR"},
-			Destination: &cfg.Debug.Addr,
-		},
-	}
-}
-
-// ListWebdavWithConfig applies the config to the list commands flagset.
-func ListWebdavWithConfig(cfg *config.Config) []cli.Flag {
-	return []cli.Flag{
-		&cli.StringFlag{
-			Name:        "http-namespace",
-			Value:       flags.OverrideDefaultString(cfg.Service.Namespace, "com.owncloud.web"),
-			Usage:       "Set the base namespace for service discovery",
-			EnvVars:     []string{"WEBDAV_HTTP_NAMESPACE"},
-			Destination: &cfg.Service.Namespace,
-		},
-		&cli.StringFlag{
-			Name:        "service-name",
-			Value:       flags.OverrideDefaultString(cfg.Service.Name, "webdav"),
-			Usage:       "Service name",
-			EnvVars:     []string{"WEBDAV_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
-	}
-}