@friggframework/devtools 2.0.0--canary.413.39a9576.0 → 2.0.0--canary.414.451bd3d.0

package/frigg-cli/deploy-command/index.js

@@ -1,11 +1,90 @@
 const { spawn, spawnSync } = require('child_process');
 const path = require('path');
+const fs = require('fs');
 
 async function deployCommand(options) {
     console.log('Deploying the serverless application...');
 
+    // Collect validated environment variables
+    let integrationEnvironmentVariables = { ...process.env }; // Start with all, then filter
+
+    // Try to load and validate environment from appDefinition
+    const appDefPath = path.join(process.cwd(), 'index.js');
+    if (fs.existsSync(appDefPath)) {
+        try {
+            const { Definition } = require(appDefPath);
+
+            if (Definition.environment) {
+                console.log(
+                    '🔧 Loading environment configuration from appDefinition...'
+                );
+                const envVars = Object.keys(Definition.environment).filter(
+                    (key) => Definition.environment[key] === true
+                );
+                console.log(
+                    `   Found ${
+                        envVars.length
+                    } environment variables: ${envVars.join(', ')}`
+                );
+
+                // Try to use the env-validator if available
+                try {
+                    const {
+                        validateEnvironmentVariables,
+                    } = require('@friggframework/devtools/infrastructure/env-validator');
+                    const validation = validateEnvironmentVariables(Definition);
+
+                    if (
+                        validation.missing.length > 0 &&
+                        !options.skipEnvValidation
+                    ) {
+                        console.warn(
+                            '⚠️  Warning: Missing environment variables detected'
+                        );
+                        console.warn(
+                            '   Run with --skip-env-validation to bypass this check'
+                        );
+                    }
+
+                    // Only pass the environment variables defined in app definition
+                    integrationEnvironmentVariables = Object.fromEntries(
+                        envVars
+                            .map((key) => [key, process.env[key]])
+                            .filter(([_, value]) => value !== undefined)
+                    );
+                } catch (validatorError) {
+                    // Validator not available in current version, just warn
+                    const missing = envVars.filter((v) => !process.env[v]);
+                    if (missing.length > 0) {
+                        console.warn(
+                            `⚠️  Warning: Missing environment variables: ${missing.join(
+                                ', '
+                            )}`
+                        );
+                        console.warn(
+                            '   These should be set in your CI/CD environment or .env file'
+                        );
+                    }
+
+                    // Only pass the environment variables defined in app definition
+                    integrationEnvironmentVariables = Object.fromEntries(
+                        envVars
+                            .map((key) => [key, process.env[key]])
+                            .filter(([_, value]) => value !== undefined)
+                    );
+                }
+            }
+        } catch (error) {
+            console.warn(
+                'Could not load appDefinition environment config:',
+                error.message
+            );
+            // Keep all env vars if we can't validate
+        }
+    }
+
     // AWS discovery is now handled directly in serverless-template.js
-    console.log('🔥 Deploying serverless application...');
+    console.log('🚀 Deploying serverless application...');
     const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';
     const command = 'serverless';
@@ -17,12 +96,10 @@ async function deployCommand(options) {
         options.stage,
     ];
 
-    console.log('>>> Env vars: ', JSON.stringify(process.env));
-
     const childProcess = spawn(command, serverlessArgs, {
         cwd: backendPath,
         stdio: 'inherit',
-        env: { ...process.env },
+        env: integrationEnvironmentVariables, // Only pass validated environment variables
     });
 
     childProcess.on('error', (error) => {