@sylvesterllc/aws-constructs 1.0.4 → 1.0.6
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.
- package/dist/resources/gateway/createMicroServiceBundle.js +3 -3
- package/dist/resources/helpers/createAuthorizer.js +5 -4
- package/dist/resources/lambda/createLambda.d.ts +1 -1
- package/dist/resources/lambda/createLambda.js +4 -4
- package/package.json +1 -1
- package/src/resources/gateway/createMicroServiceBundle.ts +4 -3
- package/src/resources/helpers/createAuthorizer.ts +6 -4
- package/src/resources/lambda/createLambda.ts +3 -3
|
@@ -25,6 +25,7 @@ class CreateMicroServiceBundle {
|
|
|
25
25
|
// Create Authorizer
|
|
26
26
|
if (this.requireAuthorizer) {
|
|
27
27
|
authorizer = new createAuthorizer_1.CreateAuthorizer(scope, this.appConfig, this.props.RESOURCES.AUTHORIZER).JwtAuthorizer;
|
|
28
|
+
authorizer._attachToApi(this.gatewayApi);
|
|
28
29
|
}
|
|
29
30
|
// Create Lambdas
|
|
30
31
|
const lambdaProp = {
|
|
@@ -106,7 +107,7 @@ class CreateMicroServiceBundle {
|
|
|
106
107
|
}
|
|
107
108
|
AddRoutes(props, gateway, lambdas, authorizer) {
|
|
108
109
|
this.appConfig.lambdaConfigs?.forEach((prop) => {
|
|
109
|
-
const lambdaId = createLambda_1.CreateLambda.getIdForLambda(prop);
|
|
110
|
+
const lambdaId = createLambda_1.CreateLambda.getIdForLambda(prop, this.appConfig);
|
|
110
111
|
if (!lambdaId) {
|
|
111
112
|
throw new Error(`Can't find lambda`);
|
|
112
113
|
}
|
|
@@ -120,9 +121,8 @@ class CreateMicroServiceBundle {
|
|
|
120
121
|
AssignAccessToSecretManager(secret, lambdas) {
|
|
121
122
|
lambdas.forEach((lambda) => {
|
|
122
123
|
const result = secret.grantRead(lambda);
|
|
123
|
-
console.log('Assigning Access to Secret Manager: ', result);
|
|
124
124
|
});
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
exports.CreateMicroServiceBundle = CreateMicroServiceBundle;
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createMicroServiceBundle.js","sourceRoot":"","sources":["../../../src/resources/gateway/createMicroServiceBundle.ts"],"names":[],"mappings":";;;AACA,2DAAyD;AAEzD,iDAA8D;AAK9D,kEAA+D;AAC/D,0DAAiD;AACjD,yDAAsD;AACtD,6CAA8C;AAC9C,2DAA0D;AAM1D,MAAa,wBAAwB;IAKjC,YAAY,KAAgB,EACP,UAAoB,EACpB,KAAwB,EACxB,SAAoB,EACpB,MAAgB,EAChB,SAAmB,EACnB,MAAuB;QALvB,eAAU,GAAV,UAAU,CAAU;QACpB,UAAK,GAAL,KAAK,CAAmB;QACxB,cAAS,GAAT,SAAS,CAAW;QACpB,WAAM,GAAN,MAAM,CAAU;QAChB,cAAS,GAAT,SAAS,CAAU;QACnB,WAAM,GAAN,MAAM,CAAiB;QAGxC,IAAI,CAAC,sBAAsB,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACnG,IAAI,CAAC,iBAAiB,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAEO,MAAM,CAAC,KAAgB;QAG3B,IAAI,UAAU,GAA8B,SAAS,CAAC;QAEtD,oBAAoB;QACpB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,UAAU,GAAG,IAAI,mCAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,UAAW,CAAC,CAAC,aAAa,CAAC;SAC5G;QAED,iBAAiB;QACjB,MAAM,UAAU,GAAmB;YAC/B,KAAK;YACL,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,2BAAY,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAE7D,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;SAC3D;QAED,kCAAkC;QAClC,IAAI,IAAI,CAAC,sBAAsB,EAAE;YAC7B,IAAI,CAAC,uBAAuB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;SACjG;QAED,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;SACrE;QAED,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3B,MAAM,CAAC,YAAY,CAAC;gBACZ,KAAK,EAAE,GAAG,MAAM,CAAC,YAAY,SAAS;gBACtC,MAAM,EAAE,sBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;aAElC,CAAC,CAAA;QACN,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC7E,CAAC;IAEO,oBAAoB,CAAC,MAAe,EAAE,OAAyB;QAEnE,IAAI,MAAM,EAAE;YACR,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,EAAE;gBAE7B,OAAO,CAAC,OAAO,CAAC,CAAC,MAAsB,EAAE,EAAE;oBAEvC,yCAAyC;oBACzC,0BAA0B;oBAC1B,mCAAmC;oBAEnC,eAAe;oBACf,MAAM,CAAC,eAAe,CAClB,IAAI,yBAAe,CAAC;wBAChB,MAAM,EAAE,gBAAM,CAAC,KAAK;wBACpB,OAAO,EAAE,6BAAc,CAAC,gBAAgB;wBACxC,SAAS,EAAE;4BACP,KAAK,CAAC,QAAQ;4BACd,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,qDAAqD;yBAC/E;qBACJ,CAAC,CACL,CAAC;gBAIN,CAAC,CAAC,CAAC;YAEP,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAEO,uBAAuB,CAAC,KAAgB,EAAE,SAA0C,EAAE,OAAyB;QAEnH,IAAI,SAAS,EAAE;YACX,SAAS,CAAC,OAAO,CAAC,CAAC,QAA2B,EAAE,EAAE;gBAE9C,IAAI,QAAQ,CAAC,MAAM,EAAE;oBACjB,IAAI,CAAC,oCAAoC,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;iBACvE;qBACI;oBACD,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAC/D;YACL,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAEO,oCAAoC,CAAC,KAAgB,EAAE,QAA2B,EAAE,OAAyB;QACjH,OAAO,CAAC,OAAO,CAAC,CAAC,MAAsB,EAAE,EAAE;YAEvC,IAAI,QAAQ,GAAG,mBAAmB,GAAG,QAAQ,CAAC,MAAM,GAAG,GAAG,GAAG,CAAE,KAAe,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;YACzH,IAAI,SAAS,GAAG,IAAI,yBAAe,CAAC;gBAChC,MAAM,EAAE,gBAAM,CAAC,KAAK;gBACpB,SAAS,EAAE;oBACP,QAAQ;oBACR,QAAQ,GAAG,UAAU;iBACxB;gBACD,OAAO,EAAE,6BAAc,CAAC,gBAAgB;aAC3C,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAEjD,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,4BAA4B,CAAC,KAAgB,EAAE,QAA2B,EAAE,OAAyB;QACzG,IAAI,KAAK,GAAW,oBAAK,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;QAEvF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAsB,EAAE,EAAE;YACvC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;QAEpC,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,SAAS,CAAC,KAAwB,EACtC,OAAiB,EACjB,OAAyB,EACzB,UAA4B;QAE5B,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,IAAmB,EAAE,EAAE;YAE1D,MAAM,QAAQ,GAAG,2BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAEnD,IAAI,CAAC,QAAQ,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACxC;YACD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;YAE7D,IAAI,CAAC,UAAU,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;aACxD;YAED,qBAAM,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAEjE,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,2BAA2B,CAAC,MAAe,EAAE,OAAyB;QAE1E,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAC,MAAM,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IAEP,CAAC;CAEJ;AAxKD,4DAwKC","sourcesContent":["import { IRestApi, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { ITable, Table } from \"aws-cdk-lib/aws-dynamodb\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Effect, PolicyStatement } from \"aws-cdk-lib/aws-iam\";\nimport { Construct } from \"constructs\";\nimport { TsgDynamoTableRef, TsgLambdaProp } from \"../../config/types\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { MicroserviceProps } from \"../../interfaces/MicroserviceProps\";\nimport { CreateAuthorizer } from \"../helpers/createAuthorizer\";\nimport { Routes } from \"../helpers/createRoutes\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { Duration, Stack } from \"aws-cdk-lib\";\nimport { CreateDynamoDb } from \"../dynamodb/CreateDynamo\";\nimport { ISecret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { MetricOptions } from \"aws-cdk-lib/aws-cloudwatch\";\n\nexport class CreateMicroServiceBundle {\n    \n    protected readonly requireDynamoTableRefs: boolean;\n    protected readonly requireAuthorizer: boolean;\n\n    constructor(scope: Construct, \n        private readonly gatewayApi: IRestApi, \n        private readonly props: MicroserviceProps,        \n        private readonly appConfig: AppConfig,\n        private readonly tables?: Table[], \n        private readonly secretMgr?: ISecret, \n        private readonly layers?: LayerVersion[],        \n        ) {\n        \n        this.requireDynamoTableRefs = (props.RESOURCES.DYNAMO?.TABLE_REFS?.length ?? 0 > 0) ? true : false;\n        this.requireAuthorizer = (props.RESOURCES.AUTHORIZER) ? true : false;\n        this.onInit(scope);\n    }\n\n    private onInit(scope: Construct) {\n\n        \n        let authorizer: TokenAuthorizer|undefined = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = new CreateAuthorizer(scope, this.appConfig, this.props.RESOURCES.AUTHORIZER!).JwtAuthorizer;   \n        }        \n\n        // Create Lambdas\n        const lambdaProp: TsgLambdaProps = {\n            scope,\n            prop: this.props,            \n            layers: this.layers,\n            appConfig: this.appConfig\n        };\n\n        const lambdas = new CreateLambda(lambdaProp, this.appConfig);\n\n        if (this.tables) {\n            this.AssignAccessToTables(this.tables, lambdas.Lambdas);\n        }        \n\n        // Allow access to existing tables\n        if (this.requireDynamoTableRefs) {\n            this.AssignAccessToTableRefs(scope, this.props.RESOURCES.DYNAMO?.TABLE_REFS, lambdas.Lambdas);\n        }\n\n        if (this.secretMgr) {\n            this.AssignAccessToSecretManager(this.secretMgr, lambdas.Lambdas);\n        }        \n\n        lambdas.Lambdas.map((lambda) => {\n            lambda.metricErrors({                \n                    label: `${lambda.functionName}-errors`, \n                    period: Duration.minutes(3)           \n                \n            })\n        });\n\n        this.AddRoutes(this.props, this.gatewayApi, lambdas.Lambdas, authorizer);\n    }\n\n    private AssignAccessToTables(tables: Table[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            tables.forEach((table: ITable) => {\n\n                lambdas.forEach((lambda: NodejsFunction) => {\n\n                    //  This is a CDK bug: It doesn't provide\n                    //  access to the indexes.\n                    //table.grantReadWriteData(lambda);\n\n                    //  Workaround:\n                    lambda.addToRolePolicy(\n                        new PolicyStatement({\n                            effect: Effect.ALLOW,\n                            actions: CreateDynamoDb.ReadWriteActions,\n                            resources: [\n                                table.tableArn,\n                                `${table.tableArn}/*`, // This is not recognized by cdk, but table is.  why?\n                            ],\n                        })\n                    );\n\n                    \n                    \n                });\n\n            });\n        }\n    }\n\n    private AssignAccessToTableRefs(scope: Construct, tableRefs: TsgDynamoTableRef[] | undefined, lambdas: NodejsFunction[]) {\n\n        if (tableRefs) {\n            tableRefs.forEach((tableRef: TsgDynamoTableRef) => {\n\n                if (tableRef.region) {\n                    this.AssignReadWriteAccessToTableInRegion(scope, tableRef, lambdas);\n                }\n                else {\n                    this.AssignReadWriteAccessToTable(scope, tableRef, lambdas);\n                }\n            });\n        }\n    }\n\n    private AssignReadWriteAccessToTableInRegion(scope: Construct, tableRef: TsgDynamoTableRef, lambdas: NodejsFunction[]) {\n        lambdas.forEach((lambda: NodejsFunction) => {\n\n            let tableArn = \"arn:aws:dynamodb:\" + tableRef.region + \":\" + ((scope as Stack).account) + \":table/\" + tableRef.tableName;\n            let statement = new PolicyStatement({\n                effect: Effect.ALLOW,\n                resources: [\n                    tableArn,\n                    tableArn + \"/index/*\",\n                ],\n                actions: CreateDynamoDb.ReadWriteActions,\n            });\n\n            lambda.role?.addToPrincipalPolicy(statement);\n            \n        });\n    }\n\n    private AssignReadWriteAccessToTable(scope: Construct, tableRef: TsgDynamoTableRef, lambdas: NodejsFunction[]) {\n        let table: ITable = Table.fromTableName(scope, tableRef.tableName, tableRef.tableName);\n\n        lambdas.forEach((lambda: NodejsFunction) => {\n            table.grantReadWriteData(lambda)\n            \n        });\n    }\n\n    private AddRoutes(props: MicroserviceProps, \n        gateway: IRestApi, \n        lambdas: NodejsFunction[], \n        authorizer?: TokenAuthorizer) {\n\n        this.appConfig.lambdaConfigs?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop);\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    }\n\n    private AssignAccessToSecretManager(secret: ISecret, lambdas: NodejsFunction[]) {\n\n        lambdas.forEach((lambda) => {\n            const result = secret.grantRead(lambda);\n            console.log('Assigning Access to Secret Manager: ',result);\n        });\n        \n    }\n\n}"]}
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createMicroServiceBundle.js","sourceRoot":"","sources":["../../../src/resources/gateway/createMicroServiceBundle.ts"],"names":[],"mappings":"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","sourcesContent":["import { IRestApi, TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { ITable, Table } from \"aws-cdk-lib/aws-dynamodb\";\nimport { NodejsFunction } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Effect, PolicyStatement } from \"aws-cdk-lib/aws-iam\";\nimport { Construct } from \"constructs\";\nimport { TsgDynamoTableRef, TsgLambdaProp } from \"../../config/types\";\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { MicroserviceProps } from \"../../interfaces/MicroserviceProps\";\nimport { CreateAuthorizer } from \"../helpers/createAuthorizer\";\nimport { Routes } from \"../helpers/createRoutes\";\nimport { CreateLambda } from \"../lambda/createLambda\";\nimport { Duration, Stack } from \"aws-cdk-lib\";\nimport { CreateDynamoDb } from \"../dynamodb/CreateDynamo\";\nimport { ISecret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { MetricOptions } from \"aws-cdk-lib/aws-cloudwatch\";\n\nexport class CreateMicroServiceBundle {\n    \n    protected readonly requireDynamoTableRefs: boolean;\n    protected readonly requireAuthorizer: boolean;\n\n    constructor(scope: Construct, \n        private readonly gatewayApi: IRestApi, \n        private readonly props: MicroserviceProps,        \n        private readonly appConfig: AppConfig,\n        private readonly tables?: Table[], \n        private readonly secretMgr?: ISecret, \n        private readonly layers?: LayerVersion[],        \n        ) {\n        \n        this.requireDynamoTableRefs = (props.RESOURCES.DYNAMO?.TABLE_REFS?.length ?? 0 > 0) ? true : false;\n        this.requireAuthorizer = (props.RESOURCES.AUTHORIZER) ? true : false;\n        this.onInit(scope);\n    }\n\n    private onInit(scope: Construct) {\n\n        \n        let authorizer: TokenAuthorizer|undefined = undefined;\n\n        // Create Authorizer\n        if (this.requireAuthorizer) {\n            authorizer = new CreateAuthorizer(scope, this.appConfig, this.props.RESOURCES.AUTHORIZER!).JwtAuthorizer;\n            authorizer._attachToApi(this.gatewayApi);   \n        }        \n\n        // Create Lambdas\n        const lambdaProp: TsgLambdaProps = {\n            scope,\n            prop: this.props,            \n            layers: this.layers,\n            appConfig: this.appConfig\n        };\n\n        const lambdas = new CreateLambda(lambdaProp, this.appConfig);\n\n        if (this.tables) {\n            this.AssignAccessToTables(this.tables, lambdas.Lambdas);\n        }        \n\n        // Allow access to existing tables\n        if (this.requireDynamoTableRefs) {\n            this.AssignAccessToTableRefs(scope, this.props.RESOURCES.DYNAMO?.TABLE_REFS, lambdas.Lambdas);\n        }\n\n        if (this.secretMgr) {\n            this.AssignAccessToSecretManager(this.secretMgr, lambdas.Lambdas);\n        }        \n\n        lambdas.Lambdas.map((lambda) => {\n            lambda.metricErrors({                \n                    label: `${lambda.functionName}-errors`, \n                    period: Duration.minutes(3)           \n                \n            })\n        });\n\n        this.AddRoutes(this.props, this.gatewayApi, lambdas.Lambdas, authorizer);\n    }\n\n    private AssignAccessToTables(tables: Table[], lambdas: NodejsFunction[]) {\n\n        if (tables) {\n            tables.forEach((table: ITable) => {\n\n                lambdas.forEach((lambda: NodejsFunction) => {\n\n                    //  This is a CDK bug: It doesn't provide\n                    //  access to the indexes.\n                    //table.grantReadWriteData(lambda);\n\n                    //  Workaround:\n                    lambda.addToRolePolicy(\n                        new PolicyStatement({\n                            effect: Effect.ALLOW,\n                            actions: CreateDynamoDb.ReadWriteActions,\n                            resources: [\n                                table.tableArn,\n                                `${table.tableArn}/*`, // This is not recognized by cdk, but table is.  why?\n                            ],\n                        })\n                    );\n\n                    \n                    \n                });\n\n            });\n        }\n    }\n\n    private AssignAccessToTableRefs(scope: Construct, tableRefs: TsgDynamoTableRef[] | undefined, lambdas: NodejsFunction[]) {\n\n        if (tableRefs) {\n            tableRefs.forEach((tableRef: TsgDynamoTableRef) => {\n\n                if (tableRef.region) {\n                    this.AssignReadWriteAccessToTableInRegion(scope, tableRef, lambdas);\n                }\n                else {\n                    this.AssignReadWriteAccessToTable(scope, tableRef, lambdas);\n                }\n            });\n        }\n    }\n\n    private AssignReadWriteAccessToTableInRegion(scope: Construct, tableRef: TsgDynamoTableRef, lambdas: NodejsFunction[]) {\n        lambdas.forEach((lambda: NodejsFunction) => {\n\n            let tableArn = \"arn:aws:dynamodb:\" + tableRef.region + \":\" + ((scope as Stack).account) + \":table/\" + tableRef.tableName;\n            let statement = new PolicyStatement({\n                effect: Effect.ALLOW,\n                resources: [\n                    tableArn,\n                    tableArn + \"/index/*\",\n                ],\n                actions: CreateDynamoDb.ReadWriteActions,\n            });\n\n            lambda.role?.addToPrincipalPolicy(statement);\n            \n        });\n    }\n\n    private AssignReadWriteAccessToTable(scope: Construct, tableRef: TsgDynamoTableRef, lambdas: NodejsFunction[]) {\n        let table: ITable = Table.fromTableName(scope, tableRef.tableName, tableRef.tableName);\n\n        lambdas.forEach((lambda: NodejsFunction) => {\n            table.grantReadWriteData(lambda)\n            \n        });\n    }\n\n    private AddRoutes(props: MicroserviceProps, \n        gateway: IRestApi, \n        lambdas: NodejsFunction[], \n        authorizer?: TokenAuthorizer) {\n\n        this.appConfig.lambdaConfigs?.forEach((prop: TsgLambdaProp) => {\n\n            const lambdaId = CreateLambda.getIdForLambda(prop, this.appConfig);\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    }\n\n    private AssignAccessToSecretManager(secret: ISecret, lambdas: NodejsFunction[]) {\n\n        lambdas.forEach((lambda) => {\n            const result = secret.grantRead(lambda);\n            \n        });\n        \n    }\n\n}"]}
|
|
@@ -26,18 +26,19 @@ class CreateAuthorizer extends baseResource_1.BaseResource {
|
|
|
26
26
|
createLambdaAuthorizer(scope, lambdaConfig) {
|
|
27
27
|
//console.log("ENTER createLambdaAuthorizer");
|
|
28
28
|
const authorizerProps = this.createLambdaFunctionProps(lambdaConfig);
|
|
29
|
-
const lambdaId = createLambda_1.CreateLambda.getIdForLambda(lambdaConfig);
|
|
29
|
+
const lambdaId = createLambda_1.CreateLambda.getIdForLambda(lambdaConfig, this.config);
|
|
30
30
|
const lambda = new aws_lambda_nodejs_1.NodejsFunction(scope, lambdaId, authorizerProps);
|
|
31
31
|
lambda.grantInvoke(new aws_iam_1.ServicePrincipal('apigateway.amazonaws.com'));
|
|
32
32
|
if (lambdaConfig?.managedPolicies && lambdaConfig.managedPolicies.length > 0) {
|
|
33
33
|
this.assignManagedPolicies(lambda, lambdaConfig.managedPolicies);
|
|
34
34
|
}
|
|
35
|
-
const
|
|
35
|
+
const props = {
|
|
36
36
|
handler: lambda,
|
|
37
37
|
authorizerName: lambdaConfig.name,
|
|
38
38
|
resultsCacheTtl: aws_cdk_lib_1.Duration.seconds(0),
|
|
39
39
|
identitySource: aws_apigateway_1.IdentitySource.header('Authorization'),
|
|
40
|
-
}
|
|
40
|
+
};
|
|
41
|
+
const lambdaAuthorizer = new aws_apigateway_1.TokenAuthorizer(scope, `${lambdaConfig.name}-authorizer`, props);
|
|
41
42
|
return lambdaAuthorizer;
|
|
42
43
|
}
|
|
43
44
|
createOutput(scope, createdAssets) {
|
|
@@ -77,4 +78,4 @@ class CreateAuthorizer extends baseResource_1.BaseResource {
|
|
|
77
78
|
}
|
|
78
79
|
}
|
|
79
80
|
exports.CreateAuthorizer = CreateAuthorizer;
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createAuthorizer.js","sourceRoot":"","sources":["../../../src/resources/helpers/createAuthorizer.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration } from \"aws-cdk-lib\";\nimport { IdentitySource, TokenAuthorizer, TokenAuthorizerProps } from \"aws-cdk-lib/aws-apigateway\";\nimport { ManagedPolicy, ServicePrincipal } from \"aws-cdk-lib/aws-iam\";\nimport { NodejsFunction, NodejsFunctionProps, SourceMapMode } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Construct } from \"constructs\";\nimport * as path from 'path';\nimport { AppConfig } from \"../../config/AppConfig\";\n\nimport { TsgLambdaProp } from \"../../config/types\";\nimport { MicroserviceProps } from \"../../interfaces/MicroserviceProps\";\nimport { BaseResource } from \"../base/baseResource\";\nimport { CreateLambda } from \"../lambda/createLambda\";\n\nexport class CreateAuthorizer extends BaseResource<TokenAuthorizer> {\n\n    get JwtAuthorizer() {\n        return this.createdResources[0];\n    }\n\n    constructor(scope: Construct, props: AppConfig, protected authProps: TsgLambdaProp) {\n\n        super(scope, props);\n\n        this.createdResources = this.createResource(scope)!;\n\n        if (this.createdResources) {\n            this.createOutput<TokenAuthorizer>(scope, this.createdResources);\n        }\n\n    }\n\n    protected createResource(scope: Construct): TokenAuthorizer[] | null {\n        return [this.createLambdaAuthorizer(scope, this.authProps)];\n    }\n\n    private createLambdaAuthorizer(scope: Construct, lambdaConfig: TsgLambdaProp) {\n        //console.log(\"ENTER createLambdaAuthorizer\");\n\n        const authorizerProps = this.createLambdaFunctionProps(lambdaConfig!);\n\n        const lambdaId = CreateLambda.getIdForLambda(lambdaConfig, this.config);\n        const lambda = new NodejsFunction(scope, lambdaId, authorizerProps);\n\n        lambda.grantInvoke(new ServicePrincipal('apigateway.amazonaws.com'));\n\n        if (lambdaConfig?.managedPolicies && lambdaConfig.managedPolicies.length > 0) {\n            this.assignManagedPolicies(lambda, lambdaConfig.managedPolicies);\n        }\n\n        const props: TokenAuthorizerProps = {\n            handler: lambda,\n            authorizerName: lambdaConfig.name,\n            resultsCacheTtl: Duration.seconds(0), \n            identitySource: IdentitySource.header('Authorization'),\n            \n        };\n\n        const lambdaAuthorizer = new TokenAuthorizer(scope, `${lambdaConfig.name}-authorizer`, props);\n\n        return lambdaAuthorizer;\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n\n        const entity = createdAssets[0];\n\n        // new CfnOutput(scope, `authorizer`, {\n        //     value: (entity as TokenAuthorizer).authorizerArn\n        // });\n\n    }\n\n    private createLambdaFunctionProps(prop: TsgLambdaProp) {       \n\n        const lambdaProp: NodejsFunctionProps = {\n            entry: path.join(prop.codePath),\n            functionName: prop.name,\n            handler: prop.handler,\n            runtime: prop.runtime || this.config.GLOBALS.stackRuntime,\n            timeout: prop.duration || Duration.minutes(2),\n            memorySize: prop.memory || 512,\n            environment: {\n                \"VERBOSE_LOGGING\": \"true\",                \n                ...prop.environment\n            },\n            bundling: {\n                minify: false,\n                target: 'es2020',\n                sourceMap: true,\n                sourceMapMode: SourceMapMode.INLINE,\n                environment: prop.environment || prop.environment,\n            },\n        }\n        return lambdaProp;\n    };\n\n    private assignManagedPolicies(lambda: NodejsFunction, managedPolicyNames: string[]) {\n\n        managedPolicyNames.forEach((managedPolicyName: string) => {\n\n            let policy = ManagedPolicy.fromAwsManagedPolicyName(managedPolicyName);\n\n            lambda.role?.addManagedPolicy(policy);\n        });\n\n    }\n\n}"]}
|
|
@@ -16,5 +16,5 @@ export declare class CreateLambda extends BaseResource<NodejsFunction> {
|
|
|
16
16
|
private createLambdaFunctionProps;
|
|
17
17
|
private assignManagedPolicies;
|
|
18
18
|
private createAlarmsForLambdas;
|
|
19
|
-
static getIdForLambda(lambdaProp: TsgLambdaProp): string;
|
|
19
|
+
static getIdForLambda(lambdaProp: TsgLambdaProp, appConfig: AppConfig): string;
|
|
20
20
|
}
|
|
@@ -38,7 +38,7 @@ class CreateLambda extends baseResource_1.BaseResource {
|
|
|
38
38
|
const createdLambdas = this.props.prop.RESOURCES.LAMBDA.map((config) => {
|
|
39
39
|
//console.log("ENTER createLambdaFunctions.map for " + config.name);
|
|
40
40
|
let lambdaProps = this.createLambdaProps(config, role, layers);
|
|
41
|
-
const lambdaId = CreateLambda.getIdForLambda(config);
|
|
41
|
+
const lambdaId = CreateLambda.getIdForLambda(config, this.config);
|
|
42
42
|
let fctn = new aws_lambda_nodejs_1.NodejsFunction(scope, lambdaId, lambdaProps);
|
|
43
43
|
// If we have managed policies, we add them.
|
|
44
44
|
if (config.managedPolicies && config.managedPolicies?.length > 0) {
|
|
@@ -127,9 +127,9 @@ class CreateLambda extends baseResource_1.BaseResource {
|
|
|
127
127
|
// invocationAlarm.addAlarmAction(alarmAction);
|
|
128
128
|
});
|
|
129
129
|
}
|
|
130
|
-
static getIdForLambda(lambdaProp) {
|
|
131
|
-
return `${lambdaProp.name}`.toLowerCase();
|
|
130
|
+
static getIdForLambda(lambdaProp, appConfig) {
|
|
131
|
+
return `${appConfig.AppPrefix}-${lambdaProp.name}`.toLowerCase();
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
134
|
exports.CreateLambda = CreateLambda;
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createLambda.js","sourceRoot":"","sources":["../../../src/resources/lambda/createLambda.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration } from \"aws-cdk-lib\";\nimport { TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { Alarm, ComparisonOperator, IAlarmAction } from \"aws-cdk-lib/aws-cloudwatch\";\nimport { IRole, ManagedPolicy } from \"aws-cdk-lib/aws-iam\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { NodejsFunction, NodejsFunctionProps, SourceMapMode } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Construct } from \"constructs\";\nimport * as path from 'path';\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { TsgLambdaProp } from \"../../config/types\";\n\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { CreateLambdaFunctionInput } from \"../../interfaces/CreateLambdaFunctionInput\";\nimport { BaseResource } from \"../base/baseResource\";\n\n\nexport class CreateLambda extends BaseResource<NodejsFunction> {\n\n    public Lambdas: NodejsFunction[] = [];\n    \n\n    constructor(private props: TsgLambdaProps, config: AppConfig) {\n        super(props.scope, config);\n\n        const resources = this.createResource(props.scope);\n\n        this.Lambdas = [...resources];\n\n        this.createAlarmsForLambdas(this.Lambdas);\n        \n        this.createOutput(props.scope, resources);\n    }\n\n    protected createResource(scope: Construct): NodejsFunction[] {\n\n        const result = this.createLambdas(this.props);\n        \n        return result;\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        createdAssets.forEach((x, idx) => {\n\n            new CfnOutput(scope, `lambda-${idx}`, {\n                // @ts-ignore\n                value: x.functionName\n            });\n        });\n    }\n\n    private createLambdas(props: TsgLambdaProps): NodejsFunction[] {\n        \n        const createdLambdas: NodejsFunction[] = this.createLambdaFunctions(this.scope, props.role, props.layers);\n\n        return createdLambdas;\n    }\n\n    private createLambdaFunctions(scope: Construct, role?: IRole, layers?: LayerVersion[]) {\n\n        //console.log(\"ENTER createLambdaFunctions\");\n        const createdLambdas = this.props.prop.RESOURCES.LAMBDA.map((config:TsgLambdaProp) => {\n\n            //console.log(\"ENTER createLambdaFunctions.map for \" + config.name);\n            let lambdaProps = this.createLambdaProps(config, role, layers);\n\n            const lambdaId = CreateLambda.getIdForLambda(config);\n            let fctn = new NodejsFunction(scope, lambdaId, lambdaProps);\n\n            //  If we have managed policies, we add them.\n            if (config.managedPolicies && config.managedPolicies?.length > 0) {\n                \n                this.assignManagedPolicies(fctn, config.managedPolicies);\n            }\n\n            return fctn;\n        });\n\n        return createdLambdas || [];\n    }\n\n    private createLambdaProps(prop: TsgLambdaProp, role?: IRole, layers?: LayerVersion[], props?: TsgLambdaProps) {\n\n        return this.createLambdaFunctionProps({\n            prop, \n            role,\n            layers, \n            props\n        });\n    }\n\n    private createLambdaFunctionProps(props: CreateLambdaFunctionInput) {\n        const { prop, role, layers } = props;\n\n        const lambdaProp: NodejsFunctionProps = {\n            entry: path.join(prop.codePath),\n            functionName: `${this.props.appConfig.AppPrefix}-${prop.name}`,\n            handler: prop.handler,\n            runtime: prop.runtime || this.config.GLOBALS.stackRuntime,\n            timeout: prop.duration || Duration.minutes(2),\n            memorySize: prop.memory || 512,\n            environment: {\n                \"VERBOSE_LOGGING\": \"true\",                \n                ...prop.environment\n            },\n            bundling: {\n                minify: false,\n                target: 'es2020',\n                sourceMap: true,\n                sourceMapMode: SourceMapMode.INLINE,\n                environment: prop.environment || prop.environment,\n            },\n            role,\n            layers\n\n        }\n\n        \n        return lambdaProp;\n    };\n\n    private assignManagedPolicies(lambda: NodejsFunction, managedPolicyNames: string[]) {\n\n        managedPolicyNames.forEach((managedPolicyName: string) => {\n\n            let policy = ManagedPolicy.fromAwsManagedPolicyName(managedPolicyName);\n\n            lambda.role?.addManagedPolicy(policy);\n        });\n\n    }\n\n    private createAlarmsForLambdas(lambdas: NodejsFunction[]) {        \n\n        lambdas.forEach((lambda, idx) => {\n\n            const errorMetric = lambda.metricErrors({\n                period: Duration.minutes(3),\n                \n            });\n\n            const durationMetric = lambda.metricDuration({\n                period: Duration.minutes(3),                \n            });\n\n            const invocationMetric = lambda.metricInvocations({\n                period: Duration.minutes(3),                \n            });\n\n            new Alarm(this.props.scope, `${this.config.AppPrefix}-${idx}-error-alarm`, {\n                metric: errorMetric, \n                threshold: 5,\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n                evaluationPeriods: 3,\n                alarmDescription: `${this.config.AppPrefix}-${idx} errors over 3 min period`,\n                alarmName: `${this.config.AppPrefix}-${idx}-error-alarm`\n            });\n\n            new Alarm(this.props.scope, `${this.config.AppPrefix}-${idx}-duration-alarm`, {\n                metric: durationMetric, \n                threshold: 1,\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n                evaluationPeriods: 3,\n                alarmDescription: `${this.config.AppPrefix}-${idx} duration errors over 3 min period`,\n                alarmName: `${this.config.AppPrefix}-${idx}-duration-alarm`\n            });\n\n            const invocationAlarm = new Alarm(this.props.scope, `${this.config.AppPrefix}-${idx}-invocation-alarm`, {\n                metric: errorMetric, \n                threshold: 1000,\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n                evaluationPeriods: 3,\n                alarmDescription: `${this.config.AppPrefix}-${idx} errors over 3 min period`,\n                alarmName: `${this.config.AppPrefix}-${idx}-invocation-Metric-alarm`\n            });\n\n            // const alarmAction: IAlarmAction = {};\n            // invocationAlarm.addAlarmAction(alarmAction);\n        });\n    }\n\n    public static getIdForLambda(lambdaProp: TsgLambdaProp) {       \n        return `${lambdaProp.name}`.toLowerCase();\n    }\n}"]}
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createLambda.js","sourceRoot":"","sources":["../../../src/resources/lambda/createLambda.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration } from \"aws-cdk-lib\";\nimport { TokenAuthorizer } from \"aws-cdk-lib/aws-apigateway\";\nimport { Alarm, ComparisonOperator, IAlarmAction } from \"aws-cdk-lib/aws-cloudwatch\";\nimport { IRole, ManagedPolicy } from \"aws-cdk-lib/aws-iam\";\nimport { LayerVersion } from \"aws-cdk-lib/aws-lambda\";\nimport { NodejsFunction, NodejsFunctionProps, SourceMapMode } from \"aws-cdk-lib/aws-lambda-nodejs\";\nimport { Construct } from \"constructs\";\nimport * as path from 'path';\nimport { AppConfig } from \"../../config/AppConfig\";\nimport { TsgLambdaProp } from \"../../config/types\";\n\nimport { TsgLambdaProps } from \"../../config/types/TsgLambdaProps\";\nimport { CreateLambdaFunctionInput } from \"../../interfaces/CreateLambdaFunctionInput\";\nimport { BaseResource } from \"../base/baseResource\";\n\n\nexport class CreateLambda extends BaseResource<NodejsFunction> {\n\n    public Lambdas: NodejsFunction[] = [];\n    \n\n    constructor(private props: TsgLambdaProps, config: AppConfig) {\n        super(props.scope, config);\n\n        const resources = this.createResource(props.scope);\n\n        this.Lambdas = [...resources];\n\n        this.createAlarmsForLambdas(this.Lambdas);\n        \n        this.createOutput(props.scope, resources);\n    }\n\n    protected createResource(scope: Construct): NodejsFunction[] {\n\n        const result = this.createLambdas(this.props);\n        \n        return result;\n    }\n\n    protected createOutput<T>(scope: Construct, createdAssets: T[]): void {\n        createdAssets.forEach((x, idx) => {\n\n            new CfnOutput(scope, `lambda-${idx}`, {\n                // @ts-ignore\n                value: x.functionName\n            });\n        });\n    }\n\n    private createLambdas(props: TsgLambdaProps): NodejsFunction[] {\n        \n        const createdLambdas: NodejsFunction[] = this.createLambdaFunctions(this.scope, props.role, props.layers);\n\n        return createdLambdas;\n    }\n\n    private createLambdaFunctions(scope: Construct, role?: IRole, layers?: LayerVersion[]) {\n\n        //console.log(\"ENTER createLambdaFunctions\");\n        const createdLambdas = this.props.prop.RESOURCES.LAMBDA.map((config:TsgLambdaProp) => {\n\n            //console.log(\"ENTER createLambdaFunctions.map for \" + config.name);\n            let lambdaProps = this.createLambdaProps(config, role, layers);\n\n            const lambdaId = CreateLambda.getIdForLambda(config, this.config);\n            let fctn = new NodejsFunction(scope, lambdaId, lambdaProps);\n\n            //  If we have managed policies, we add them.\n            if (config.managedPolicies && config.managedPolicies?.length > 0) {\n                \n                this.assignManagedPolicies(fctn, config.managedPolicies);\n            }\n\n            return fctn;\n        });\n\n        return createdLambdas || [];\n    }\n\n    private createLambdaProps(prop: TsgLambdaProp, role?: IRole, layers?: LayerVersion[], props?: TsgLambdaProps) {\n\n        return this.createLambdaFunctionProps({\n            prop, \n            role,\n            layers, \n            props\n        });\n    }\n\n    private createLambdaFunctionProps(props: CreateLambdaFunctionInput) {\n        const { prop, role, layers } = props;\n\n        const lambdaProp: NodejsFunctionProps = {\n            entry: path.join(prop.codePath),\n            functionName: `${this.props.appConfig.AppPrefix}-${prop.name}`,\n            handler: prop.handler,\n            runtime: prop.runtime || this.config.GLOBALS.stackRuntime,\n            timeout: prop.duration || Duration.minutes(2),\n            memorySize: prop.memory || 512,\n            environment: {\n                \"VERBOSE_LOGGING\": \"true\",                \n                ...prop.environment\n            },\n            bundling: {\n                minify: false,\n                target: 'es2020',\n                sourceMap: true,\n                sourceMapMode: SourceMapMode.INLINE,\n                environment: prop.environment || prop.environment,\n            },\n            role,\n            layers\n\n        }\n\n        \n        return lambdaProp;\n    };\n\n    private assignManagedPolicies(lambda: NodejsFunction, managedPolicyNames: string[]) {\n\n        managedPolicyNames.forEach((managedPolicyName: string) => {\n\n            let policy = ManagedPolicy.fromAwsManagedPolicyName(managedPolicyName);\n\n            lambda.role?.addManagedPolicy(policy);\n        });\n\n    }\n\n    private createAlarmsForLambdas(lambdas: NodejsFunction[]) {        \n\n        lambdas.forEach((lambda, idx) => {\n\n            const errorMetric = lambda.metricErrors({\n                period: Duration.minutes(3),\n                \n            });\n\n            const durationMetric = lambda.metricDuration({\n                period: Duration.minutes(3),                \n            });\n\n            const invocationMetric = lambda.metricInvocations({\n                period: Duration.minutes(3),                \n            });\n\n            new Alarm(this.props.scope, `${this.config.AppPrefix}-${idx}-error-alarm`, {\n                metric: errorMetric, \n                threshold: 5,\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n                evaluationPeriods: 3,\n                alarmDescription: `${this.config.AppPrefix}-${idx} errors over 3 min period`,\n                alarmName: `${this.config.AppPrefix}-${idx}-error-alarm`\n            });\n\n            new Alarm(this.props.scope, `${this.config.AppPrefix}-${idx}-duration-alarm`, {\n                metric: durationMetric, \n                threshold: 1,\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n                evaluationPeriods: 3,\n                alarmDescription: `${this.config.AppPrefix}-${idx} duration errors over 3 min period`,\n                alarmName: `${this.config.AppPrefix}-${idx}-duration-alarm`\n            });\n\n            const invocationAlarm = new Alarm(this.props.scope, `${this.config.AppPrefix}-${idx}-invocation-alarm`, {\n                metric: errorMetric, \n                threshold: 1000,\n                comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n                evaluationPeriods: 3,\n                alarmDescription: `${this.config.AppPrefix}-${idx} errors over 3 min period`,\n                alarmName: `${this.config.AppPrefix}-${idx}-invocation-Metric-alarm`\n            });\n\n            // const alarmAction: IAlarmAction = {};\n            // invocationAlarm.addAlarmAction(alarmAction);\n        });\n    }\n\n    public static getIdForLambda(lambdaProp: TsgLambdaProp, appConfig: AppConfig) {       \n        return `${appConfig.AppPrefix}-${lambdaProp.name}`.toLowerCase();\n    }\n}"]}
|
package/package.json
CHANGED
|
@@ -42,7 +42,8 @@ export class CreateMicroServiceBundle {
|
|
|
42
42
|
|
|
43
43
|
// Create Authorizer
|
|
44
44
|
if (this.requireAuthorizer) {
|
|
45
|
-
authorizer = new CreateAuthorizer(scope, this.appConfig, this.props.RESOURCES.AUTHORIZER!).JwtAuthorizer;
|
|
45
|
+
authorizer = new CreateAuthorizer(scope, this.appConfig, this.props.RESOURCES.AUTHORIZER!).JwtAuthorizer;
|
|
46
|
+
authorizer._attachToApi(this.gatewayApi);
|
|
46
47
|
}
|
|
47
48
|
|
|
48
49
|
// Create Lambdas
|
|
@@ -159,7 +160,7 @@ export class CreateMicroServiceBundle {
|
|
|
159
160
|
|
|
160
161
|
this.appConfig.lambdaConfigs?.forEach((prop: TsgLambdaProp) => {
|
|
161
162
|
|
|
162
|
-
const lambdaId = CreateLambda.getIdForLambda(prop);
|
|
163
|
+
const lambdaId = CreateLambda.getIdForLambda(prop, this.appConfig);
|
|
163
164
|
|
|
164
165
|
if (!lambdaId) {
|
|
165
166
|
throw new Error(`Can't find lambda`);
|
|
@@ -179,7 +180,7 @@ export class CreateMicroServiceBundle {
|
|
|
179
180
|
|
|
180
181
|
lambdas.forEach((lambda) => {
|
|
181
182
|
const result = secret.grantRead(lambda);
|
|
182
|
-
|
|
183
|
+
|
|
183
184
|
});
|
|
184
185
|
|
|
185
186
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CfnOutput, Duration } from "aws-cdk-lib";
|
|
2
|
-
import { IdentitySource, TokenAuthorizer } from "aws-cdk-lib/aws-apigateway";
|
|
2
|
+
import { IdentitySource, TokenAuthorizer, TokenAuthorizerProps } from "aws-cdk-lib/aws-apigateway";
|
|
3
3
|
import { ManagedPolicy, ServicePrincipal } from "aws-cdk-lib/aws-iam";
|
|
4
4
|
import { NodejsFunction, NodejsFunctionProps, SourceMapMode } from "aws-cdk-lib/aws-lambda-nodejs";
|
|
5
5
|
import { Construct } from "constructs";
|
|
@@ -38,7 +38,7 @@ export class CreateAuthorizer extends BaseResource<TokenAuthorizer> {
|
|
|
38
38
|
|
|
39
39
|
const authorizerProps = this.createLambdaFunctionProps(lambdaConfig!);
|
|
40
40
|
|
|
41
|
-
const lambdaId = CreateLambda.getIdForLambda(lambdaConfig);
|
|
41
|
+
const lambdaId = CreateLambda.getIdForLambda(lambdaConfig, this.config);
|
|
42
42
|
const lambda = new NodejsFunction(scope, lambdaId, authorizerProps);
|
|
43
43
|
|
|
44
44
|
lambda.grantInvoke(new ServicePrincipal('apigateway.amazonaws.com'));
|
|
@@ -47,13 +47,15 @@ export class CreateAuthorizer extends BaseResource<TokenAuthorizer> {
|
|
|
47
47
|
this.assignManagedPolicies(lambda, lambdaConfig.managedPolicies);
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
const
|
|
50
|
+
const props: TokenAuthorizerProps = {
|
|
51
51
|
handler: lambda,
|
|
52
52
|
authorizerName: lambdaConfig.name,
|
|
53
53
|
resultsCacheTtl: Duration.seconds(0),
|
|
54
54
|
identitySource: IdentitySource.header('Authorization'),
|
|
55
55
|
|
|
56
|
-
}
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
const lambdaAuthorizer = new TokenAuthorizer(scope, `${lambdaConfig.name}-authorizer`, props);
|
|
57
59
|
|
|
58
60
|
return lambdaAuthorizer;
|
|
59
61
|
}
|
|
@@ -63,7 +63,7 @@ export class CreateLambda extends BaseResource<NodejsFunction> {
|
|
|
63
63
|
//console.log("ENTER createLambdaFunctions.map for " + config.name);
|
|
64
64
|
let lambdaProps = this.createLambdaProps(config, role, layers);
|
|
65
65
|
|
|
66
|
-
const lambdaId = CreateLambda.getIdForLambda(config);
|
|
66
|
+
const lambdaId = CreateLambda.getIdForLambda(config, this.config);
|
|
67
67
|
let fctn = new NodejsFunction(scope, lambdaId, lambdaProps);
|
|
68
68
|
|
|
69
69
|
// If we have managed policies, we add them.
|
|
@@ -178,7 +178,7 @@ export class CreateLambda extends BaseResource<NodejsFunction> {
|
|
|
178
178
|
});
|
|
179
179
|
}
|
|
180
180
|
|
|
181
|
-
public static getIdForLambda(lambdaProp: TsgLambdaProp) {
|
|
182
|
-
return `${lambdaProp.name}`.toLowerCase();
|
|
181
|
+
public static getIdForLambda(lambdaProp: TsgLambdaProp, appConfig: AppConfig) {
|
|
182
|
+
return `${appConfig.AppPrefix}-${lambdaProp.name}`.toLowerCase();
|
|
183
183
|
}
|
|
184
184
|
}
|