mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-19 08:40:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

move config validation into a separate function

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-28 11:10:39 +02:00
parent df53c2a545
commit 3054875a05
64 changed files with 189 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bingo/Variables.mk
View File

@@ -1,4 +1,4 @@
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.2. DO NOT EDIT.
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT.
# All tools are designed to be build inside $GOBIN.
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
GOPATH ?= $(shell go env GOPATH)

2
.bingo/variables.env
View File

@@ -1,4 +1,4 @@
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.2. DO NOT EDIT.
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT.
# All tools are designed to be build inside $GOBIN.
# Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
GOBIN=${GOBIN:=$(go env GOBIN)}

2
extensions/accounts/pkg/config/defaults/defaultconfig.go
View File

@@ -10,10 +10,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/accounts/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

3
extensions/appprovider/pkg/config/defaults/defaultconfig.go
View File

@@ -6,9 +6,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/appprovider/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

2
extensions/audit/pkg/config/defaults/defaultconfig.go
View File

@@ -6,10 +6,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/audit/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

3
extensions/auth-basic/pkg/config/defaults/defaultconfig.go
View File

@@ -9,9 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/auth-basic/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

3
extensions/auth-bearer/pkg/config/defaults/defaultconfig.go
View File

@@ -6,9 +6,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/auth-bearer/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

7
extensions/auth-machine/pkg/config/defaults/defaultconfig.go
View File

@@ -1,16 +1,13 @@
package defaults
import (
"log"
"github.com/owncloud/ocis/extensions/auth-machine/pkg/config"
)
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -78,8 +75,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.AuthProviders.Machine.APIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.AuthProviders.Machine.APIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.AuthProviders.Machine.APIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

8
extensions/auth-machine/pkg/config/parser/parse.go
View File

@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/auth-machine/pkg/config"
"github.com/owncloud/ocis/extensions/auth-machine/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.AuthProviders.Machine.APIKey == "" {
return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}

7
extensions/frontend/pkg/config/defaults/defaultconfig.go
View File

@@ -1,16 +1,13 @@
package defaults
import (
"log"
"github.com/owncloud/ocis/extensions/frontend/pkg/config"
)
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -114,8 +111,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
cfg.TransferSecret = cfg.Commons.TransferSecret
} else if cfg.TransferSecret == "" {
log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

8
extensions/frontend/pkg/config/parser/parse.go
View File

@@ -29,5 +29,13 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.TransferSecret == "" {
return ftm.Errorf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}

7
extensions/gateway/pkg/config/defaults/defaultconfig.go
View File

@@ -1,16 +1,13 @@
package defaults
import (
"log"
"github.com/owncloud/ocis/extensions/gateway/pkg/config"
)
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -105,8 +102,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
cfg.TransferSecret = cfg.Commons.TransferSecret
} else if cfg.TransferSecret == "" {
log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

9
extensions/gateway/pkg/config/parser/parse.go
View File

@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/gateway/pkg/config"
"github.com/owncloud/ocis/extensions/gateway/pkg/config/defaults"
@@ -29,5 +30,13 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.TransferSecret == "" {
return fmt.Errorf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}

2
extensions/glauth/pkg/config/defaults/defaultconfig.go
View File

@@ -9,10 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

5
extensions/glauth/pkg/config/parser/parse.go
View File

@@ -28,5 +28,10 @@ func ParseConfig(cfg *config.Config) error {
// sanitize config
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

2
extensions/graph-explorer/pkg/config/defaults/defaultconfig.go
View File

@@ -8,10 +8,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/graph-explorer/pkg/config/parser/parse.go
View File

@@ -30,5 +30,9 @@ func ParseConfig(cfg *config.Config) error {
// sanitize config
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

2
extensions/graph/pkg/config/defaults/defaultconfig.go
View File

@@ -8,10 +8,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/graph/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

3
extensions/group/pkg/config/defaults/defaultconfig.go
View File

@@ -9,9 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/group/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

2
extensions/idm/pkg/config/defaults/defaultconfig.go
View File

@@ -9,10 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/idm/pkg/config/parser/parse.go
View File

@@ -28,5 +28,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

2
extensions/idp/pkg/config/defaults/defaultconfig.go
View File

@@ -10,10 +10,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/idp/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

2
extensions/nats/pkg/config/defaults/defaultconfig.go
View File

@@ -12,10 +12,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/nats/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

6
extensions/notifications/pkg/config/defaults/defaultconfig.go
View File

@@ -1,17 +1,13 @@
package defaults
import (
"log"
"github.com/owncloud/ocis/extensions/notifications/pkg/config"
)
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -55,8 +51,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.Notifications.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.Notifications.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.Notifications.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

8
extensions/notifications/pkg/config/parser/parse.go
View File

@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/notifications/pkg/config"
"github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.Notifications.MachineAuthAPIKey == "" {
return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}

3
extensions/ocdav/pkg/config/defaults/defaultconfig.go
View File

@@ -6,9 +6,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/ocdav/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

5
extensions/ocs/pkg/config/defaults/defaultconfig.go
View File

@@ -1,7 +1,6 @@
package defaults
import (
"log"
"strings"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
@@ -9,10 +8,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -91,8 +88,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

8
extensions/ocs/pkg/config/parser/parse.go
View File

@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
"github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.MachineAuthAPIKey == "" {
return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}

3
extensions/proxy/pkg/config/defaults/defaultconfig.go
View File

@@ -1,7 +1,6 @@
package defaults
import (
"log"
"path"
"strings"
@@ -188,8 +187,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
if cfg.Reva == nil && cfg.Commons != nil && cfg.Commons.Reva != nil {

9
extensions/proxy/pkg/config/parser/parse.go
View File

@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults"
@@ -28,5 +29,13 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.MachineAuthAPIKey == "" {
return fmt.Errorf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}

5
extensions/settings/pkg/config/defaults/defaultconfig.go
View File

@@ -1,7 +1,6 @@
package defaults
import (
"log"
"path"
"strings"
@@ -11,10 +10,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -95,8 +92,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.Metadata.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

4
extensions/settings/pkg/config/parser/parse.go
View File

@@ -28,5 +28,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

8
extensions/sharing/pkg/config/defaults/defaultconfig.go
View File

@@ -1,7 +1,6 @@
package defaults
import (
"log"
"path/filepath"
"github.com/owncloud/ocis/extensions/sharing/pkg/config"
@@ -10,9 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -125,14 +123,10 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.UserSharingDrivers.CS3.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key for the cs3 user sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
}
if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key for the cs3 public sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

13
extensions/sharing/pkg/config/parser/parse.go
View File

@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/sharing/pkg/config"
"github.com/owncloud/ocis/extensions/sharing/pkg/config/defaults"
@@ -29,5 +30,17 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" {
return fmt.Errorf("machine auth api key for the cs3 public sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
}
if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" {
return fmt.Errorf("machine auth api key for the cs3 user sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}

3
extensions/storage-metadata/pkg/config/defaults/defaultconfig.go
View File

@@ -10,9 +10,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/storage-metadata/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

3
extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go
View File

@@ -6,9 +6,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/storage-publiclink/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

3
extensions/storage-shares/pkg/config/defaults/defaultconfig.go
View File

@@ -6,9 +6,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/storage-shares/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

3
extensions/storage-users/pkg/config/defaults/defaultconfig.go
View File

@@ -10,9 +10,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/storage-users/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

11
extensions/storage/pkg/config/defaults/defaultconfig.go
View File

@@ -1,7 +1,6 @@
package defaults
import (
"log"
"os"
"path"
@@ -21,10 +20,8 @@ const (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -458,11 +455,9 @@ func DefaultConfig() *config.Config {
}
func EnsureDefaults(cfg *config.Config) {
if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
cfg.TransferSecret = cfg.Commons.TransferSecret
} else {
log.Fatal("reva transfer secret is not set up properly, bailing out (storage)")
}
//if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
// cfg.TransferSecret = cfg.Commons.TransferSecret
//}
}
func Sanitize(cfg *config.Config) {

8
extensions/storage/pkg/config/parser/parse.go
View File

@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config"
"github.com/owncloud/ocis/extensions/storage-metadata/pkg/config/defaults"
@@ -29,5 +30,12 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.TransferSecret == "" {
return fmt.Errorf("reva transfer secret is not set up properly, bailing out (storage)")
}
return nil
}

2
extensions/store/pkg/config/defaults/defaultconfig.go
View File

@@ -9,10 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

5
extensions/store/pkg/config/parser/parse.go
View File

@@ -29,5 +29,10 @@ func ParseConfig(cfg *config.Config) error {
// sanitize config
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

5
extensions/thumbnails/pkg/config/defaults/defaultconfig.go
View File

@@ -1,7 +1,6 @@
package defaults
import (
"log"
"path"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
@@ -10,10 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}
@@ -76,8 +73,6 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.Thumbnail.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
cfg.Thumbnail.TransferSecret = cfg.Commons.TransferSecret
} else if cfg.TransferSecret == "" {
log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

9
extensions/thumbnails/pkg/config/parser/parse.go
View File

@@ -2,6 +2,7 @@ package parser
import (
"errors"
"fmt"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults"
@@ -30,5 +31,13 @@ func ParseConfig(cfg *config.Config) error {
// sanitize config
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
if cfg.TransferSecret == "" {
return fmt.Errorf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
return nil
}

3
extensions/user/pkg/config/defaults/defaultconfig.go
View File

@@ -9,9 +9,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/user/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

2
extensions/web/pkg/config/defaults/defaultconfig.go
View File

@@ -8,10 +8,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/web/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}

2
extensions/webdav/pkg/config/defaults/defaultconfig.go
View File

@@ -8,10 +8,8 @@ import (
func FullDefaultConfig() *config.Config {
cfg := DefaultConfig()
EnsureDefaults(cfg)
Sanitize(cfg)
return cfg
}

4
extensions/webdav/pkg/config/parser/parse.go
View File

@@ -29,5 +29,9 @@ func ParseConfig(cfg *config.Config) error {
defaults.Sanitize(cfg)
return Validate(cfg)
}
func Validate(cfg *config.Config) error {
return nil
}