@geekmidas/cli 1.10.10 → 1.10.11

package/dist/index.mjs

@@ -4,13 +4,13 @@ import { getAppBuildOrder, getDependencyEnvVars, getDeployTargetError, isDeployT
 import { getAppNameFromCwd, loadAppConfig, loadConfig, loadWorkspaceAppInfo, loadWorkspaceConfig, parseModuleConfig } from "./config-jsRYHOHU.mjs";
 import { getCredentialsPath, getDokployCredentials, getDokployRegistryId, getDokployToken, removeDokployCredentials, storeDokployCredentials, storeDokployRegistryId } from "./credentials-s1kLcIzK.mjs";
 import { ConstructGenerator, EndpointGenerator, OPENAPI_OUTPUT_PATH, copyAllClients, copyClientToFrontends, generateOpenApi, getBackendOpenApiPath, isPartitionedRoutes, normalizeRoutes, openapiCommand, resolveOpenApiConfig } from "./openapi-DenF-okj.mjs";
-import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-B7H2PPCS.mjs";
+import { getKeyPath, maskPassword, readStageSecrets, secretsExist, setCustomSecret, toEmbeddableSecrets, writeStageSecrets } from "./storage-Df-NFMY9.mjs";
 import { DokployApi } from "./dokploy-api-2ldYoN3i.mjs";
 import { encryptSecrets } from "./encryption-BOH5M-f-.mjs";
 import { CachedStateProvider } from "./CachedStateProvider-BDq5WqSy.mjs";
-import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-DmUOfLeX.mjs";
+import { createStageSecrets, generateConnectionUrls, generateDbPassword, generateDbUrl, generateFullstackCustomSecrets, generateServiceCredentials, rotateServicePassword, writeDockerEnvFromSecrets } from "./fullstack-secrets-Bnm_QeZr.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-C4UdILaI.mjs";
-import { isSSMConfigured, pullSecrets, pushSecrets } from "./sync-CzXruMzP.mjs";
+import { isSSMConfigured, pullSecrets, pushSecrets } from "./sync-D-7NTKvV.mjs";
 import { createRequire } from "node:module";
 import { copyFileSync, existsSync, readFileSync, unlinkSync } from "node:fs";
 import { basename, dirname, join, parse, relative, resolve } from "node:path";
@@ -35,7 +35,7 @@ import prompts from "prompts";
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.9";
+var version = "1.10.10";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -838,7 +838,7 @@ function rewriteUrlsWithPorts(secrets, resolvedPorts) {
 		for (const { defaultPort, resolvedPort } of portReplacements) if (value === String(defaultPort)) result[key] = String(resolvedPort);
 	}
 	for (const [key, value] of Object.entries(result)) {
-		if (!key.endsWith("_URL") && key !== "DATABASE_URL") continue;
+		if (!key.endsWith("_URL") && !key.endsWith("_ENDPOINT") && 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);
@@ -2198,7 +2198,7 @@ async function buildForProvider(provider, context, rootOutputDir, endpointGenera
 		let masterKey;
 		if (context.production?.bundle && !skipBundle) {
 			logger$9.log(`\n📦 Bundling production server...`);
-			const { bundleServer } = await import("./bundler-kk_XJTRp.mjs");
+			const { bundleServer } = await import("./bundler-BvByD6tt.mjs");
 			const allConstructs = [
 				...endpoints.map((e) => e.construct),
 				...functions.map((f) => f.construct),
@@ -2922,12 +2922,12 @@ services:
 `;
 	if (serviceMap.has("rabbitmq")) yaml += `      - RABBITMQ_URL=\${RABBITMQ_URL:-amqp://rabbitmq:5672}
 `;
-	if (serviceMap.has("minio")) yaml += `      - S3_ENDPOINT=\${S3_ENDPOINT:-http://minio:9000}
-      - S3_ACCESS_KEY_ID=\${MINIO_ACCESS_KEY:-app}
-      - S3_SECRET_ACCESS_KEY=\${MINIO_SECRET_KEY:-app}
-      - S3_BUCKET=\${MINIO_BUCKET:-app}
-      - S3_REGION=\${S3_REGION:-eu-west-1}
-      - S3_FORCE_PATH_STYLE=true
+	if (serviceMap.has("minio")) yaml += `      - STORAGE_ENDPOINT=\${STORAGE_ENDPOINT:-http://minio:9000}
+      - STORAGE_ACCESS_KEY_ID=\${STORAGE_ACCESS_KEY_ID:-${imageName}}
+      - STORAGE_SECRET_ACCESS_KEY=\${STORAGE_SECRET_ACCESS_KEY:-${imageName}}
+      - STORAGE_BUCKET=\${STORAGE_BUCKET:-${imageName}}
+      - STORAGE_REGION=\${STORAGE_REGION:-eu-west-1}
+      - STORAGE_FORCE_PATH_STYLE=true
 `;
 	yaml += `    healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:${port}${healthCheckPath}"]
@@ -3009,12 +3009,13 @@ services:
     container_name: minio
     restart: unless-stopped
     entrypoint: sh
-    command: -c 'mkdir -p /data/\${MINIO_BUCKET:-app} && /usr/bin/docker-entrypoint.sh server --console-address ":9001" /data'
+    command: -c 'mkdir -p /data/\${STORAGE_BUCKET:-${imageName}} && /usr/bin/docker-entrypoint.sh server --console-address ":9001" /data'
     environment:
-      MINIO_ROOT_USER: \${MINIO_ACCESS_KEY:-app}
-      MINIO_ROOT_PASSWORD: \${MINIO_SECRET_KEY:-app}
+      MINIO_ROOT_USER: \${STORAGE_ACCESS_KEY_ID:-${imageName}}
+      MINIO_ROOT_PASSWORD: \${STORAGE_SECRET_ACCESS_KEY:-${imageName}}
     ports:
-      - "9001:9001"  # Console UI
+      - "\${MINIO_API_PORT:-9000}:9000"
+      - "\${MINIO_CONSOLE_PORT:-9001}:9001"
     volumes:
       - minio_data:/data
     healthcheck:
@@ -3102,6 +3103,7 @@ services:
 `;
 	for (const [appName, app] of apps) yaml += generateAppService(appName, app, apps, {
 		registry,
+		projectName: workspace.name,
 		hasPostgres,
 		hasRedis,
 		hasMinio
@@ -3157,12 +3159,13 @@ services:
     container_name: ${workspace.name}-minio
     restart: unless-stopped
     entrypoint: sh
-    command: -c 'mkdir -p /data/\${MINIO_BUCKET:-app} && /usr/bin/docker-entrypoint.sh server --console-address ":9001" /data'
+    command: -c 'mkdir -p /data/\${STORAGE_BUCKET:-${workspace.name}} && /usr/bin/docker-entrypoint.sh server --console-address ":9001" /data'
     environment:
-      MINIO_ROOT_USER: \${MINIO_ACCESS_KEY:-app}
-      MINIO_ROOT_PASSWORD: \${MINIO_SECRET_KEY:-app}
+      MINIO_ROOT_USER: \${STORAGE_ACCESS_KEY_ID:-${workspace.name}}
+      MINIO_ROOT_PASSWORD: \${STORAGE_SECRET_ACCESS_KEY:-${workspace.name}}
     ports:
-      - "9001:9001"  # Console UI
+      - "\${MINIO_API_PORT:-9000}:9000"
+      - "\${MINIO_CONSOLE_PORT:-9001}:9001"
     volumes:
       - minio_data:/data
     healthcheck:
@@ -3216,7 +3219,7 @@ function getInfraServiceImage(serviceName, config$1) {
 * Generate a service definition for an app.
 */
 function generateAppService(appName, app, allApps, options) {
-	const { registry, hasPostgres, hasRedis, hasMinio } = options;
+	const { registry, projectName, hasPostgres, hasRedis, hasMinio } = options;
 	const imageRef = registry ? `\${REGISTRY:-${registry}}/` : "";
 	const healthCheckPath = app.type === "frontend" ? "/" : "/health";
 	const healthCheckCmd = app.type === "frontend" ? `["CMD", "wget", "-q", "--spider", "http://localhost:${app.port}/"]` : `["CMD", "wget", "-q", "--spider", "http://localhost:${app.port}${healthCheckPath}"]`;
@@ -3244,12 +3247,12 @@ function generateAppService(appName, app, allApps, options) {
 `;
 		if (hasRedis) yaml += `      - REDIS_URL=\${REDIS_URL:-redis://redis:6379}
 `;
-		if (hasMinio) yaml += `      - S3_ENDPOINT=\${S3_ENDPOINT:-http://minio:9000}
-      - S3_ACCESS_KEY_ID=\${MINIO_ACCESS_KEY:-app}
-      - S3_SECRET_ACCESS_KEY=\${MINIO_SECRET_KEY:-app}
-      - S3_BUCKET=\${MINIO_BUCKET:-app}
-      - S3_REGION=\${S3_REGION:-eu-west-1}
-      - S3_FORCE_PATH_STYLE=true
+		if (hasMinio) yaml += `      - STORAGE_ENDPOINT=\${STORAGE_ENDPOINT:-http://minio:9000}
+      - STORAGE_ACCESS_KEY_ID=\${STORAGE_ACCESS_KEY_ID:-${projectName}}
+      - STORAGE_SECRET_ACCESS_KEY=\${STORAGE_SECRET_ACCESS_KEY:-${projectName}}
+      - STORAGE_BUCKET=\${STORAGE_BUCKET:-${projectName}}
+      - STORAGE_REGION=\${STORAGE_REGION:-eu-west-1}
+      - STORAGE_FORCE_PATH_STYLE=true
 `;
 	}
 	yaml += `    healthcheck:
@@ -6307,7 +6310,7 @@ async function deployCommand(options) {
 		dokployConfig = setupResult.config;
 		finalRegistry = dokployConfig.registry ?? dockerConfig.registry;
 		if (setupResult.serviceUrls) {
-			const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1, initStageSecrets } = await import("./storage-C1FNm2EP.mjs");
+			const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1, initStageSecrets } = await import("./storage-D3lh8Xpq.mjs");
 			let secrets = await readStageSecrets$1(stage);
 			if (!secrets) {
 				logger$3.log(`   Creating secrets file for stage "${stage}"...`);
@@ -11131,7 +11134,7 @@ async function secretsInitCommand(options) {
 	if (secrets.urls.DATABASE_URL) logger$2.log(`\n  DATABASE_URL: ${maskUrl(secrets.urls.DATABASE_URL)}`);
 	if (secrets.urls.REDIS_URL) logger$2.log(`  REDIS_URL: ${maskUrl(secrets.urls.REDIS_URL)}`);
 	if (secrets.urls.RABBITMQ_URL) logger$2.log(`  RABBITMQ_URL: ${maskUrl(secrets.urls.RABBITMQ_URL)}`);
-	if (secrets.urls.S3_ENDPOINT) logger$2.log(`  S3_ENDPOINT: ${secrets.urls.S3_ENDPOINT}`);
+	if (secrets.urls.STORAGE_ENDPOINT) logger$2.log(`  STORAGE_ENDPOINT: ${secrets.urls.STORAGE_ENDPOINT}`);
 	if (Object.keys(secrets.custom).length > 0) logger$2.log(`\n  Custom secrets: ${Object.keys(secrets.custom).length}`);
 	logger$2.log(`\n  Use "gkm secrets:show --stage ${stage}" to view secrets`);
 	logger$2.log("  Use \"gkm secrets:set <KEY> <VALUE> --stage " + stage + "\" to add custom secrets");
@@ -11199,7 +11202,7 @@ async function secretsShowCommand(options) {
 	if (secrets.urls.DATABASE_URL) logger$2.log(`  DATABASE_URL: ${reveal ? secrets.urls.DATABASE_URL : maskUrl(secrets.urls.DATABASE_URL)}`);
 	if (secrets.urls.REDIS_URL) logger$2.log(`  REDIS_URL: ${reveal ? secrets.urls.REDIS_URL : maskUrl(secrets.urls.REDIS_URL)}`);
 	if (secrets.urls.RABBITMQ_URL) logger$2.log(`  RABBITMQ_URL: ${reveal ? secrets.urls.RABBITMQ_URL : maskUrl(secrets.urls.RABBITMQ_URL)}`);
-	if (secrets.urls.S3_ENDPOINT) logger$2.log(`  S3_ENDPOINT: ${secrets.urls.S3_ENDPOINT}`);
+	if (secrets.urls.STORAGE_ENDPOINT) logger$2.log(`  STORAGE_ENDPOINT: ${secrets.urls.STORAGE_ENDPOINT}`);
 	const customKeys = Object.keys(secrets.custom);
 	if (customKeys.length > 0) {
 		logger$2.log("\nCustom Secrets:");
@@ -11398,6 +11401,10 @@ function reconcileSecrets(secrets, workspace) {
 	];
 	for (const { key, name: name$1 } of serviceMap) if (workspace.services[key] && !result.services[name$1]) {
 		const creds = generateServiceCredentials(name$1);
+		if (name$1 === "minio") {
+			creds.bucket = workspace.name;
+			creds.username = workspace.name;
+		}
 		result = {
 			...result,
 			services: {
@@ -11983,9 +11990,9 @@ program.command("secrets:push").description("Push secrets to remote provider (SS
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { pushSecrets: pushSecrets$1 } = await import("./sync-CyGe5f1I.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-C0dsg-Gq.mjs");
-		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-C1FNm2EP.mjs");
+		const { pushSecrets: pushSecrets$1 } = await import("./sync-CIzj1CQe.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile--yaWO052.mjs");
+		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-D3lh8Xpq.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
 		if (secrets) {
@@ -12008,9 +12015,9 @@ program.command("secrets:pull").description("Pull secrets from remote provider (
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig: loadWorkspaceConfig$1 } = await import("./config.mjs");
-		const { pullSecrets: pullSecrets$1 } = await import("./sync-CyGe5f1I.mjs");
-		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-C1FNm2EP.mjs");
-		const { reconcileMissingSecrets } = await import("./reconcile-C0dsg-Gq.mjs");
+		const { pullSecrets: pullSecrets$1 } = await import("./sync-CIzj1CQe.mjs");
+		const { writeStageSecrets: writeStageSecrets$1 } = await import("./storage-D3lh8Xpq.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile--yaWO052.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		let secrets = await pullSecrets$1(options.stage, workspace);
 		if (!secrets) {
@@ -12035,8 +12042,8 @@ 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-C0dsg-Gq.mjs");
-		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-C1FNm2EP.mjs");
+		const { reconcileMissingSecrets } = await import("./reconcile--yaWO052.mjs");
+		const { readStageSecrets: readStageSecrets$1, writeStageSecrets: writeStageSecrets$1 } = await import("./storage-D3lh8Xpq.mjs");
 		const { workspace } = await loadWorkspaceConfig$1();
 		const secrets = await readStageSecrets$1(options.stage, workspace.root);
 		if (!secrets) {