@geekmidas/cli 1.10.5 → 1.10.7

package/dist/index.mjs

@@ -8,7 +8,7 @@ import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecr
 import { DokployApi } from "./dokploy-api-2ldYoN3i.mjs";
 import { encryptSecrets } from "./encryption-BOH5M-f-.mjs";
 import { CachedStateProvider } from "./CachedStateProvider-BDq5WqSy.mjs";
-import { createStageSecrets, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-odm79Uo1.mjs";
+import { createStageSecrets, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-ca0Kyrvt.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-C4UdILaI.mjs";
 import { isSSMConfigured, pullSecrets, pushSecrets } from "./sync-CbeKrnQV.mjs";
 import { createRequire } from "node:module";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.4";
+var version = "1.10.6";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -2841,7 +2841,7 @@ const DEFAULT_SERVICE_IMAGES = {
 };
 /** Default Docker image versions for services */
 const DEFAULT_SERVICE_VERSIONS = {
-	postgres: "16-alpine",
+	postgres: "18-alpine",
 	redis: "7-alpine",
 	rabbitmq: "3-management-alpine"
 };
@@ -2922,7 +2922,7 @@ services:
       POSTGRES_PASSWORD: \${POSTGRES_PASSWORD:-postgres}
       POSTGRES_DB: \${POSTGRES_DB:-app}
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - dbdata:/var/lib/postgresql/18/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
@@ -2971,7 +2971,7 @@ services:
 	yaml += `
 volumes:
 `;
-	if (serviceMap.has("postgres")) yaml += `  postgres_data:
+	if (serviceMap.has("postgres")) yaml += `  dbdata:
 `;
 	if (serviceMap.has("redis")) yaml += `  redis_data:
 `;
@@ -3051,7 +3051,7 @@ services:
       POSTGRES_PASSWORD: \${POSTGRES_PASSWORD:-postgres}
       POSTGRES_DB: \${POSTGRES_DB:-app}
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - dbdata:/var/lib/postgresql/18/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 5s
@@ -3089,7 +3089,7 @@ services:
 	yaml += `
 volumes:
 `;
-	if (hasPostgres) yaml += `  postgres_data:
+	if (hasPostgres) yaml += `  dbdata:
 `;
 	if (hasRedis) yaml += `  redis_data:
 `;
@@ -3105,7 +3105,7 @@ networks:
 */
 function getInfraServiceImage(serviceName, config$1) {
 	const defaults = {
-		postgres: "postgres:16-alpine",
+		postgres: "postgres:18-alpine",
 		redis: "redis:7-alpine"
 	};
 	if (!config$1 || config$1 === true) return defaults[serviceName];
@@ -6954,7 +6954,7 @@ function generateDockerFiles(options, template, dbApps) {
     env_file:
       - ./docker/.env` : "";
 		services.push(`  postgres:
-    image: postgres:16-alpine
+    image: postgres:18-alpine
     container_name: ${options.name}-postgres
     restart: unless-stopped${envFile}
     environment:
@@ -6964,13 +6964,13 @@ function generateDockerFiles(options, template, dbApps) {
     ports:
       - '\${POSTGRES_HOST_PORT:-5432}:5432'
     volumes:
-      - postgres_data:/var/lib/postgresql/data${initVolume}
+      - dbdata:/var/lib/postgresql/18/data${initVolume}
     healthcheck:
       test: ['CMD-SHELL', 'pg_isready -U $$POSTGRES_USER']
       interval: 5s
       timeout: 5s
       retries: 5`);
-		volumes.push("  postgres_data:");
+		volumes.push("  dbdata:");
 		if (isFullstack && dbApps?.length) {
 			files.push({
 				path: "docker/postgres/init.sh",
@@ -10868,7 +10868,7 @@ async function initCommand(projectName, options = {}) {
 	const secretServices = [];
 	if (services.db) secretServices.push("postgres");
 	if (services.cache) secretServices.push("redis");
-	const devSecrets = createStageSecrets("development", secretServices);
+	const devSecrets = createStageSecrets("development", secretServices, { projectName: name$1 });
 	const customSecrets = {
 		NODE_ENV: "development",
 		PORT: "3000",
@@ -11005,16 +11005,19 @@ async function secretsInitCommand(options) {
 	const config$1 = await loadConfig();
 	const services = getServicesFromConfig(config$1.docker?.compose?.services);
 	if (services.length === 0) logger$2.warn("No services configured in docker.compose.services. Creating secrets with empty services.");
-	const secrets = createStageSecrets(stage, services);
+	let projectName;
+	let workspaceSecrets;
 	try {
 		const loaded = await loadWorkspaceConfig();
+		projectName = loaded.workspace.name;
 		const isMultiApp = Object.keys(loaded.workspace.apps).length > 1;
 		if (isMultiApp) {
-			const customSecrets = generateFullstackCustomSecrets(loaded.workspace);
-			secrets.custom = customSecrets;
+			workspaceSecrets = generateFullstackCustomSecrets(loaded.workspace);
 			logger$2.log("  Detected workspace mode — generating per-app secrets");
 		}
 	} catch {}
+	const secrets = createStageSecrets(stage, services, { projectName });
+	if (workspaceSecrets) secrets.custom = workspaceSecrets;
 	await writeStageSecrets(secrets);
 	logger$2.log(`\n✓ Secrets initialized for stage "${stage}"`);
 	logger$2.log(`  Location: .gkm/secrets/${stage}.json`);
@@ -11292,7 +11295,7 @@ async function generateFreshSecrets(stage, workspace, options) {
 	const serviceNames = [];
 	if (workspace.services.db) serviceNames.push("postgres");
 	if (workspace.services.cache) serviceNames.push("redis");
-	const secrets = createStageSecrets(stage, serviceNames);
+	const secrets = createStageSecrets(stage, serviceNames, { projectName: workspace.name });
 	const isMultiApp = Object.keys(workspace.apps).length > 1;
 	if (isMultiApp) {
 		const customSecrets = generateFullstackCustomSecrets(workspace);
@@ -11829,7 +11832,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-6FoT41G3.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-WzC1oAUV.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-C5OyCA7V.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Dx_jZbq6.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
@@ -11855,7 +11858,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-6FoT41G3.mjs");
 		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Dx_jZbq6.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-WzC1oAUV.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-C5OyCA7V.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -11880,7 +11883,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-WzC1oAUV.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile-C5OyCA7V.mjs");
 		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-Dx_jZbq6.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);