@geekmidas/cli 1.10.7 → 1.10.8

package/dist/index.mjs

@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.6";
+var version = "1.10.7";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1222,10 +1222,25 @@ async function loadSecretsForApp(secretsRoot, appName) {
 	return mapped;
 }
 /**
+* Build the environment variables to pass to `docker compose up`.
+* Merges process.env, secrets, and port mappings so that Docker Compose
+* can interpolate variables like ${POSTGRES_USER} correctly.
+* @internal Exported for testing
+*/
+function buildDockerComposeEnv(secretsEnv, portEnv) {
+	return {
+		...process.env,
+		...secretsEnv,
+		...portEnv
+	};
+}
+/**
 * Start docker-compose services for the workspace.
+* Passes both port mappings and secrets to docker-compose so that
+* variables like POSTGRES_USER/POSTGRES_PASSWORD are available.
 * @internal Exported for testing
 */
-async function startWorkspaceServices(workspace, portEnv) {
+async function startWorkspaceServices(workspace, portEnv, secretsEnv) {
 	const services = workspace.services;
 	if (!services.db && !services.cache && !services.mail) return;
 	const servicesToStart = [];
@@ -1243,10 +1258,7 @@ async function startWorkspaceServices(workspace, portEnv) {
 		execSync(`docker compose up -d ${servicesToStart.join(" ")}`, {
 			cwd: workspace.root,
 			stdio: "inherit",
-			env: {
-				...process.env,
-				...portEnv
-			}
+			env: buildDockerComposeEnv(secretsEnv, portEnv)
 		});
 		logger$11.log("✅ Services started");
 	} catch (error) {
@@ -1295,8 +1307,9 @@ async function workspaceDevCommand(workspace, options) {
 		if (copiedCount > 0) logger$11.log(`\n📦 Copied ${copiedCount} API client(s)`);
 	}
 	const resolvedPorts = await resolveServicePorts(workspace.root);
-	await startWorkspaceServices(workspace, resolvedPorts.dockerEnv);
-	const secretsEnv = rewriteUrlsWithPorts(await loadDevSecrets(workspace), resolvedPorts);
+	const rawSecrets = await loadDevSecrets(workspace);
+	await startWorkspaceServices(workspace, resolvedPorts.dockerEnv, rawSecrets);
+	const secretsEnv = rewriteUrlsWithPorts(rawSecrets, resolvedPorts);
 	if (Object.keys(secretsEnv).length > 0) logger$11.log(`   Loaded ${Object.keys(secretsEnv).length} secret(s)`);
 	const dependencyEnv = generateAllDependencyEnvVars(workspace);
 	if (Object.keys(dependencyEnv).length > 0) {
@@ -2874,7 +2887,9 @@ function generateDockerCompose(options) {
 	const { imageName, registry, port, healthCheckPath, services } = options;
 	const serviceMap = normalizeServices(services);
 	const imageRef = registry ? `\${REGISTRY:-${registry}}/` : "";
-	let yaml = `version: '3.8'
+	let yaml = `# Use "gkm dev" or "gkm test" to start services.
+# Running "docker compose up" directly will not inject secrets or resolve ports.
+version: '3.8'
 
 services:
   api:
@@ -2990,7 +3005,9 @@ networks:
 function generateMinimalDockerCompose(options) {
 	const { imageName, registry, port, healthCheckPath } = options;
 	const imageRef = registry ? `\${REGISTRY:-${registry}}/` : "";
-	return `version: '3.8'
+	return `# Use "gkm dev" or "gkm test" to start services.
+# Running "docker compose up" directly will not inject secrets or resolve ports.
+version: '3.8'
 
 services:
   api:
@@ -3032,7 +3049,8 @@ function generateWorkspaceCompose(workspace, options = {}) {
 	const postgresImage = getInfraServiceImage("postgres", services.db);
 	const redisImage = getInfraServiceImage("redis", services.cache);
 	let yaml = `# Docker Compose for ${workspace.name} workspace
-# Generated by gkm - do not edit manually
+# Use "gkm dev" or "gkm test" to start services.
+# Running "docker compose up" directly will not inject secrets or resolve ports.
 
 services:
 `;
@@ -7057,7 +7075,9 @@ function generateDockerFiles(options, template, dbApps) {
     environment:
       MP_SMTP_AUTH_ACCEPT_ANY: 1
       MP_SMTP_AUTH_ALLOW_INSECURE: 1`);
-	let dockerCompose = `services:
+	let dockerCompose = `# Use "gkm dev" or "gkm test" to start services.
+# Running "docker compose up" directly will not inject secrets or resolve ports.
+services:
 ${services.join("\n\n")}
 `;
 	if (volumes.length > 0) dockerCompose += `
@@ -11364,23 +11384,15 @@ async function testCommand(options = {}) {
 		if (error instanceof Error && error.message.includes("key not found")) console.log(`  Decryption key not found for ${stage}`);
 		else throw error;
 	}
-	const composePath = join(cwd, "docker-compose.yml");
-	const mappings = parseComposePortMappings(composePath);
-	if (mappings.length > 0) {
-		const ports = await loadPortState(cwd);
-		if (Object.keys(ports).length > 0) {
-			secretsEnv = rewriteUrlsWithPorts(secretsEnv, {
-				dockerEnv: {},
-				ports,
-				mappings
-			});
-			console.log(`  🔌 Applied ${Object.keys(ports).length} port mapping(s)`);
-		}
-	}
-	secretsEnv = rewriteDatabaseUrlForTests(secretsEnv);
 	let dependencyEnv = {};
 	try {
 		const appInfo = await loadWorkspaceAppInfo(cwd);
+		const resolvedPorts = await resolveServicePorts(appInfo.workspaceRoot);
+		await startWorkspaceServices(appInfo.workspace, resolvedPorts.dockerEnv, secretsEnv);
+		if (resolvedPorts.mappings.length > 0) {
+			secretsEnv = rewriteUrlsWithPorts(secretsEnv, resolvedPorts);
+			console.log(`  🔌 Applied ${Object.keys(resolvedPorts.ports).length} port mapping(s)`);
+		}
 		dependencyEnv = getDependencyEnvVars(appInfo.workspace, appInfo.appName);
 		if (Object.keys(dependencyEnv).length > 0) console.log(`  🔗 Loaded ${Object.keys(dependencyEnv).length} dependency URL(s)`);
 		const sniffed = await sniffAppEnvironment(appInfo.app, appInfo.appName, appInfo.workspaceRoot, { logWarnings: false });
@@ -11396,7 +11408,22 @@ async function testCommand(options = {}) {
 			dependencyEnv = filteredEnv;
 			console.log(`  🔍 Sniffed ${sniffed.requiredEnvVars.length} required env var(s)`);
 		}
-	} catch {}
+	} catch {
+		const composePath = join(cwd, "docker-compose.yml");
+		const mappings = parseComposePortMappings(composePath);
+		if (mappings.length > 0) {
+			const ports = await loadPortState(cwd);
+			if (Object.keys(ports).length > 0) {
+				secretsEnv = rewriteUrlsWithPorts(secretsEnv, {
+					dockerEnv: {},
+					ports,
+					mappings
+				});
+				console.log(`  🔌 Applied ${Object.keys(ports).length} port mapping(s)`);
+			}
+		}
+	}
+	secretsEnv = rewriteDatabaseUrlForTests(secretsEnv);
 	console.log("");
 	const allSecrets = {
 		...secretsEnv,