Fix validation and spin-up if authorizer is not configured (#117)

aserto-dev · Aug 10, 2023 · 27d0195 · 27d0195
1 parent 467e091
commit 27d0195
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/cmd/topazd/topaz_run.go b/cmd/topazd/topaz_run.go
@@ -47,25 +47,24 @@ var cmdRun = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		directory := topaz.DirectoryResolver(authorizer.Context, authorizer.Logger, authorizer.Configuration)
-		decisionlog, err := authorizer.GetDecisionLogger(authorizer.Configuration.DecisionLogger)
+		err = authorizer.ConfigServices()
 		if err != nil {
 			return err
 		}
+		if _, ok := authorizer.Services["topaz"]; ok {
+			directory := topaz.DirectoryResolver(authorizer.Context, authorizer.Logger, authorizer.Configuration)
+			decisionlog, err := authorizer.GetDecisionLogger(authorizer.Configuration.DecisionLogger)
+			if err != nil {
+				return err
+			}
 
-		controllerFactory := controller.NewFactory(authorizer.Logger, authorizer.Configuration.ControllerConfig, client.NewDialOptionsProvider())
-
-		runtime, _, err := topaz.NewRuntimeResolver(authorizer.Context, authorizer.Logger, authorizer.Configuration, controllerFactory, decisionlog, directory)
-		if err != nil {
-			return err
-		}
+			controllerFactory := controller.NewFactory(authorizer.Logger, authorizer.Configuration.ControllerConfig, client.NewDialOptionsProvider())
 
-		err = authorizer.ConfigServices()
-		if err != nil {
-			return err
-		}
+			runtime, _, err := topaz.NewRuntimeResolver(authorizer.Context, authorizer.Logger, authorizer.Configuration, controllerFactory, decisionlog, directory)
+			if err != nil {
+				return err
+			}
 
-		if _, ok := authorizer.Services["topaz"]; ok {
 			authorizer.Services["topaz"].(*app.Topaz).Resolver.SetRuntimeResolver(runtime)
 			authorizer.Services["topaz"].(*app.Topaz).Resolver.SetDirectoryResolver(directory)
 		}

diff --git a/pkg/cc/config/topaz_config.go b/pkg/cc/config/topaz_config.go
@@ -66,11 +66,13 @@ func (c *Config) validation() error {
 	if c.Version != ConfigFileVersion {
 		return errors.New("unsupported config version")
 	}
-	if c.Command.Mode == CommandModeRun && c.OPA.InstanceID == "" {
-		return errors.New("opa.instance_id not set")
-	}
-	if len(c.OPA.Config.Bundles) > 1 {
-		return errors.New("opa.config.bundles - too many bundles")
+	if _, ok := c.Services["authorizer"]; ok {
+		if c.Command.Mode == CommandModeRun && c.OPA.InstanceID == "" {
+			return errors.New("opa.instance_id not set")
+		}
+		if len(c.OPA.Config.Bundles) > 1 {
+			return errors.New("opa.config.bundles - too many bundles")
+		}
 	}
 
 	if len(c.Services) == 0 {