Update directory configuration

aserto-dev · Jun 9, 2023 · cb801ef · cb801ef
1 parent e11a2bf
commit cb801ef
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 33 deletions.
diff --git a/directory/config.go b/directory/config.go
@@ -1,15 +1,45 @@
 package directory
 
 import (
+	grpcc "github.com/aserto-dev/go-aserto/client"
 	"github.com/aserto-dev/go-edge-ds/pkg/directory"
+	"github.com/mitchellh/mapstructure"
+	"github.com/pkg/errors"
 )
 
 type Config struct {
-	EdgeConfig directory.Config `json:"edge"`
-	Remote     struct {
-		Addr     string `json:"address"`
-		Key      string `json:"api_key"`
-		Insecure bool   `json:"insecure"`
-		TenantID string `json:"tenant_id"`
-	} `json:"remote"`
+	Config map[string]interface{} `json:"config"`
+}
+
+func (cfg *Config) ToRemoteConfig() (*grpcc.Config, error) {
+	grpcCfg := grpcc.Config{}
+	dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
+		Result:  &grpcCfg,
+		TagName: "json",
+	})
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding file decision logger config")
+	}
+	err = dec.Decode(cfg.Config)
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding file decision logger config")
+	}
+
+	return &grpcCfg, nil
+}
+
+func (cfg *Config) ToEdgeConfig() (*directory.Config, error) {
+	edgeCfg := directory.Config{}
+	dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
+		Result:  &edgeCfg,
+		TagName: "json",
+	})
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding file decision logger config")
+	}
+	err = dec.Decode(cfg.Config)
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding file decision logger config")
+	}
+	return &edgeCfg, nil
 }
diff --git a/pkg/app/authorizer.go b/pkg/app/authorizer.go
@@ -25,9 +25,17 @@ type Authorizer struct {
 
 // Start starts all services required by the engine.
 func (e *Authorizer) Start() error {
-	if (strings.Contains(e.Configuration.Directory.Remote.Addr, "localhost") || strings.Contains(e.Configuration.Directory.Remote.Addr, "0.0.0.0")) &&
-		e.Configuration.Directory.EdgeConfig.DBPath != "" {
-		addr := strings.Split(e.Configuration.Directory.Remote.Addr, ":")
+	remoteConfig, err := e.Configuration.Directory.ToRemoteConfig()
+	if err != nil {
+		return err
+	}
+	edgeConfig, err := e.Configuration.Directory.ToEdgeConfig()
+	if err != nil {
+		return err
+	}
+	if (strings.Contains(remoteConfig.Address, "localhost") || strings.Contains(remoteConfig.Address, "0.0.0.0")) &&
+		edgeConfig.DBPath != "" {
+		addr := strings.Split(remoteConfig.Address, ":")
 		if len(addr) != 2 {
 			return errors.Errorf("invalid remote address - should contain <host>:<port>")
 		}
@@ -38,7 +46,7 @@ func (e *Authorizer) Start() error {
 		}
 
 		edge, err := edgeServer.NewEdgeServer(
-			e.Configuration.Directory.EdgeConfig,
+			*edgeConfig,
 			&e.Configuration.API.GRPC.Certs,
 			addr[0],
 			port,
@@ -51,7 +59,7 @@ func (e *Authorizer) Start() error {
 		e.Server.RegisterServer("edgeDirServer", edge.Start, edge.Stop)
 	}
 
-	err := e.Server.Start(e.Context)
+	err = e.Server.Start(e.Context)
 	if err != nil {
 		return errors.Wrap(err, "failed to start engine server")
 	}

diff --git a/pkg/app/directory/simple_resolver.go b/pkg/app/directory/simple_resolver.go
@@ -6,36 +6,35 @@ import (
 	grpcc "github.com/aserto-dev/go-aserto/client"
 	ds2 "github.com/aserto-dev/go-directory/aserto/directory/reader/v2"
 
-	"github.com/aserto-dev/topaz/directory"
 	"github.com/aserto-dev/topaz/resolvers"
 	"github.com/rs/zerolog"
 )
 
 type Resolver struct {
 	logger  *zerolog.Logger
-	cfg     *directory.Config
+	cfg     *grpcc.Config
 	dirConn *grpcc.Connection
 }
 
 var _ resolvers.DirectoryResolver = &Resolver{}
 
-func NewResolver(logger *zerolog.Logger, cfg *directory.Config) resolvers.DirectoryResolver {
+func NewResolver(logger *zerolog.Logger, cfg *grpcc.Config) resolvers.DirectoryResolver {
 	return &Resolver{
 		logger: logger,
 		cfg:    cfg,
 	}
 }
 
-func connect(logger *zerolog.Logger, cfg *directory.Config) (*grpcc.Connection, error) {
-	logger.Debug().Str("tenant-id", cfg.Remote.TenantID).Str("addr", cfg.Remote.Addr).Str("apiKey", cfg.Remote.Key).Bool("insecure", cfg.Remote.Insecure).Msg("GetDS")
+func connect(logger *zerolog.Logger, cfg *grpcc.Config) (*grpcc.Connection, error) {
+	logger.Debug().Str("tenant-id", cfg.TenantID).Str("addr", cfg.Address).Str("apiKey", cfg.APIKey).Bool("insecure", cfg.Insecure).Msg("GetDS")
 
 	ctx := context.Background()
 
 	conn, err := grpcc.NewConnection(ctx,
-		grpcc.WithAddr(cfg.Remote.Addr),
-		grpcc.WithAPIKeyAuth(cfg.Remote.Key),
-		grpcc.WithTenantID(cfg.Remote.TenantID),
-		grpcc.WithInsecure(cfg.Remote.Insecure),
+		grpcc.WithAddr(cfg.Address),
+		grpcc.WithAPIKeyAuth(cfg.APIKey),
+		grpcc.WithTenantID(cfg.TenantID),
+		grpcc.WithInsecure(cfg.Insecure),
 	)
 	if err != nil {
 		return nil, err

diff --git a/pkg/app/tests/authz_test.go b/pkg/app/tests/authz_test.go
@@ -17,8 +17,8 @@ import (
 
 func TestWithMissingIdentity(t *testing.T) {
 	harness := atesting.SetupOnline(t, func(cfg *config.Config) {
-		cfg.Directory.EdgeConfig.DBPath = atesting.AssetAcmeEBBFilePath()
-		cfg.Directory.Remote.Addr = "localhost:12345"
+		cfg.Directory.Config["db_path"] = atesting.AssetAcmeEBBFilePath()
+		cfg.Directory.Config["address"] = "localhost:12345"
 	})
 	defer harness.Cleanup()
 

diff --git a/pkg/app/tests/grpc_test.go b/pkg/app/tests/grpc_test.go
@@ -17,8 +17,7 @@ var _ = Describe("Engine GRPC Server", func() {
 
 		BeforeEach(func() {
 			h = testing.SetupOffline(ginkgoT, func(cfg *config.Config) {
-				cfg.Directory.EdgeConfig.DBPath = testing.AssetAcmeEBBFilePath()
-				cfg.OPA.LocalBundles.Paths = []string{testing.AssetLocalBundle()}
+				cfg.Directory.Config["db_path"] = testing.AssetAcmeEBBFilePath()
 			})
 		})
 

diff --git a/pkg/app/tests/policy_test.go b/pkg/app/tests/policy_test.go
@@ -14,8 +14,7 @@ import (
 
 func TestPolicy(t *testing.T) {
 	harness := atesting.SetupOnline(t, func(cfg *config.Config) {
-		cfg.Directory.EdgeConfig.DBPath = atesting.AssetAcmeEBBFilePath()
-		cfg.Directory.Remote.Addr = "localhost:12346"
+		cfg.Directory.Config["db_path"] = atesting.AssetAcmeEBBFilePath()
 	})
 	defer harness.Cleanup()
 

diff --git a/pkg/app/tests/runtime_test.go b/pkg/app/tests/runtime_test.go
@@ -17,7 +17,7 @@ var _ = Describe("Engine Runtime", func() {
 
 		BeforeEach(func() {
 			h = testing.SetupOffline(ginkgoT, func(cfg *config.Config) {
-				cfg.Directory.EdgeConfig.DBPath = testing.AssetAcmeEBBFilePath()
+				cfg.Directory.Config["db_path"] = testing.AssetAcmeEBBFilePath()
 				cfg.OPA.LocalBundles.Paths = []string{testing.AssetLocalBundle()}
 			})
 		})

diff --git a/pkg/app/topaz/directory_resolver.go b/pkg/app/topaz/directory_resolver.go
@@ -14,5 +14,9 @@ func DirectoryResolver(
 	logger *zerolog.Logger,
 	cfg *config.Config) resolvers.DirectoryResolver {
 
-	return directory.NewResolver(logger, &cfg.Directory)
+	dirCfg, err := cfg.Directory.ToRemoteConfig()
+	if err != nil {
+		logger.Error().Err(err).Msg("cannot configure directory resolver")
+	}
+	return directory.NewResolver(logger, dirCfg)
 }
diff --git a/pkg/testing/assets/config-local.yaml b/pkg/testing/assets/config-local.yaml
@@ -4,10 +4,9 @@ logging:
   log_level: debug
 
 directory_service:
-  edge:
+  config:
     db_path: /tmp/edgeds.db
     seed_metadata: false
-  remote:
     address: "localhost:9292"
     insecure: true
 

diff --git a/pkg/testing/assets/config-online.yaml b/pkg/testing/assets/config-online.yaml
@@ -4,10 +4,9 @@ logging:
   log_level: debug
 
 directory_service:
-  edge:
+  config:
     db_path: /tmp/edgeds.db
     seed_metadata: false
-  remote:
     insecure: true
 
 api: