add sns testing

manwaring · manwaring · commit 9ede51687a94 · 2019-09-03T15:10:43.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -1 +1 @@
-export * from './api-wrapper';
+export * from './wrapper';
diff --git a/src/api/parser.test.ts b/src/api/parser.test.ts
@@ -1,6 +1,6 @@
 import { stringify } from 'querystring';
 import createEvent from '@serverless/event-mocks';
-import { Request, Body } from './api-parser';
+import { Request, Body } from './parser';
 
 describe('Body parsing', () => {
   it('Parses json body', () => {
diff --git a/src/api/parser.ts b/src/api/parser.ts
diff --git a/src/api/responses.test.ts b/src/api/responses.test.ts
@@ -1,5 +1,5 @@
 import createEvent from '@serverless/event-mocks';
-import { success, error, invalid, redirect } from './api-responses';
+import { success, error, invalid, redirect } from './responses';
 
 describe('API responses', () => {
   // @ts-ignore
@@ -13,6 +13,13 @@ describe('API responses', () => {
     });
   });
 
+  it('Handles success response without payload', () => {
+    expect(success()).toEqual({
+      headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Credentials': true },
+      statusCode: 200
+    });
+  });
+
   it('Handles error response', () => {
     expect(() => error('error')).toThrow('error');
   });
@@ -25,6 +32,13 @@ describe('API responses', () => {
     });
   });
 
+  it('Handles invalid response without validation errors', () => {
+    expect(invalid()).toEqual({
+      headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Credentials': true },
+      statusCode: 400
+    });
+  });
+
   it('Handles redirect response', () => {
     expect(redirect('url')).toEqual({
       headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Credentials': true, Location: 'url' },
diff --git a/src/api/responses.ts b/src/api/responses.ts
@@ -7,7 +7,7 @@ const HEADERS = {
   'Access-Control-Allow-Credentials': true
 };
 
-export function success(payload: any = null) {
+export function success(payload?: any) {
   const response = { statusCode: 200, headers: HEADERS };
   if (payload) {
     response['body'] = JSON.stringify(payload);
@@ -16,8 +16,11 @@ export function success(payload: any = null) {
   return response;
 }
 
-export function invalid(errors: string[] = []) {
-  const response = { statusCode: 400, headers: HEADERS, body: JSON.stringify({ errors }) };
+export function invalid(errors?: string[]) {
+  const response = { statusCode: 400, headers: HEADERS };
+  if (errors) {
+    response['body'] = JSON.stringify({ errors });
+  }
   metrics.invalid(response);
   return response;
 }
@@ -29,7 +32,7 @@ export function redirect(url: string) {
   return response;
 }
 
-export function error(error: any = '') {
+export function error(error?: any) {
   metrics.error(error);
   throw new Error(error);
 }
diff --git a/src/api/wrapper.test.ts b/src/api/wrapper.test.ts
@@ -1,5 +1,5 @@
 import createEvent from '@serverless/event-mocks';
-import { apiWrapper, ApiSignature } from './api-wrapper';
+import { apiWrapper, ApiSignature } from './wrapper';
 
 describe('API wrapper', () => {
   // @ts-ignore
diff --git a/src/api/wrapper.ts b/src/api/wrapper.ts
@@ -1,6 +1,6 @@
 import { APIGatewayEvent } from 'aws-lambda';
-import { Request } from './api-parser';
-import { success, invalid, redirect, error } from './api-responses';
+import { Request } from './parser';
+import { success, invalid, redirect, error } from './responses';
 
 export function apiWrapper<T extends Function>(fn: T): T {
   return <any>function(event: APIGatewayEvent) {
diff --git a/src/sns/index.ts b/src/sns/index.ts
@@ -1 +1 @@
-export * from './sns';
+export * from './wrapper';
diff --git a/src/sns/parser.test.ts b/src/sns/parser.test.ts
@@ -0,0 +1,24 @@
+import createEvent from '@serverless/event-mocks';
+import { SnsParser } from './parser';
+
+describe('Stream parsing', () => {
+  it('Parses string messages', () => {
+    const Sns = {
+      Message: 'hello world'
+    };
+    // @ts-ignore
+    const event = createEvent('aws:sns', { Records: [{ Sns }] });
+    const message = new SnsParser(event).getMessage();
+    expect(message).toEqual('hello world');
+  });
+
+  it('Parses JSON stringified messages', () => {
+    const Sns = {
+      Message: JSON.stringify({ hello: 'world' })
+    };
+    // @ts-ignore
+    const event = createEvent('aws:sns', { Records: [{ Sns }] });
+    const message = new SnsParser(event).getMessage();
+    expect(message).toEqual({ hello: 'world' });
+  });
+});
diff --git a/src/sns/parser.ts b/src/sns/parser.ts
@@ -0,0 +1,13 @@
+import { SNSEvent } from 'aws-lambda';
+
+export class SnsParser {
+  constructor(private event: SNSEvent) {}
+
+  getMessage() {
+    let message = this.event.Records[0].Sns.Message;
+    try {
+      message = JSON.parse(message);
+    } catch (err) {}
+    return message;
+  }
+}
diff --git a/src/sns/responses.test.ts b/src/sns/responses.test.ts
@@ -0,0 +1,11 @@
+import { success, error } from './responses';
+
+describe('Sns responses', () => {
+  it('Handles success response', () => {
+    expect(success('success')).toEqual('success');
+  });
+
+  it('Handles error response', () => {
+    expect(() => error('error')).toThrow('error');
+  });
+});
diff --git a/src/sns/responses.ts b/src/sns/responses.ts
@@ -0,0 +1,13 @@
+import { Metrics } from '../common';
+
+const metrics = new Metrics('SNS');
+
+export function success(message: any): void {
+  metrics.success(message);
+  return message;
+}
+
+export function error(error: any): void {
+  metrics.error(error);
+  throw new Error(error);
+}
diff --git a/src/sns/wrapper.test.ts b/src/sns/wrapper.test.ts
@@ -0,0 +1,20 @@
+import createEvent from '@serverless/event-mocks';
+import { snsWrapper, SnsSignature } from './wrapper';
+
+describe('Stream wrapper', () => {
+  const Sns = {
+    Message: 'hello world'
+  };
+  // @ts-ignore
+  const requestEvent = createEvent('aws:sns', { Records: [{ Sns }] });
+
+  it('Has expected properties and response funtions', () => {
+    function mockHandler({ event, message, success, error }: SnsSignature) {
+      expect(event).toEqual(requestEvent);
+      expect(message).toEqual('hello world');
+      expect(success).toBeInstanceOf(Function);
+      expect(error).toBeInstanceOf(Function);
+    }
+    snsWrapper(mockHandler)(requestEvent);
+  });
+});
diff --git a/src/sns/wrapper.ts b/src/sns/wrapper.ts
@@ -1,23 +1,15 @@
 import { SNSEvent } from 'aws-lambda';
 import { Metrics } from '../common';
+import { success, error } from './responses';
+import { SnsParser } from './parser';
 
 const metrics = new Metrics('SNS');
 
 export function snsWrapper<T extends Function>(fn: T): T {
   return <any>function(event: SNSEvent) {
-    const message = JSON.parse(event.Records[0].Sns.Message);
+    const message = new SnsParser(event).getMessage();
     metrics.common(message);
 
-    function success(message: any = ''): void {
-      metrics.success(message);
-      return message;
-    }
-
-    function error(error: any = ''): void {
-      metrics.error(error);
-      throw new Error(error);
-    }
-
     const signature: SnsSignature = { event, message, success, error };
     return fn(signature);
   };
diff --git a/src/stream/index.ts b/src/stream/index.ts
@@ -1 +1 @@
-export * from './stream-wrapper';
+export * from './wrapper';
diff --git a/src/stream/parser.test.ts b/src/stream/parser.test.ts
@@ -1,7 +1,7 @@
 import createEvent from '@serverless/event-mocks';
-import { Stream } from './stream';
+import { DynamoDBStreamParser } from './parser';
 
-describe('Stream parsing', () => {
+describe('DynamoDB stream parsing', () => {
   const firstRecord = {
     eventId: '1',
     eventVersion: '1.0',
@@ -53,63 +53,83 @@ describe('Stream parsing', () => {
           N: '456'
         }
       },
+      StreamViewType: 'NEW_AND_OLD_IMAGES',
+      SequenceNumber: '111',
+      SizeBytes: 26
+    },
+    awsRegion: 'us-east-1',
+    eventName: 'INSERT',
+    eventSourceARN: 'arn:aws:dynamodb:us-east-1:1234567890:table/table',
+    eventSource: 'aws-dynamodb'
+  };
+  const thirdRecord = {
+    eventId: '1',
+    eventVersion: '1.0',
+    dynamodb: {
+      Keys: {
+        Id: {
+          N: '789'
+        }
+      },
       OldImage: {
         Message: {
-          S: 'hola'
+          S: 'buongiorno'
         },
         Id: {
-          N: '456'
+          N: '789'
         }
       },
       StreamViewType: 'NEW_AND_OLD_IMAGES',
       SequenceNumber: '111',
       SizeBytes: 26
     },
     awsRegion: 'us-east-1',
-    eventName: 'PUT',
+    eventName: 'DELETE',
     eventSourceARN: 'arn:aws:dynamodb:us-east-1:1234567890:table/table',
     eventSource: 'aws-dynamodb'
   };
   // @ts-ignore
-  const event = createEvent('aws:dynamo', { Records: [firstRecord, secondRecord] });
-  const stream = new Stream(event);
+  const event = createEvent('aws:dynamo', { Records: [firstRecord, secondRecord, thirdRecord] });
+  const stream = new DynamoDBStreamParser(event);
   const { newVersions, oldVersions, versions } = stream.getVersions();
 
   it('Gets new versions correctly', () => {
-    const firstVersion = { Message: 'goodbye', Id: 123 };
-    const secondVersion = { Message: 'hasta la vista', Id: 456 };
     expect(newVersions).toHaveLength(2);
-    expect(newVersions).toContainEqual(firstVersion);
-    expect(newVersions).toContainEqual(secondVersion);
+    expect(newVersions).toContainEqual({ Message: 'goodbye', Id: 123 });
+    expect(newVersions).toContainEqual({ Message: 'hasta la vista', Id: 456 });
   });
 
   it('Gets old versions correctly', () => {
-    const firstVersion = { Message: 'hello', Id: 123 };
-    const secondVersion = { Message: 'hola', Id: 456 };
     expect(oldVersions).toHaveLength(2);
-    expect(oldVersions).toContainEqual(firstVersion);
-    expect(oldVersions).toContainEqual(secondVersion);
+    expect(oldVersions).toContainEqual({ Message: 'hello', Id: 123 });
+    expect(oldVersions).toContainEqual({ Message: 'buongiorno', Id: 789 });
   });
 
   it('Gets versions correctly', () => {
-    const firstVersion = {
+    expect(versions).toHaveLength(3);
+    expect(versions).toContainEqual({
       newVersion: { Message: 'goodbye', Id: 123 },
       oldVersion: { Message: 'hello', Id: 123 },
       keys: { Id: 123 },
       tableName: 'table',
       tableArn: 'arn:aws:dynamodb:us-east-1:1234567890:table/table',
       eventName: 'PUT'
-    };
-    const secondVersion = {
+    });
+    expect(versions).toContainEqual({
       newVersion: { Message: 'hasta la vista', Id: 456 },
-      oldVersion: { Message: 'hola', Id: 456 },
+      oldVersion: null,
       keys: { Id: 456 },
       tableName: 'table',
       tableArn: 'arn:aws:dynamodb:us-east-1:1234567890:table/table',
-      eventName: 'PUT'
-    };
-    expect(versions).toHaveLength(2);
-    expect(versions).toContainEqual(firstVersion);
-    expect(versions).toContainEqual(secondVersion);
+      eventName: 'INSERT'
+    });
+    expect(versions).toContainEqual({
+      newVersion: null,
+      oldVersion: { Message: 'buongiorno', Id: 789 },
+      keys: { Id: 789 },
+      tableName: 'table',
+      tableArn: 'arn:aws:dynamodb:us-east-1:1234567890:table/table',
+      eventName: 'DELETE'
+    });
   });
 });
diff --git a/src/stream/parser.ts b/src/stream/parser.ts
@@ -1,6 +1,6 @@
 import { DynamoDB, DynamoDBStreams } from 'aws-sdk';
 
-export class Stream {
+export class DynamoDBStreamParser {
   constructor(private event: Event) {}
 
   getVersions(): { newVersions: any[]; oldVersions: any[]; versions: Version[] } {
diff --git a/src/stream/responses.test.ts b/src/stream/responses.test.ts
@@ -0,0 +1,11 @@
+import { success, error } from './responses';
+
+describe('DynamoDB stream responses', () => {
+  it('Handles success response', () => {
+    expect(success('success')).toEqual('success');
+  });
+
+  it('Handles error response', () => {
+    expect(() => error('error')).toThrow('error');
+  });
+});
diff --git a/src/stream/responses.ts b/src/stream/responses.ts
@@ -0,0 +1,13 @@
+import { Metrics } from '../common';
+
+const metrics = new Metrics('DynamoDB Stream');
+
+export function success(message: any): void {
+  metrics.success(message);
+  return message;
+}
+
+export function error(error: any): void {
+  metrics.error(error);
+  throw new Error(error);
+}
diff --git a/src/stream/wrapper.test.ts b/src/stream/wrapper.test.ts
@@ -1,5 +1,5 @@
 import createEvent from '@serverless/event-mocks';
-import { streamWrapper } from './stream-wrapper';
+import { streamWrapper } from './wrapper';
 
 describe('Stream wrapper', () => {
   // @ts-ignore
diff --git a/src/stream/wrapper.ts b/src/stream/wrapper.ts

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export * from './api-wrapper';`
	`1`	`+export * from './wrapper';`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export * from './sns';`
	`1`	`+export * from './wrapper';`