fix issue where guac.yaml was not being read for backend configuration (#2388)

Signed-off-by: pxp928 <[email protected]>

Author: pxp928

pkg/assembler/backends/arangodb/backend.go

@@ -137,6 +137,11 @@ func registerFlags(cmd *cobra.Command) error {
 		return fmt.Errorf("failed to bind flags: %w", err)
 	}
 
+	// set values from guac.yaml if present
+	flags.user = viper.GetString("arango-user")
+	flags.pass = viper.GetString("arango-pass")
+	flags.addr = viper.GetString("arango-addr")
+
 	return nil
 }
 

pkg/assembler/backends/ent/backend/backend.go

@@ -63,6 +63,13 @@ func registerFlags(cmd *cobra.Command) error {
 		return fmt.Errorf("failed to bind flags: %w", err)
 	}
 
+	// set values from guac.yaml if present
+	flags.dbAddress = viper.GetString("db-address")
+	flags.dbDriver = viper.GetString("db-driver")
+	flags.dbDebug = viper.GetBool("db-debug")
+	flags.dbMigrate = viper.GetBool("db-migrate")
+	flags.dbConnTime = viper.GetString("db-conn-time")
+
 	return nil
 }
 

pkg/assembler/backends/keyvalue/backend.go

@@ -54,6 +54,11 @@ func registerFlags(cmd *cobra.Command) error {
 		return fmt.Errorf("failed to bind flags: %w", err)
 	}
 
+	// set values from guac.yaml if present
+	flags.kvStore = viper.GetString("kv-store")
+	flags.kvRedis = viper.GetString("kv-redis")
+	flags.kvTiKV = viper.GetString("kv-tikv")
+
 	return nil
 }
 

pkg/assembler/backends/neo4j/backend.go

@@ -76,6 +76,12 @@ func registerFlags(cmd *cobra.Command) error {
 		return fmt.Errorf("failed to bind flags: %w", err)
 	}
 
+	// set values from guac.yaml if present
+	flags.user = viper.GetString("neo4j-user")
+	flags.pass = viper.GetString("neo4j-pass")
+	flags.addr = viper.GetString("neo4j-addr")
+	flags.realm = viper.GetString("neo4j-realm")
+
 	return nil
 }
 

pkg/assembler/backends/neptune/neptune.go

@@ -71,6 +71,13 @@ func registerFlags(cmd *cobra.Command) error {
 		return fmt.Errorf("failed to bind flags: %w", err)
 	}
 
+	// set values from guac.yaml if present
+	flags.endpoint = viper.GetString("neptune-endpoint")
+	flags.port = viper.GetInt("neptune-port")
+	flags.region = viper.GetString("neptune-region")
+	flags.user = viper.GetString("neptune-user")
+	flags.realm = viper.GetString("neptune-realm")
+
 	return nil
 }
 

pkg/assembler/backends/register.go

@@ -19,6 +19,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/guacsec/guac/pkg/cli"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/maps"
 )
@@ -48,10 +49,10 @@ func Register(name string, gb GBFunc, fr FlagRegistrarFunc, fp FlagParserFunc) {
 
 // RegisterFlags registers all backend-specific flags to the given command
 func RegisterFlags(cmd *cobra.Command) error {
-	var err error
+	// initialize viper to read in guac.yaml configuration file
+	cli.InitConfig()
 	for _, register := range flagRegistrar {
-		err = register(cmd)
-		if err != nil {
+		if err := register(cmd); err != nil {
 			return err
 		}
 	}