Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic storage provider add aliases #4307

Merged
merged 5 commits into from
Nov 1, 2023
Merged

Dynamic storage provider add aliases #4307

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d91ff7a
Extract regex expansion into utils package
javfg Nov 1, 2023
bd83c4e
Add alias resolution for storage ids
javfg Nov 1, 2023
de9e2e6
Linting
javfg Nov 1, 2023
36b1953
Add changelog
javfg Nov 1, 2023
b41ad6f
Remove stray log
javfg Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pkg/storage/registry/static/static.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package static

import (
"context"
"os"
"path"
"regexp"
"strings"
Expand All @@ -30,7 +29,6 @@ import (

"github.com/cs3org/reva/pkg/appctx"
"github.com/cs3org/reva/pkg/errtypes"
"github.com/cs3org/reva/pkg/logger"
"github.com/cs3org/reva/pkg/sharedconf"
"github.com/cs3org/reva/pkg/storage"
"github.com/cs3org/reva/pkg/storage/registry/registry"
Expand Down Expand Up @@ -132,7 +130,6 @@ func (b *reg) GetHome(ctx context.Context) (*registrypb.ProviderInfo, error) {
}

func (b *reg) FindProviders(ctx context.Context, ref *provider.Reference) ([]*registrypb.ProviderInfo, error) {
l := logger.New(logger.WithWriter(os.Stdout, logger.ConsoleMode))
// find longest match
var match *registrypb.ProviderInfo
var shardedMatches []*registrypb.ProviderInfo
Expand Down Expand Up @@ -195,7 +192,6 @@ func (b *reg) FindProviders(ctx context.Context, ref *provider.Reference) ([]*re
}
}

l.Debug().Msgf(">>>>>> match: %+v %+v", match, shardedMatches)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@javfg can we keep this as Debug?

if match != nil && match.ProviderPath != "" {
return []*registrypb.ProviderInfo{match}, nil
} else if len(shardedMatches) > 0 {
Expand Down