update callback file

Author: eduardomourar

src/callback.ts

@@ -1,10 +1,10 @@
 import { v4 as uuidv4 } from 'uuid';
+import CloudFormation from 'aws-sdk/clients/cloudformation';
 
 import {
     SessionProxy,
 } from './proxy';
 import { BaseResourceModel, OperationStatus, Response } from './interface';
-import { KitchenSinkEncoder } from './utils';
 
 
 const LOG = console;
@@ -25,24 +25,27 @@ export async function reportProgress(options: ProgressOptions): Promise<void> {
         resourceModel,
         message,
     } = options;
-    const client = session.client('CloudFormation');
+    const client: CloudFormation = session.client('CloudFormation') as CloudFormation;
 
-    const request: { [key: string]: any; } = {
+    const request: CloudFormation.RecordHandlerProgressInput = {
         BearerToken: bearerToken,
         OperationStatus: operationStatus,
         StatusMessage: message,
         ClientRequestToken: uuidv4(),
-    };
+    } as CloudFormation.RecordHandlerProgressInput;
     if (resourceModel) {
         request.ResourceModel = JSON.stringify(resourceModel);
     }
     if (errorCode) {
         request.ErrorCode = errorCode;
     }
     if (currentOperationStatus) {
-        request['CurrentOperationStatus'] = currentOperationStatus;
-        const response: { [key: string]: any; } = await client.makeRequest('recordHandlerProgress', request).promise()
-        const requestId = response['ResponseMetadata']['RequestId'];
+        request.CurrentOperationStatus = currentOperationStatus;
+        const response: { [key: string]: any; } = await client.recordHandlerProgress(request).promise();
+        let requestId: string = '';
+        if (response['ResponseMetadata']) {
+            requestId = response.ResponseMetadata.RequestId;
+        }
         LOG.info(`Record Handler Progress with Request Id ${requestId} and Request: ${request}`);
     }
 }

src/index.ts

@@ -0,0 +1,9 @@
+export * from './callback';
+export * as exceptions from './exceptions';
+export * from './interface';
+export * from './log-delivery';
+export * from './metrics';
+export * from './proxy';
+export * from './resource';
+export * from './scheduler';
+export * from './utils';

tests/lib/callback.test.ts

@@ -30,24 +30,25 @@ describe('when getting callback', () => {
 
     beforeEach(() => {
         recordHandlerProgress = mockResult({
-            ResponseMetadata: {RequestId: 'mock_request'}
+            ResponseMetadata: {RequestId: 'mock-request'}
         });
         const cfn = (CloudFormation as unknown) as jest.Mock;
         cfn.mockImplementation(() => {
+            const returnValue = {
+                recordHandlerProgress
+            };
             return {
+                ...returnValue,
                 makeRequest: (operation: string, params?: {[key: string]: any}) => {
-                    const returnValue = {
-                        recordHandlerProgress
-                    };
                     return returnValue[operation](params);
                 }
             };
         });
         session = new SessionProxy({});
-        
     });
 
     afterEach(() => {
+        jest.clearAllMocks();
         jest.restoreAllMocks();
     });