@friggframework/devtools 2.0.0-next.34 → 2.0.0-next.35

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

@@ -5,7 +5,7 @@ async function deployCommand(options) {
     console.log('Deploying the serverless application...');
 
     // 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,8 +17,6 @@ async function deployCommand(options) {
         options.stage,
     ];
 
-    console.log('>>> Env vars: ', JSON.stringify(process.env));
-
     const childProcess = spawn(command, serverlessArgs, {
         cwd: backendPath,
         stdio: 'inherit',

package/infrastructure/serverless-template.js

@@ -558,7 +558,11 @@ const composeServerlessDefinition = async (AppDefinition) => {
     // Debug: log keys of env vars available during deploy (to verify GA -> Serverless pass-through)
     try {
         const envKeys = Object.keys(process.env || {}).sort();
-        console.log('Frigg deploy env keys (sample):', envKeys.slice(0, 30), `... total=${envKeys.length}`);
+        console.log(
+            'Frigg deploy env keys (sample):',
+            envKeys.slice(0, 30),
+            `... total=${envKeys.length}`
+        );
     } catch (e) {
         console.log('Frigg deploy env keys: <unavailable>', e?.message);
     }
@@ -584,8 +588,18 @@ const composeServerlessDefinition = async (AppDefinition) => {
             environment: {
                 STAGE: '${opt:stage, "dev"}',
                 AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1,
-                // Pass through all environment variables from the deployment process
-                ...process.env,
+                // Pass through FRIGG__ prefixed variables (stripping the prefix)
+                // This avoids CloudFormation validation errors from system variables
+                ...Object.fromEntries(
+                    Object.entries(process.env)
+                        .filter(([key]) => key.startsWith('FRIGG__'))
+                        .map(([key, value]) => [
+                            key.replace('FRIGG__', ''),
+                            value,
+                        ])
+                ),
+                // Also include essential non-prefixed variables
+                ...(process.env.NODE_ENV && { NODE_ENV: process.env.NODE_ENV }),
                 // Add discovered resources to environment if available
                 ...(discoveredResources.defaultVpcId && {
                     AWS_DISCOVERY_VPC_ID: discoveredResources.defaultVpcId,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.34",
+  "version": "2.0.0-next.35",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -9,8 +9,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0-next.34",
-    "@friggframework/test": "2.0.0-next.34",
+    "@friggframework/schemas": "2.0.0-next.35",
+    "@friggframework/test": "2.0.0-next.35",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -32,8 +32,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.34",
-    "@friggframework/prettier-config": "2.0.0-next.34",
+    "@friggframework/eslint-config": "2.0.0-next.35",
+    "@friggframework/prettier-config": "2.0.0-next.35",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "13e17e28d6859ea0c4d30a14255db89d4968bcde"
+  "gitHead": "2b5b01f23819faad6b2780f1aaabbd9bfb52fe4a"
 }