@geekmidas/cli 1.10.4 → 1.10.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @geekmidas/cli
 
+## 1.10.5
+
+### Patch Changes
+
+- 🐛 [`c97b9db`](https://github.com/geekmidas/toolbox/commit/c97b9db7cb66040b461cd3682f0b82ae2f24bd14) Thanks [@geekmidas](https://github.com/geekmidas)! - Fix credentials embedding
+
 ## 1.10.4
 
 ### Patch Changes

package/dist/index.cjs

@@ -35,7 +35,7 @@ const prompts = require_chunk.__toESM(require("prompts"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.3";
+var version = "1.10.4";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -815,13 +815,19 @@ function rewriteUrlsWithPorts(secrets, resolvedPorts) {
 	const { ports, mappings } = resolvedPorts;
 	const result = { ...secrets };
 	const portReplacements = [];
+	const serviceNames = /* @__PURE__ */ new Set();
 	for (const mapping of mappings) {
+		serviceNames.add(mapping.service);
 		const resolved = ports[mapping.envVar];
 		if (resolved !== void 0) portReplacements.push({
 			defaultPort: mapping.defaultPort,
 			resolvedPort: resolved
 		});
 	}
+	for (const [key, value] of Object.entries(result)) {
+		if (!key.endsWith("_HOST")) continue;
+		if (serviceNames.has(value)) result[key] = "localhost";
+	}
 	for (const [key, value] of Object.entries(result)) {
 		if (!key.endsWith("_PORT")) continue;
 		for (const { defaultPort, resolvedPort } of portReplacements) if (value === String(defaultPort)) result[key] = String(resolvedPort);
@@ -829,6 +835,7 @@ function rewriteUrlsWithPorts(secrets, resolvedPorts) {
 	for (const [key, value] of Object.entries(result)) {
 		if (!key.endsWith("_URL") && key !== "DATABASE_URL") continue;
 		let rewritten = value;
+		for (const name$1 of serviceNames) rewritten = rewritten.replace(new RegExp(`@${name$1}:`, "g"), "@localhost:");
 		for (const { defaultPort, resolvedPort } of portReplacements) rewritten = replacePortInUrl(rewritten, defaultPort, resolvedPort);
 		result[key] = rewritten;
 	}
@@ -2882,7 +2889,7 @@ services:
     environment:
       - NODE_ENV=production
 `;
-	if (serviceMap.has("postgres")) yaml$1 += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://postgres:postgres@postgres:5432/app}
+	if (serviceMap.has("postgres")) yaml$1 += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://\${POSTGRES_USER:-postgres}:\${POSTGRES_PASSWORD:-postgres}@postgres:5432/\${POSTGRES_DB:-app}}
 `;
 	if (serviceMap.has("redis")) yaml$1 += `      - REDIS_URL=\${REDIS_URL:-redis://redis:6379}
 `;
@@ -2917,7 +2924,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -3046,7 +3053,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -3139,7 +3146,7 @@ function generateAppService(appName, app, allApps, options) {
 `;
 	}
 	if (app.type === "backend") {
-		if (hasPostgres) yaml$1 += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://postgres:postgres@postgres:5432/app}
+		if (hasPostgres) yaml$1 += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://\${POSTGRES_USER:-postgres}:\${POSTGRES_PASSWORD:-postgres}@postgres:5432/\${POSTGRES_DB:-app}}
 `;
 		if (hasRedis) yaml$1 += `      - REDIS_URL=\${REDIS_URL:-redis://redis:6379}
 `;
@@ -6951,15 +6958,15 @@ function generateDockerFiles(options, template, dbApps) {
     container_name: ${options.name}-postgres
     restart: unless-stopped${envFile}
     environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: ${options.name.replace(/-/g, "_")}_dev
+      POSTGRES_USER: \${POSTGRES_USER:-postgres}
+      POSTGRES_PASSWORD: \${POSTGRES_PASSWORD:-postgres}
+      POSTGRES_DB: \${POSTGRES_DB:-${options.name.replace(/-/g, "_")}_dev}
     ports:
       - '\${POSTGRES_HOST_PORT:-5432}:5432'
     volumes:
       - postgres_data:/var/lib/postgresql/data${initVolume}
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U postgres']
+      test: ['CMD-SHELL', 'pg_isready -U $$POSTGRES_USER']
       interval: 5s
       timeout: 5s
       retries: 5`);
@@ -11368,7 +11375,6 @@ async function testCommand(options = {}) {
 		}
 	}
 	secretsEnv = rewriteDatabaseUrlForTests(secretsEnv);
-	await ensureTestDatabase(secretsEnv);
 	let dependencyEnv = {};
 	try {
 		const appInfo = await require_config.loadWorkspaceAppInfo(cwd);
@@ -11456,34 +11462,6 @@ function rewriteDatabaseUrlForTests(env) {
 	}
 	return result;
 }
-/**
-* Ensure the test database exists by connecting to the default database
-* and running CREATE DATABASE IF NOT EXISTS.
-* @internal Exported for testing
-*/
-async function ensureTestDatabase(env) {
-	const databaseUrl = env.DATABASE_URL;
-	if (!databaseUrl) return;
-	try {
-		const url = new URL(databaseUrl);
-		const testDbName = url.pathname.slice(1);
-		if (!testDbName) return;
-		url.pathname = "/postgres";
-		const { default: pg$1 } = await import("pg");
-		const client = new pg$1.Client({ connectionString: url.toString() });
-		await client.connect();
-		try {
-			await client.query(`CREATE DATABASE "${testDbName}"`);
-			console.log(`  📦 Created test database "${testDbName}"`);
-		} catch (err) {
-			if (err.code !== "42P04") throw err;
-		} finally {
-			await client.end();
-		}
-	} catch (err) {
-		console.log(`  ⚠️  Could not ensure test database: ${err.message}`);
-	}
-}
 
 //#endregion
 //#region src/upgrade/index.ts