@byaga/cdk-patterns 0.8.3 → 0.8.5

package/lib/FunctionIntegration.d.ts

@@ -1,6 +1,6 @@
 import { DeployStack } from "./DeployStack";
 import { Function, FunctionProps } from "aws-cdk-lib/aws-lambda";
-import { JsonSchema, MethodOptions } from "aws-cdk-lib/aws-apigateway";
+import { JsonSchema, MethodOptions, Method } from "aws-cdk-lib/aws-apigateway";
 import { Duration } from "aws-cdk-lib";
 import { RestApi } from "./RestApi";
 interface AddToApiOptions {
@@ -16,6 +16,10 @@ export declare class FunctionIntegration extends Function {
     stack: DeployStack;
     name: string;
     constructor(stack: DeployStack, id: string, options: FunctionIntegrationProps);
-    attach(api: RestApi, httpMethod: string, path: string, props?: AddToApiOptions): void;
+    attach(api: RestApi, httpMethod: string, path: string, props?: AddToApiOptions): ApiAttachPoint;
+}
+interface ApiAttachPoint {
+    method: Method;
+    resourceArn: string;
 }
 export {};

package/lib/FunctionIntegration.js

@@ -26,7 +26,7 @@ class FunctionIntegration extends aws_lambda_1.Function {
             exportName: stack.genName(id, 'function-name')
         });
     }
-    attach(api, httpMethod, path, props) {
+    attach(api, httpMethod, path, props = {}) {
         const resource = api.path(path);
         const integration = new aws_apigateway_1.LambdaIntegration(this, {
             requestTemplates: {
@@ -38,6 +38,10 @@ class FunctionIntegration extends aws_lambda_1.Function {
         if (schema)
             options = applySchema(this.stack, this.name, schema, options, resource);
         const method = resource.addMethod(httpMethod, integration, options);
+        return {
+            method,
+            resourceArn: `arn:aws:execute-api:${this.stack.region}:${this.stack.account}:${api.restApiId}/${this.stack.stage}/${httpMethod}${path}`
+        };
     }
 }
 exports.FunctionIntegration = FunctionIntegration;

package/lib/RestApi.d.ts

@@ -1,4 +1,4 @@
-import { RestApi as RestApiBase, IDomainName, IResource } from "aws-cdk-lib/aws-apigateway";
+import { IDomainName, IResource, RestApi as RestApiBase } from "aws-cdk-lib/aws-apigateway";
 import { DeployStack } from "./DeployStack";
 import { ICorsConfig } from "./ICorsConfig";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";

package/lib/RestApi.js

@@ -127,7 +127,9 @@ class RestApi extends aws_apigateway_1.RestApi {
         return policyStatement;
     }
     path(uri) {
-        const { node } = uri.split('/').reduce((resource, path) => {
+        const { node } = uri.split('/')
+            .filter(path => !!path)
+            .reduce((resource, path) => {
             if (!resource.children[path]) {
                 resource.children[path] = {
                     children: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byaga/cdk-patterns",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Collection of common patterns used when making AWS CloudFormation templates using CDK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/FunctionIntegration.ts

@@ -6,7 +6,7 @@ import {
     MethodOptions,
     Model,
     RequestValidator,
-    IResource
+    IResource, Method
 } from "aws-cdk-lib/aws-apigateway";
 import {CfnOutput, Duration} from "aws-cdk-lib";
 import {applyHoneycombToLambda} from "./methods/apply-honeycomb-to-lambda";
@@ -47,7 +47,7 @@ export class FunctionIntegration extends Function {
         });
     }
 
-    attach(api: RestApi, httpMethod: string, path: string, props?: AddToApiOptions) {
+    attach(api: RestApi, httpMethod: string, path: string, props: AddToApiOptions = {}) : ApiAttachPoint {
         const resource: IResource = api.path(path)
         const integration = new LambdaIntegration(this, {
             requestTemplates: {
@@ -60,6 +60,11 @@ export class FunctionIntegration extends Function {
         if (schema) options = applySchema(this.stack, this.name, schema, options, resource)
 
         const method = resource.addMethod(httpMethod, integration, options)
+
+        return {
+            method,
+            resourceArn: `arn:aws:execute-api:${this.stack.region}:${this.stack.account}:${api.restApiId}/${this.stack.stage}/${httpMethod}${path}`
+        };
     }
 }
 
@@ -80,4 +85,9 @@ function applySchema(stack: DeployStack, name: string, schema: JsonSchema, optio
             })
         }
     }
+}
+
+interface ApiAttachPoint {
+    method: Method
+    resourceArn: string
 }

package/src/RestApi.ts

@@ -1,12 +1,12 @@
 import {
-    RestApi as RestApiBase,
     BasePathMapping,
     ContentHandling,
     DomainName,
     EndpointType,
-    MockIntegration,
     IDomainName,
-    IResource
+    IResource,
+    MockIntegration,
+    RestApi as RestApiBase
 } from "aws-cdk-lib/aws-apigateway";
 import {DeployStack} from "./DeployStack"
 import {ICorsConfig} from "./ICorsConfig";
@@ -163,15 +163,17 @@ export class RestApi extends RestApiBase {
     }
 
     path(uri: string): IResource {
-        const {node} = uri.split('/').reduce((resource, path) => {
-            if (!resource.children[path]) {
-                resource.children[path] = {
-                    children: {},
-                    node: resource.node.addResource(path)
+        const {node} = uri.split('/')
+            .filter(path => !!path)
+            .reduce((resource, path) => {
+                if (!resource.children[path]) {
+                    resource.children[path] = {
+                        children: {},
+                        node: resource.node.addResource(path)
+                    }
                 }
-            }
-            return resource.children[path];
-        }, this._tree);
+                return resource.children[path];
+            }, this._tree);
 
         return node
     }