ocis changes for the reva wrap-unwrap refactoring

these changes are necessary when you want to test the wrap unwrap changes in reva
owncloud · Aug 25, 2021 · b315c81 · b315c81
1 parent 291b5fa
commit b315c81
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/accounts/pkg/storage/cs3.go b/accounts/pkg/storage/cs3.go
@@ -108,7 +108,7 @@ func (r CS3Repo) LoadAccounts(ctx context.Context, a *[]*proto.Account) (err err
 	ctx = metadata.AppendToOutgoingContext(ctx, revactx.TokenHeader, t)
 	res, err := r.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", accountsFolder),
+			Path: accountsFolder,
 		},
 	})
 	if err != nil {
@@ -159,7 +159,7 @@ func (r CS3Repo) DeleteAccount(ctx context.Context, id string) (err error) {
 
 	resp, err := r.storageProvider.Delete(ctx, &provider.DeleteRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", accountsFolder, id),
+			Path: path.Join(accountsFolder, id),
 		},
 	})
 
@@ -222,7 +222,7 @@ func (r CS3Repo) LoadGroups(ctx context.Context, g *[]*proto.Group) (err error)
 	ctx = metadata.AppendToOutgoingContext(ctx, revactx.TokenHeader, t)
 	res, err := r.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", groupsFolder),
+			Path: groupsFolder,
 		},
 	})
 	if err != nil {
@@ -273,7 +273,7 @@ func (r CS3Repo) DeleteGroup(ctx context.Context, id string) (err error) {
 
 	resp, err := r.storageProvider.Delete(ctx, &provider.DeleteRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", groupsFolder, id),
+			Path: path.Join(groupsFolder, id),
 		},
 	})
 
@@ -325,7 +325,7 @@ func (r CS3Repo) makeRootDirIfNotExist(ctx context.Context, folder string) error
 // MakeDirIfNotExist will create a root node in the metadata storage. Requires an authenticated context.
 func MakeDirIfNotExist(ctx context.Context, sp provider.ProviderAPIClient, folder string) error {
 	var rootPathRef = &provider.Reference{
-		Path: path.Join("/meta", folder),
+		Path: folder,
 	}
 
 	resp, err := sp.Stat(ctx, &provider.StatRequest{

diff --git a/ocis-pkg/indexer/index/cs3/autoincrement.go b/ocis-pkg/indexer/index/cs3/autoincrement.go
@@ -174,7 +174,7 @@ func (idx *Autoincrement) Remove(id string, v string) error {
 		return err
 	}
 
-	deletePath := path.Join("/meta", idx.indexRootDir, v)
+	deletePath := path.Join(idx.indexRootDir, v)
 	resp, err := idx.storageProvider.Delete(ctx, &provider.DeleteRequest{
 		Ref: &provider.Reference{
 			Path: deletePath,
@@ -215,7 +215,7 @@ func (idx *Autoincrement) Search(pattern string) ([]string, error) {
 
 	res, err := idx.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", idx.indexRootDir),
+			Path: idx.indexRootDir,
 		},
 	})
 
@@ -328,7 +328,7 @@ func (idx *Autoincrement) next() (int, error) {
 
 	res, err := idx.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", idx.indexRootDir),
+			Path: idx.indexRootDir,
 		},
 	})
 

diff --git a/ocis-pkg/indexer/index/cs3/helper.go b/ocis-pkg/indexer/index/cs3/helper.go
@@ -12,7 +12,7 @@ import (
 func deleteIndexRoot(ctx context.Context, storageProvider provider.ProviderAPIClient, indexRootDir string) error {
 	res, err := storageProvider.Delete(ctx, &provider.DeleteRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", indexRootDir),
+			Path: path.Join("/", indexRootDir),
 		},
 	})
 	if err != nil {

diff --git a/ocis-pkg/indexer/index/cs3/non_unique.go b/ocis-pkg/indexer/index/cs3/non_unique.go
@@ -133,7 +133,7 @@ func (idx *NonUnique) Lookup(v string) ([]string, error) {
 
 	res, err := idx.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", idx.indexRootDir, v),
+			Path: path.Join(idx.indexRootDir, v),
 		},
 	})
 
@@ -190,7 +190,7 @@ func (idx *NonUnique) Remove(id string, v string) error {
 		return err
 	}
 
-	deletePath := path.Join("/meta", idx.indexRootDir, v, id)
+	deletePath := path.Join(idx.indexRootDir, v, id)
 	resp, err := idx.storageProvider.Delete(ctx, &provider.DeleteRequest{
 		Ref: &provider.Reference{
 			Path: deletePath,
@@ -205,7 +205,7 @@ func (idx *NonUnique) Remove(id string, v string) error {
 		return &idxerrs.NotFoundErr{TypeName: idx.typeName, Key: idx.indexBy, Value: v}
 	}
 
-	toStat := path.Join("/meta", idx.indexRootDir, v)
+	toStat := path.Join(idx.indexRootDir, v)
 	lcResp, err := idx.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
 		Ref: &provider.Reference{
 			Path: toStat,
@@ -216,7 +216,7 @@ func (idx *NonUnique) Remove(id string, v string) error {
 	}
 
 	if len(lcResp.Infos) == 0 {
-		deletePath = path.Join("/meta", idx.indexRootDir, v)
+		deletePath = path.Join(idx.indexRootDir, v)
 		_, err := idx.storageProvider.Delete(ctx, &provider.DeleteRequest{
 			Ref: &provider.Reference{
 				Path: deletePath,
@@ -263,7 +263,7 @@ func (idx *NonUnique) Search(pattern string) ([]string, error) {
 	matches := make([]string, 0)
 	res, err := idx.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", idx.indexRootDir),
+			Path: idx.indexRootDir,
 		},
 	})
 

diff --git a/ocis-pkg/indexer/index/cs3/unique.go b/ocis-pkg/indexer/index/cs3/unique.go
@@ -70,7 +70,7 @@ func NewUniqueIndexWithOptions(o ...option.Option) index.Index {
 		typeName:        opts.TypeName,
 		filesDir:        opts.FilesDir,
 		indexBaseDir:    path.Join(opts.DataDir, "index.cs3"),
-		indexRootDir:    path.Join(path.Join(opts.DataDir, "index.cs3"), strings.Join([]string{"unique", opts.TypeName, opts.IndexBy}, ".")),
+		indexRootDir:    path.Join("/", opts.DataDir, "index.cs3", strings.Join([]string{"unique", opts.TypeName, opts.IndexBy}, ".")),
 		cs3conf: &Config{
 			ProviderAddr: opts.ProviderAddr,
 			DataURL:      opts.DataURL,
@@ -188,7 +188,7 @@ func (idx *Unique) Remove(id string, v string) error {
 		return err
 	}
 
-	deletePath := path.Join("/meta", idx.indexRootDir, v)
+	deletePath := path.Join(idx.indexRootDir, v)
 	ctx = metadata.AppendToOutgoingContext(ctx, revactx.TokenHeader, t)
 	resp, err := idx.storageProvider.Delete(ctx, &provider.DeleteRequest{
 		Ref: &provider.Reference{
@@ -241,7 +241,7 @@ func (idx *Unique) Search(pattern string) ([]string, error) {
 	ctx = metadata.AppendToOutgoingContext(ctx, revactx.TokenHeader, t)
 	res, err := idx.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
 		Ref: &provider.Reference{
-			Path: path.Join("/meta", idx.indexRootDir),
+			Path: idx.indexRootDir,
 		},
 	})
 

diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
@@ -204,10 +204,10 @@ func rules(cfg *config.Config, logger log.Logger) map[string]map[string]interfac
 
 	// generate rules based on default config
 	return map[string]map[string]interface{}{
-		cfg.Reva.StorageHome.MountPath:       {"address": cfg.Reva.StorageHome.Endpoint},
-		cfg.Reva.StorageHome.MountID:         {"address": cfg.Reva.StorageHome.Endpoint},
-		cfg.Reva.StorageUsers.MountPath:      {"address": cfg.Reva.StorageUsers.Endpoint},
-		cfg.Reva.StorageUsers.MountID + ".*": {"address": cfg.Reva.StorageUsers.Endpoint},
+		cfg.Reva.StorageHome.MountPath:       {"address": cfg.Reva.StorageHome.Endpoint, "provider_id": cfg.Reva.StorageUsers.MountID},
+		cfg.Reva.StorageHome.MountID:         {"address": cfg.Reva.StorageHome.Endpoint, "provider_id": cfg.Reva.StorageUsers.MountID},
+		cfg.Reva.StorageUsers.MountPath:      {"address": cfg.Reva.StorageUsers.Endpoint, "provider_id": cfg.Reva.StorageUsers.MountID},
+		cfg.Reva.StorageUsers.MountID + ".*": {"address": cfg.Reva.StorageUsers.Endpoint, "provider_id": cfg.Reva.StorageUsers.MountID, "provider_path": cfg.Reva.StorageUsers.MountPath},
 		cfg.Reva.StoragePublicLink.MountPath: {"address": cfg.Reva.StoragePublicLink.Endpoint},
 		// public link storage returns the mount id of the actual storage
 		// medatada storage not part of the global namespace