@friggframework/devtools 2.0.0--canary.622.bcbe848.0 → 2.0.0--canary.623.ee3bde8.0

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

@@ -1,42 +1,20 @@
 /**
  * Environment Builder Service
- *
+ * 
  * Domain Service - Hexagonal Architecture
- *
+ * 
  * Builds Lambda environment variable configuration from:
  * 1. AppDefinition environment flags
  * 2. Discovered AWS resources (VPC IDs, KMS keys, etc.)
  * 3. Generated resource references
  */
 
-// OTLP-family exporters read their endpoint/headers from these standard env
-// vars (ADR-011). When such an exporter is configured we auto-register them as
-// Serverless passthroughs so the deployed Lambda inherits them from the deploy
-// environment — no need for the adopter to also list them under `environment`.
-//
-// NOTE (VPC egress): a Lambda in a private subnet needs a NAT gateway or a VPC
-// endpoint to reach an external OTLP backend (Honeycomb/Datadog). Without egress
-// the exporter fails silently within its flush timeout — see the deploy docs.
-const OTLP_EXPORTER_TYPES = new Set(['otlp', 'honeycomb', 'datadog']);
-const OTEL_PASSTHROUGH_VARS = [
-    'OTEL_EXPORTER_OTLP_ENDPOINT',
-    'OTEL_EXPORTER_OTLP_HEADERS',
-];
-
-function addTelemetryEnvPassthrough(appDefinition, envVars) {
-    const exporterType = appDefinition?.telemetry?.exporter?.type;
-    if (!OTLP_EXPORTER_TYPES.has(exporterType)) return;
-    for (const key of OTEL_PASSTHROUGH_VARS) {
-        envVars[key] = `\${env:${key}, ''}`;
-    }
-}
-
 /**
  * Get environment variables from AppDefinition
- *
+ * 
  * Extracts environment variable definitions where value is true,
  * and creates Serverless variable references.
- *
+ * 
  * @param {Object} appDefinition - Application definition
  * @returns {Object} Environment variable mappings
  */
@@ -60,8 +38,6 @@ function getAppEnvironmentVars(appDefinition) {
         'AWS_SESSION_TOKEN',
     ]);
 
-    addTelemetryEnvPassthrough(appDefinition, envVars);
-
     if (!appDefinition.environment) {
         return envVars;
     }
@@ -89,8 +65,7 @@ function getAppEnvironmentVars(appDefinition) {
     }
     if (skippedKeys.length > 0) {
         console.log(
-            `   ⚠️  Skipped ${
-                skippedKeys.length
+            `   ⚠️  Skipped ${skippedKeys.length
             } reserved AWS Lambda variables: ${skippedKeys.join(', ')}`
         );
     }
@@ -100,9 +75,9 @@ function getAppEnvironmentVars(appDefinition) {
 
 /**
  * Build complete environment configuration for Lambda functions
- *
+ * 
  * Combines app environment vars with discovered AWS resource references
- *
+ * 
  * @param {Object} appEnvironmentVars - Environment vars from AppDefinition
  * @param {Object} discoveredResources - Discovered AWS resources
  * @returns {Object} Complete environment configuration
@@ -110,7 +85,7 @@ function getAppEnvironmentVars(appDefinition) {
 function buildEnvironment(appEnvironmentVars, discoveredResources) {
     const environment = {
         ...appEnvironmentVars,
-        STAGE: '${self:provider.stage}', // Used by encryption bypass logic
+        STAGE: '${self:provider.stage}',  // Used by encryption bypass logic
         FRIGG_STACK: '${self:service}',
         FRIGG_STAGE: '${self:provider.stage}',
         FRIGG_REGION: '${self:provider.region}',
@@ -126,9 +101,7 @@ function buildEnvironment(appEnvironmentVars, discoveredResources) {
     // Add database connection info if discovered
     if (discoveredResources.auroraClusterEndpoint) {
         environment.DATABASE_HOST = discoveredResources.auroraClusterEndpoint;
-        environment.DATABASE_PORT = String(
-            discoveredResources.auroraPort || 5432
-        );
+        environment.DATABASE_PORT = String(discoveredResources.auroraPort || 5432);
     }
 
     // Add secrets manager secret ARN if discovered
@@ -143,3 +116,4 @@ module.exports = {
     getAppEnvironmentVars,
     buildEnvironment,
 };
+

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

@@ -1,13 +1,10 @@
 /**
  * Tests for Environment Builder Service
- *
+ * 
  * Tests environment variable extraction and building
  */
 
-const {
-    getAppEnvironmentVars,
-    buildEnvironment,
-} = require('./environment-builder');
+const { getAppEnvironmentVars, buildEnvironment } = require('./environment-builder');
 
 describe('Environment Builder', () => {
     describe('getAppEnvironmentVars()', () => {
@@ -111,42 +108,6 @@ describe('Environment Builder', () => {
         });
     });
 
-    describe('telemetry env passthrough (ADR-011)', () => {
-        it('auto-adds OTLP env passthroughs when an OTLP-family exporter is configured', () => {
-            const result = getAppEnvironmentVars({
-                telemetry: { exporter: { type: 'otlp' } },
-            });
-
-            expect(result.OTEL_EXPORTER_OTLP_ENDPOINT).toBe(
-                "${env:OTEL_EXPORTER_OTLP_ENDPOINT, ''}"
-            );
-            expect(result.OTEL_EXPORTER_OTLP_HEADERS).toBe(
-                "${env:OTEL_EXPORTER_OTLP_HEADERS, ''}"
-            );
-        });
-
-        it.each(['honeycomb', 'datadog'])(
-            'adds OTLP passthroughs for the "%s" preset',
-            (type) => {
-                const result = getAppEnvironmentVars({
-                    telemetry: { exporter: { type } },
-                });
-                expect(result.OTEL_EXPORTER_OTLP_ENDPOINT).toBeDefined();
-            }
-        );
-
-        it('adds no OTLP env vars for console/none exporters or absent telemetry', () => {
-            expect(
-                getAppEnvironmentVars({
-                    telemetry: { exporter: { type: 'console' } },
-                }).OTEL_EXPORTER_OTLP_ENDPOINT
-            ).toBeUndefined();
-            expect(
-                getAppEnvironmentVars({}).OTEL_EXPORTER_OTLP_ENDPOINT
-            ).toBeUndefined();
-        });
-    });
-
     describe('buildEnvironment()', () => {
         it('should combine app vars with standard Frigg variables', () => {
             const appEnvironmentVars = {
@@ -154,10 +115,7 @@ describe('Environment Builder', () => {
             };
             const discoveredResources = {};
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
             expect(result.API_KEY).toBe("${env:API_KEY, ''}");
             expect(result.STAGE).toBe('${self:provider.stage}');
@@ -172,14 +130,9 @@ describe('Environment Builder', () => {
                 kmsKeyId: 'arn:aws:kms:us-east-1:123456:key/abc-123',
             };
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
-            expect(result.KMS_KEY_ARN).toBe(
-                'arn:aws:kms:us-east-1:123456:key/abc-123'
-            );
+            expect(result.KMS_KEY_ARN).toBe('arn:aws:kms:us-east-1:123456:key/abc-123');
         });
 
         it('should prefer kmsKeyId over kmsKeyArn if both present', () => {
@@ -189,33 +142,22 @@ describe('Environment Builder', () => {
                 kmsKeyArn: 'arn:aws:kms:us-east-1:123456:key/secondary',
             };
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
             // Implementation uses if/else-if, so kmsKeyId takes priority
-            expect(result.KMS_KEY_ARN).toBe(
-                'arn:aws:kms:us-east-1:123456:key/primary'
-            );
+            expect(result.KMS_KEY_ARN).toBe('arn:aws:kms:us-east-1:123456:key/primary');
         });
 
         it('should add database connection info if discovered', () => {
             const appEnvironmentVars = {};
             const discoveredResources = {
-                auroraClusterEndpoint:
-                    'cluster.abc.us-east-1.rds.amazonaws.com',
+                auroraClusterEndpoint: 'cluster.abc.us-east-1.rds.amazonaws.com',
                 auroraPort: 5432,
             };
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
-            expect(result.DATABASE_HOST).toBe(
-                'cluster.abc.us-east-1.rds.amazonaws.com'
-            );
+            expect(result.DATABASE_HOST).toBe('cluster.abc.us-east-1.rds.amazonaws.com');
             expect(result.DATABASE_PORT).toBe('5432');
         });
 
@@ -225,10 +167,7 @@ describe('Environment Builder', () => {
                 auroraClusterEndpoint: 'cluster.example.com',
             };
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
             expect(result.DATABASE_HOST).toBe('cluster.example.com');
             expect(result.DATABASE_PORT).toBe('5432');
@@ -237,18 +176,12 @@ describe('Environment Builder', () => {
         it('should add database secret ARN if discovered', () => {
             const appEnvironmentVars = {};
             const discoveredResources = {
-                databaseSecretArn:
-                    'arn:aws:secretsmanager:us-east-1:123456:secret:db-secret',
+                databaseSecretArn: 'arn:aws:secretsmanager:us-east-1:123456:secret:db-secret',
             };
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
-            expect(result.DATABASE_SECRET_ARN).toBe(
-                'arn:aws:secretsmanager:us-east-1:123456:secret:db-secret'
-            );
+            expect(result.DATABASE_SECRET_ARN).toBe('arn:aws:secretsmanager:us-east-1:123456:secret:db-secret');
         });
 
         it('should combine all discovered resources', () => {
@@ -259,27 +192,19 @@ describe('Environment Builder', () => {
                 kmsKeyArn: 'arn:aws:kms:us-east-1:123456:key/abc',
                 auroraClusterEndpoint: 'db.example.com',
                 auroraPort: 3306,
-                databaseSecretArn:
-                    'arn:aws:secretsmanager:us-east-1:123456:secret:db',
+                databaseSecretArn: 'arn:aws:secretsmanager:us-east-1:123456:secret:db',
             };
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
             expect(result.CUSTOM_VAR).toBe("${env:CUSTOM_VAR, ''}");
             expect(result.FRIGG_STACK).toBe('${self:service}');
             expect(result.FRIGG_STAGE).toBe('${self:provider.stage}');
             expect(result.FRIGG_REGION).toBe('${self:provider.region}');
-            expect(result.KMS_KEY_ARN).toBe(
-                'arn:aws:kms:us-east-1:123456:key/abc'
-            );
+            expect(result.KMS_KEY_ARN).toBe('arn:aws:kms:us-east-1:123456:key/abc');
             expect(result.DATABASE_HOST).toBe('db.example.com');
             expect(result.DATABASE_PORT).toBe('3306');
-            expect(result.DATABASE_SECRET_ARN).toBe(
-                'arn:aws:secretsmanager:us-east-1:123456:secret:db'
-            );
+            expect(result.DATABASE_SECRET_ARN).toBe('arn:aws:secretsmanager:us-east-1:123456:secret:db');
         });
 
         it('should handle empty discoveredResources', () => {
@@ -288,10 +213,7 @@ describe('Environment Builder', () => {
             };
             const discoveredResources = {};
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
             expect(result.API_KEY).toBe("${env:API_KEY, ''}");
             expect(result.FRIGG_STACK).toBe('${self:service}');
@@ -315,13 +237,11 @@ describe('Environment Builder', () => {
                 auroraPort: 3306, // Number
             };
 
-            const result = buildEnvironment(
-                appEnvironmentVars,
-                discoveredResources
-            );
+            const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
             expect(result.DATABASE_PORT).toBe('3306'); // String
             expect(typeof result.DATABASE_PORT).toBe('string');
         });
     });
 });
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.622.bcbe848.0",
+  "version": "2.0.0--canary.623.ee3bde8.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -25,9 +25,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.622.bcbe848.0",
-    "@friggframework/schemas": "2.0.0--canary.622.bcbe848.0",
-    "@friggframework/test": "2.0.0--canary.622.bcbe848.0",
+    "@friggframework/core": "2.0.0--canary.623.ee3bde8.0",
+    "@friggframework/schemas": "2.0.0--canary.623.ee3bde8.0",
+    "@friggframework/test": "2.0.0--canary.623.ee3bde8.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.18.0",
@@ -55,8 +55,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.622.bcbe848.0",
-    "@friggframework/prettier-config": "2.0.0--canary.622.bcbe848.0",
+    "@friggframework/eslint-config": "2.0.0--canary.623.ee3bde8.0",
+    "@friggframework/prettier-config": "2.0.0--canary.623.ee3bde8.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bcbe848aba41074b800d057b608dbc787d24c0ed"
+  "gitHead": "ee3bde8d1adc7e90a424a26429ce4b4d612ff52f"
 }