go-duck-cli 1.1.18 → 1.1.20

package/generators/devops.js

@@ -96,6 +96,11 @@ services:
       - "${dbPort}:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${config.datasource?.username || 'postgres'} -d ${config.datasource?.database || 'go_duck_master'}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     networks:
       - go-duck-net
 
@@ -166,7 +171,8 @@ services:
       KC_DB_USERNAME: ${config.datasource?.username || 'postgres'}
       KC_DB_PASSWORD: ${config.datasource?.password || 'password'}
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     volumes:
       - ./keycloak/realm-config:/opt/keycloak/data/import
     ports:
@@ -240,7 +246,7 @@ services:
       - GO_DUCK_ELASTICSEARCH_ADDRESSES=http://elasticsearch:9200
     depends_on:
       postgres:
-        condition: service_started
+        condition: service_healthy
       redis:
         condition: service_started
       mosquitto:
@@ -254,8 +260,7 @@ services:
 
 networks:
   go-duck-net:
-    external: true
-    name: devops_go-duck-net
+    driver: bridge
 `;
 
     // --- 5. MQTT Broker Config ---

package/generators/multitenancy.js

@@ -179,12 +179,22 @@ func TenantMiddleware(db *gorm.DB, cfg *config.Config) gin.HandlerFunc {
 		}
 
         if len(mappings) == 0 {
-             conn, _ := mgr.GetDB(fallbackDB)
+             conn, err := mgr.GetDB(fallbackDB)
+             if err != nil || conn == nil {
+                 c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to resolve tenant fallback database connection"})
+                 c.Abort()
+                 return
+             }
              siloConnections["fallback"] = conn
              c.Set("tenantDBConn", conn)
 
 			 if cfg.GoDuck.Datasource.MongoDB.Enabled {
-				mClient, _ := mgr.GetMongoClient(fallbackDB)
+				mClient, err := mgr.GetMongoClient(fallbackDB)
+				if err != nil || mClient == nil {
+					c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to resolve tenant fallback MongoDB connection"})
+					c.Abort()
+					return
+				}
 				mDB := mClient.Database(fallbackDB)
 				mongoConnections["fallback"] = mDB
 				c.Set("tenantMongoDB", mDB)
@@ -214,11 +224,21 @@ func TenantMiddleware(db *gorm.DB, cfg *config.Config) gin.HandlerFunc {
 
             // The FIRST one in our sorted list is the primary/lead silo for this request
             if len(mappings) > 0 {
-                primaryConn, _ := mgr.GetDB(mappings[0].DBName)
+                primaryConn, err := mgr.GetDB(mappings[0].DBName)
+                if err != nil || primaryConn == nil {
+                     c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to resolve primary tenant database connection"})
+                     c.Abort()
+                     return
+                }
                 c.Set("tenantDBConn", primaryConn)
 
 				if cfg.GoDuck.Datasource.MongoDB.Enabled {
-					mClient, _ := mgr.GetMongoClient(mappings[0].DBName)
+					mClient, err := mgr.GetMongoClient(mappings[0].DBName)
+					if err != nil || mClient == nil {
+						 c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to resolve primary tenant MongoDB connection"})
+						 c.Abort()
+						 return
+					}
 					c.Set("tenantMongoDB", mClient.Database(mappings[0].DBName))
 				}
 
@@ -309,7 +329,7 @@ func CreateDatabaseAndMigrate(masterDB *gorm.DB) gin.HandlerFunc {
         var exists int
         masterDB.Raw("SELECT 1 FROM pg_database WHERE datname = ?", req.DBName).Scan(&exists)
         if exists == 0 {
-		    masterDB.Exec(fmt.Sprintf("CREATE DATABASE %s", req.DBName))
+		    masterDB.Exec(fmt.Sprintf("CREATE DATABASE \"%s\"", req.DBName))
         }
 
 		// 2. Clear other primary flags for this role if setting new primary

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",

package/templates/go/router.go.hbs

@@ -2,8 +2,10 @@ package router
 
 import (
     "context"
+    "fmt"
     "log"
     "net/http"
+    "strings"
     "time"
 
     "github.com/gin-gonic/gin"
@@ -84,6 +86,32 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
         if err := migrations.RunGoNativeMigrations(masterDB); err != nil {
             logger.Error("Goose Migration failed: %v", err)
         }
+
+        // 10b. Initialize and Migrate Fallback DB if multi-tenancy is enabled
+        if appConfig.GoDuck.Multitenancy.Enabled {
+            fallbackDB := strings.ToLower(appConfig.GoDuck.Name) + "_fallback"
+            var exists int
+            masterDB.Raw("SELECT 1 FROM pg_database WHERE datname = ?", fallbackDB).Scan(&exists)
+            if exists == 0 {
+                if err := masterDB.Exec(fmt.Sprintf("CREATE DATABASE \"%s\"", fallbackDB)).Error; err != nil {
+                    log.Printf("Warning: Failed to create fallback database %s: %v", fallbackDB, err)
+                } else {
+                    log.Printf("✅ Created fallback database: %s", fallbackDB)
+                }
+            }
+
+            // Run tenant migrations on the fallback database
+            mgr := middleware.GetTenantManager(masterDB, appConfig)
+            if fDB, err := mgr.GetDB(fallbackDB); err == nil {
+                if err := migrations.RunGoNativeMigrationsForTenant(fDB); err != nil {
+                    log.Printf("Warning: Failed to run migrations on fallback database: %v", err)
+                } else {
+                    log.Printf("✅ Migrated fallback database: %s", fallbackDB)
+                }
+            } else {
+                log.Printf("Warning: Failed to connect to fallback database for migration: %v", err)
+            }
+        }
     }
 
     var masterMongo *mongo.Client