@friggframework/devtools 2.0.0-next.45 → 2.0.0-next.47

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

@@ -1,5 +1,4 @@
 const fs = require('fs');
-const path = require('path');
 let AWSDiscovery;
 
 function loadAWSDiscovery() {
@@ -33,23 +32,28 @@ class BuildTimeDiscovery {
     async discoverAndCreateConfig(outputPath = './aws-discovery-config.json') {
         try {
             console.log('Starting AWS resource discovery for build...');
-            
+
             const resources = await this.discovery.discoverResources();
-            
+
             // Create configuration object
             const config = {
                 awsDiscovery: resources,
                 generatedAt: new Date().toISOString(),
-                region: this.region
+                region: this.region,
             };
-            
+
             // Write configuration to file
             fs.writeFileSync(outputPath, JSON.stringify(config, null, 2));
-            console.log(`AWS discovery configuration written to: ${outputPath}`);
-            
+            console.log(
+                `AWS discovery configuration written to: ${outputPath}`,
+            );
+
             return config;
         } catch (error) {
-            console.error('Error during AWS resource discovery:', error.message);
+            console.error(
+                'Error during AWS resource discovery:',
+                error.message,
+            );
             throw error;
         }
     }
@@ -62,22 +66,34 @@ class BuildTimeDiscovery {
      */
     replaceTemplateVariables(templateContent, discoveredResources) {
         let updatedContent = templateContent;
-        
+
         // Replace AWS discovery placeholders
         const replacements = {
-            '${self:custom.awsDiscovery.defaultVpcId}': discoveredResources.defaultVpcId,
-            '${self:custom.awsDiscovery.defaultSecurityGroupId}': discoveredResources.defaultSecurityGroupId,
-            '${self:custom.awsDiscovery.privateSubnetId1}': discoveredResources.privateSubnetId1,
-            '${self:custom.awsDiscovery.privateSubnetId2}': discoveredResources.privateSubnetId2,
-            '${self:custom.awsDiscovery.privateRouteTableId}': discoveredResources.privateRouteTableId,
-            '${self:custom.awsDiscovery.defaultKmsKeyId}': discoveredResources.defaultKmsKeyId
+            '${self:custom.awsDiscovery.defaultVpcId}':
+                discoveredResources.defaultVpcId,
+            '${self:custom.awsDiscovery.defaultSecurityGroupId}':
+                discoveredResources.defaultSecurityGroupId,
+            '${self:custom.awsDiscovery.privateSubnetId1}':
+                discoveredResources.privateSubnetId1,
+            '${self:custom.awsDiscovery.privateSubnetId2}':
+                discoveredResources.privateSubnetId2,
+            '${self:custom.awsDiscovery.privateRouteTableId}':
+                discoveredResources.privateRouteTableId,
+            '${self:custom.awsDiscovery.defaultKmsKeyId}':
+                discoveredResources.defaultKmsKeyId,
         };
-        
+
         for (const [placeholder, value] of Object.entries(replacements)) {
             // Use a more targeted replacement to avoid replacing similar strings
-            updatedContent = updatedContent.replace(new RegExp(placeholder.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), value);
+            updatedContent = updatedContent.replace(
+                new RegExp(
+                    placeholder.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'),
+                    'g',
+                ),
+                value,
+            );
         }
-        
+
         return updatedContent;
     }
 
@@ -91,25 +107,33 @@ class BuildTimeDiscovery {
     async processServerlessConfig(configPath, outputPath = null) {
         try {
             console.log(`Processing serverless configuration: ${configPath}`);
-            
+
             // Read the current serverless configuration
             const configContent = fs.readFileSync(configPath, 'utf8');
-            
+
             // Discover AWS resources
             const resources = await this.discovery.discoverResources();
-            
+
             // Replace placeholders with discovered values
-            const updatedContent = this.replaceTemplateVariables(configContent, resources);
-            
+            const updatedContent = this.replaceTemplateVariables(
+                configContent,
+                resources,
+            );
+
             // Write to output file or overwrite original
             const finalPath = outputPath || configPath;
             fs.writeFileSync(finalPath, updatedContent);
-            
-            console.log(`Updated serverless configuration written to: ${finalPath}`);
-            
+
+            console.log(
+                `Updated serverless configuration written to: ${finalPath}`,
+            );
+
             return resources;
         } catch (error) {
-            console.error('Error processing serverless configuration:', error.message);
+            console.error(
+                'Error processing serverless configuration:',
+                error.message,
+            );
             throw error;
         }
     }
@@ -121,7 +145,7 @@ class BuildTimeDiscovery {
      */
     generateCustomSection(discoveredResources) {
         return {
-            awsDiscovery: discoveredResources
+            awsDiscovery: discoveredResources,
         };
     }
 
@@ -135,40 +159,48 @@ class BuildTimeDiscovery {
     async preBuildHook(appDefinition, region) {
         try {
             console.log('Running pre-build AWS discovery hook...');
-            
+
             // Only run discovery if VPC, KMS, or SSM features are enabled
-            const needsDiscovery = appDefinition.vpc?.enable ||
-                                 appDefinition.encryption?.fieldLevelEncryptionMethod === 'kms' ||
-                                 appDefinition.ssm?.enable;
-            
+            const needsDiscovery =
+                appDefinition.vpc?.enable ||
+                appDefinition.encryption?.fieldLevelEncryptionMethod ===
+                    'kms' ||
+                appDefinition.ssm?.enable;
+
             if (!needsDiscovery) {
                 console.log('No AWS discovery needed based on app definition');
                 return null;
             }
-            
+
             // Create discovery instance with specified region
             loadAWSDiscovery();
             const discovery = new AWSDiscovery(region);
             const resources = await discovery.discoverResources();
-            
+
             // Create environment variables for serverless
             const envVars = {
                 AWS_DISCOVERY_VPC_ID: resources.defaultVpcId,
-                AWS_DISCOVERY_SECURITY_GROUP_ID: resources.defaultSecurityGroupId,
+                AWS_DISCOVERY_SECURITY_GROUP_ID:
+                    resources.defaultSecurityGroupId,
                 AWS_DISCOVERY_SUBNET_ID_1: resources.privateSubnetId1,
                 AWS_DISCOVERY_SUBNET_ID_2: resources.privateSubnetId2,
                 AWS_DISCOVERY_PUBLIC_SUBNET_ID: resources.publicSubnetId,
                 AWS_DISCOVERY_ROUTE_TABLE_ID: resources.privateRouteTableId,
-                AWS_DISCOVERY_KMS_KEY_ID: resources.defaultKmsKeyId  // Keep consistent naming convention (even though it's an ARN)
+                AWS_DISCOVERY_KMS_KEY_ID: resources.defaultKmsKeyId, // Keep consistent naming convention (even though it's an ARN)
             };
-            
+
             // Set environment variables for serverless to use
             Object.assign(process.env, envVars);
-            
-            console.log('AWS discovery completed and environment variables set');
+
+            console.log(
+                'AWS discovery completed and environment variables set',
+            );
             return resources;
         } catch (error) {
-            console.error('Error in pre-build AWS discovery hook:', error.message);
+            console.error(
+                'Error in pre-build AWS discovery hook:',
+                error.message,
+            );
             throw error;
         }
     }
@@ -186,11 +218,11 @@ async function runBuildTimeDiscovery(options = {}) {
     const {
         region = process.env.AWS_REGION || 'us-east-1',
         outputPath = './aws-discovery-config.json',
-        configPath = null
+        configPath = null,
     } = options;
-    
+
     const discovery = new BuildTimeDiscovery(region);
-    
+
     if (configPath) {
         // Process existing serverless configuration
         return await discovery.processServerlessConfig(configPath);
@@ -200,7 +232,7 @@ async function runBuildTimeDiscovery(options = {}) {
     }
 }
 
-module.exports = { 
-    BuildTimeDiscovery, 
-    runBuildTimeDiscovery 
-};
+module.exports = {
+    BuildTimeDiscovery,
+    runBuildTimeDiscovery,
+};

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/cliIntegration.js

@@ -17,7 +17,7 @@ class FriggCLIIntegration {
     const possiblePaths = [
       path.resolve(process.cwd(), '../frigg-cli/index.js'),
       path.resolve(process.cwd(), '../../frigg-cli/index.js'),
-      path.resolve(process.cwd(), 'packages/devtools/frigg-cli/index.js'),
+      path.resolve(process.cwd(), 'packages/frigg-cli/index.js'),
       'frigg' // Global installation
     ]
 

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,16 +1,19 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.45",
+  "version": "2.0.0-next.47",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
+    "@aws-sdk/client-rds": "^3.906.0",
+    "@aws-sdk/client-s3": "^3.917.0",
+    "@aws-sdk/client-secrets-manager": "^3.906.0",
     "@aws-sdk/client-sts": "^3.835.0",
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0-next.45",
-    "@friggframework/test": "2.0.0-next.45",
+    "@friggframework/schemas": "2.0.0-next.47",
+    "@friggframework/test": "2.0.0-next.47",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -32,15 +35,15 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.45",
-    "@friggframework/prettier-config": "2.0.0-next.45",
+    "@friggframework/eslint-config": "2.0.0-next.47",
+    "@friggframework/prettier-config": "2.0.0-next.47",
     "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",
@@ -50,9 +53,6 @@
     "lint:fix": "prettier --write --loglevel error . && eslint . --fix",
     "test": "jest --passWithNoTests # TODO"
   },
-  "bin": {
-    "frigg": "./frigg-cli/index.js"
-  },
   "author": "",
   "license": "MIT",
   "main": "index.js",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "996a15bcdfaa4252b9891a33f1b1c84548d66bbc"
+  "gitHead": "7a7b05dc023f05a6b1c18075064e88f29156fee1"
 }

package/frigg-cli/.eslintrc.js

@@ -1,141 +0,0 @@
-module.exports = {
-  env: {
-    browser: false,
-    es2021: true,
-    node: true,
-    jest: true
-  },
-  extends: [
-    'standard'
-  ],
-  parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'commonjs'
-  },
-  rules: {
-    // Enforce consistent indentation
-    'indent': ['error', 2],
-    
-    // Enforce consistent spacing
-    'space-before-function-paren': ['error', 'never'],
-    'object-curly-spacing': ['error', 'always'],
-    
-    // Enforce semicolons for consistency
-    'semi': ['error', 'always'],
-    
-    // Allow console.log in CLI applications
-    'no-console': 'off',
-    
-    // Allow process.exit in CLI applications
-    'no-process-exit': 'off',
-    
-    // Enforce consistent quote usage
-    'quotes': ['error', 'single', { avoidEscape: true }],
-    
-    // Enforce consistent comma usage
-    'comma-dangle': ['error', 'never'],
-    
-    // Enforce consistent line endings
-    'eol-last': ['error', 'always'],
-    
-    // Enforce consistent spacing around operators
-    'space-infix-ops': 'error',
-    
-    // Enforce consistent spacing in object literals
-    'key-spacing': ['error', { beforeColon: false, afterColon: true }],
-    
-    // Enforce consistent spacing in arrays
-    'array-bracket-spacing': ['error', 'never'],
-    
-    // Enforce consistent spacing in function calls
-    'func-call-spacing': ['error', 'never'],
-    
-    // Enforce consistent spacing around keywords
-    'keyword-spacing': ['error', { before: true, after: true }],
-    
-    // Enforce consistent line breaks
-    'max-len': ['error', { 
-      code: 120, 
-      ignoreUrls: true, 
-      ignoreStrings: true, 
-      ignoreTemplateLiterals: true 
-    }],
-    
-    // Enforce consistent naming conventions
-    'camelcase': ['error', { properties: 'never' }],
-    
-    // Enforce consistent error handling
-    'no-unused-vars': ['error', { 
-      vars: 'all', 
-      args: 'after-used', 
-      ignoreRestSiblings: true 
-    }],
-    
-    // Allow async without await for command handlers
-    'require-await': 'off',
-    
-    // Enforce consistent return statements
-    'consistent-return': 'error',
-    
-    // Enforce proper error handling
-    'handle-callback-err': 'error',
-    
-    // Disallow modifying variables that are declared using const
-    'no-const-assign': 'error',
-    
-    // Disallow duplicate imports
-    'no-duplicate-imports': 'error',
-    
-    // Disallow unnecessary escape characters
-    'no-useless-escape': 'error',
-    
-    // Enforce consistent use of template literals
-    'prefer-template': 'error',
-    
-    // Enforce consistent use of destructuring
-    'prefer-destructuring': ['error', {
-      array: true,
-      object: true
-    }, {
-      enforceForRenamedProperties: false
-    }]
-  },
-  overrides: [
-    {
-      files: ['**/__tests__/**/*.js', '**/*.test.js', '**/*.spec.js'],
-      env: {
-        jest: true
-      },
-      rules: {
-        // Allow longer lines in tests for readability
-        'max-len': ['error', { code: 150 }],
-        
-        // Allow anonymous functions in tests
-        'func-names': 'off',
-        
-        // Allow magic numbers in tests
-        'no-magic-numbers': 'off',
-        
-        // Allow nested describe/it blocks
-        'max-nested-callbacks': 'off',
-        
-        // Allow multiple expectations in tests
-        'jest/prefer-expect-assertions': 'off'
-      }
-    },
-    {
-      files: ['index.js'],
-      rules: {
-        // Allow shebang in main CLI file
-        'node/shebang': 'off'
-      }
-    }
-  ],
-  ignorePatterns: [
-    'node_modules/',
-    'coverage/',
-    'dist/',
-    'build/',
-    '*.min.js'
-  ]
-};