support protocol version 2.0.0 for callback

Author: eduardomourar

.pylintrc

@@ -22,3 +22,7 @@ good-names=e,ex,f,fp,i,j,k,v,n,_
 
 indent-string='    '
 max-line-length=88
+
+[DESIGN]
+
+max-attributes=12

codecov.yml

@@ -0,0 +1,7 @@
+coverage:
+  status:
+    project:
+      default:
+        threshold: 5%
+
+    patch: false

python/rpdk/typescript/codegen.py

@@ -48,6 +48,7 @@ def __init__(self):
         self.package_name = None
         self.package_root = None
         self._use_docker = True
+        self._protocol_version = "2.0.0"
         self._build_command = None
         self._lib_path = None
 
@@ -59,20 +60,22 @@ def _init_from_project(self, project):
         self._build_command = project.settings.get("buildCommand", None)
         self._lib_path = project.settings.get("supportLibrary", self.SUPPORT_LIB_URI)
 
-    def _prompt_for_use_docker(self, project):
+    def _init_settings(self, project):
+        LOG.debug("Writing settings")
         self._use_docker = input_with_validation(
             "Use docker for platform-independent packaging (Y/n)?\n",
             validate_no,
             "This is highly recommended unless you are experienced \n"
             "with cross-platform Typescript packaging.",
         )
         project.settings["useDocker"] = self._use_docker
+        project.settings["protocolVersion"] = self._protocol_version
 
     def init(self, project):
         LOG.debug("Init started")
 
         self._init_from_project(project)
-        self._prompt_for_use_docker(project)
+        self._init_settings(project)
 
         project.runtime = self.RUNTIME
         project.entrypoint = self.ENTRY_POINT

python/rpdk/typescript/data/.npmrc

@@ -1 +1 @@
-optional = false
+optional = true

python/rpdk/typescript/templates/handlers.ts

@@ -12,7 +12,6 @@ import {
 } from '{{lib_name}}';
 import { ResourceModel } from './models';
 
-
 // Use this logger to forward log messages to CloudWatch Logs.
 const LOGGER = console;
 
@@ -44,7 +43,7 @@ class Resource extends BaseResource<ResourceModel> {
             if (session instanceof SessionProxy) {
                 const client = session.client('S3');
             }
-            // Setting Status to success will signal to cfn that the operation is complete
+            // Setting Status to success will signal to CloudFormation that the operation is complete
             progress.status = OperationStatus.Success;
         } catch(err) {
             LOGGER.log(err);
@@ -98,7 +97,6 @@ class Resource extends BaseResource<ResourceModel> {
         const model: ResourceModel = request.desiredResourceState;
         const progress: ProgressEvent<ResourceModel> = ProgressEvent.builder()
             .status(OperationStatus.InProgress)
-            .resourceModel(model)
             .build() as ProgressEvent<ResourceModel>;
         // TODO: put code here
         progress.status = OperationStatus.Success;

src/callback.ts

@@ -1,9 +1,7 @@
-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';

src/index.ts

@@ -115,9 +115,8 @@ export class BaseResourceHandlerRequest<T extends BaseModel> {
 }
 
 export interface CfnResponse<T> {
-    bearerToken: string;
     errorCode?: HandlerErrorCode;
-    operationStatus: OperationStatus;
+    status: OperationStatus;
     message: string;
     resourceModel?: T;
     resourceModels?: T[];

src/interface.ts

@@ -97,7 +97,7 @@ export class ProgressEvent<R extends BaseModel = BaseModel, T = Map<string, any>
         return null;
     }
 
-    public serialize(toTesponse = false, bearerToken?: string): Map<string, any> {
+    public serialize(): Map<string, any> {
         // To match Java serialization, which drops 'null' values, and the
         // contract tests currently expect this also.
         const json: Map<string, any> = new Map<string, any>(Object.entries(this)); //JSON.parse(JSON.stringify(this)));
@@ -107,26 +107,17 @@ export class ProgressEvent<R extends BaseModel = BaseModel, T = Map<string, any>
             }
         });
         // Mutate to what's expected in the response.
-        if (toTesponse) {
-            json.set('bearerToken', bearerToken);
-            json.set('operationStatus', json.get('status'));
-            json.delete('status');
-            if (this.resourceModel) {
-                json.set('resourceModel', this.resourceModel.toObject());
-            }
-            if (this.resourceModels) {
-                const models = this.resourceModels.map((resource: R) =>
-                    resource.toObject()
-                );
-                json.set('resourceModels', models);
-            }
-            json.delete('callbackDelaySeconds');
-            if (json.has('callbackContext')) {
-                json.delete('callbackContext');
-            }
-            if (this.errorCode) {
-                json.set('errorCode', this.errorCode);
-            }
+        if (this.resourceModel) {
+            json.set('resourceModel', this.resourceModel.toObject());
+        }
+        if (this.resourceModels) {
+            const models = this.resourceModels.map((resource: R) =>
+                resource.toObject()
+            );
+            json.set('resourceModels', models);
+        }
+        if (this.errorCode) {
+            json.set('errorCode', this.errorCode);
         }
         return json;
     }