update config to init changes

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

extensions/search/pkg/command/server.go

@@ -23,7 +23,11 @@ func Server(cfg *config.Config) *cli.Command {
 		Usage:    fmt.Sprintf("start %s extension without runtime (unsupervised mode)", cfg.Service.Name),
 		Category: "server",
 		Before: func(c *cli.Context) error {
-			return parser.ParseConfig(cfg)
+			err := parser.ParseConfig(cfg)
+			if err != nil {
+				fmt.Printf("%v", err)
+			}
+			return err
 		},
 		Action: func(c *cli.Context) error {
 			logger := logging.Configure(cfg.Service.Name, cfg.Log)

extensions/search/pkg/config/config.go

@@ -18,10 +18,9 @@ type Config struct {
 
 	GRPC GRPC `ocisConfig:"grpc"`
 
-	Datapath     string       `yaml:"data_path" env:"SEARCH_DATA_PATH"`
-	Reva         Reva         `ocisConfig:"reva"`
-	TokenManager TokenManager `ocisConfig:"token_manager"`
-	Events       Events       `yaml:"events"`
+	Datapath string `yaml:"data_path" env:"SEARCH_DATA_PATH"`
+	Reva     Reva   `ocisConfig:"reva"`
+	Events   Events `yaml:"events"`
 
 	MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SEARCH_MACHINE_AUTH_API_KEY"`
 

extensions/search/pkg/config/defaults/defaultconfig.go

@@ -32,9 +32,6 @@ func DefaultConfig() *config.Config {
 		Reva: config.Reva{
 			Address: "127.0.0.1:9142",
 		},
-		TokenManager: config.TokenManager{
-			JWTSecret: "Pive-Fumkiu4",
-		},
 		Events: config.Events{
 			Endpoint:      "127.0.0.1:9233",
 			Cluster:       "ocis-cluster",
@@ -67,6 +64,10 @@ func EnsureDefaults(cfg *config.Config) {
 	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
+
+	if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
+		cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
+	}
 }
 
 func Sanitize(cfg *config.Config) {

extensions/search/pkg/config/parser/parse.go

@@ -6,11 +6,12 @@ import (
 	"github.com/owncloud/ocis/extensions/search/pkg/config"
 	"github.com/owncloud/ocis/extensions/search/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/owncloud/ocis/ocis-pkg/shared"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
 )
 
-// ParseConfig loads accounts configuration from known paths.
+// ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
 	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
@@ -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 shared.MissingMachineAuthApiKeyError(cfg.Service.Name)
+	}
 	return nil
 }

extensions/search/pkg/config/reva.go

@@ -4,8 +4,3 @@ package config
 type Reva struct {
 	Address string `ocisConfig:"address" env:"REVA_GATEWAY"`
 }
-
-// TokenManager is the config for using the reva token manager
-type TokenManager struct {
-	JWTSecret string `ocisConfig:"jwt_secret" env:"OCIS_JWT_SECRET;SEARCH_JWT_SECRET"`
-}