set correct flag type (#76)

merging because the failing tests are unrelated
owncloud · Feb 11, 2020 · ac3381e · ac3381e
1 parent 2b2e7f0
commit ac3381e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/changelog/unreleased/76 b/changelog/unreleased/76
@@ -0,0 +1,8 @@
+Bugfix: set correct flag type in the flagsets
+
+While upgrading to the micro/cli version 2 there where two instances of `StringFlag`
+which had not been changed to `StringSliceFlag`.
+This caused `ocis-reva users` and `ocis-reva storage-root` to fail on startup.
+
+https://github.com/owncloud/ocis-reva/issues/75
+https://github.com/owncloud/ocis-reva/pull/76
diff --git a/pkg/flagset/storageroot.go b/pkg/flagset/storageroot.go
@@ -116,9 +116,9 @@ func StorageRootWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_ROOT_URL"},
 			Destination: &cfg.Reva.StorageRoot.URL,
 		},
-		&cli.StringFlag{
+		&cli.StringSliceFlag{
 			Name:    "service",
-			Value:   "storageprovider",
+			Value:   cli.NewStringSlice("storageprovider"),
 			Usage:   "--service storageprovider [--service otherservice]",
 			EnvVars: []string{"REVA_STORAGE_ROOT_SERVICES"},
 		},

diff --git a/pkg/flagset/users.go b/pkg/flagset/users.go
@@ -195,9 +195,9 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_USERS_URL"},
 			Destination: &cfg.Reva.Users.URL,
 		},
-		&cli.StringFlag{
+		&cli.StringSliceFlag{
 			Name:    "service",
-			Value:   "userprovider", // TODO preferences
+			Value:   cli.NewStringSlice("userprovider"), // TODO preferences
 			Usage:   "--service userprovider [--service otherservice]",
 			EnvVars: []string{"REVA_USERS_SERVICES"},
 		},