@sylvesterllc/aws-constructs 1.0.63 → 1.0.64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,5 @@
1
- import { IRestApi } from "aws-cdk-lib/aws-apigateway";
1
+ import { IRestApi, RequestAuthorizer, TokenAuthorizer } from "aws-cdk-lib/aws-apigateway";
2
2
  export interface ApiLambdaResult {
3
3
  api: IRestApi;
4
+ authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null;
4
5
  }
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpTGFtYmRhUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludGVyZmFjZXMvQXBpTGFtYmRhUmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJUmVzdEFwaSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtYXBpZ2F0ZXdheVwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEFwaUxhbWJkYVJlc3VsdCB7XG4gICAgYXBpOiAgSVJlc3RBcGk7XG4gICAgXG59Il19
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpTGFtYmRhUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludGVyZmFjZXMvQXBpTGFtYmRhUmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUb2tlbiB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgSVJlc3RBcGksIFJlcXVlc3RBdXRob3JpemVyLCBUb2tlbkF1dGhvcml6ZXIgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWFwaWdhdGV3YXlcIjtcblxuZXhwb3J0IGludGVyZmFjZSBBcGlMYW1iZGFSZXN1bHQge1xuICAgIGFwaTogIElSZXN0QXBpO1xuICAgIGF1dGhvcml6ZXI6IFRva2VuQXV0aG9yaXplciB8IFJlcXVlc3RBdXRob3JpemVyIHwgdW5kZWZpbmVkIHwgbnVsbDtcbn0iXX0=
@@ -13,9 +13,8 @@ export declare class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaRes
13
13
  protected requireAuthorizer: boolean;
14
14
  protected authorizer?: TsgAuthorizerType;
15
15
  constructor(scope: Construct, config: AppConfig, gatewayApi: IRestApi, layers?: LayerVersion[] | undefined, tables?: ITable[] | undefined);
16
- protected createResource(scope: Construct): any[] | null;
16
+ protected createResource(scope: Construct): ApiLambdaResult[] | null;
17
17
  protected createOutput<T>(scope: Construct, createdAssets: T[]): void;
18
- private onInit;
19
18
  private createAuthorizer;
20
19
  private assignAccessToTables;
21
20
  private AddRoutes;
@@ -19,6 +19,7 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
19
19
  this.gatewayApi = gatewayApi;
20
20
  this.layers = layers;
21
21
  this.tables = tables;
22
+ console.log('### CreateApiAndAttachLambdas ### Constructor ###: ', config);
22
23
  this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER &&
23
24
  this.config.RESOURCES.AUTHORIZER.type) ? true : false;
24
25
  if (this.requireAuthorizer) {
@@ -27,15 +28,9 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
27
28
  else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {
28
29
  throw new Error(`You must provide an authorizer type if a Authorizer is required`);
29
30
  }
30
- this.onInit();
31
+ this.createdResources = this.createResource(scope);
31
32
  }
32
33
  createResource(scope) {
33
- return null;
34
- }
35
- createOutput(scope, createdAssets) {
36
- return;
37
- }
38
- onInit() {
39
34
  let authorizer = undefined;
40
35
  // Create Authorizer
41
36
  if (this.requireAuthorizer) {
@@ -49,7 +44,18 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
49
44
  }
50
45
  // Create Routes on API Gateway for Lambdas from config
51
46
  this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer || undefined);
52
- return lambdas.Lambdas;
47
+ const result = {
48
+ api: this.gatewayApi,
49
+ authorizer: authorizer
50
+ };
51
+ return [result];
52
+ }
53
+ createOutput(scope, createdAssets) {
54
+ this.createdResources.forEach((x, idx) => {
55
+ new aws_cdk_lib_1.CfnOutput(scope, `Authorizerr-${idx}`, {
56
+ value: x.authorizer?.authorizerArn
57
+ });
58
+ });
53
59
  }
54
60
  createAuthorizer() {
55
61
  let authorizer = undefined;
@@ -91,4 +97,4 @@ class CreateApiAndAttachLambdas extends baseResource_1.BaseResource {
91
97
  }
92
98
  }
93
99
  exports.CreateApiAndAttachLambdas = CreateApiAndAttachLambdas;
94
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CreateApiAndAttachLambdas.js","sourceRoot":"","sources":["../../../src/resources/gateway/CreateApiAndAttachLambdas.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { BaseResource } from \"../base/baseResource\";\nimport { ITable } from \"aws-cdk-lib/aws-dynamodb\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { ApiLambdaResult } from \"../../interfaces/ApiLambdaResult\";\nimport { TsgAuthorizerType } from \"../../config/types/TsgAuthorizerType\";\nimport { IRestApi, RequestAuthorizer, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { TsgJwtTokenAuthorizer } from \"../lambda-authorizer/TsgJwtTokenAuthorizer\";\nimport { RemovalPolicy } from \"aws-cdk-lib\";\nimport { TsgRequestAuthorizer } from \"../lambda-authorizer/TsgRequestAuthorizer\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { TsgLambdaProp } from \"../../config/types\";\nimport { Routes } from \"../helpers/createRoutes\";\n\nexport class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {\n    \n    protected requireAuthorizer: boolean;\n    protected authorizer?: TsgAuthorizerType;\n\n    constructor(scope: Construct,\n        config: AppConfig,\n        private gatewayApi: IRestApi,\n        private layers?: LayerVersion[],\n        private tables?: ITable[]) {\n        super(scope, config);\n\n        this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && \n            this.config.RESOURCES.AUTHORIZER.type) ? true : false;       \n\n        if (this.requireAuthorizer) {\n            this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;\n        } else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {\n            throw new Error(`You must provide an authorizer type if a Authorizer is required`);\n        }\n\n        this.onInit();\n    }\n\n    protected createResource(scope: Construct): any[] | null {\n\n        return null;\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        return;\n    }\n\n    private onInit() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = this.createAuthorizer();\n        }\n\n        // Create Lambdas\n        const lambdas = new CreateLambda(this.scope, this.config, this.layers);\n        \n        // Give Access to Lambdds to All DynamoDb Tables\n        if (this.tables) {\n            this.assignAccessToTables(this.tables, lambdas.Lambdas);\n        }\n\n        // Create Routes on API Gateway for Lambdas from config\n        this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer || undefined);\n\n        return lambdas.Lambdas;\n    }\n\n    private createAuthorizer() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;\n\n        if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.TOKEN_AUTHORIZER) {\n\n            authorizer = new TsgJwtTokenAuthorizer(this.scope,\n                this.config).JwtAuthorizer;\n\n            authorizer?._attachToApi(this.gatewayApi);\n            authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n\n        } else if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.REQUEST_AUTHORIZER) {\n            authorizer = new TsgRequestAuthorizer(this.scope,\n                this.config).RequestAuthorizer as RequestAuthorizer;\n\n            authorizer?._attachToApi(this.gatewayApi);\n            authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n        }\n        return null;\n    }\n\n    private assignAccessToTables(tables: ITable[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            lambdas.forEach((lambda: NodejsFunction) => {\n\n                tables.forEach((table: ITable) => {\n\n                    table.grantReadWriteData(lambda);\n\n                });\n            });\n        }\n    }\n\n    private AddRoutes(config: AppConfig,\n        gateway: IRestApi,\n        lambdas: NodejsFunction[],\n        authorizer?: TokenAuthorizer|RequestAuthorizer) {\n\n        config.RESOURCES.LAMBDA?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.config);\n\n            if (!lambdaId) {\n                throw new Error(`Can't find lambda`);\n            }\n            const lambdaNode = lambdas.find(x => x.node.id === lambdaId);\n\n            if (!lambdaNode) {\n                throw new Error(\"Can't find the Lambda Integration\");\n            }\n\n            Routes.createResource(prop, gateway, lambdaNode, authorizer);\n        });\n    }\n}"]}
100
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CreateApiAndAttachLambdas.js","sourceRoot":"","sources":["../../../src/resources/gateway/CreateApiAndAttachLambdas.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { BaseResource } from \"../base/baseResource\";\nimport { ITable } from \"aws-cdk-lib/aws-dynamodb\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { ApiLambdaResult } from \"../../interfaces/ApiLambdaResult\";\nimport { TsgAuthorizerType } from \"../../config/types/TsgAuthorizerType\";\nimport { IRestApi, RequestAuthorizer, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { TsgJwtTokenAuthorizer } from \"../lambda-authorizer/TsgJwtTokenAuthorizer\";\nimport { CfnOutput, RemovalPolicy } from \"aws-cdk-lib\";\nimport { TsgRequestAuthorizer } from \"../lambda-authorizer/TsgRequestAuthorizer\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { TsgLambdaProp } from \"../../config/types\";\nimport { Routes } from \"../helpers/createRoutes\";\n\nexport class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {\n    \n    protected requireAuthorizer: boolean;\n    protected authorizer?: TsgAuthorizerType;\n\n    constructor(scope: Construct,\n        config: AppConfig,\n        private gatewayApi: IRestApi,\n        private layers?: LayerVersion[],\n        private tables?: ITable[]) {\n        super(scope, config);\n\n        console.log('### CreateApiAndAttachLambdas ### Constructor ###: ', config);\n        \n        this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER && \n            this.config.RESOURCES.AUTHORIZER.type) ? true : false;       \n\n        if (this.requireAuthorizer) {\n            this.authorizer = this.config.RESOURCES.AUTHORIZER?.type;\n        } else if (this.config.RESOURCES.AUTHORIZER && !this.config.RESOURCES.AUTHORIZER.type) {\n            throw new Error(`You must provide an authorizer type if a Authorizer is required`);\n        }\n\n        this.createdResources = this.createResource(scope)!;\n    }\n\n    protected createResource(scope: Construct): ApiLambdaResult[] | null {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = this.createAuthorizer();\n        }\n\n        // Create Lambdas\n        const lambdas = new CreateLambda(this.scope, this.config, this.layers);\n        \n        // Give Access to Lambdds to All DynamoDb Tables\n        if (this.tables) {\n            this.assignAccessToTables(this.tables, lambdas.Lambdas);\n        }\n\n        // Create Routes on API Gateway for Lambdas from config\n        this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer || undefined);\n\n        const result: ApiLambdaResult = {\n            api: this.gatewayApi,\n            authorizer: authorizer\n        };\n        return [result];\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        \n        this.createdResources!.forEach((x, idx) => {\n            new CfnOutput(scope, `Authorizerr-${idx}`, {\n                value: x.authorizer?.authorizerArn!\n            });\n        });\n    }    \n\n    private createAuthorizer() {\n\n        let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;\n\n        if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.TOKEN_AUTHORIZER) {\n\n            authorizer = new TsgJwtTokenAuthorizer(this.scope,\n                this.config).JwtAuthorizer;\n\n            authorizer?._attachToApi(this.gatewayApi);\n            authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n\n        } else if (this.requireAuthorizer && this.authorizer === TsgAuthorizerType.REQUEST_AUTHORIZER) {\n            authorizer = new TsgRequestAuthorizer(this.scope,\n                this.config).RequestAuthorizer as RequestAuthorizer;\n\n            authorizer?._attachToApi(this.gatewayApi);\n            authorizer?.applyRemovalPolicy(RemovalPolicy.DESTROY);\n\n            return authorizer;\n        }\n        return null;\n    }\n\n    private assignAccessToTables(tables: ITable[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            lambdas.forEach((lambda: NodejsFunction) => {\n\n                tables.forEach((table: ITable) => {\n\n                    table.grantReadWriteData(lambda);\n\n                });\n            });\n        }\n    }\n\n    private AddRoutes(config: AppConfig,\n        gateway: IRestApi,\n        lambdas: NodejsFunction[],\n        authorizer?: TokenAuthorizer|RequestAuthorizer) {\n\n        config.RESOURCES.LAMBDA?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.config);\n\n            if (!lambdaId) {\n                throw new Error(`Can't find lambda`);\n            }\n            const lambdaNode = lambdas.find(x => x.node.id === lambdaId);\n\n            if (!lambdaNode) {\n                throw new Error(\"Can't find the Lambda Integration\");\n            }\n\n            Routes.createResource(prop, gateway, lambdaNode, authorizer);\n        });\n    }\n}"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sylvesterllc/aws-constructs",
3
- "version": "1.0.63",
3
+ "version": "1.0.64",
4
4
  "description": "AWS Constructs",
5
5
  "main": "dist/index.js",
6
6
  "keywords": [
@@ -1,6 +1,7 @@
1
- import { IRestApi } from "aws-cdk-lib/aws-apigateway";
1
+ import { Token } from "aws-cdk-lib";
2
+ import { IRestApi, RequestAuthorizer, TokenAuthorizer } from "aws-cdk-lib/aws-apigateway";
2
3
 
3
4
  export interface ApiLambdaResult {
4
5
  api: IRestApi;
5
-
6
+ authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null;
6
7
  }
@@ -6,7 +6,7 @@ import { ApiLambdaResult } from "../../interfaces/ApiLambdaResult";
6
6
  import { TsgAuthorizerType } from "../../config/types/TsgAuthorizerType";
7
7
  import { IRestApi, RequestAuthorizer, TokenAuthorizer } from "aws-cdk-lib/aws-apigateway";
8
8
  import { TsgJwtTokenAuthorizer } from "../lambda-authorizer/TsgJwtTokenAuthorizer";
9
- import { RemovalPolicy } from "aws-cdk-lib";
9
+ import { CfnOutput, RemovalPolicy } from "aws-cdk-lib";
10
10
  import { TsgRequestAuthorizer } from "../lambda-authorizer/TsgRequestAuthorizer";
11
11
  import { CreateLambda } from "../lambda/createLambda";
12
12
  import { TsgLambdaProps } from "../../config/types/TsgLambdaProps";
@@ -27,6 +27,8 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
27
27
  private tables?: ITable[]) {
28
28
  super(scope, config);
29
29
 
30
+ console.log('### CreateApiAndAttachLambdas ### Constructor ###: ', config);
31
+
30
32
  this.requireAuthorizer = (this.config.RESOURCES.AUTHORIZER &&
31
33
  this.config.RESOURCES.AUTHORIZER.type) ? true : false;
32
34
 
@@ -36,19 +38,10 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
36
38
  throw new Error(`You must provide an authorizer type if a Authorizer is required`);
37
39
  }
38
40
 
39
- this.onInit();
41
+ this.createdResources = this.createResource(scope)!;
40
42
  }
41
43
 
42
- protected createResource(scope: Construct): any[] | null {
43
-
44
- return null;
45
- }
46
-
47
- protected createOutput<T>(scope: Construct, createdAssets: T[]): void {
48
- return;
49
- }
50
-
51
- private onInit() {
44
+ protected createResource(scope: Construct): ApiLambdaResult[] | null {
52
45
 
53
46
  let authorizer: TokenAuthorizer | RequestAuthorizer | undefined | null = undefined;
54
47
 
@@ -68,9 +61,22 @@ export class CreateApiAndAttachLambdas extends BaseResource<ApiLambdaResult> {
68
61
  // Create Routes on API Gateway for Lambdas from config
69
62
  this.AddRoutes(this.config, this.gatewayApi, lambdas.Lambdas, authorizer || undefined);
70
63
 
71
- return lambdas.Lambdas;
64
+ const result: ApiLambdaResult = {
65
+ api: this.gatewayApi,
66
+ authorizer: authorizer
67
+ };
68
+ return [result];
72
69
  }
73
70
 
71
+ protected createOutput<T>(scope: Construct, createdAssets: T[]): void {
72
+
73
+ this.createdResources!.forEach((x, idx) => {
74
+ new CfnOutput(scope, `Authorizerr-${idx}`, {
75
+ value: x.authorizer?.authorizerArn!
76
+ });
77
+ });
78
+ }
79
+
74
80
  private createAuthorizer() {
75
81
 
76
82
  let authorizer: TokenAuthorizer | RequestAuthorizer | undefined = undefined;