@crossdelta/infrastructure 0.12.1 → 0.12.3

package/bin/generate-env.mjs

@@ -94,6 +94,13 @@ var getLocalUrl = (config) => {
   }
   return `http://localhost:${port}`;
 };
+var isDeploymentUrl = (value) => value.startsWith("https://") && !value.includes("localhost") && !value.includes("${");
+var warnIfDeploymentUrl = (serviceName, key, value) => {
+  if (!isDeploymentUrl(value))
+    return;
+  console.warn(`⚠️  ${serviceName}: ${key}=${value} looks like a deployment URL and will be written to .env.local.
+` + `   If this value is only meaningful in the deployed container, use containerEnv: instead of env:.`);
+};
 var buildServiceEnvLines = (serviceConfigs) => {
   const lines = [];
   lines.push("", "# Service URLs");
@@ -113,6 +120,7 @@ var buildServiceEnvLines = (serviceConfigs) => {
     lines.push("", "# Service Environment");
     for (const config of envLiteralConfigs) {
       for (const [key, value] of Object.entries(config.envLiterals)) {
+        warnIfDeploymentUrl(config.name, key, value);
         lines.push(`${key}=${value}`);
       }
     }
@@ -132,7 +140,10 @@ var findWorkspaceRoot = () => {
 };
 var loadPulumiConfig = async (infraDirectory, stack) => {
   try {
-    const stdout = execSync(`pulumi config --show-secrets --json --stack ${stack} --cwd ${infraDirectory}`, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+    const stdout = execSync(`pulumi config --show-secrets --json --stack ${stack} --cwd ${infraDirectory}`, {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
     const config = JSON.parse(stdout);
     return Object.entries(config).filter(([key]) => key.includes(":")).filter(([, entry]) => entry.value !== undefined && entry.value !== null && entry.value !== "undefined").map(([fullKey, entry]) => {
       const [, rawKey] = fullKey.split(":");

package/bin/generate-env.ts

@@ -85,6 +85,17 @@ const getLocalUrl = (config: MinimalServiceConfig): string | undefined => {
   return `http://localhost:${port}`
 }
 
+const isDeploymentUrl = (value: string): boolean =>
+  value.startsWith('https://') && !value.includes('localhost') && !value.includes('${')
+
+const warnIfDeploymentUrl = (serviceName: string, key: string, value: string): void => {
+  if (!isDeploymentUrl(value)) return
+  console.warn(
+    `⚠️  ${serviceName}: ${key}=${value} looks like a deployment URL and will be written to .env.local.\n` +
+      `   If this value is only meaningful in the deployed container, use containerEnv: instead of env:.`,
+  )
+}
+
 const buildServiceEnvLines = (serviceConfigs: MinimalServiceConfig[]): string[] => {
   const lines: string[] = []
 
@@ -108,6 +119,7 @@ const buildServiceEnvLines = (serviceConfigs: MinimalServiceConfig[]): string[]
     lines.push('', '# Service Environment')
     for (const config of envLiteralConfigs) {
       for (const [key, value] of Object.entries(config.envLiterals)) {
+        warnIfDeploymentUrl(config.name, key, value)
         lines.push(`${key}=${value}`)
       }
     }
@@ -116,8 +128,7 @@ const buildServiceEnvLines = (serviceConfigs: MinimalServiceConfig[]): string[]
   return lines
 }
 
-const hasLockFile = (directory: string): boolean =>
-  LOCK_FILES.some((file) => existsSync(join(directory, file)))
+const hasLockFile = (directory: string): boolean => LOCK_FILES.some((file) => existsSync(join(directory, file)))
 
 const findWorkspaceRoot = (): string => {
   let directory = process.cwd()
@@ -131,10 +142,10 @@ const findWorkspaceRoot = (): string => {
 
 const loadPulumiConfig = async (infraDirectory: string, stack: string): Promise<string[]> => {
   try {
-    const stdout = execSync(
-      `pulumi config --show-secrets --json --stack ${stack} --cwd ${infraDirectory}`,
-      { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] },
-    )
+    const stdout = execSync(`pulumi config --show-secrets --json --stack ${stack} --cwd ${infraDirectory}`, {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    })
 
     const config = JSON.parse(stdout) as Record<string, PulumiConfigEntry>
 
@@ -160,8 +171,7 @@ const discoverServices = (servicesDirectory: string): MinimalServiceConfig[] =>
 
     // Extract port from ports() API: ports().http(4001) or ports().primary(4222)
     const portsApiMatch =
-      content.match(/ports\(\)\.(?:http|https|grpc|primary)\((\d+)\)/) ||
-      content.match(/ports\(\)\.add\((\d+)/)
+      content.match(/ports\(\)\.(?:http|https|grpc|primary)\((\d+)\)/) || content.match(/ports\(\)\.add\((\d+)/)
 
     return {
       name: extract.string(content, /name:\s*['"]([^'"]+)['"]/) ?? file.replace('.ts', ''),
@@ -193,7 +203,7 @@ const main = async () => {
   }
 
   const serviceConfigs = discoverServices(servicesDirectory)
-  
+
   if (serviceConfigs.length > 0) {
     envLines.push(...buildServiceEnvLines(serviceConfigs))
     console.log(`✅ Discovered ${serviceConfigs.length} services`)

package/dist/index.cjs

@@ -1170,11 +1170,8 @@ var generateHandleBlock = (handle, level, basicAuth) => {
 ${inner}
 }`, level);
 };
-var generateRouteBlock = (route, encode, useOnDemandTls) => {
+var generateRouteBlock = (route, encode) => {
   const body = [];
-  if (useOnDemandTls) {
-    body.push("  tls {", "    on_demand", "  }");
-  }
   if (!route.redirect && encode?.length) {
     body.push(`  encode ${encode.join(" ")}`);
   }
@@ -1233,10 +1230,9 @@ var generateCaddyfile = (config) => {
   const healthCheckBlock = `:${healthCheck.port} {
   respond ${healthCheck.path} 200
 }`;
-  const useOnDemandTls = config.onDemandTls != null;
   const blocks = [
     generateGlobalBlock(config),
-    ...config.routes.map((route) => generateRouteBlock(route, config.encode, useOnDemandTls)),
+    ...config.routes.map((route) => generateRouteBlock(route, config.encode)),
     healthCheckBlock,
     ...config.catchAllUpstream && config.onDemandTls ? [generateCatchAllBlock(config.catchAllUpstream, config.encode)] : []
   ];

package/dist/index.js

@@ -1074,11 +1074,8 @@ var generateHandleBlock = (handle, level, basicAuth) => {
 ${inner}
 }`, level);
 };
-var generateRouteBlock = (route, encode, useOnDemandTls) => {
+var generateRouteBlock = (route, encode) => {
   const body = [];
-  if (useOnDemandTls) {
-    body.push("  tls {", "    on_demand", "  }");
-  }
   if (!route.redirect && encode?.length) {
     body.push(`  encode ${encode.join(" ")}`);
   }
@@ -1137,10 +1134,9 @@ var generateCaddyfile = (config) => {
   const healthCheckBlock = `:${healthCheck.port} {
   respond ${healthCheck.path} 200
 }`;
-  const useOnDemandTls = config.onDemandTls != null;
   const blocks = [
     generateGlobalBlock(config),
-    ...config.routes.map((route) => generateRouteBlock(route, config.encode, useOnDemandTls)),
+    ...config.routes.map((route) => generateRouteBlock(route, config.encode)),
     healthCheckBlock,
     ...config.catchAllUpstream && config.onDemandTls ? [generateCatchAllBlock(config.catchAllUpstream, config.encode)] : []
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossdelta/infrastructure",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "type": "module",
   "license": "MIT",
   "publishConfig": {