add new properties for resource request (#23)

Author: eduardomourar

src/interface.ts

@@ -236,8 +236,14 @@ export class BaseResourceHandlerRequest<T extends BaseModel> extends BaseDto {
     @Expose() clientRequestToken: ClientRequestToken;
     @Expose() desiredResourceState?: T;
     @Expose() previousResourceState?: T;
+    @Expose() desiredResourceTags: Dict<string>;
+    @Expose() previousResourceTags: Dict<string>;
+    @Expose() systemTags: Dict<string>;
+    @Expose() awsAccountId: string;
+    @Expose() awsPartition: string;
     @Expose() logicalResourceIdentifier?: LogicalResourceId;
     @Expose() nextToken?: NextToken;
+    @Expose() region: string;
 }
 
 export class UnmodeledRequest extends BaseResourceHandlerRequest<BaseModel> {
@@ -246,6 +252,20 @@ export class UnmodeledRequest extends BaseResourceHandlerRequest<BaseModel> {
         return UnmodeledRequest.deserialize(obj);
     }
 
+    @Exclude()
+    public static getPartition(region: Optional<string>): Optional<string> {
+        if (!region) {
+            return null;
+        }
+        if (region.startsWith('cn')) {
+            return 'aws-cn';
+        }
+        if (region.startsWith('us-gov')) {
+            return 'aws-gov';
+        }
+        return 'aws';
+    }
+
     @Exclude()
     public toModeled<T extends BaseModel = BaseModel>(
         modelCls: Constructor<T> & { deserialize?: Function }
@@ -254,8 +274,13 @@ export class UnmodeledRequest extends BaseResourceHandlerRequest<BaseModel> {
             BaseResourceHandlerRequest<T>
         >({
             clientRequestToken: this.clientRequestToken,
+            desiredResourceTags: this.desiredResourceTags,
+            systemTags: this.systemTags,
+            awsAccountId: this.awsAccountId,
             logicalResourceIdentifier: this.logicalResourceIdentifier,
             nextToken: this.nextToken,
+            region: this.region,
+            awsPartition: UnmodeledRequest.getPartition(this.region),
         });
         request.desiredResourceState = modelCls.deserialize(
             this.desiredResourceState || {}

src/proxy.ts

@@ -161,15 +161,4 @@ export class ProgressEvent<
  */
 export class ResourceHandlerRequest<
     T extends BaseModel
-> extends BaseResourceHandlerRequest<T> {
-    @Expose() clientRequestToken: string;
-    @Expose() desiredResourceState: T;
-    @Expose() previousResourceState: T;
-    @Expose() desiredResourceTags: Dict<string>;
-    @Expose() systemTags: Dict<string>;
-    @Expose() awsAccountId: string;
-    @Expose() awsPartition: string;
-    @Expose() logicalResourceIdentifier: string;
-    @Expose() nextToken: string;
-    @Expose() region: string;
-}
+> extends BaseResourceHandlerRequest<T> {}

src/resource.ts

@@ -230,7 +230,11 @@ export abstract class BaseResource<T extends BaseModel = BaseModel> {
                 clientRequestToken: request.bearerToken,
                 desiredResourceState: request.requestData.resourceProperties,
                 previousResourceState: request.requestData.previousResourceProperties,
+                desiredResourceTags: request.requestData.stackTags,
+                systemTags: request.requestData.systemTags,
+                awsAccountId: request.awsAccountId,
                 logicalResourceIdentifier: request.requestData.logicalResourceId,
+                region: request.region,
             });
             return unmodeled.toModeled<T>(this.modelCls);
         } catch (err) {

tests/lib/interface.test.ts

@@ -1,4 +1,4 @@
-import { Integer } from '../../src/interface';
+import { Integer, UnmodeledRequest } from '../../src/interface';
 import { SerializableModel } from '../data/sample-model';
 
 describe('when getting interface', () => {
@@ -62,4 +62,14 @@ describe('when getting interface', () => {
         expect(typeof serialized['SomeInt']).toBe('number');
         expect(serialized['SomeInt']).toBe(35190274);
     });
+
+    test('unmodeled request partion', () => {
+        const partionMap = [null, 'aws', 'aws-cn', 'aws-gov'];
+        [null, 'us-east-1', 'cn-region1', 'us-gov-region1'].forEach(
+            (region: string, index: number) => {
+                const partion = UnmodeledRequest.getPartition(region);
+                expect(partion).toBe(partionMap[index]);
+            }
+        );
+    });
 });

tests/lib/resource.test.ts

@@ -323,7 +323,12 @@ describe('when getting resource', () => {
             clientRequestToken: request.bearerToken,
             desiredResourceState: { state: 'state1' },
             previousResourceState: { state: 'state2' },
+            desiredResourceTags: request.requestData.stackTags,
+            systemTags: request.requestData.systemTags,
+            awsAccountId: request.awsAccountId,
             logicalResourceIdentifier: 'myBucket',
+            region: request.region,
+            awsPartition: 'aws',
         });
     });