fix: cli config fails (#542)

GenerateNU · Apr 15, 2024 · a911f1f · a911f1f
1 parent 9dffc47
commit a911f1f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/backend/src/main.go b/backend/src/main.go
@@ -58,8 +58,6 @@ func main() {
 	configPath := flag.String("config", filepath.Join("..", "..", "config"), "Specify the path to the config directory")
 	useDevDotEnv := flag.Bool("use-dev-dot-env", true, "Specify if you want to use the .env.dev file")
 
-	fmt.Println("foo", *useDevDotEnv)
-
 	flag.Parse()
 
 	config, err := config.GetConfiguration(*configPath, *useDevDotEnv)

diff --git a/cli/commands/clean_tests.go b/cli/commands/clean_tests.go
@@ -7,6 +7,7 @@ import (
 	"os/user"
 	"sync"
 
+	"github.com/GenerateNU/sac/backend/src/config"
 	_ "github.com/lib/pq"
 	"github.com/urfave/cli/v2"
 )
@@ -32,7 +33,12 @@ func ClearDBCommand() *cli.Command {
 func CleanTestDBs(ctx context.Context) error {
 	fmt.Println("Cleaning test databases")
 
-	db, err := sql.Open("postgres", CONFIG.Database.WithDb())
+	config, err := config.GetConfiguration(CONFIG, false)
+	if err != nil {
+		return err
+	}
+
+	db, err := sql.Open("postgres", config.Database.WithDb())
 	if err != nil {
 		return err
 	}
@@ -45,7 +51,7 @@ func CleanTestDBs(ctx context.Context) error {
 	}
 
 	query := "SELECT datname FROM pg_database WHERE datistemplate = false AND datname != 'postgres' AND datname != $1 AND datname != $2 AND datname LIKE 'sac_test_%';"
-	rows, err := db.Query(query, currentUser.Username, CONFIG.Database.DatabaseName)
+	rows, err := db.Query(query, currentUser.Username, config.Database.DatabaseName)
 	if err != nil {
 		return err
 	}

diff --git a/cli/commands/config.go b/cli/commands/config.go
@@ -3,7 +3,6 @@ package commands
 import (
 	"path/filepath"
 
-	"github.com/GenerateNU/sac/backend/src/config"
 	"github.com/GenerateNU/sac/cli/utils"
 )
 
@@ -12,6 +11,6 @@ var (
 	FRONTEND_DIR    = filepath.Join(ROOT_DIR, "/frontend")
 	BACKEND_DIR     = filepath.Join(ROOT_DIR, "/backend")
 	BACKEND_SRC_DIR = filepath.Join(BACKEND_DIR, "/src")
-	CONFIG, _       = config.GetConfiguration(filepath.Join(ROOT_DIR, "/config"), false)
+	CONFIG          = filepath.Join(ROOT_DIR, "/config")
 	MIGRATION_FILE  = filepath.Join(BACKEND_SRC_DIR, "/migrations/data.sql")
 )
diff --git a/cli/commands/drop.go b/cli/commands/drop.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/GenerateNU/sac/backend/src/config"
 	"github.com/urfave/cli/v2"
 )
 
@@ -52,7 +53,12 @@ func DropData() error {
 	dbMutex.Lock()
 	defer dbMutex.Unlock()
 
-	db, err := sql.Open("postgres", CONFIG.Database.WithDb())
+	config, err := config.GetConfiguration(CONFIG, false)
+	if err != nil {
+		return err
+	}
+
+	db, err := sql.Open("postgres", config.Database.WithDb())
 	if err != nil {
 		return err
 	}
@@ -95,7 +101,12 @@ func DropDB() error {
 	dbMutex.Lock()
 	defer dbMutex.Unlock()
 
-	db, err := sql.Open("postgres", CONFIG.Database.WithDb())
+	config, err := config.GetConfiguration(CONFIG, false)
+	if err != nil {
+		return err
+	}
+
+	db, err := sql.Open("postgres", config.Database.WithDb())
 	if err != nil {
 		return err
 	}

diff --git a/cli/commands/insert.go b/cli/commands/insert.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 
+	"github.com/GenerateNU/sac/backend/src/config"
 	"github.com/lib/pq"
 	"github.com/urfave/cli/v2"
 )
@@ -34,7 +35,12 @@ func InsertCommand() *cli.Command {
 }
 
 func InsertDB() error {
-	db, err := sql.Open("postgres", CONFIG.Database.WithDb())
+	config, err := config.GetConfiguration(CONFIG, false)
+	if err != nil {
+		return err
+	}
+
+	db, err := sql.Open("postgres", config.Database.WithDb())
 	if err != nil {
 		return err
 	}