@friggframework/devtools 2.0.0-next.40 → 2.0.0-next.42

package/infrastructure/iam-generator.test.js

@@ -51,7 +51,11 @@ describe('IAM Generator', () => {
                 websockets: { enable: false }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('AWSTemplateFormatVersion');
             expect(yaml).toContain('FriggDeploymentUser');
@@ -66,7 +70,11 @@ describe('IAM Generator', () => {
                 vpc: { enable: true }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('FriggVPCPolicy');
             expect(yaml).toContain('CreateVPCPermissions');
@@ -81,7 +89,11 @@ describe('IAM Generator', () => {
                 encryption: { fieldLevelEncryptionMethod: 'kms' }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('FriggKMSPolicy');
             expect(yaml).toContain('CreateKMSPermissions');
@@ -97,7 +109,11 @@ describe('IAM Generator', () => {
                 ssm: { enable: true }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('FriggSSMPolicy');
             expect(yaml).toContain('CreateSSMPermissions');
@@ -113,7 +129,11 @@ describe('IAM Generator', () => {
                 ssm: { enable: true }
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             // Check parameter defaults match the enabled features
             expect(yaml).toContain("Default: 'true'"); // VPC enabled
@@ -127,7 +147,11 @@ describe('IAM Generator', () => {
                 integrations: []
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             // Check for core permissions
             expect(yaml).toContain('cloudformation:CreateStack');
@@ -149,7 +173,11 @@ describe('IAM Generator', () => {
                 integrations: []
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('internal-error-queue-*');
         });
@@ -160,7 +188,11 @@ describe('IAM Generator', () => {
                 integrations: []
             };
 
-            const yaml = generateIAMCloudFormation(appDefinition);
+            const summary = getFeatureSummary(appDefinition);
+            const yaml = generateIAMCloudFormation({
+                appName: summary.appName,
+                features: summary.features
+            });
 
             expect(yaml).toContain('Outputs:');
             expect(yaml).toContain('DeploymentUserArn:');

package/infrastructure/serverless-template.js

@@ -2,10 +2,19 @@ const path = require('path');
 const fs = require('fs');
 const { AWSDiscovery } = require('./aws-discovery');
 
-const shouldRunDiscovery = (AppDefinition) =>
-    AppDefinition.vpc?.enable === true ||
-    AppDefinition.encryption?.fieldLevelEncryptionMethod === 'kms' ||
-    AppDefinition.ssm?.enable === true;
+const shouldRunDiscovery = (AppDefinition) => {
+    console.log('⚙️  Checking FRIGG_SKIP_AWS_DISCOVERY:', process.env.FRIGG_SKIP_AWS_DISCOVERY);
+    if (process.env.FRIGG_SKIP_AWS_DISCOVERY === 'true') {
+        console.log('⚙️  Skipping AWS discovery because FRIGG_SKIP_AWS_DISCOVERY is set.');
+        return false;
+    }
+
+    return (
+        AppDefinition.vpc?.enable === true ||
+        AppDefinition.encryption?.fieldLevelEncryptionMethod === 'kms' ||
+        AppDefinition.ssm?.enable === true
+    );
+};
 
 const getAppEnvironmentVars = (AppDefinition) => {
     const envVars = {};
@@ -649,6 +658,12 @@ const applyKmsConfiguration = (definition, AppDefinition, discoveredResources) =
         return;
     }
 
+    // Skip KMS configuration for local development when AWS discovery is disabled
+    if (process.env.FRIGG_SKIP_AWS_DISCOVERY === 'true') {
+        console.log('⚙️  Skipping KMS configuration for local development (FRIGG_SKIP_AWS_DISCOVERY is set)');
+        return;
+    }
+
     if (discoveredResources.defaultKmsKeyId) {
         console.log(`Using existing KMS key: ${discoveredResources.defaultKmsKeyId}`);
         definition.resources.Resources.FriggKMSKeyAlias = {
@@ -846,6 +861,12 @@ const configureVpc = (definition, AppDefinition, discoveredResources) => {
         return;
     }
 
+    // Skip VPC configuration for local development when AWS discovery is disabled
+    if (process.env.FRIGG_SKIP_AWS_DISCOVERY === 'true') {
+        console.log('⚙️  Skipping VPC configuration for local development (FRIGG_SKIP_AWS_DISCOVERY is set)');
+        return;
+    }
+
     definition.provider.iamRoleStatements.push({
         Effect: 'Allow',
         Action: [

package/infrastructure/serverless-template.test.js

@@ -55,6 +55,7 @@ describe('composeServerlessDefinition', () => {
         jest.restoreAllMocks();
         // Restore env
         delete process.env.AWS_REGION;
+        delete process.env.FRIGG_SKIP_AWS_DISCOVERY;
         process.argv = ['node', 'test'];
     });
 
@@ -86,6 +87,50 @@ describe('composeServerlessDefinition', () => {
 
             expect(AWSDiscovery).toHaveBeenCalledTimes(1);
         });
+
+        it('should skip AWS discovery when FRIGG_SKIP_AWS_DISCOVERY is set to true', async () => {
+            AWSDiscovery.mockClear();
+            process.env.FRIGG_SKIP_AWS_DISCOVERY = 'true';
+
+            const appDefinition = {
+                integrations: [],
+                vpc: { enable: true },
+                encryption: { fieldLevelEncryptionMethod: 'kms' },
+                ssm: { enable: true },
+            };
+
+            await composeServerlessDefinition(appDefinition);
+
+            expect(AWSDiscovery).not.toHaveBeenCalled();
+        });
+
+        it('should run AWS discovery when FRIGG_SKIP_AWS_DISCOVERY is not set', async () => {
+            AWSDiscovery.mockClear();
+            delete process.env.FRIGG_SKIP_AWS_DISCOVERY;
+
+            const appDefinition = {
+                integrations: [],
+                vpc: { enable: true },
+            };
+
+            await composeServerlessDefinition(appDefinition);
+
+            expect(AWSDiscovery).toHaveBeenCalledTimes(1);
+        });
+
+        it('should skip VPC configuration when FRIGG_SKIP_AWS_DISCOVERY is true', async () => {
+            process.env.FRIGG_SKIP_AWS_DISCOVERY = 'true';
+
+            const appDefinition = {
+                integrations: [],
+                vpc: { enable: true, management: 'discover' },
+            };
+
+            const result = await composeServerlessDefinition(appDefinition);
+
+            // VPC configuration should not be present when skipped
+            expect(result.provider.vpc).toBeUndefined();
+        });
     });
 
     describe('Basic Configuration', () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.40",
+  "version": "2.0.0-next.42",
   "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.40",
-    "@friggframework/test": "2.0.0-next.40",
+    "@friggframework/schemas": "2.0.0-next.42",
+    "@friggframework/test": "2.0.0-next.42",
     "@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.40",
-    "@friggframework/prettier-config": "2.0.0-next.40",
+    "@friggframework/eslint-config": "2.0.0-next.42",
+    "@friggframework/prettier-config": "2.0.0-next.42",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "088c50c6e1e37a6d42be05af49349b70ae94ee31"
+  "gitHead": "9b956c72ec74f70bb5efd336782cf269c79c3d9b"
 }

package/test/index.js

@@ -1,11 +1,9 @@
-const {testDefinitionRequiredAuthMethods} = require('./auther-definition-method-tester');
-const {createMockIntegration, createMockApiObject} = require('./mock-integration');
-const { testAutherDefinition } = require('./auther-definition-tester');
+const { testDefinitionRequiredAuthMethods } = require('./auther-definition-method-tester');
+const { createMockIntegration, createMockApiObject } = require('./mock-integration');
 
 
 module.exports = {
     createMockIntegration,
     createMockApiObject,
     testDefinitionRequiredAuthMethods,
-    testAutherDefinition,
 };

package/test/mock-integration.js

@@ -1,8 +1,4 @@
 const {
-    Auther,
-    Credential,
-    Entity,
-    IntegrationFactory,
     createObjectId,
 } = require('@friggframework/core');
 
@@ -11,7 +7,6 @@ async function createMockIntegration(
     userId = null,
     config = { type: IntegrationClass.Definition.name }
 ) {
-    const integrationFactory = new IntegrationFactory([IntegrationClass]);
     userId = userId || createObjectId();
 
     const insertOptions = {
@@ -24,10 +19,8 @@ async function createMockIntegration(
     const entities = [];
     for (const moduleName in IntegrationClass.modules) {
         const ModuleDef = IntegrationClass.Definition.modules[moduleName];
-        const module = await Auther.getInstance({
-            definition: ModuleDef,
-            userId: userId,
-        });
+        // todo: create module using the new architecture
+        const module = {}
         const credential = await module.CredentialModel.findOneAndUpdate(
             user,
             { $set: user },
@@ -51,11 +44,8 @@ async function createMockIntegration(
         );
     }
 
-    const integration = await integrationFactory.createIntegration(
-        entities,
-        userId,
-        config
-    );
+    // todo: create integration using the new architecture
+    const integration = {}
 
     integration.id = integration.record._id;
 

package/frigg-cli/__tests__/jest.config.js

@@ -1,102 +0,0 @@
-module.exports = {
-  displayName: 'Frigg CLI Tests',
-  testMatch: [
-    '<rootDir>/__tests__/**/*.test.js',
-    '<rootDir>/__tests__/**/*.spec.js'
-  ],
-  testEnvironment: 'node',
-  collectCoverageFrom: [
-    '../**/*.js',
-    '!../**/*.test.js',
-    '!../**/*.spec.js',
-    '!../node_modules/**',
-    '!../__tests__/**',
-    '!../coverage/**'
-  ],
-  coverageDirectory: 'coverage',
-  coverageReporters: [
-    'text',
-    'text-summary',
-    'html',
-    'lcov',
-    'json'
-  ],
-  coverageThreshold: {
-    global: {
-      branches: 85,
-      functions: 85,
-      lines: 85,
-      statements: 85
-    },
-    '../install-command/index.js': {
-      branches: 90,
-      functions: 90,
-      lines: 90,
-      statements: 90
-    },
-    '../build-command/index.js': {
-      branches: 90,
-      functions: 90,
-      lines: 90,
-      statements: 90
-    },
-    '../deploy-command/index.js': {
-      branches: 90,
-      functions: 90,
-      lines: 90,
-      statements: 90
-    },
-    '../ui-command/index.js': {
-      branches: 90,
-      functions: 90,
-      lines: 90,
-      statements: 90
-    },
-    '../generate-command/index.js': {
-      branches: 90,
-      functions: 90,
-      lines: 90,
-      statements: 90
-    }
-  },
-  setupFilesAfterEnv: [
-    '<rootDir>/utils/test-setup.js'
-  ],
-  testTimeout: 10000,
-  maxWorkers: '50%',
-  verbose: true,
-  collectCoverage: true,
-  coveragePathIgnorePatterns: [
-    '/node_modules/',
-    '/__tests__/',
-    '/coverage/',
-    '.test.js',
-    '.spec.js'
-  ],
-  moduleFileExtensions: [
-    'js',
-    'json',
-    'node'
-  ],
-  transform: {},
-  testResultsProcessor: 'jest-sonar-reporter',
-  reporters: [
-    'default',
-    [
-      'jest-junit',
-      {
-        outputDirectory: 'coverage',
-        outputName: 'junit.xml',
-        ancestorSeparator: ' › ',
-        uniqueOutputName: 'false',
-        suiteNameTemplate: '{filepath}',
-        classNameTemplate: '{classname}',
-        titleTemplate: '{title}'
-      }
-    ]
-  ],
-  watchman: false,
-  forceExit: true,
-  detectOpenHandles: true,
-  errorOnDeprecated: true
-};

package/frigg-cli/__tests__/utils/command-tester.js

@@ -1,170 +0,0 @@
-const { Command } = require('commander');
-
-/**
- * CommandTester - Utility class for testing CLI commands
- * Provides a fluent interface for setting up mocks and executing commands
- */
-class CommandTester {
-  constructor(commandDefinition) {
-    this.commandDefinition = commandDefinition;
-    this.mocks = new Map();
-    this.originalEnv = process.env;
-    this.capturedLogs = {
-      info: [],
-      error: [],
-      debug: [],
-      warn: []
-    };
-  }
-
-  /**
-   * Set up a mock for a module
-   * @param {string} modulePath - Path to the module to mock
-   * @param {object} implementation - Mock implementation
-   * @returns {CommandTester} - Fluent interface
-   */
-  mock(modulePath, implementation) {
-    this.mocks.set(modulePath, implementation);
-    return this;
-  }
-
-  /**
-   * Set environment variables for the test
-   * @param {object} env - Environment variables to set
-   * @returns {CommandTester} - Fluent interface
-   */
-  withEnv(env) {
-    process.env = { ...process.env, ...env };
-    return this;
-  }
-
-  /**
-   * Capture console output during test execution
-   * @returns {CommandTester} - Fluent interface
-   */
-  captureOutput() {
-    const originalConsole = { ...console };
-    
-    console.log = (...args) => {
-      this.capturedLogs.info.push(args.join(' '));
-      originalConsole.log(...args);
-    };
-    
-    console.error = (...args) => {
-      this.capturedLogs.error.push(args.join(' '));
-      originalConsole.error(...args);
-    };
-    
-    console.warn = (...args) => {
-      this.capturedLogs.warn.push(args.join(' '));
-      originalConsole.warn(...args);
-    };
-    
-    console.debug = (...args) => {
-      this.capturedLogs.debug.push(args.join(' '));
-      originalConsole.debug(...args);
-    };
-    
-    return this;
-  }
-
-  /**
-   * Execute the command with given arguments
-   * @param {string[]} args - Command arguments
-   * @param {object} options - Command options
-   * @returns {Promise<object>} - Execution result
-   */
-  async execute(args = [], options = {}) {
-    // Set up mocks
-    for (const [path, impl] of this.mocks) {
-      jest.mock(path, () => impl, { virtual: true });
-    }
-
-    try {
-      const program = new Command();
-      
-      // Set up the command
-      const cmd = program
-        .command(this.commandDefinition.name)
-        .description(this.commandDefinition.description);
-      
-      // Add options if defined
-      if (this.commandDefinition.options) {
-        this.commandDefinition.options.forEach(option => {
-          cmd.option(option.flags, option.description, option.defaultValue);
-        });
-      }
-      
-      // Add action
-      cmd.action(this.commandDefinition.action);
-      
-      // Mock process.exit to prevent actual exit
-      const originalExit = process.exit;
-      let exitCode = 0;
-      process.exit = (code) => {
-        exitCode = code;
-        throw new Error(`Process exited with code ${code}`);
-      };
-      
-      try {
-        await program.parseAsync(['node', 'cli', ...args]);
-        
-        return {
-          success: true,
-          exitCode: 0,
-          logs: this.capturedLogs,
-          args,
-          options
-        };
-      } catch (error) {
-        if (error.message.includes('Process exited with code')) {
-          return {
-            success: false,
-            exitCode,
-            error: error.message,
-            logs: this.capturedLogs,
-            args,
-            options
-          };
-        }
-        throw error;
-      } finally {
-        process.exit = originalExit;
-      }
-    } finally {
-      // Clean up mocks
-      for (const [path] of this.mocks) {
-        jest.unmock(path);
-      }
-      
-      // Restore environment
-      process.env = this.originalEnv;
-    }
-  }
-
-  /**
-   * Get captured logs
-   * @returns {object} - Captured logs by type
-   */
-  getLogs() {
-    return this.capturedLogs;
-  }
-
-  /**
-   * Reset the tester state
-   * @returns {CommandTester} - Fluent interface
-   */
-  reset() {
-    this.mocks.clear();
-    this.capturedLogs = {
-      info: [],
-      error: [],
-      debug: [],
-      warn: []
-    };
-    process.env = this.originalEnv;
-    return this;
-  }
-}
-
-module.exports = { CommandTester };