From 8350bf4c0ef3ddf161fe2e3cbbbd48f6db12b8fe Mon Sep 17 00:00:00 2001
From: Travis Cotton <trcotton@lanl.gov>
Date: Mon, 29 Jan 2024 12:42:00 -0700
Subject: [PATCH] Removing writeConfig from config.go. Added reading
 OCHAMI_CONFIG from env, no longer generating passwords or writing config file

---
 config.go |  9 ---------
 main.go   | 26 ++++----------------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/config.go b/config.go
index 5961d5d..089ad32 100644
--- a/config.go
+++ b/config.go
@@ -34,12 +34,3 @@ func readConfig(filename string) (*Config, error) {
 
 	return c, nil
 }
-
-func writeConfig(filename string, config *Config) error {
-	data, err := yaml.Marshal(config)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(filename, data, 0644)
-}
diff --git a/main.go b/main.go
index b6dc30c..cad7d1d 100644
--- a/main.go
+++ b/main.go
@@ -13,15 +13,6 @@ import (
 	_ "github.com/lib/pq"
 )
 
-func generatePassword() (string, error) {
-	bytes := make([]byte, 16)
-	if _, err := rand.Read(bytes); err != nil {
-		return "", err
-	}
-
-	return hex.EncodeToString(bytes), nil
-}
-
 func connectDB(username, password, dbhost, dbname string) (*sql.DB, error) {
 	return connectDBWithRetry(username, password, dbhost, dbname, 2)
 }
@@ -60,7 +51,10 @@ func execSQL(db *sql.DB, query string) error {
 
 func main() {
 
-	config, err := readConfig("ochami.yaml")
+        if config_file == "" {
+		log.Fatal("OCHAMI_CONFIG is required")
+	}
+	config, err := readConfig(config_file)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -98,13 +92,6 @@ func main() {
 		}
 
 		for _, user := range database.Users {
-			if user.Password == "" {
-				user.Password, err = generatePassword()
-				if err != nil {
-					log.Fatal(err)
-				}
-			}
-
 			err = execSQL(db, fmt.Sprintf("CREATE USER \"%s\" WITH PASSWORD '%s';", user.Name, user.Password))
 			if err != nil {
 				log.Fatal(err)
@@ -116,9 +103,4 @@ func main() {
 			}
 		}
 	}
-
-	err = writeConfig("ochami.yaml", config)
-	if err != nil {
-		log.Fatal(err)
-	}
 }