@friggframework/devtools 2.0.0--canary.654.3cd4278.0 → 2.0.0--canary.654.5821f44.0

package/infrastructure/domains/shared/environment-builder.js

@@ -49,9 +49,22 @@ function addTelemetryEnvPassthrough(appDefinition, envVars) {
 // the core default, so it emits no env var.
 function addLoggingEnv(appDefinition, envVars) {
     const level = appDefinition?.logging?.level;
-    if (level === undefined) return;
+    const normalized = level === undefined ? undefined : normalizeLogLevel(level);
+
+    // serverless-offline copies only AWS_* shell vars into handlers, so under
+    // frigg start the shell level must travel through provider.environment.
+    if (process.env.FRIGG_SKIP_AWS_DISCOVERY === 'true') {
+        const shellLevel = process.env.FRIGG_LOG_LEVEL?.trim();
+        if (shellLevel) {
+            envVars.FRIGG_LOG_LEVEL = shellLevel;
+            return;
+        }
+        // Emit INFO too: without it the local DEBUG default (IS_OFFLINE) wins.
+        if (normalized) envVars.FRIGG_LOG_LEVEL = normalized;
+        return;
+    }
 
-    const normalized = normalizeLogLevel(level);
+    if (normalized === undefined) return;
     if (normalized === 'INFO') {
         delete envVars.FRIGG_LOG_LEVEL;
         return;

package/infrastructure/domains/shared/environment-builder.test.js

@@ -206,6 +206,64 @@ describe('Environment Builder', () => {
                 getAppEnvironmentVars({ logging: { level: 'verbose' } })
             ).toThrow(/logging\.level/);
         });
+
+        describe('under frigg start (FRIGG_SKIP_AWS_DISCOVERY=true)', () => {
+            const saved = {};
+            const setEnv = (vars) => {
+                for (const [key, value] of Object.entries(vars)) {
+                    saved[key] = process.env[key];
+                    if (value === undefined) delete process.env[key];
+                    else process.env[key] = value;
+                }
+            };
+
+            beforeEach(() => setEnv({ FRIGG_SKIP_AWS_DISCOVERY: 'true', FRIGG_LOG_LEVEL: undefined }));
+
+            afterEach(() => {
+                for (const [key, value] of Object.entries(saved)) {
+                    if (value === undefined) delete process.env[key];
+                    else process.env[key] = value;
+                }
+            });
+
+            it('passes the shell FRIGG_LOG_LEVEL to the handlers, which serverless-offline would drop', () => {
+                setEnv({ FRIGG_LOG_LEVEL: 'warn' });
+
+                expect(getAppEnvironmentVars({}).FRIGG_LOG_LEVEL).toBe('warn');
+            });
+
+            it('lets the shell FRIGG_LOG_LEVEL win over logging.level', () => {
+                setEnv({ FRIGG_LOG_LEVEL: 'error' });
+
+                expect(
+                    getAppEnvironmentVars({ logging: { level: 'debug' } }).FRIGG_LOG_LEVEL
+                ).toBe('error');
+            });
+
+            it('emits logging.level INFO, so the local DEBUG default does not replace it', () => {
+                expect(
+                    getAppEnvironmentVars({ logging: { level: 'info' } }).FRIGG_LOG_LEVEL
+                ).toBe('INFO');
+            });
+
+            it('ignores an empty shell value', () => {
+                setEnv({ FRIGG_LOG_LEVEL: '  ' });
+
+                expect(getAppEnvironmentVars({})).not.toHaveProperty('FRIGG_LOG_LEVEL');
+                expect(
+                    getAppEnvironmentVars({ logging: { level: 'warn' } }).FRIGG_LOG_LEVEL
+                ).toBe('WARN');
+            });
+
+            it('does not read the shell value outside frigg start', () => {
+                setEnv({ FRIGG_SKIP_AWS_DISCOVERY: undefined, FRIGG_LOG_LEVEL: 'error' });
+
+                expect(getAppEnvironmentVars({})).not.toHaveProperty('FRIGG_LOG_LEVEL');
+                expect(
+                    getAppEnvironmentVars({ logging: { level: 'info' } })
+                ).not.toHaveProperty('FRIGG_LOG_LEVEL');
+            });
+        });
     });
 
     describe("getAppEnvironmentVars() - 'ssm' offload", () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.654.3cd4278.0",
+  "version": "2.0.0--canary.654.5821f44.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -26,9 +26,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.654.3cd4278.0",
-    "@friggframework/schemas": "2.0.0--canary.654.3cd4278.0",
-    "@friggframework/test": "2.0.0--canary.654.3cd4278.0",
+    "@friggframework/core": "2.0.0--canary.654.5821f44.0",
+    "@friggframework/schemas": "2.0.0--canary.654.5821f44.0",
+    "@friggframework/test": "2.0.0--canary.654.5821f44.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.18.0",
@@ -56,8 +56,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.654.3cd4278.0",
-    "@friggframework/prettier-config": "2.0.0--canary.654.3cd4278.0",
+    "@friggframework/eslint-config": "2.0.0--canary.654.5821f44.0",
+    "@friggframework/prettier-config": "2.0.0--canary.654.5821f44.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -89,5 +89,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3cd42784313ae866c499d7c7549b7c28e39d3045"
+  "gitHead": "5821f44da7972564eb82727042b9760556114670"
 }