Merge branch 'master' into spaces-registry-and-provider

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

.drone.star

@@ -570,7 +570,7 @@ def litmusOcisOldWebdav():
           "cd /drone/src/tests/oc-integration-tests/drone/",
           "/drone/src/cmd/revad/revad -c frontend.toml &",
           "/drone/src/cmd/revad/revad -c gateway.toml &",
-          "/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
+          "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
           "/drone/src/cmd/revad/revad -c users.toml",
         ],
       },
@@ -622,7 +622,7 @@ def litmusOcisNewWebdav():
           "cd /drone/src/tests/oc-integration-tests/drone/",
           "/drone/src/cmd/revad/revad -c frontend.toml &",
           "/drone/src/cmd/revad/revad -c gateway.toml &",
-          "/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
+          "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
           "/drone/src/cmd/revad/revad -c users.toml",
         ]
       },
@@ -675,7 +675,7 @@ def litmusOcisSpacesDav():
           "cd /drone/src/tests/oc-integration-tests/drone/",
           "/drone/src/cmd/revad/revad -c frontend.toml &",
           "/drone/src/cmd/revad/revad -c gateway.toml &",
-          "/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
+          "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
           "/drone/src/cmd/revad/revad -c users.toml",
         ]
       },
@@ -740,11 +740,11 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
               "/drone/src/cmd/revad/revad -c frontend.toml &",
               "/drone/src/cmd/revad/revad -c gateway.toml &",
               "/drone/src/cmd/revad/revad -c shares.toml &",
-              "/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
-              "/drone/src/cmd/revad/revad -c storage-publiclink-ocis.toml &",
               "/drone/src/cmd/revad/revad -c storage-shares.toml &",
-              "/drone/src/cmd/revad/revad -c ldap-users.toml &",
               "/drone/src/cmd/revad/revad -c machine-auth.toml",
+              "/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
+              "/drone/src/cmd/revad/revad -c storage-publiclink.toml &",
+              "/drone/src/cmd/revad/revad -c ldap-users.toml",
             ],
           },
           cloneOc10TestReposStep(),
@@ -816,8 +816,8 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
               "/drone/src/cmd/revad/revad -c frontend.toml &",
               "/drone/src/cmd/revad/revad -c gateway.toml &",
               "/drone/src/cmd/revad/revad -c shares.toml &",
-              "/drone/src/cmd/revad/revad -c storage-oc-s3ng.toml &",
-              "/drone/src/cmd/revad/revad -c storage-publiclink-s3ng.toml &",
+              "/drone/src/cmd/revad/revad -c storage-users-s3ng.toml &",
+              "/drone/src/cmd/revad/revad -c storage-publiclink.toml &",
               "/drone/src/cmd/revad/revad -c storage-shares.toml &",
               "/drone/src/cmd/revad/revad -c ldap-users.toml &",
               "/drone/src/cmd/revad/revad -c machine-auth.toml",

changelog/unreleased/eos-skip-get-user-call.md

@@ -0,0 +1,3 @@
+Enhancement: Skip get user call in eosfs in case previous ones also failed
+
+https://github.com/cs3org/reva/pull/2237

changelog/unreleased/toml-cleanup.md

@@ -0,0 +1,5 @@
+Enhancement: update toml configs
+
+We updated the local and drone configurations, cleanad up the example configs and removed the reva gen subcommand which was generating outdated config.
+
+https://github.com/cs3org/reva/pull/2239

cmd/reva/completer.go

@@ -79,15 +79,7 @@ func (c *Completer) argumentCompleter(args ...string) []prompt.Suggest {
 		return []prompt.Suggest{}
 	}
 
-	var suggests []prompt.Suggest
-
 	switch args[0] {
-	case "gen":
-		suggests = convertCmdToSuggests([]*command{
-			genConfigSubCommand(),
-			genUsersSubCommand(),
-		})
-		return prompt.FilterHasPrefix(suggests, args[1], true)
 
 	case "login":
 		if len(args) == 2 {