rename BaseResourceModel to BaseModel

Author: eduardomourar

python/rpdk/typescript/templates/models.ts

@@ -1,8 +1,8 @@
 // This is a generated file. Modifications will be overwritten.
-import { BaseResourceModel, Optional } from '{{lib_name}}';
+import { BaseModel, Optional } from '{{lib_name}}';
 
 {% for model, properties in models.items() %}
-export class {{ model|uppercase_first_letter }}{% if model == "ResourceModel" %} extends BaseResourceModel{% endif %} {
+export class {{ model|uppercase_first_letter }}{% if model == "ResourceModel" %} extends BaseModel{% endif %} {
     ['constructor']: typeof {{ model|uppercase_first_letter }};
     public static readonly TYPE_NAME: string = '{{ type_name }}';
 

src/callback.ts

@@ -2,11 +2,11 @@ import { v4 as uuidv4 } from 'uuid';
 import CloudFormation from 'aws-sdk/clients/cloudformation';
 
 import { SessionProxy } from './proxy';
-import { BaseResourceModel, CfnResponse, OperationStatus } from './interface';
+import { BaseModel, CfnResponse, OperationStatus } from './interface';
 
 const LOGGER = console;
 
-interface ProgressOptions extends CfnResponse<BaseResourceModel> {
+interface ProgressOptions extends CfnResponse<BaseModel> {
     session: SessionProxy;
     currentOperationStatus?: OperationStatus;
 }

src/interface.ts

@@ -69,8 +69,8 @@ export interface RequestContext<T> {
 
 @builder
 @allArgsConstructor
-export class BaseResourceModel {
-    ['constructor']: typeof BaseResourceModel;
+export class BaseModel {
+    ['constructor']: typeof BaseModel;
     protected static readonly TYPE_NAME?: string;
 
     constructor(...args: any[]) {}
@@ -92,7 +92,7 @@ export class BaseResourceModel {
         return data;
     }
 
-    public static deserialize(jsonData: any): ThisType<BaseResourceModel> {
+    public static deserialize(jsonData: any): ThisType<BaseModel> {
         return new this(new Map<string, any>(Object.entries(jsonData)));
     }
 
@@ -104,7 +104,7 @@ export class BaseResourceModel {
 }
 
 @allArgsConstructor
-export class BaseResourceHandlerRequest<T extends BaseResourceModel> {
+export class BaseResourceHandlerRequest<T extends BaseModel> {
     public clientRequestToken: ClientRequestToken;
     public desiredResourceState?: T;
     public previousResourceState?: T;

src/proxy.ts

@@ -6,7 +6,7 @@ import { allArgsConstructor, builder, IBuilder } from 'tombok';
 
 import {
     BaseResourceHandlerRequest,
-    BaseResourceModel,
+    BaseModel,
     HandlerErrorCode,
     OperationStatus,
 } from './interface';
@@ -43,7 +43,7 @@ export class SessionProxy {
 @allArgsConstructor
 @builder
 export class ProgressEvent<
-    R extends BaseResourceModel = BaseResourceModel,
+    R extends BaseModel = BaseModel,
     T = Map<string, any>
 > {
     /**
@@ -187,7 +187,7 @@ export class ProgressEvent<
 @allArgsConstructor
 @builder
 export class ResourceHandlerRequest<
-    T extends BaseResourceModel
+    T extends BaseModel
 > extends BaseResourceHandlerRequest<T> {
     public clientRequestToken: string;
     public desiredResourceState: T;

src/resource.ts

@@ -6,7 +6,7 @@ import { reportProgress } from './callback';
 import { BaseHandlerException, InternalFailure, InvalidRequest } from './exceptions';
 import {
     Action,
-    BaseResourceModel,
+    BaseModel,
     BaseResourceHandlerRequest,
     Callable,
     CfnResponse,
@@ -91,7 +91,7 @@ function ensureSerialize(toResponse = false): MethodDecorator {
     };
 }
 
-export abstract class BaseResource<T extends BaseResourceModel = BaseResourceModel> {
+export abstract class BaseResource<T extends BaseModel = BaseModel> {
     constructor(
         public typeName: string,
         private modelCls: Constructor<T>,

src/utils.ts

@@ -7,7 +7,7 @@ import { allArgsConstructor } from 'tombok';
 import {
     Action,
     BaseResourceHandlerRequest,
-    BaseResourceModel,
+    BaseModel,
     Credentials,
     RequestContext,
 } from './interface';
@@ -128,7 +128,7 @@ export class HandlerRequest<
 }
 
 @allArgsConstructor
-export class UnmodeledRequest extends BaseResourceHandlerRequest<BaseResourceModel> {
+export class UnmodeledRequest extends BaseResourceHandlerRequest<BaseModel> {
     constructor(...args: any[]) {
         super();
     }
@@ -139,7 +139,7 @@ export class UnmodeledRequest extends BaseResourceHandlerRequest<BaseResourceMod
         return request;
     }
 
-    public toModeled<T extends BaseResourceModel = BaseResourceModel>(
+    public toModeled<T extends BaseModel = BaseModel>(
         modelCls: Constructor<T> & { deserialize?: Function }
     ): BaseResourceHandlerRequest<T> {
         return new BaseResourceHandlerRequest<T>(

tests/lib/callback.test.ts

@@ -2,7 +2,7 @@ import CloudFormation from 'aws-sdk/clients/cloudformation';
 import { reportProgress } from '../../src/callback';
 import { SessionProxy } from '../../src/proxy';
 import {
-    BaseResourceModel,
+    BaseModel,
     HandlerErrorCode,
     OperationStatus,
 } from '../../src/interface';
@@ -78,7 +78,7 @@ describe('when getting callback', () => {
             errorCode: HandlerErrorCode.InternalFailure,
             operationStatus: OperationStatus.Failed,
             currentOperationStatus: OperationStatus.InProgress,
-            resourceModel: {} as BaseResourceModel,
+            resourceModel: {} as BaseModel,
             message: 'test message',
         });
         expect(recordHandlerProgress).toHaveBeenCalledTimes(1);

tests/lib/interface.test.ts

@@ -1,7 +1,7 @@
-import { BaseResourceModel, Optional } from '../../src/interface';
+import { BaseModel, Optional } from '../../src/interface';
 
 describe('when getting interface', () => {
-    class ResourceModel extends BaseResourceModel {
+    class ResourceModel extends BaseModel {
         ['constructor']: typeof ResourceModel;
         public static readonly TYPE_NAME: string = 'Test::Resource::Model';
 

tests/lib/proxy.test.ts

@@ -1,6 +1,6 @@
 import { ProgressEvent, SessionProxy } from '../../src/proxy';
 import {
-    BaseResourceModel,
+    BaseModel,
     Credentials,
     HandlerErrorCode,
     OperationStatus,
@@ -10,7 +10,7 @@ import {
 describe('when getting session proxy', () => {
     const BEARER_TOKEN = 'f3390613-b2b5-4c31-a4c6-66813dff96a6';
 
-    class ResourceModel extends BaseResourceModel {
+    class ResourceModel extends BaseModel {
         public static readonly TYPE_NAME: string = 'Test::Resource::Model';
 
         public somekey: Optional<string>;

tests/lib/resource.test.ts

@@ -7,7 +7,7 @@ import { reportProgress } from '../../src/callback';
 import {
     Action,
     BaseResourceHandlerRequest,
-    BaseResourceModel,
+    BaseModel,
     CfnResponse,
     HandlerErrorCode,
     OperationStatus,
@@ -38,7 +38,7 @@ describe('when getting resource', () => {
     let mockSession: jest.SpyInstance;
     const TYPE_NAME = 'Test::Foo::Bar';
     class Resource extends BaseResource {}
-    class MockModel extends BaseResourceModel {
+    class MockModel extends BaseModel {
         ['constructor']: typeof MockModel;
         public static readonly TYPE_NAME: string = TYPE_NAME;
         public static deserialize(jsonData: any): MockModel {
@@ -170,7 +170,7 @@ describe('when getting resource', () => {
     });
 
     test('entrypoint handler raises', async () => {
-        class Model extends BaseResourceModel {
+        class Model extends BaseModel {
             ['constructor']: typeof Model;
             aString: string;
             public static deserialize(jsonData: any): Model {
@@ -312,7 +312,7 @@ describe('when getting resource', () => {
                 return { state: 'state2' };
             });
 
-        class Model extends BaseResourceModel {
+        class Model extends BaseModel {
             ['constructor']: typeof Model;
             public static deserialize = mockDeserialize;
         }
@@ -490,7 +490,7 @@ describe('when getting resource', () => {
                 return { state: 'state2' };
             });
 
-        class Model extends BaseResourceModel {
+        class Model extends BaseModel {
             ['constructor']: typeof Model;
             public static deserialize = mockDeserialize;
         }
@@ -538,7 +538,7 @@ describe('when getting resource', () => {
     });
 
     test('test entrypoint success', async () => {
-        class Model extends BaseResourceModel {
+        class Model extends BaseModel {
             ['constructor']: typeof Model;
         }
         const spyDeserialize: jest.SpyInstance = jest.spyOn(Model, 'deserialize');