From 0ca6a6b70b5b5f05c23aaae809479062082e6d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@owncloud.com>
Date: Tue, 5 Dec 2023 12:28:45 +0100
Subject: [PATCH] drop unused reva config from postprocessing (#7672)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
---
 services/policies/pkg/config/config.go        |  2 --
 .../pkg/config/defaults/defaultconfig.go      | 19 -------------------
 services/policies/pkg/config/parser/parse.go  |  5 -----
 3 files changed, 26 deletions(-)

diff --git a/services/policies/pkg/config/config.go b/services/policies/pkg/config/config.go
index c4412458e..45e76e9e1 100644
--- a/services/policies/pkg/config/config.go
+++ b/services/policies/pkg/config/config.go
@@ -13,9 +13,7 @@ type Config struct {
 	GRPC           GRPC                  `yaml:"grpc"`
 	Service        Service               `yaml:"-"`
 	Debug          Debug                 `yaml:"debug"`
-	TokenManager   *TokenManager         `yaml:"token_manager"`
 	Events         Events                `yaml:"events"`
-	Reva           *shared.Reva          `yaml:"reva"`
 	GRPCClientTLS  *shared.GRPCClientTLS `yaml:"grpc_client_tls"`
 	Context        context.Context       `yaml:"-"`
 	Log            *Log                  `yaml:"log"`
diff --git a/services/policies/pkg/config/defaults/defaultconfig.go b/services/policies/pkg/config/defaults/defaultconfig.go
index 91ba7eeef..77cb7ff97 100644
--- a/services/policies/pkg/config/defaults/defaultconfig.go
+++ b/services/policies/pkg/config/defaults/defaultconfig.go
@@ -3,7 +3,6 @@ package defaults
 import (
 	"time"
 
-	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 	"github.com/owncloud/ocis/v2/ocis-pkg/structs"
 	"github.com/owncloud/ocis/v2/services/policies/pkg/config"
 )
@@ -32,7 +31,6 @@ func DefaultConfig() *config.Config {
 			Addr:      "127.0.0.1:9125",
 			Namespace: "com.owncloud.api",
 		},
-		Reva: shared.DefaultRevaConfig(),
 		Events: config.Events{
 			Endpoint:  "127.0.0.1:9233",
 			Cluster:   "ocis-cluster",
@@ -45,23 +43,6 @@ func DefaultConfig() *config.Config {
 }
 
 func EnsureDefaults(cfg *config.Config) {
-	if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
-		cfg.TokenManager = &config.TokenManager{
-			JWTSecret: cfg.Commons.TokenManager.JWTSecret,
-		}
-	} else if cfg.TokenManager == nil {
-		cfg.TokenManager = &config.TokenManager{}
-	}
-
-	if cfg.Reva == nil && cfg.Commons != nil && cfg.Commons.Reva != nil {
-		cfg.Reva = &shared.Reva{
-			Address: cfg.Commons.Reva.Address,
-			TLS:     cfg.Commons.Reva.TLS,
-		}
-	} else if cfg.Reva == nil {
-		cfg.Reva = &shared.Reva{}
-	}
-
 	if cfg.Log == nil && cfg.Commons != nil && cfg.Commons.Log != nil {
 		cfg.Log = &config.Log{
 			Level:  cfg.Commons.Log.Level,
diff --git a/services/policies/pkg/config/parser/parse.go b/services/policies/pkg/config/parser/parse.go
index 873472671..ce3f1f2cb 100644
--- a/services/policies/pkg/config/parser/parse.go
+++ b/services/policies/pkg/config/parser/parse.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 	"github.com/owncloud/ocis/v2/services/policies/pkg/config"
 	"github.com/owncloud/ocis/v2/services/policies/pkg/config/defaults"
 
@@ -34,9 +33,5 @@ func ParseConfig(cfg *config.Config) error {
 }
 
 func Validate(cfg *config.Config) error {
-	if cfg.TokenManager.JWTSecret == "" {
-		return shared.MissingJWTTokenError(cfg.Service.Name)
-	}
-
 	return nil
 }