@friggframework/devtools 2.0.0--canary.395.93acf57.0 → 2.0.0--canary.395.04851d8.0

package/infrastructure/IAM-POLICY-TEMPLATES.md

@@ -83,27 +83,45 @@ aws cloudformation update-stack \
 For custom policy generation based on your app definition:
 
 ```javascript
-const { generateIAMPolicy, generateIAMCloudFormation } = require('./iam-generator');
+const { generateIAMPolicy, generateIAMCloudFormation, getFeatureSummary } = require('./iam-generator');
 
 // Generate basic JSON policy
 const basicPolicy = generateIAMPolicy('basic');
 
-// Generate full JSON policy  
+// Generate full JSON policy
 const fullPolicy = generateIAMPolicy('full');
 
-// Generate CloudFormation template with auto-detection
-const autoTemplate = generateIAMCloudFormation(appDefinition, { mode: 'auto' });
-
-// Generate CloudFormation template with specific mode
-const basicTemplate = generateIAMCloudFormation(appDefinition, { mode: 'basic' });
-const fullTemplate = generateIAMCloudFormation(appDefinition, { mode: 'full' });
+// Generate CloudFormation template with auto-detected features
+const summary = getFeatureSummary(appDefinition);
+const template = generateIAMCloudFormation({
+    appName: summary.appName,
+    features: summary.features,
+    userPrefix: 'frigg-deployment-user',
+    stackName: 'frigg-deployment-iam'
+});
+
+// Or manually specify features
+const customTemplate = generateIAMCloudFormation({
+    appName: 'my-app',
+    features: {
+        vpc: true,
+        kms: true,
+        ssm: true,
+        websockets: false
+    },
+    userPrefix: 'my-deployment-user',
+    stackName: 'my-deployment-stack'
+});
 ```
 
-### Generator Modes
+### Feature Detection
+
+Use `getFeatureSummary(appDefinition)` to automatically detect features from your app definition:
 
-- **`basic`** - Core permissions only, ignores app definition features
-- **`full`** - All features enabled, ignores app definition features  
-- **`auto`** - Analyzes app definition and enables features as needed (default)
+```javascript
+const summary = getFeatureSummary(appDefinition);
+// Returns: { appName, features: { core, vpc, kms, ssm, websockets }, integrationCount }
+```
 
 ## Security Best Practices
 

package/infrastructure/iam-generator.js

@@ -1,52 +1,31 @@
 const path = require('path');
 
 /**
- * Generate IAM CloudFormation template based on AppDefinition
- * @param {Object} appDefinition - Application definition object
+ * Generate IAM CloudFormation template
  * @param {Object} options - Generation options
- * @param {string} [options.deploymentUserName='frigg-deployment-user'] - IAM user name
+ * @param {string} [options.appName='Frigg'] - Application name
+ * @param {Object} [options.features={}] - Enabled features { vpc, kms, ssm, websockets }
+ * @param {string} [options.userPrefix='frigg-deployment-user'] - IAM user name prefix
  * @param {string} [options.stackName='frigg-deployment-iam'] - CloudFormation stack name
- * @param {string} [options.mode='auto'] - Policy mode: 'basic', 'full', or 'auto' (auto-detect from appDefinition)
  * @returns {string} CloudFormation YAML template
  */
-function generateIAMCloudFormation(appDefinition, options = {}) {
-    const { deploymentUserName = 'frigg-deployment-user', mode = 'auto' } =
-        options;
-
-    // Determine which features are enabled based on mode
-    let features;
-    if (mode === 'basic') {
-        features = {
-            vpc: false,
-            kms: false,
-            ssm: false,
-            websockets: appDefinition.websockets?.enable === true,
-        };
-    } else if (mode === 'full') {
-        features = {
-            vpc: true,
-            kms: true,
-            ssm: true,
-            websockets: appDefinition.websockets?.enable === true,
-        };
-    } else {
-        // mode === 'auto'
-        features = {
-            vpc: appDefinition.vpc?.enable === true,
-            kms:
-                appDefinition.encryption
-                    ?.fieldLevelEncryptionMethod === 'kms',
-            ssm: appDefinition.ssm?.enable === true,
-            websockets: appDefinition.websockets?.enable === true,
-        };
-    }
+function generateIAMCloudFormation(options = {}) {
+    const {
+        appName = 'Frigg',
+        features = {},
+        userPrefix = 'frigg-deployment-user',
+        stackName = 'frigg-deployment-iam'
+    } = options;
+
+    const deploymentUserName = userPrefix;
+
+    // Features are already analyzed by caller (use getFeatureSummary to extract features from appDefinition)
+    // Expected features: { vpc, kms, ssm, websockets }
 
     // Build the CloudFormation template
     const template = {
         AWSTemplateFormatVersion: '2010-09-09',
-        Description: `IAM roles and policies for ${
-            appDefinition.name || 'Frigg'
-        } application deployment pipeline`,
+        Description: `IAM roles and policies for ${appName} application deployment pipeline`,
 
         Parameters: {
             DeploymentUserName: {
@@ -829,6 +808,7 @@ function generateIAMPolicy(mode = 'basic') {
 
 module.exports = {
     generateIAMCloudFormation,
+    generateCloudFormationTemplate: generateIAMCloudFormation, // Alias for generate-command/index.js compatibility
     getFeatureSummary,
     generateBasicIAMPolicy,
     generateFullIAMPolicy,

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.395.93acf57.0",
+  "version": "2.0.0--canary.395.04851d8.0",
   "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--canary.395.93acf57.0",
-    "@friggframework/test": "2.0.0--canary.395.93acf57.0",
+    "@friggframework/schemas": "2.0.0--canary.395.04851d8.0",
+    "@friggframework/test": "2.0.0--canary.395.04851d8.0",
     "@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--canary.395.93acf57.0",
-    "@friggframework/prettier-config": "2.0.0--canary.395.93acf57.0",
+    "@friggframework/eslint-config": "2.0.0--canary.395.04851d8.0",
+    "@friggframework/prettier-config": "2.0.0--canary.395.04851d8.0",
     "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": "93acf5743952234f13423ffc9da82a5f4059c567"
+  "gitHead": "04851d8d253adc1abe6aeae2d8e26e9887d7334b"
 }

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 };