bump reva, change decomposeds3 drivername

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

opencloud/README.md

@@ -55,7 +55,7 @@ A node that doesn't have any (or malformed) metadata.
 This command provides additional options:
 
 * `-b` / `--blobstore`\
-Allows specifying the blobstore to use. Defaults to `decomposed`. Empty blobs will not be checked. Can also be switched to `decomposed_s3`, but needs addtional envvar configuration (see the `storage-users` service for more details).
+Allows specifying the blobstore to use. Defaults to `decomposed`. Empty blobs will not be checked. Can also be switched to `decomposeds3`, but needs addtional envvar configuration (see the `storage-users` service for more details).
 * `--fail`\
 Exits with non-zero exit code if inconsistencies are found. Useful for automation.
 
@@ -86,7 +86,7 @@ This command provides additional options:
 * `--dry-run` (default: `true`)\
 Do not remove any revisions but print the revisions that would be removed.
 * `-b` / `--blobstore`\
-Allows specifying the blobstore to use. Defaults to `decomposed`. Can be switched to `decomposed_s3` but needs addtional envvar configuration (see the `storage-users` service for more details).
+Allows specifying the blobstore to use. Defaults to `decomposed`. Can be switched to `decomposeds3` but needs addtional envvar configuration (see the `storage-users` service for more details).
 * `-v` / `--verbose`\
 Prints additional information about the revisions that are removed.
 * `--glob-mechanism` (default: `glob`\

opencloud/pkg/command/backup.go

@@ -9,8 +9,8 @@ import (
 	"github.com/opencloud-eu/opencloud/pkg/config"
 	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/pkg/config/parser"
-	ocbs "github.com/opencloud-eu/reva/v2/pkg/storage/fs/decomposed/blobstore"
-	s3bs "github.com/opencloud-eu/reva/v2/pkg/storage/fs/decomposed_s3/blobstore"
+	decomposedbs "github.com/opencloud-eu/reva/v2/pkg/storage/fs/decomposed/blobstore"
+	decomposeds3bs "github.com/opencloud-eu/reva/v2/pkg/storage/fs/decomposeds3/blobstore"
 	"github.com/urfave/cli/v2"
 )
 
@@ -47,7 +47,7 @@ func ConsistencyCommand(cfg *config.Config) *cli.Command {
 			&cli.StringFlag{
 				Name:    "blobstore",
 				Aliases: []string{"b"},
-				Usage:   "the blobstore type. Can be (none, decomposed, decomposed_s3). Default decomposed",
+				Usage:   "the blobstore type. Can be (none, decomposed, decomposeds3). Default decomposed",
 				Value:   "decomposed",
 			},
 			&cli.BoolFlag{
@@ -67,17 +67,17 @@ func ConsistencyCommand(cfg *config.Config) *cli.Command {
 				err error
 			)
 			switch c.String("blobstore") {
-			case "decomposed_s3":
-				bs, err = s3bs.New(
+			case "decomposeds3":
+				bs, err = decomposeds3bs.New(
 					cfg.StorageUsers.Drivers.DecomposedS3.Endpoint,
 					cfg.StorageUsers.Drivers.DecomposedS3.Region,
 					cfg.StorageUsers.Drivers.DecomposedS3.Bucket,
 					cfg.StorageUsers.Drivers.DecomposedS3.AccessKey,
 					cfg.StorageUsers.Drivers.DecomposedS3.SecretKey,
-					s3bs.Options{},
+					decomposeds3bs.Options{},
 				)
 			case "decomposed":
-				bs, err = ocbs.New(basePath)
+				bs, err = decomposedbs.New(basePath)
 			case "none":
 				bs = nil
 			default:

opencloud/pkg/command/revisions.go

@@ -11,8 +11,8 @@ import (
 	"github.com/opencloud-eu/opencloud/pkg/config"
 	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/pkg/config/parser"
-	ocbs "github.com/opencloud-eu/reva/v2/pkg/storage/fs/decomposed/blobstore"
-	s3bs "github.com/opencloud-eu/reva/v2/pkg/storage/fs/decomposed_s3/blobstore"
+	decomposedbs "github.com/opencloud-eu/reva/v2/pkg/storage/fs/decomposed/blobstore"
+	decomposeds3bs "github.com/opencloud-eu/reva/v2/pkg/storage/fs/decomposeds3/blobstore"
 	"github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/lookup"
 	"github.com/opencloud-eu/reva/v2/pkg/storagespace"
 	"github.com/urfave/cli/v2"
@@ -56,7 +56,7 @@ func PurgeRevisionsCommand(cfg *config.Config) *cli.Command {
 			&cli.StringFlag{
 				Name:    "blobstore",
 				Aliases: []string{"b"},
-				Usage:   "the blobstore type. Can be (none, decomposed, decomposed_s3). Default decomposed. Note: When using s3ng this needs same configuration as the storage-users service",
+				Usage:   "the blobstore type. Can be (none, decomposed, decomposeds3). Default decomposed. Note: When using decomposeds3 this needs same configuration as the storage-users service",
 				Value:   "decomposed",
 			},
 			&cli.BoolFlag{
@@ -93,17 +93,17 @@ func PurgeRevisionsCommand(cfg *config.Config) *cli.Command {
 				err error
 			)
 			switch c.String("blobstore") {
-			case "decomposed_s3":
-				bs, err = s3bs.New(
+			case "decomposeds3":
+				bs, err = decomposeds3bs.New(
 					cfg.StorageUsers.Drivers.DecomposedS3.Endpoint,
 					cfg.StorageUsers.Drivers.DecomposedS3.Region,
 					cfg.StorageUsers.Drivers.DecomposedS3.Bucket,
 					cfg.StorageUsers.Drivers.DecomposedS3.AccessKey,
 					cfg.StorageUsers.Drivers.DecomposedS3.SecretKey,
-					s3bs.Options{},
+					decomposeds3bs.Options{},
 				)
 			case "decomposed":
-				bs, err = ocbs.New(basePath)
+				bs, err = decomposedbs.New(basePath)
 			case "none":
 				bs = nil
 			default:

opencloud/pkg/revisions/revisions.go

@@ -164,7 +164,7 @@ func PurgeRevisions(nodes <-chan string, bs DelBlobstore, dryRun, verbose bool)
 
 		if !dryRun {
 			if blobID != "" {
-				//  TODO: needs spaceID for s3ng
+				//  TODO: needs spaceID for decomposeds3
 				if err := bs.Delete(&node.Node{BlobID: blobID}); err != nil {
 					fmt.Printf("error deleting blob %s: %v\n", blobID, err)
 					continue