Skip to content

Commit

Permalink
remove commented out code
Browse files Browse the repository at this point in the history
  • Loading branch information
David Christofas committed Apr 26, 2022

Unverified

No user is associated with the committer email.
1 parent 4ae93e6 commit e2ea74c
Showing 7 changed files with 1 addition and 29 deletions.
5 changes: 0 additions & 5 deletions extensions/appprovider/pkg/command/command.go
Original file line number Diff line number Diff line change
@@ -24,9 +24,6 @@ func AppProvider(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "app-provider",
Usage: "start appprovider for providing apps",
// Before: func(c *cli.Context) error {
// return ParseConfig(c, cfg, "storage-app-provider")
// },
Action: func(c *cli.Context) error {
logCfg := cfg.Logging
logger := log.NewLogger(
@@ -105,7 +102,6 @@ func appProviderConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]
// TODO build services dynamically
"services": map[string]interface{}{
"appprovider": map[string]interface{}{
// "gatewaysvc": cfg.Reva.Gateway.Endpoint,
"app_provider_url": cfg.ExternalAddr,
"driver": cfg.Driver,
"drivers": map[string]interface{}{
@@ -143,7 +139,6 @@ func NewAppProvider(cfg *ociscfg.Config) suture.Service {
}

func (s AppProviderSutureService) Serve(ctx context.Context) error {
// s.cfg.Reva.AppProvider.Context = ctx
cmd := AppProvider(s.cfg)
f := &flag.FlagSet{}
cmdFlags := cmd.Flags
1 change: 0 additions & 1 deletion extensions/auth-basic/pkg/command/command.go
Original file line number Diff line number Diff line change
@@ -162,7 +162,6 @@ func NewAuthBasic(cfg *ociscfg.Config) suture.Service {
}

func (s AuthBasicSutureService) Serve(ctx context.Context) error {
// s.cfg.Reva.AuthBasic.Context = ctx
f := &flag.FlagSet{}
cmdFlags := AuthBasic(s.cfg).Flags
for k := range cmdFlags {
1 change: 0 additions & 1 deletion extensions/auth-bearer/pkg/command/command.go
Original file line number Diff line number Diff line change
@@ -134,7 +134,6 @@ func NewAuthBearer(cfg *ociscfg.Config) suture.Service {
}

func (s AuthBearerSutureService) Serve(ctx context.Context) error {
// s.cfg.Reva.AuthBearer.Context = ctx
cmd := AuthBearer(s.cfg)
f := &flag.FlagSet{}
cmdFlags := cmd.Flags
1 change: 0 additions & 1 deletion extensions/gateway/pkg/command/command.go
Original file line number Diff line number Diff line change
@@ -394,7 +394,6 @@ func NewGateway(cfg *ociscfg.Config) suture.Service {
}

func (s GatewaySutureService) Serve(ctx context.Context) error {
// s.cfg.Reva.Gateway.Context = ctx
cmd := Gateway(s.cfg)
f := &flag.FlagSet{}
cmdFlags := cmd.Flags
3 changes: 0 additions & 3 deletions extensions/storage/pkg/command/health.go
Original file line number Diff line number Diff line change
@@ -14,9 +14,6 @@ func Health(cfg *config.Config) *cli.Command {
Name: "health",
Usage: "check health status",
Category: "info",
// Before: func(c *cli.Context) error {
// return ParseConfig(c, cfg, "storage")
// },
Action: func(c *cli.Context) error {
logger := NewLogger(cfg)

17 changes: 0 additions & 17 deletions extensions/storage/pkg/command/root.go
Original file line number Diff line number Diff line change
@@ -12,19 +12,6 @@ import (
// GetCommands provides all commands for this service
func GetCommands(cfg *config.Config) cli.Commands {
return []*cli.Command{
// Frontend(cfg),
// Gateway(cfg),
// Users(cfg),
// Groups(cfg),
// AppProvider(cfg),
// AuthBasic(cfg),
// AuthBearer(cfg),
// AuthMachine(cfg),
// Sharing(cfg),
// StoragePublicLink(cfg),
// StorageShares(cfg),
// StorageUsers(cfg),
// StorageMetadata(cfg),
Health(cfg),
}
}
@@ -35,10 +22,6 @@ func Execute(cfg *config.Config) error {
Name: "storage",
Usage: "Storage service for oCIS",

// Before: func(c *cli.Context) error {
// return ParseConfig(c, cfg, "storage")
// },

Commands: GetCommands(cfg),
})

2 changes: 1 addition & 1 deletion ocis-pkg/ldap/ldap.go
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ func WaitForCA(log log.Logger, insecure bool, caCert string) error {
log.Warn().Str("LDAP CACert", caCert).Msgf("File does not exist. Waiting %d seconds for it to appear.", _caTimeout)
time.Sleep(_caTimeout * time.Second)
if _, err := os.Stat(caCert); errors.Is(err, os.ErrNotExist) {
log.Warn().Str("LDAP CACert", caCert).Msgf("File does still not exist after Timeout")
log.Warn().Str("LDAP CACert", caCert).Msgf("File still does not exist after Timeout")
return err
}
}

0 comments on commit e2ea74c

Please sign in to comment.