Disable local directory services when using a remote directory

pkg/app/console.go

@@ -45,13 +45,19 @@ func (e *ConsoleService) Cleanups() []func() {
 }
 
 func (e *ConsoleService) PrepareConfig(cfg *config.Config) *handlers.TopazCfg {
+	directoryServiceURL := serviceAddress(fmt.Sprintf("https://%s", strings.Split(cfg.DirectoryResolver.Address, ":")[0]))
+
 	authorizerURL := ""
 	if serviceConfig, ok := cfg.APIConfig.Services[authorizerService]; ok {
 		authorizerURL = getGatewayAddress(serviceConfig)
 	}
+
 	readerURL := ""
 	if serviceConfig, ok := cfg.APIConfig.Services[readerService]; ok {
 		readerURL = getGatewayAddress(serviceConfig)
+		if cfg.DirectoryResolver.Address == serviceConfig.GRPC.ListenAddress {
+			directoryServiceURL = readerURL
+		}
 	}
 	writerURL := ""
 	if serviceConfig, ok := cfg.APIConfig.Services[writerService]; ok {
@@ -86,19 +92,12 @@ func (e *ConsoleService) PrepareConfig(cfg *config.Config) *handlers.TopazCfg {
 		}
 	}
 
-	directoryAPIKey := ""
-	if _, ok := cfg.APIConfig.Services[readerService]; ok {
-		for key := range cfg.Auth.APIKeys {
-			// we only need a key
-			directoryAPIKey = key
-			break
-		}
-	}
+	directoryAPIKey := cfg.DirectoryResolver.APIKey
 
 	return &handlers.TopazCfg{
 		AuthorizerServiceURL:        authorizerURL,
 		AuthorizerAPIKey:            authorizerAPIKey,
-		DirectoryServiceURL:         readerURL,
+		DirectoryServiceURL:         directoryServiceURL,
 		DirectoryAPIKey:             directoryAPIKey,
 		DirectoryTenantID:           cfg.DirectoryResolver.TenantID,
 		DirectoryReaderServiceURL:   readerURL,

pkg/app/topaz.go

@@ -50,6 +50,11 @@ type ServiceTypes interface {
 	Cleanups() []func()
 }
 
+var (
+	ErrBadDirResolverConfig = errors.New("remote directory resolver address is different from reader grpc address")
+	ErrNeedsModelService    = errors.New("console needs the model service to be configured")
+)
+
 func (e *Topaz) AddGRPCServerOptions(grpcOptions ...grpc.ServerOption) {
 	e.ServerOptions = append(e.ServerOptions, grpcOptions...)
 }
@@ -96,7 +101,15 @@ func (e *Topaz) ConfigServices() error {
 	}
 
 	if err := e.validateConfig(); err != nil {
-		return err
+		if errors.Is(err, ErrBadDirResolverConfig) {
+			for _, serviceName := range e.Services["edge"].AvailableServices() {
+				delete(e.Configuration.APIConfig.Services, serviceName)
+			}
+			delete(e.Services, "edge")
+			e.Logger.Info().Msg("disabling local directory services")
+		} else {
+			return err
+		}
 	}
 
 	serviceMap := mapToGRPCPorts(e.Configuration.APIConfig.Services)
@@ -306,14 +319,14 @@ func (e *Topaz) GetDecisionLogger(cfg config.DecisionLogConfig) (decisionlog.Dec
 func (e *Topaz) validateConfig() error {
 	if readerConfig, ok := e.Configuration.APIConfig.Services["reader"]; ok {
 		if readerConfig.GRPC.ListenAddress != e.Configuration.DirectoryResolver.Address {
-			return errors.New("remote directory resolver address is different from reader grpc address")
+			return ErrBadDirResolverConfig
 		}
 	}
 
 	if _, ok := e.Configuration.APIConfig.Services["console"]; ok {
 		if _, ok := e.Configuration.APIConfig.Services["reader"]; ok {
 			if _, ok := e.Configuration.APIConfig.Services["model"]; !ok {
-				return errors.New("console needs the model service to be configured")
+				return ErrNeedsModelService
 			}
 		}
 	}