@friggframework/devtools 2.0.0--canary.461.ec909cf.0 → 2.0.0--canary.461.7b36f0f.0

package/infrastructure/infrastructure-composer.js

@@ -0,0 +1,85 @@
+/**
+ * Infrastructure Composer
+ * 
+ * Application Layer - Hexagonal Architecture
+ * 
+ * Orchestrates the composition of serverless infrastructure definitions
+ * using domain builders and shared utilities.
+ */
+
+// Domain Builders
+const { BuilderOrchestrator } = require('./domains/shared/builder-orchestrator');
+const { VpcBuilder } = require('./domains/networking/vpc-builder');
+const { KmsBuilder } = require('./domains/security/kms-builder');
+const { AuroraBuilder } = require('./domains/database/aurora-builder');
+const { SsmBuilder } = require('./domains/parameters/ssm-builder');
+const { WebsocketBuilder } = require('./domains/integration/websocket-builder');
+const { IntegrationBuilder } = require('./domains/integration/integration-builder');
+
+// Utilities
+const { modifyHandlerPaths } = require('./domains/shared/utilities/handler-path-resolver');
+const { createBaseDefinition } = require('./domains/shared/utilities/base-definition-factory');
+const { ensurePrismaLayerExists } = require('./domains/shared/utilities/prisma-layer-manager');
+
+/**
+ * Compose serverless definition using domain builders
+ * 
+ * This is the main entry point that orchestrates all infrastructure building
+ * using the DDD/Hexagonal architecture pattern.
+ */
+const composeServerlessDefinition = async (AppDefinition) => {
+    console.log('🏗️  Composing serverless definition with domain builders...');
+
+    // Ensure Prisma layer exists (minimal, runtime only)
+    await ensurePrismaLayerExists(AppDefinition.database || {});
+
+    // Create orchestrator with all domain builders
+    const orchestrator = new BuilderOrchestrator([
+        new VpcBuilder(),
+        new KmsBuilder(),
+        new AuroraBuilder(),
+        new SsmBuilder(),
+        new WebsocketBuilder(),
+        new IntegrationBuilder(),
+    ]);
+
+    // Build all infrastructure (orchestrator handles validation, dependencies, parallel execution)
+    // Builders automatically skip if shouldExecute() returns false (e.g., local mode)
+    const { merged, discoveredResources, appEnvironmentVars } =
+        await orchestrator.buildAll(AppDefinition);
+
+    // Create base definition with core functions
+    const definition = createBaseDefinition(
+        AppDefinition,
+        appEnvironmentVars,
+        discoveredResources
+    );
+
+    // Merge builder results into definition
+    Object.assign(definition.resources.Resources, merged.resources);
+    definition.provider.iamRoleStatements.push(...merged.iamStatements);
+    Object.assign(definition.provider.environment, merged.environment);
+    Object.assign(definition.functions, merged.functions);
+
+    if (merged.vpcConfig) {
+        definition.provider.vpc = merged.vpcConfig;
+    }
+
+    // Add unique plugins (avoid duplicates)
+    merged.plugins.forEach(plugin => {
+        if (!definition.plugins.includes(plugin)) {
+            definition.plugins.push(plugin);
+        }
+    });
+
+    Object.assign(definition.custom, merged.custom);
+
+    // Modify handler paths for offline mode
+    definition.functions = modifyHandlerPaths(definition.functions);
+
+    console.log('✅ Serverless definition composed successfully');
+    return definition;
+};
+
+module.exports = { composeServerlessDefinition };
+

package/infrastructure/scripts/build-prisma-layer.js

@@ -3,25 +3,26 @@
 /**
  * Build Prisma Lambda Layer
  *
- * Creates a Lambda Layer containing Prisma packages and rhel-openssl-3.0.x binaries.
+ * Creates a MINIMAL Lambda Layer containing only Prisma runtime client and query engines.
  * This reduces individual Lambda function sizes by ~60% (120MB → 45MB).
  *
+ * IMPORTANT: This layer does NOT include the Prisma CLI (saves ~82MB).
+ * The CLI is only needed for migrations and is packaged separately with the dbMigrate function.
+ *
  * The layer is configured based on AppDefinition database settings:
- * - PostgreSQL: Includes PostgreSQL client + query engine
- * - MongoDB: Includes MongoDB client + query engine (if needed)
+ * - PostgreSQL: Includes PostgreSQL client + query engine only
+ * - MongoDB: Includes MongoDB client + query engine only (if needed)
  * - Defaults to PostgreSQL only if not specified
  *
  * Usage:
- *   node scripts/build-prisma-layer.js [--mongodb] [--postgresql]
+ *   node scripts/build-prisma-layer.js
  *   npm run build:prisma-layer
  *
  * Output:
  *   layers/prisma/nodejs/node_modules/
- *   ├── @prisma/client
- *   ├── @prisma/engines
+ *   ├── @prisma/client (runtime only, ~10-15MB)
  *   ├── generated/prisma-postgresql (if PostgreSQL enabled)
- *   ├── generated/prisma-mongodb (if MongoDB enabled)
- *   └── prisma (CLI for migrations)
+ *   └── generated/prisma-mongodb (if MongoDB enabled)
  *
  * See: LAMBDA-LAYER-PRISMA.md for complete documentation
  */
@@ -108,6 +109,10 @@ const FILES_TO_REMOVE = [
     'CHANGELOG*',   // Changelog files
     '*.test.js',    // Test files
     '*.spec.js',    // Spec files
+    '*mysql.wasm*',        // MySQL WASM files (not needed for PostgreSQL)
+    '*cockroachdb.wasm*',  // CockroachDB WASM files
+    '*sqlite.wasm*',       // SQLite WASM files
+    '*sqlserver.wasm*',    // SQL Server WASM files
 ];
 
 // ANSI color codes for output
@@ -179,25 +184,20 @@ async function createLayerStructure() {
 }
 
 /**
- * Install Prisma CLI and client directly into layer
- * @param {Boolean} includeCLI - Whether to include Prisma CLI (needed for migrations)
+ * Install Prisma client directly into layer (RUNTIME ONLY - NO CLI)
+ * 
+ * The Prisma CLI is NOT included in this layer to keep it small.
+ * For migrations, the dbMigrate function has its own separate packaging with CLI.
  */
-async function installPrismaPackages(includeCLI = false) {
-    logStep(3, `Installing Prisma packages (${includeCLI ? 'with CLI' : 'runtime only'})`);
+async function installPrismaPackages() {
+    logStep(3, 'Installing Prisma runtime client (CLI excluded)');
 
-    // Create a minimal package.json in the layer
+    // Create a minimal package.json with ONLY the runtime client
     const dependencies = {
         '@prisma/client': '^6.16.3',
-        '@prisma/engines': '^6.16.3',
     };
 
-    // Only include CLI if needed (saves 50MB + 32MB effect dependency)
-    if (includeCLI) {
-        dependencies['prisma'] = '^6.16.3';
-        log('  Including Prisma CLI for migrations', 'yellow');
-    } else {
-        log('  Runtime only - CLI excluded (saves ~82MB)', 'green');
-    }
+    log('  Runtime client only - CLI excluded (saves ~82MB)', 'green');
 
     const layerPackageJson = {
         name: 'prisma-lambda-layer',
@@ -210,14 +210,21 @@ async function installPrismaPackages(includeCLI = false) {
     await fs.writeJson(packageJsonPath, layerPackageJson, { spaces: 2 });
     logSuccess('Created layer package.json');
 
-    // Install Prisma packages
-    log('Installing prisma and @prisma/client...');
+    // Install Prisma packages with Lambda binary target
+    // Setting PRISMA_CLI_BINARY_TARGETS ensures only rhel-openssl-3.0.x binary is downloaded
+    log('Installing @prisma/client for AWS Lambda (rhel-openssl-3.0.x)...');
     try {
-        execSync('npm install --production --no-package-lock', {
+        const env = {
+            ...process.env,
+            PRISMA_CLI_BINARY_TARGETS: 'rhel-openssl-3.0.x',
+        };
+        
+        execSync('npm install --omit=dev --no-package-lock', {
             cwd: path.join(LAYER_OUTPUT_PATH, 'nodejs'),
-            stdio: 'inherit'
+            stdio: 'inherit',
+            env,
         });
-        logSuccess('Prisma packages installed');
+        logSuccess('Prisma packages installed with Lambda binary target');
     } catch (error) {
         throw new Error(`Failed to install Prisma packages: ${error.message}`);
     }
@@ -402,23 +409,22 @@ async function verifyRhelBinaries(expectedClients) {
 
 /**
  * Verify required files exist
- * @param {Boolean} includeCLI - Whether CLI files should be present
+ * Runtime layer should NOT have CLI files
  */
-async function verifyLayerStructure(includeCLI) {
-    logStep(8, 'Verifying layer structure');
+async function verifyLayerStructure() {
+    logStep(8, 'Verifying layer structure (runtime only)');
 
     const requiredPaths = [
         '@prisma/client/runtime',
         '@prisma/client/index.d.ts',
-        '@prisma/engines',
-        'generated/prisma-postgresql/schema.prisma',  // PostgreSQL
+        'generated/prisma-postgresql/schema.prisma',  // PostgreSQL (default)
     ];
 
-    // Only check for CLI files if CLI was included
-    if (includeCLI) {
-        requiredPaths.push('prisma/build');
-        requiredPaths.push('.bin/prisma');
-    }
+    // Verify CLI is NOT present (keeps layer small)
+    const forbiddenPaths = [
+        'prisma/build',
+        '.bin/prisma',
+    ];
 
     let allPresent = true;
 
@@ -436,7 +442,15 @@ async function verifyLayerStructure(includeCLI) {
         throw new Error('Layer structure verification failed - missing required files');
     }
 
-    logSuccess('All required files present');
+    logSuccess('All required runtime files present');
+    
+    // Verify CLI is NOT present
+    for (const forbiddenPath of forbiddenPaths) {
+        const fullPath = path.join(LAYER_NODE_MODULES, forbiddenPath);
+        if (await fs.pathExists(fullPath)) {
+            logWarning(`  ⚠ ${forbiddenPath} found (should be excluded for minimal layer)`);
+        }
+    }
 }
 
 /**
@@ -455,11 +469,11 @@ async function displayLayerSummary() {
     log(`Layer size: ~${layerSizeMB} MB`, 'green');
 
     log('\nPackages included:', 'bright');
-    log('  - prisma (CLI - installed)', 'reset');
-    log('  - @prisma/client (runtime - installed)', 'reset');
-    log('  - @prisma/engines (binaries - installed)', 'reset');
-    log('  - generated/prisma-postgresql (PostgreSQL only)', 'reset');
-    log('\nNote: MongoDB support excluded (not used in this project)', 'yellow');
+    log('  - @prisma/client (runtime only - ~10-15MB)', 'reset');
+    log('  - generated/prisma-postgresql (PostgreSQL client)', 'reset');
+    log('\nPackages EXCLUDED for minimal size:', 'bright');
+    log('  - prisma CLI (excluded - only in dbMigrate function)', 'yellow');
+    log('  - @prisma/engines (minimal - only rhel binary)', 'yellow');
 
     log('\nNext steps:', 'bright');
     log('  1. Verify layer structure: ls -lah layers/prisma/nodejs/node_modules/', 'reset');
@@ -473,13 +487,12 @@ async function displayLayerSummary() {
 /**
  * Main build function
  * @param {Object} databaseConfig - Database configuration from AppDefinition.database
- * @param {Boolean} includeCLI - Whether to include Prisma CLI (false = runtime only)
  */
-async function buildPrismaLayer(databaseConfig = {}, includeCLI = false) {
+async function buildPrismaLayer(databaseConfig = {}) {
     const startTime = Date.now();
 
     log('\n' + '='.repeat(60), 'bright');
-    log(`  Building Prisma Lambda Layer ${includeCLI ? '(with CLI)' : '(runtime only)'}`, 'bright');
+    log('  Building Minimal Prisma Lambda Layer (Runtime Only)', 'bright');
     log('='.repeat(60) + '\n', 'bright');
 
     // Log paths
@@ -493,12 +506,12 @@ async function buildPrismaLayer(databaseConfig = {}, includeCLI = false) {
     try {
         await cleanLayerDirectory();
         await createLayerStructure();
-        await installPrismaPackages(includeCLI);    // Install Prisma packages (CLI optional)
+        await installPrismaPackages();              // Install runtime client only (NO CLI)
         await copyPrismaPackages(clientPackages);   // Copy generated clients from core
         await removeUnnecessaryFiles();             // Remove source maps, docs, tests (37MB+)
         await removeNonRhelBinaries();              // Remove non-Linux binaries
         await verifyRhelBinaries(clientPackages);   // Verify query engines present
-        await verifyLayerStructure(includeCLI);     // Verify structure (conditional on CLI)
+        await verifyLayerStructure();               // Verify minimal runtime structure
         await displayLayerSummary();
 
         const duration = ((Date.now() - startTime) / 1000).toFixed(2);

package/infrastructure/{build-time-discovery.test.js → scripts/build-time-discovery.test.js}

@@ -5,7 +5,8 @@ const { AWSDiscovery } = require('./aws-discovery');
 
 // Mock dependencies
 jest.mock('fs');
-jest.mock('./aws-discovery');
+// Mock will be updated when tests are rewritten for new provider architecture
+// jest.mock('./aws-discovery');
 
 describe('BuildTimeDiscovery', () => {
     let buildTimeDiscovery;
@@ -14,7 +15,7 @@ describe('BuildTimeDiscovery', () => {
 
     beforeEach(() => {
         buildTimeDiscovery = new BuildTimeDiscovery('us-east-1');
-        
+
         // Mock AWSDiscovery
         mockAWSDiscovery = {
             discoverResources: jest.fn(),
@@ -27,7 +28,7 @@ describe('BuildTimeDiscovery', () => {
 
         // Reset environment
         process.env = { ...originalEnv };
-        
+
         jest.clearAllMocks();
     });
 
@@ -338,7 +339,7 @@ describe('BuildTimeDiscovery', () => {
         it('should process config file when configPath provided', async () => {
             const mockConfigContent = 'provider: aws';
             const mockResources = { defaultVpcId: 'vpc-12345678' };
-            
+
             fs.readFileSync.mockReturnValue(mockConfigContent);
             mockAWSDiscovery.discoverResources.mockResolvedValue(mockResources);
 

package/layers/prisma/nodejs/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "prisma-lambda-layer",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "@prisma/client": "^6.16.3"
+  }
+}

package/management-ui/server/utils/environment/awsParameterStore.js

@@ -1,8 +1,15 @@
-import AWS from 'aws-sdk';
+import {
+  SSMClient,
+  GetParametersByPathCommand,
+  PutParameterCommand,
+  DeleteParameterCommand,
+  DescribeParametersCommand,
+  GetParameterHistoryCommand,
+} from '@aws-sdk/client-ssm';
 
 class AWSParameterStore {
   constructor(config = {}) {
-    this.ssm = new AWS.SSM({
+    this.ssm = new SSMClient({
       region: config.region || process.env.AWS_REGION || 'us-east-1',
       ...config.awsConfig
     });
@@ -20,16 +27,16 @@ class AWSParameterStore {
 
     try {
       do {
-        const params = {
+        const command = new GetParametersByPathCommand({
           Path: path,
           Recursive: true,
           WithDecryption: true,
           MaxResults: 10,
           NextToken: nextToken
-        };
+        });
+
+        const response = await this.ssm.send(command);
 
-        const response = await this.ssm.getParametersByPath(params).promise();
-        
         for (const param of response.Parameters) {
           const key = this.extractKeyFromPath(param.Name, environment);
           parameters.push({
@@ -60,7 +67,7 @@ class AWSParameterStore {
    */
   async setParameter(environment, variable) {
     const parameterName = `${this.prefix}/${environment}/${variable.key}`;
-    
+
     try {
       const params = {
         Name: parameterName,
@@ -89,8 +96,9 @@ class AWSParameterStore {
         params.KeyId = this.kmsKeyId;
       }
 
-      const response = await this.ssm.putParameter(params).promise();
-      
+      const command = new PutParameterCommand(params);
+      const response = await this.ssm.send(command);
+
       return {
         success: true,
         version: response.Version,
@@ -107,9 +115,10 @@ class AWSParameterStore {
    */
   async deleteParameter(environment, key) {
     const parameterName = `${this.prefix}/${environment}/${key}`;
-    
+
     try {
-      await this.ssm.deleteParameter({ Name: parameterName }).promise();
+      const command = new DeleteParameterCommand({ Name: parameterName });
+      await this.ssm.send(command);
       return { success: true };
     } catch (error) {
       if (error.code === 'ParameterNotFound') {
@@ -142,7 +151,7 @@ class AWSParameterStore {
         try {
           const existing = existingParams.find(p => p.key === variable.key);
           const result = await this.setParameter(environment, variable);
-          
+
           if (existing) {
             results.updated.push({ key: variable.key, ...result });
           } else {
@@ -201,7 +210,8 @@ class AWSParameterStore {
   async validateAccess() {
     try {
       // Try to list parameters to check access
-      await this.ssm.describeParameters({ MaxResults: 1 }).promise();
+      const command = new DescribeParametersCommand({ MaxResults: 1 });
+      await this.ssm.send(command);
       return { valid: true };
     } catch (error) {
       return {
@@ -221,12 +231,12 @@ class AWSParameterStore {
     content += `# Generated on ${new Date().toISOString()}\n\n`;
 
     const sorted = parameters.sort((a, b) => a.key.localeCompare(b.key));
-    
+
     for (const param of sorted) {
       if (param.description) {
         content += `# ${param.description}\n`;
       }
-      
+
       // Mask secret values in export
       const value = param.isSecret ? '**REDACTED**' : param.value;
       content += `${param.key}=${value}\n\n`;
@@ -240,13 +250,14 @@ class AWSParameterStore {
    */
   async getParameterHistory(environment, key, maxResults = 10) {
     const parameterName = `${this.prefix}/${environment}/${key}`;
-    
+
     try {
-      const response = await this.ssm.getParameterHistory({
+      const command = new GetParameterHistoryCommand({
         Name: parameterName,
         WithDecryption: false,
         MaxResults: maxResults
-      }).promise();
+      });
+      const response = await this.ssm.send(command);
 
       return response.Parameters.map(p => ({
         version: p.Version,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.ec909cf.0",
+  "version": "2.0.0--canary.461.7b36f0f.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -11,8 +11,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.461.ec909cf.0",
-    "@friggframework/test": "2.0.0--canary.461.ec909cf.0",
+    "@friggframework/schemas": "2.0.0--canary.461.7b36f0f.0",
+    "@friggframework/test": "2.0.0--canary.461.7b36f0f.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -34,15 +34,15 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.461.ec909cf.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.ec909cf.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.7b36f0f.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.7b36f0f.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
+    "osls": "^3.40.1",
     "prettier": "^2.7.1",
-    "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
-    "serverless-jetpack": "^0.11.2",
+    "serverless-esbuild": "^1.54.3",
     "serverless-kms-grants": "^1.0.0",
     "serverless-offline": "^13.8.0",
     "serverless-offline-sqs": "^8.0.0",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ec909cf5076fa52ca3e914ee671a1c13c2cb11ee"
+  "gitHead": "7b36f0f437980499b06c66adc4ddbc3e80f6d8e6"
 }