@geekmidas/cli 1.10.26 → 1.10.27

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { __require } from "./chunk-Duj1WY3L.mjs";
 import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployTargetSupported } from "./workspace-D4z4A4cq.mjs";
 import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceAppInfo, loadWorkspaceConfig, parseModuleConfig } from "./config-jsRYHOHU.mjs";
 import { getCredentialsPath, getDokployCredentials, getDokployRegistryId, getDokployToken, removeDokployCredentials, storeDokployCredentials, storeDokployRegistryId } from "./credentials-s1kLcIzK.mjs";
-import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-C6jD5nlK.mjs";
+import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateLocalStackCredentials, generatePgBossUrl, generateSecurePassword, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-BDE7Sk93.mjs";
 import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-dbb9RyBl.mjs";
 import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, copyAllClients, copyClientToFrontends, generateOpenApi, getBackendOpenApiPath, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-DeG0ffQ8.mjs";
 import { DokployApi } from "./dokploy-api-BIT0683o.mjs";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.25";
+var version = "1.10.26";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -781,10 +781,10 @@ async function prepareEntryCredentials(options) {
 		const depEnv = getDependencyEnvVars(appInfo.workspace, appInfo.appName);
 		Object.assign(credentials, depEnv);
 	}
-	if (!credentials.EVENT_PUBLISHER_CONNECTION_STRING && !credentials.EVENT_SUBSCRIBER_CONNECTION_STRING && credentials.POSTGRES_USER) {
+	if (!credentials.EVENT_PUBLISHER_CONNECTION_STRING && !credentials.EVENT_SUBSCRIBER_CONNECTION_STRING && credentials.PGBOSS_DB_USER) {
 		const pgbossUrl = generatePgBossUrl({
-			username: credentials.POSTGRES_USER,
-			password: credentials.POSTGRES_PASSWORD ?? "",
+			username: credentials.PGBOSS_DB_USER,
+			password: credentials.PGBOSS_DB_PASSWORD ?? "",
 			host: credentials.POSTGRES_HOST ?? "localhost",
 			port: Number(credentials.POSTGRES_PORT ?? "5432"),
 			database: credentials.POSTGRES_DB ?? "app"
@@ -7504,7 +7504,7 @@ function generateDockerEnv(apps, eventsBackend) {
 		const envVar = `${app.name.toUpperCase()}_DB_PASSWORD`;
 		return `${envVar}=${app.password}`;
 	});
-	if (eventsBackend === "pgboss") envVars.push(`PGBOSS_DB_PASSWORD=pgboss-dev-password`);
+	envVars.push(`PGBOSS_DB_PASSWORD=pgboss-dev-password`);
 	return `# Auto-generated docker environment file
 # Contains database passwords for docker-compose postgres init
 # This file is gitignored - do not commit to version control
@@ -7565,8 +7565,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
 EOSQL
 `;
 	});
-	let pgbossBlock = "";
-	if (eventsBackend === "pgboss") pgbossBlock = `
+	const pgbossBlock = `
 # Create pgboss user with dedicated schema - idempotent
 echo "Creating pgboss user and schema..."
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
@@ -7602,7 +7601,8 @@ set -e
 # Auto-generated PostgreSQL init script (idempotent - safe to re-run)
 # Creates per-app users with separate schemas in a single database
 # - api: uses public schema
-# - auth: uses auth schema (search_path=auth)${eventsBackend === "pgboss" ? "\n# - pgboss: uses pgboss schema for event processing" : ""}
+# - auth: uses auth schema (search_path=auth)
+# - pgboss: uses pgboss schema for event processing
 ${extensions}
 ${userCreations.join("\n")}${pgbossBlock}
 echo "Database initialization complete!"
@@ -11837,26 +11837,27 @@ function reconcileSecrets(secrets, workspace) {
 		logger$1.log(`   🔄 Adding missing service credentials: ${name$1}`);
 		changed = true;
 	}
+	if (result.services.postgres && !result.services.pgboss) {
+		result = {
+			...result,
+			services: {
+				...result.services,
+				pgboss: {
+					host: result.services.postgres.host,
+					port: result.services.postgres.port,
+					username: "pgboss",
+					password: generateSecurePassword(),
+					database: result.services.postgres.database ?? "app"
+				}
+			}
+		};
+		result.urls = generateConnectionUrls(result.services, result.eventsBackend);
+		logger$1.log("   🔄 Adding missing service credentials: pgboss");
+		changed = true;
+	}
 	const eventsBackend = workspace.services.events;
 	if (eventsBackend && result.eventsBackend !== eventsBackend) {
 		result.eventsBackend = eventsBackend;
-		if (eventsBackend === "pgboss" && !result.services.pgboss) {
-			result = {
-				...result,
-				services: {
-					...result.services,
-					pgboss: {
-						host: result.services.postgres?.host ?? "localhost",
-						port: result.services.postgres?.port ?? 5432,
-						username: "pgboss",
-						password: generateSecurePassword(),
-						database: result.services.postgres?.database ?? "app"
-					}
-				}
-			};
-			logger$1.log("   🔄 Adding missing service credentials: pgboss");
-			changed = true;
-		}
 		if (eventsBackend === "sns" && !result.services.localstack) {
 			result = {
 				...result,
@@ -12427,7 +12428,7 @@ program.command("secrets:push").description("Push secrets to remote provider (SS
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
 		const { pushSecrets: pushSecrets$1 } = await import("./sync-COnAugP-.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-jfx0dsno.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
@@ -12453,7 +12454,7 @@ program.command("secrets:pull").description("Pull secrets from remote provider (
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
 		const { pullSecrets: pullSecrets$1 } = await import("./sync-COnAugP-.mjs");
 		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-jfx0dsno.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -12478,7 +12479,7 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-jfx0dsno.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-BjWhjfSp.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Cs4WBsc4.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);