wip Function Factory

.gitignore

@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules
 
 # testing
 /coverage
@@ -22,4 +22,3 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-

__mocks__/aws-sdk.ts

@@ -1,15 +1,16 @@
 /**
  * Mocking the AWS SDK version 2
  * @see https://dev.to/elthrasher/mocking-aws-with-jest-and-typescript-199i
- * Uses `requireActual` because SST uses `SharedIniFileCredentials`
+ * Uses `importActual` because SST uses `SharedIniFileCredentials`
  *
  * For mocking AWS SDK version 3, use https://m-radzikowski.github.io/aws-sdk-client-mock/
  */
 
 import DynamoDB from './aws-sdk/clients/dynamodb';
 import S3 from './aws-sdk/clients/s3';
+import { vi } from 'vitest';
 
-const SharedIniFileCredentials =
-  jest.requireActual('aws-sdk').SharedIniFileCredentials;
+const SharedIniFileCredentials = ((await vi.importActual('aws-sdk')) as any)
+  .SharedIniFileCredentials;
 
 export { DynamoDB, S3, SharedIniFileCredentials };

__mocks__/aws-sdk/clients/dynamodb.ts

@@ -3,10 +3,11 @@
  * Only used methods are mocked.
  * @see https://dev.to/elthrasher/mocking-aws-with-jest-and-typescript-199i
  */
+import { vi } from 'vitest';
 
 import { awsSdkV2PromiseResponse } from '../../awsSdkV2PromiseResponse';
 
-export const batchWriteFn = jest
+export const batchWriteFn = vi
   .fn()
   .mockImplementation(() => ({ promise: awsSdkV2PromiseResponse }));
 

__mocks__/aws-sdk/clients/s3.ts

@@ -3,10 +3,11 @@
  * Only used methods are mocked.
  * @see https://dev.to/elthrasher/mocking-aws-with-jest-and-typescript-199i
  */
+import { vi } from 'vitest';
 
 import { awsSdkV2PromiseResponse } from '../../awsSdkV2PromiseResponse';
 
-export const getObjectFn = jest.fn().mockImplementation(() => ({
+export const getObjectFn = vi.fn().mockImplementation(() => ({
   createReadStream: awsSdkV2PromiseResponse,
 }));
 

__mocks__/awsSdkV2PromiseResponse.ts

@@ -2,7 +2,8 @@
  * For use in mocking AWS SDK v2.
  * @see https://dev.to/elthrasher/mocking-aws-with-jest-and-typescript-199i
  */
+import { vi } from 'vitest';
 
-export const awsSdkV2PromiseResponse = jest
+export const awsSdkV2PromiseResponse = vi
   .fn()
   .mockReturnValue(Promise.resolve(true));

config.json

@@ -0,0 +1,5 @@
+{
+  "matt-community-benchmarks-BenchmarkMachineStack": {
+    "BenchmarkStateMachineBenchmarkUrlC4F2BF06": "https://a014r3k9o7.execute-api.us-east-1.amazonaws.com"
+  }
+}

constructs/BenchmarkStateMachine.spec.ts

@@ -1,5 +1,7 @@
 import { App, Stack } from '@serverless-stack/resources';
 import { Template } from 'aws-cdk-lib/assertions';
+import { expect, test } from 'vitest';
+
 import lambdaTests from '../fixtures/lambda-tests';
 import { BenchmarkStateMachine } from './BenchmarkStateMachine';
 
@@ -10,7 +12,7 @@ test('BenchmarkStateMachine', () => {
     lambdaTests,
   });
   const template = Template.fromStack(stack);
-  template.resourceCountIs('AWS::Lambda::Function', 1);
-  template.resourceCountIs('AWS::StepFunctions::StateMachine', 4);
+  template.resourceCountIs('AWS::Lambda::Function', 3);
+  template.resourceCountIs('AWS::StepFunctions::StateMachine', 10);
   expect(template.toJSON()).toMatchSnapshot();
 });

constructs/BenchmarkStateMachine.ts

@@ -1,8 +1,8 @@
-import { Function, Table, TableFieldType } from '@serverless-stack/resources';
-import { Duration, RemovalPolicy } from 'aws-cdk-lib';
+import { Api, Function, Table } from '@serverless-stack/resources';
+import { CfnOutput, Duration, RemovalPolicy } from 'aws-cdk-lib';
 import { BillingMode } from 'aws-cdk-lib/aws-dynamodb';
 import { PolicyStatement } from 'aws-cdk-lib/aws-iam';
-import { Tracing } from 'aws-cdk-lib/aws-lambda';
+import { RetentionDays } from 'aws-cdk-lib/aws-logs';
 import {
   IntegrationPattern,
   JsonPath,
@@ -26,12 +26,14 @@ export class BenchmarkStateMachine extends Construct {
     const stateMachineName = 'benchmark-machine';
 
     const table = new Table(scope, 'BenchmarksTable', {
-      dynamodbTable: {
-        billingMode: BillingMode.PAY_PER_REQUEST,
-        removalPolicy: RemovalPolicy.DESTROY,
-        tableName: 'Benchmarks',
+      cdk: {
+        table: {
+          billingMode: BillingMode.PAY_PER_REQUEST,
+          removalPolicy: RemovalPolicy.DESTROY,
+          tableName: 'Benchmarks',
+        },
       },
-      fields: { pk: TableFieldType.STRING, sk: TableFieldType.STRING },
+      fields: { pk: 'string', sk: 'string' },
       primaryIndex: { partitionKey: 'pk', sortKey: 'sk' },
     });
 
@@ -45,15 +47,22 @@ export class BenchmarkStateMachine extends Construct {
           resources: ['*'],
         }),
       ],
+      logRetention: RetentionDays.ONE_WEEK,
       srcPath: 'src/benchmark',
-      tracing: Tracing.ACTIVE,
     });
 
+    // // Get data from the table
+    // const getBenchmarks = new Function(scope, 'GetBenchmarks', {
+    //   functionName: 'get-benchmarks',
+    //   handler: 'get-benchmarks.handler',
+    //   srcPath: 'src/benchmark',
+    // });
+
     // Step Functions parallel step to fan out to nested Sfn executions.
     const parallel = new Parallel(scope, 'Parallel Execution 0');
     let p = parallel;
 
-    const MAX_PARALLEL = 10;
+    const MAX_PARALLEL = 8;
 
     // Loop over functions to test. We will create a new nested state machine for each function.
     props.lambdaTests.forEach((lambdaTest, index) => {
@@ -73,7 +82,7 @@ export class BenchmarkStateMachine extends Construct {
         }
       );
 
-      // sfExecution.addRetry({ maxAttempts: 2 });
+      sfExecution.addRetry({ maxAttempts: 2 });
 
       if (index && index % MAX_PARALLEL === 0) {
         const np = new Parallel(
@@ -92,5 +101,24 @@ export class BenchmarkStateMachine extends Construct {
       stateMachineName,
       timeout: Duration.minutes(10),
     });
+
+    const api = new Api(this, 'BenchmarksApi', {
+      cors: true,
+      defaults: {
+        function: {
+          environment: { TABLE_NAME: table.tableName },
+          logRetention: RetentionDays.ONE_WEEK,
+          runtime: 'nodejs16.x',
+        },
+      },
+      routes: {
+        'GET /benchmarks': 'src/benchmark/get-benchmarks.handler',
+      },
+    });
+    api.attachPermissions([table]);
+
+    new CfnOutput(this, 'BenchmarkUrl', {
+      value: api.cdk.httpApi.apiEndpoint,
+    });
   }
 }