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.

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

[full-ci] Add Gateway flag to default config #2574

Merged
merged 3 commits into from
Oct 5, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 3 additions & 2 deletions storage/pkg/command/appprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,9 @@ func NewAppProvider(cfg *ociscfg.Config) suture.Service {
func (s AppProviderSutureService) Serve(ctx context.Context) error {
s.cfg.Reva.AppProvider.Context = ctx
f := &flag.FlagSet{}
for k := range AppProvider(s.cfg).Flags {
if err := AppProvider(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := AppProvider(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/authbasic.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,9 @@ func NewAuthBasic(cfg *ociscfg.Config) suture.Service {
func (s AuthBasicSutureService) Serve(ctx context.Context) error {
s.cfg.Reva.AuthBasic.Context = ctx
f := &flag.FlagSet{}
for k := range AuthBasic(s.cfg).Flags {
if err := AuthBasic(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := AuthBasic(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/authbearer.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ func NewAuthBearer(cfg *ociscfg.Config) suture.Service {
func (s AuthBearerSutureService) Serve(ctx context.Context) error {
s.cfg.Reva.AuthBearer.Context = ctx
f := &flag.FlagSet{}
for k := range AuthBearer(s.cfg).Flags {
if err := AuthBearer(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := AuthBearer(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,9 @@ func NewFrontend(cfg *ociscfg.Config) suture.Service {
func (s FrontendSutureService) Serve(ctx context.Context) error {
s.cfg.Reva.Frontend.Context = ctx
f := &flag.FlagSet{}
for k := range Frontend(s.cfg).Flags {
if err := Frontend(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := Frontend(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,9 @@ func NewGateway(cfg *ociscfg.Config) suture.Service {
func (s GatewaySutureService) Serve(ctx context.Context) error {
s.cfg.Reva.Gateway.Context = ctx
f := &flag.FlagSet{}
for k := range Gateway(s.cfg).Flags {
if err := Gateway(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := Gateway(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/groups.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ func NewGroupProvider(cfg *ociscfg.Config) suture.Service {
func (s GroupProvider) Serve(ctx context.Context) error {
s.cfg.Reva.Groups.Context = ctx
f := &flag.FlagSet{}
for k := range Groups(s.cfg).Flags {
if err := Groups(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := Groups(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/sharing.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,9 @@ func NewSharing(cfg *ociscfg.Config) suture.Service {
func (s SharingSutureService) Serve(ctx context.Context) error {
s.cfg.Reva.Sharing.Context = ctx
f := &flag.FlagSet{}
for k := range Sharing(s.cfg).Flags {
if err := Sharing(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := Sharing(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/storagehome.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,9 @@ func NewStorageHome(cfg *ociscfg.Config) suture.Service {
func (s StorageHomeSutureService) Serve(ctx context.Context) error {
s.cfg.Reva.StorageHome.Context = ctx
f := &flag.FlagSet{}
for k := range StorageHome(s.cfg).Flags {
if err := StorageHome(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := StorageHome(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/storagemetadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,9 @@ func NewStorageMetadata(cfg *ociscfg.Config) suture.Service {
func (s SutureService) Serve(ctx context.Context) error {
s.cfg.Reva.StorageMetadata.Context = ctx
f := &flag.FlagSet{}
for k := range StorageMetadata(s.cfg).Flags {
if err := StorageMetadata(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := StorageMetadata(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/storagepubliclink.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,9 @@ func NewStoragePublicLink(cfg *ociscfg.Config) suture.Service {
func (s StoragePublicLinkSutureService) Serve(ctx context.Context) error {
s.cfg.Reva.StoragePublicLink.Context = ctx
f := &flag.FlagSet{}
for k := range StoragePublicLink(s.cfg).Flags {
if err := StoragePublicLink(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := StoragePublicLink(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/storageusers.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,9 @@ func NewStorageUsers(cfg *ociscfg.Config) suture.Service {
func (s StorageUsersSutureService) Serve(ctx context.Context) error {
s.cfg.Reva.StorageUsers.Context = ctx
f := &flag.FlagSet{}
for k := range StorageUsers(s.cfg).Flags {
if err := StorageUsers(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := StorageUsers(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
5 changes: 3 additions & 2 deletions storage/pkg/command/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,9 @@ func NewUserProvider(cfg *ociscfg.Config) suture.Service {
func (s UserProvider) Serve(ctx context.Context) error {
s.cfg.Reva.Users.Context = ctx
f := &flag.FlagSet{}
for k := range Users(s.cfg).Flags {
if err := Users(s.cfg).Flags[k].Apply(f); err != nil {
cmdFlags := Users(s.cfg).Flags
for k := range cmdFlags {
if err := cmdFlags[k].Apply(f); err != nil {
return err
}
}
Expand Down
10 changes: 10 additions & 0 deletions storage/pkg/flagset/sharing.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ func SharingWithConfig(cfg *config.Config) []cli.Flag {

// Services

// Gateway

&cli.StringFlag{
Name: "gateway-url",
Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"),
Usage: "URL to use for the storage gateway service",
EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"},
Destination: &cfg.Reva.Gateway.Endpoint,
},

// Sharing

&cli.StringFlag{
Expand Down
10 changes: 10 additions & 0 deletions storage/pkg/flagset/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag {

// Services

// Gateway

&cli.StringFlag{
Name: "gateway-endpoint",
Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"),
Usage: "URL to use for the storage gateway service",
EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"},
Destination: &cfg.Reva.Gateway.Endpoint,
},

// Userprovider

&cli.StringFlag{
Expand Down