mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-07 12:50:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Exit when encountering config parsing errors

Browse Source
This commit is contained in:
Michael Barz
2022-05-09 11:47:06 +02:00
parent ccdc54effc
commit f6e2f46ebb
34 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/unreleased/change-ocis-init.md
View File

@@ -10,3 +10,4 @@ bootstrap you a configuration file for a secure oCIS instance.
https://github.com/owncloud/ocis/pull/3551
https://github.com/owncloud/ocis/issues/3524
https://github.com/owncloud/ocis/pull/3743

2
extensions/accounts/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
@@ -28,6 +29,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/app-provider/pkg/command/server.go
View File

@@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/app-registry/pkg/command/server.go
View File

@@ -30,6 +30,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/audit/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/events/server"
@@ -25,6 +26,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/auth-basic/pkg/command/server.go
View File

@@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/auth-bearer/pkg/command/server.go
View File

@@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/auth-machine/pkg/command/server.go
View File

@@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/frontend/pkg/command/server.go
View File

@@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/gateway/pkg/command/server.go
View File

@@ -30,6 +30,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/glauth/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
@@ -31,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/graph-explorer/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
@@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/graph/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
@@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/groups/pkg/command/server.go
View File

@@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/idm/pkg/command/server.go
View File

@@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/idp/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
@@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/nats/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
@@ -23,6 +24,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/notifications/pkg/command/server.go
View File

@@ -2,6 +2,7 @@ package command
import (
"fmt"
"os"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/events/server"
@@ -24,6 +25,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/ocdav/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/cs3org/reva/v2/pkg/micro/ocdav"
"github.com/oklog/run"
@@ -25,6 +26,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/ocs/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/logging"
@@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/proxy/pkg/command/server.go
View File

@@ -5,6 +5,7 @@ import (
"crypto/tls"
"fmt"
"net/http"
"os"
"time"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
@@ -46,6 +47,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/search/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
@@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/settings/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
@@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/sharing/pkg/command/server.go
View File

@@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/storage-publiclink/pkg/command/server.go
View File

@@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/storage-shares/pkg/command/server.go
View File

@@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/storage-system/pkg/command/server.go
View File

@@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/storage-users/pkg/command/server.go
View File

@@ -31,6 +31,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/store/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
@@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/thumbnails/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
@@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

1
extensions/users/pkg/command/server.go
View File

@@ -32,6 +32,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/web/pkg/command/server.go
View File

@@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/web/pkg/config"
@@ -27,6 +28,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

2
extensions/webdav/pkg/command/server.go
View File

@@ -3,6 +3,7 @@ package command
import (
"context"
"fmt"
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/webdav/pkg/config"
@@ -26,6 +27,7 @@ func Server(cfg *config.Config) *cli.Command {
err := parser.ParseConfig(cfg)
if err != nil {
fmt.Printf("%v", err)
os.Exit(1)
}
return err
},

8
ocis-pkg/shared/errors.go
View File

@@ -23,7 +23,7 @@ func MissingSystemUserApiKeyError(service string) error {
}
func MissingJWTTokenError(service string) error {
return fmt.Errorf("jwt_secret has not been set properly in your config for %s. "+
return fmt.Errorf("The jwt_secret has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+
"the config/corresponding environment variable).",
@@ -31,7 +31,7 @@ func MissingJWTTokenError(service string) error {
}
func MissingRevaTransferSecretError(service string) error {
return fmt.Errorf("transfer_secret has not been set properly in your config for %s. "+
return fmt.Errorf("The transfer_secret has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+
"the config/corresponding environment variable).",
@@ -39,7 +39,7 @@ func MissingRevaTransferSecretError(service string) error {
}
func MissingLDAPBindPassword(service string) error {
return fmt.Errorf("bind_password has not been set properly in your config for %s. "+
return fmt.Errorf("The ldap bind_password has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+
"the config/corresponding environment variable).",
@@ -47,7 +47,7 @@ func MissingLDAPBindPassword(service string) error {
}
func MissingServiceUserPassword(service, serviceUser string) error {
return fmt.Errorf("password of service user %s has not been set properly in your config for %s. "+
return fmt.Errorf("The password of service user %s has not been set properly in your config for %s. "+
"Make sure your %s config contains the proper values "+
"(e.g. by running ocis init or setting it manually in "+
"the config/corresponding environment variable).",