@friggframework/devtools 2.0.0--canary.402.d2f4ae6.0 → 2.0.0--canary.395.c089c7d.0

package/infrastructure/create-frigg-infrastructure.js

@@ -1,7 +1,6 @@
 const path = require('path');
 const fs = require('fs-extra');
 const { composeServerlessDefinition } = require('./serverless-template');
-
 const { findNearestBackendPackageJson } = require('@friggframework/core');
 
 async function createFriggInfrastructure() {
@@ -25,7 +24,6 @@ async function createFriggInfrastructure() {
     // ));
     const definition = await composeServerlessDefinition(
         appDefinition,
-        backend.IntegrationFactory
     );
 
     return {

package/infrastructure/iam-generator.js

@@ -431,6 +431,8 @@ function generateIAMCloudFormation(appDefinition, options = {}) {
             Resource: [
                 'arn:aws:apigateway:*::/restapis',
                 'arn:aws:apigateway:*::/restapis/*',
+                'arn:aws:apigateway:*::/apis',
+                'arn:aws:apigateway:*::/apis/*',
                 'arn:aws:apigateway:*::/domainnames',
                 'arn:aws:apigateway:*::/domainnames/*'
             ]

package/infrastructure/iam-policy-basic.json

@@ -204,6 +204,8 @@
       "Resource": [
         "arn:aws:apigateway:*::/restapis",
         "arn:aws:apigateway:*::/restapis/*",
+        "arn:aws:apigateway:*::/apis",
+        "arn:aws:apigateway:*::/apis/*",
         "arn:aws:apigateway:*::/domainnames",
         "arn:aws:apigateway:*::/domainnames/*"
       ]

package/infrastructure/iam-policy-full.json

@@ -204,6 +204,8 @@
       "Resource": [
         "arn:aws:apigateway:*::/restapis",
         "arn:aws:apigateway:*::/restapis/*",
+        "arn:aws:apigateway:*::/apis",
+        "arn:aws:apigateway:*::/apis/*",
         "arn:aws:apigateway:*::/domainnames",
         "arn:aws:apigateway:*::/domainnames/*"
       ]

package/infrastructure/serverless-template.js

@@ -724,37 +724,53 @@ const composeServerlessDefinition = async (AppDefinition) => {
 
     // KMS Configuration based on App Definition
     if (AppDefinition.encryption?.useDefaultKMSForFieldLevelEncryption === true) {
-        // Provision a dedicated KMS key and wire it automatically
-        definition.resources.Resources.FriggKMSKey = {
-            Type: 'AWS::KMS::Key',
-            Properties: {
-                EnableKeyRotation: true,
-                KeyPolicy: {
-                    Version: '2012-10-17',
-                    Statement: [
-                        {
-                            Sid: 'AllowRootAccountAdmin',
-                            Effect: 'Allow',
-                            Principal: { AWS: { 'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:root' } },
-                            Action: 'kms:*',
-                            Resource: '*'
-                        }
-                    ]
+        // Check if a KMS key was discovered
+        if (discoveredResources.defaultKmsKeyId) {
+            // Use the existing discovered KMS key
+            console.log(`Using existing KMS key: ${discoveredResources.defaultKmsKeyId}`);
+            
+            definition.provider.iamRoleStatements.push({
+                Effect: 'Allow',
+                Action: ['kms:GenerateDataKey', 'kms:Decrypt'],
+                Resource: [discoveredResources.defaultKmsKeyId]
+            });
+
+            definition.provider.environment.KMS_KEY_ARN = discoveredResources.defaultKmsKeyId;
+        } else {
+            // No existing key found, provision a dedicated KMS key
+            console.log('No existing KMS key found, creating a new one...');
+            
+            definition.resources.Resources.FriggKMSKey = {
+                Type: 'AWS::KMS::Key',
+                Properties: {
+                    EnableKeyRotation: true,
+                    KeyPolicy: {
+                        Version: '2012-10-17',
+                        Statement: [
+                            {
+                                Sid: 'AllowRootAccountAdmin',
+                                Effect: 'Allow',
+                                Principal: { AWS: { 'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:root' } },
+                                Action: 'kms:*',
+                                Resource: '*'
+                            }
+                        ]
+                    }
                 }
-            }
-        };
+            };
 
-        definition.provider.iamRoleStatements.push({
-            Effect: 'Allow',
-            Action: ['kms:GenerateDataKey', 'kms:Decrypt'],
-            Resource: [{ 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] }]
-        });
+            definition.provider.iamRoleStatements.push({
+                Effect: 'Allow',
+                Action: ['kms:GenerateDataKey', 'kms:Decrypt'],
+                Resource: [{ 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] }]
+            });
 
-        definition.provider.environment.KMS_KEY_ARN = { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] };
+            definition.provider.environment.KMS_KEY_ARN = { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] };
+        }
 
         definition.plugins.push('serverless-kms-grants');
 
-        // Configure KMS grants with discovered default key
+        // Configure KMS grants with discovered default key or environment variable
         definition.custom.kmsGrants = {
             kmsKeyId: discoveredResources.defaultKmsKeyId || '${env:AWS_DISCOVERY_KMS_KEY_ID}'
         };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.402.d2f4ae6.0",
+  "version": "2.0.0--canary.395.c089c7d.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -9,7 +9,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/test": "2.0.0--canary.402.d2f4ae6.0",
+    "@friggframework/schemas": "2.0.0--canary.395.c089c7d.0",
+    "@friggframework/test": "2.0.0--canary.395.c089c7d.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -31,8 +32,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.402.d2f4ae6.0",
-    "@friggframework/prettier-config": "2.0.0--canary.402.d2f4ae6.0",
+    "@friggframework/eslint-config": "2.0.0--canary.395.c089c7d.0",
+    "@friggframework/prettier-config": "2.0.0--canary.395.c089c7d.0",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
@@ -64,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d2f4ae66bb73bad96425a52f8aa988930459c9fd"
+  "gitHead": "c089c7d850dab85bd2b1619d27e67e6761144191"
 }

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/test/auther-definition-tester.js

@@ -1,125 +0,0 @@
-const {
-    Auther,
-    ModuleConstants,
-    createObjectId,
-    connectToDatabase,
-    disconnectFromDatabase,
-} = require('@friggframework/core');
-const { createMockApiObject } = require("./mock-integration");
-
-
-function testAutherDefinition(definition, mocks) {
-    const getModule = async (params) => {
-        const module = await Auther.getInstance({
-            definition,
-            userId: createObjectId(),
-            ...params,
-        });
-        if (mocks.tokenResponse) {
-            mocks.getTokenFrom = async function(code) {
-                await this.setTokens(mocks.tokenResponse);
-                return mocks.tokenResponse
-            }
-            mocks.getTokenFromCode = mocks.getTokenFromCode || mocks.getTokenFrom
-            mocks.getTokenFromCodeBasicAuthHeader = mocks.getTokenFromCodeBasicAuthHeader || mocks.getTokenFrom
-            mocks.getTokenFromClientCredentials = mocks.getTokenFromClientCredentials || mocks.getTokenFrom
-            mocks.getTokenFromUsernamePassword = mocks.getTokenFromUsernamePassword || mocks.getTokenFrom
-        }
-        if (mocks.refreshResponse) {
-            mocks.refreshAccessToken = async function(code) {
-                await this.setTokens(mocks.refreshResponse);
-                return mocks.refreshResponse
-            }
-        }
-        module.api = createMockApiObject(jest, module.api, mocks);
-        return module
-    }
-
-
-    describe(`${definition.moduleName} Module Tests`, () => {
-        let module, authUrl;
-        beforeAll(async () => {
-            await connectToDatabase();
-            module = await getModule();
-        });
-
-        afterAll(async () => {
-            await disconnectFromDatabase();
-        });
-
-        let requirements, authCallbackParams;
-        if (definition.API.requesterType === ModuleConstants.authType.oauth2) {
-            authCallbackParams = mocks.authorizeResponse || mocks.authorizeParams;
-            describe('getAuthorizationRequirements() test', () => {
-                it('should return auth requirements', async () => {
-                    requirements = await module.getAuthorizationRequirements();
-                    expect(requirements).toBeDefined();
-                    expect(requirements.type).toEqual(ModuleConstants.authType.oauth2);
-                    expect(requirements.url).toBeDefined();
-                    authUrl = requirements.url;
-                });
-            });
-        } else if (definition.API.requesterType === ModuleConstants.authType.basic) {
-            // could also confirm authCallbackParams against the auth requirements
-            authCallbackParams = mocks.authorizeParams
-            describe('getAuthorizationRequirements() test', () => {
-                it('should return auth requirements', async () => {
-                    requirements = module.getAuthorizationRequirements();
-                    expect(requirements).toBeDefined();
-                    expect(requirements.type).toEqual(ModuleConstants.authType.basic);
-                });
-            });
-        } else if (definition.API.requesterType === ModuleConstants.authType.apiKey) {
-            // could also confirm authCallbackParams against the auth requirements
-            authCallbackParams = mocks.authorizeParams
-            describe('getAuthorizationRequirements() test', () => {
-                it('should return auth requirements', async () => {
-                    requirements = module.getAuthorizationRequirements();
-                    expect(requirements).toBeDefined();
-                    expect(requirements.type).toEqual(ModuleConstants.authType.apiKey);
-                });
-            });
-        }
-
-        describe('Authorization requests', () => {
-            let firstRes;
-            it('processAuthorizationCallback()', async () => {
-                firstRes = await module.processAuthorizationCallback(authCallbackParams);
-                expect(firstRes).toBeDefined();
-                expect(firstRes.entity_id).toBeDefined();
-                expect(firstRes.credential_id).toBeDefined();
-            });
-            it('retrieves existing entity on subsequent calls', async () => {
-                const res = await module.processAuthorizationCallback(authCallbackParams);
-                expect(res).toEqual(firstRes);
-            });
-        });
-
-        describe('Test credential retrieval and module instantiation', () => {
-            it('retrieve by entity id', async () => {
-                const newModule = await getModule({
-                    userId: module.userId,
-                    entityId: module.entity.id
-                });
-                expect(newModule).toBeDefined();
-                expect(newModule.entity).toBeDefined();
-                expect(newModule.credential).toBeDefined();
-                expect(await newModule.testAuth()).toBeTruthy();
-
-            });
-
-            it('retrieve by credential id', async () => {
-                const newModule = await getModule({
-                    userId: module.userId,
-                    credentialId: module.credential.id
-                });
-                expect(newModule).toBeDefined();
-                expect(newModule.credential).toBeDefined();
-                expect(await newModule.testAuth()).toBeTruthy();
-            });
-        });
-    });
-}
-
-module.exports = { testAutherDefinition }
-