@takumi-stack/core 1.0.0 → 1.0.2

package/prefab/database/timestream/timestream-table.js

@@ -4,59 +4,59 @@ exports.TimestreamTablePrefab = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_iam_1 = require("aws-cdk-lib/aws-iam");
 const aws_timestream_1 = require("aws-cdk-lib/aws-timestream");
-const constructs_1 = require("constructs");
 const common_1 = require("../../../common");
-class TimestreamTablePrefab extends constructs_1.Construct {
-    table;
+class TimestreamTablePrefab extends common_1.Prefab {
     database;
-    constructor(service, params) {
-        super(service, (0, common_1.getLogicalName)(TimestreamTablePrefab.name, params.tableName));
+    table;
+    constructor(service, params, propsOverride) {
+        super(TimestreamTablePrefab.name, service, params, propsOverride);
         this.database = params.database;
-        this.table = new aws_timestream_1.CfnTable(this, (0, common_1.getLogicalName)('TimestreamTable', params.tableName), {
-            tableName: (0, common_1.getResourceName)(params.tableName, service.props),
-            databaseName: params.database.databaseName,
+        this.table = new aws_timestream_1.CfnTable(this, this.getId('TimestreamTable'), {
+            tableName: this.getResourceName('tables'),
+            databaseName: this.database.databaseName,
             magneticStoreWriteProperties: {
                 enableMagneticStoreWrites: true,
             },
             retentionProperties: {
-                MemoryStoreRetentionPeriodInHours: params.memoryHoursRetention || '24',
-                MagneticStoreRetentionPeriodInDays: params.diskDaysRetention || '365',
+                MemoryStoreRetentionPeriodInHours: '24',
+                MagneticStoreRetentionPeriodInDays: '365',
             },
+            ...params.resourceProps?.table,
         });
         this.table.addDependency(this.database);
         this.table.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.DESTROY);
         if (service.props.envName === 'prod')
             this.table.applyRemovalPolicy(aws_cdk_lib_1.RemovalPolicy.RETAIN);
     }
-    useMod(mods) {
-        return (lambda) => {
-            lambda.addEnvironment('TIMESTREAM_TABLE', this.table.tableName);
-            lambda.addEnvironment('TIMESTREAM_DB', this.database.databaseName);
-            mods.map((fn) => fn(this.table)(lambda));
-        };
-    }
-    static modifier = {
-        writer: (table) => {
+    static mods = {
+        writer: (timestreamTablePrefab) => {
             return (lambda) => {
                 lambda.addToRolePolicy(new aws_iam_1.PolicyStatement({
                     effect: aws_iam_1.Effect.ALLOW,
                     actions: ['timestream:WriteRecords'],
-                    resources: [table.attrArn],
+                    resources: [timestreamTablePrefab.table.attrArn],
                 }));
                 lambda.addToRolePolicy(new aws_iam_1.PolicyStatement({ effect: aws_iam_1.Effect.ALLOW, actions: ['timestream:DescribeEndpoints'], resources: ['*'] }));
             };
         },
-        reader: (table) => {
+        reader: (timestreamTablePrefab) => {
             return (lambda) => {
                 lambda.addToRolePolicy(new aws_iam_1.PolicyStatement({
                     effect: aws_iam_1.Effect.ALLOW,
                     actions: ['timestream:Select', 'timestream:SelectValues'],
-                    resources: [table.attrArn],
+                    resources: [timestreamTablePrefab.table.attrArn],
                 }));
                 lambda.addToRolePolicy(new aws_iam_1.PolicyStatement({ effect: aws_iam_1.Effect.ALLOW, actions: ['timestream:DescribeEndpoints'], resources: ['*'] }));
             };
         },
     };
+    applyMods(mods, envVar = 'QUEUE') {
+        return (lambda) => {
+            lambda.addEnvironment('TIMESTREAM_TABLE', this.table.tableName);
+            lambda.addEnvironment('TIMESTREAM_DB', this.database.databaseName);
+            mods.map((key) => TimestreamTablePrefab.mods[key](this)(lambda));
+        };
+    }
 }
 exports.TimestreamTablePrefab = TimestreamTablePrefab;
 //# sourceMappingURL=timestream-table.js.map

package/prefab/database/timestream/timestream-table.js.map

@@ -1 +1 @@
-{"version":3,"file":"timestream-table.js","sourceRoot":"","sources":["../../../../prefab/database/timestream/timestream-table.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"timestream-table.js","sourceRoot":"","sources":["../../../../prefab/database/timestream/timestream-table.ts"],"names":[],"mappings":"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"}

package/prefab/gateway/alb-public/index.d.ts

@@ -1,44 +1,43 @@
 import * as awsALB from 'aws-cdk-lib/aws-elasticloadbalancingv2';
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
-import { ISecurityGroup, IVpc } from 'aws-cdk-lib/aws-ec2';
+import { ISecurityGroup, IVpc, SecurityGroup, SecurityGroupProps } from 'aws-cdk-lib/aws-ec2';
 import { FargateService } from 'aws-cdk-lib/aws-ecs';
-import { Construct } from 'constructs';
-
-import { ServiceStack } from '../../../common';
-
-import { CdnApiPrefab } from '../../../prefab/cdn';
-
+import { BaseCustomConfigs, Prefab, PrefabPropsOverride, TakumiStack } from '../../../common';
+import { CdnApiPrefab } from '../../cdn';
 export type PublicAlbPrefabParams = {
-  name: string;
-  vpc: IVpc;
-  certificate: ICertificate;
-  basePath?: string;
-  cdnApiPrefab?: CdnApiPrefab;
-  existingResource?: {
-    albToClusterSG: string;
-    securityGroupId: string;
-    listenerArn: string;
-  };
+    name: string;
+    vpc: IVpc;
+    certificate: ICertificate;
+    basePath?: string;
+    cdnApiPrefab?: CdnApiPrefab;
+    resourceProps?: {
+        upstreamSecurityGroup?: Partial<SecurityGroupProps>;
+        downstreamSecurityGroup?: Partial<SecurityGroupProps>;
+        alb?: Partial<awsALB.ApplicationLoadBalancerProps>;
+        listener?: Partial<awsALB.BaseApplicationListenerProps>;
+    };
+    existingResource?: {
+        upstreamSecurityGroup?: SecurityGroup;
+        downstreamSecurityGroup?: SecurityGroup;
+        alb?: awsALB.ApplicationLoadBalancer;
+    };
 };
-export declare class PublicAlbPrefab extends Construct {
-  readonly alb: awsALB.ApplicationLoadBalancer;
-  private readonly listener;
-  private readonly albToClusterSG;
-  private readonly upstreamSG;
-  private readonly vpc;
-  private priorityIndex;
-  private service;
-  constructor(service: ServiceStack, params: PublicAlbPrefabParams);
-  private getNextPriorityIndex;
-  getAlbToClusterSG(): ISecurityGroup;
-  appendTargetGroup({ name, basePath, mappingPort, fargateService, healthCheckPath, fixedPriority }: AppendTargetGroup): void;
+export declare class PublicAlbPrefab<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> extends Prefab<PublicAlbPrefabParams, CustomConfigs> {
+    private readonly upstreamSecurityGroup;
+    readonly alb: awsALB.ApplicationLoadBalancer;
+    private readonly listener;
+    private readonly downstreamSecurityGroup;
+    private readonly vpc;
+    private priorityIndex;
+    constructor(service: TakumiStack<CustomConfigs>, params: PublicAlbPrefabParams, propsOverride?: PrefabPropsOverride<CustomConfigs>);
+    private getNextPriorityIndex;
+    getAlbToClusterSG(): ISecurityGroup;
+    appendTargetGroup(fargateService: FargateService, containerName: string, { basePath, mappingPort, healthCheckPath, fixedPriority }: TargetGroupConfig): void;
 }
-export type AppendTargetGroup = {
-  name: string;
-  basePath: string;
-  mappingPort: number;
-  fargateService: FargateService;
-  healthCheckPath: string;
-  fixedPriority?: number;
+export type TargetGroupConfig = {
+    basePath: string;
+    mappingPort: number;
+    healthCheckPath: string;
+    fixedPriority?: number;
 };
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/prefab/gateway/alb-public/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../prefab/gateway/alb-public/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,IAAI,EAA6B,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,YAAY,EAA+C,MAAM,QAAQ,CAAC;AAEnF,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,IAAI,CAAC;IACV,WAAW,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,eAAe,EAAE,MAAM,CAAC;QACxB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAEF,qBAAa,eAAgB,SAAQ,SAAS;IAC5C,SAAgB,GAAG,EAAG,MAAM,CAAC,uBAAuB,CAAC;IACrD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAO;IAC3B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,OAAO,CAAe;gBAElB,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,qBAAqB;IA0DhE,OAAO,CAAC,oBAAoB;IAGrB,iBAAiB,IAAI,cAAc;IAGnC,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,iBAAiB,GAAG,IAAI;CAgBnI;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../prefab/gateway/alb-public/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wCAAwC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAc,aAAa,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,IAAI,CAAC;IACV,WAAW,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE;QACd,qBAAqB,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACpD,uBAAuB,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACtD,GAAG,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;QACnD,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;KACzD,CAAC;IACF,gBAAgB,CAAC,EAAE;QACjB,qBAAqB,CAAC,EAAE,aAAa,CAAC;QACtC,uBAAuB,CAAC,EAAE,aAAa,CAAC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC,uBAAuB,CAAC;KACtC,CAAC;CACH,CAAC;AAEF,qBAAa,eAAe,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,CAAE,SAAQ,MAAM,CACtG,qBAAqB,EACrB,aAAa,CACd;IACC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAiB;IACvD,SAAgB,GAAG,EAAE,MAAM,CAAC,uBAAuB,CAAC;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAiB;IACzD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAO;IAC3B,OAAO,CAAC,aAAa,CAAS;gBAG5B,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,EACnC,MAAM,EAAE,qBAAqB,EAC7B,aAAa,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC;IA0EpD,OAAO,CAAC,oBAAoB;IAGrB,iBAAiB,IAAI,cAAc;IAGnC,iBAAiB,CACtB,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,MAAM,EACrB,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,iBAAiB,GAC3E,IAAI;CAgBR;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC"}

package/prefab/gateway/alb-public/index.js

@@ -25,68 +25,75 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublicAlbPrefab = void 0;
 const awsALB = __importStar(require("aws-cdk-lib/aws-elasticloadbalancingv2"));
-const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
 const aws_elasticloadbalancingv2_1 = require("aws-cdk-lib/aws-elasticloadbalancingv2");
-const constructs_1 = require("constructs");
 const common_1 = require("../../../common");
-class PublicAlbPrefab extends constructs_1.Construct {
+class PublicAlbPrefab extends common_1.Prefab {
+    upstreamSecurityGroup;
     alb;
     listener;
-    albToClusterSG;
-    upstreamSG;
+    downstreamSecurityGroup;
     vpc;
     priorityIndex;
-    service;
-    constructor(service, params) {
-        super(service, (0, common_1.getLogicalName)(PublicAlbPrefab.name));
-        this.service = service;
+    constructor(service, params, propsOverride) {
+        super(PublicAlbPrefab.name, service, params, propsOverride);
         this.vpc = params.vpc;
         this.priorityIndex = 1;
-        if (params.existingResource) {
-            this.listener = aws_elasticloadbalancingv2_1.ApplicationListener.fromApplicationListenerAttributes(this, (0, common_1.getLogicalName)(params.name, 'listener'), {
-                listenerArn: params.existingResource.listenerArn,
-                securityGroup: aws_ec2_1.SecurityGroup.fromSecurityGroupId(this, 'sg', params.existingResource.securityGroupId),
-            });
-            this.albToClusterSG = aws_ec2_1.SecurityGroup.fromSecurityGroupId(this, 'escSG', params.existingResource.albToClusterSG);
-            return this;
-        }
+        // if (params.existingResource) {
+        //   this.listener = ApplicationListener.fromApplicationListenerAttributes(this, this.getId('Listener'), {
+        //     listenerArn: params.existingResource.listenerArn,
+        //     securityGroup: SecurityGroup.fromSecurityGroupId(this, this.getId('ListenerSG'), params.existingResource.securityGroupId),
+        //   });
+        //   this.downstreamSecurityGroup = SecurityGroup.fromSecurityGroupId(this, 'ALB_SG', params.existingResource.albToClusterSG);
+        //   // Do not continue with resource creation...
+        //   return this;
+        // }
         // UPSTREAM SECURITY GROUP
-        this.upstreamSG = new aws_ec2_1.SecurityGroup(this, (0, common_1.getLogicalName)(params.name, 'sg'), {
-            securityGroupName: (0, common_1.getResourceName)('upstream', service.props),
-            vpc: params.vpc,
-            allowAllOutbound: true,
-        });
-        aws_cdk_lib_1.Tags.of(this.upstreamSG).add('Name', (0, common_1.getResourceName)('upstream', service.props));
-        this.upstreamSG.addIngressRule(aws_ec2_1.Peer.anyIpv4(), aws_ec2_1.Port.tcp(443), 'Allow https traffic');
+        this.upstreamSecurityGroup =
+            params.existingResource?.upstreamSecurityGroup ||
+                new aws_ec2_1.SecurityGroup(this, this.getId('UpstreamSG'), {
+                    securityGroupName: this.getResourceName('upstream'),
+                    vpc: params.vpc,
+                    allowAllOutbound: true,
+                    ...params.resourceProps?.upstreamSecurityGroup,
+                });
+        if (!params.existingResource?.upstreamSecurityGroup) {
+            this.upstreamSecurityGroup.addIngressRule(aws_ec2_1.Peer.anyIpv4(), aws_ec2_1.Port.tcp(443), 'Allow https traffic');
+        }
         // ALB
-        this.alb = new awsALB.ApplicationLoadBalancer(this, (0, common_1.getLogicalName)(params.name, 'alb'), {
-            loadBalancerName: (0, common_1.getResourceName)('', { ...this.service.props, serviceName: params.name }),
-            vpc: params.vpc,
-            vpcSubnets: { subnets: params.vpc.publicSubnets },
-            internetFacing: true,
-            securityGroup: this.upstreamSG,
-        });
-        // INBOUND
-        this.listener = this.alb.addListener((0, common_1.getLogicalName)(params.name, 'listener'), {
+        this.alb =
+            params.existingResource?.alb ||
+                new awsALB.ApplicationLoadBalancer(this, this.getId('ALB'), {
+                    loadBalancerName: this.getResourceName('alb'),
+                    vpc: params.vpc,
+                    vpcSubnets: { subnets: params.vpc.publicSubnets },
+                    internetFacing: true,
+                    securityGroup: this.upstreamSecurityGroup,
+                    ...params.resourceProps?.alb,
+                });
+        // Listener
+        this.listener = this.alb.addListener(this.getId('Listener'), {
             open: true,
             protocol: awsALB.ApplicationProtocol.HTTPS,
             port: 443,
             certificates: [params.certificate],
             defaultAction: aws_elasticloadbalancingv2_1.ListenerAction.fixedResponse(404, { messageBody: 'MissingPath' }),
+            ...params.resourceProps?.listener,
         });
-        // this.alb.addSecurityGroup(this.sg), getResourceName('upstream', service.props);
-        this.albToClusterSG = new aws_ec2_1.SecurityGroup(this, (0, common_1.getLogicalName)(params.name, 'escSG'), {
-            securityGroupName: (0, common_1.getResourceName)('downstream', service.props),
-            vpc: params.vpc,
-            allowAllOutbound: true,
-        });
-        this.albToClusterSG.connections.allowFrom(this.upstreamSG, aws_ec2_1.Port.allTcp(), 'Outbound traffic from ALB to Cluster');
-        aws_cdk_lib_1.Tags.of(this.albToClusterSG).add('Name', (0, common_1.getResourceName)('downstream', service.props));
+        // DOWNSTREAM SECURITY GROUP
+        this.downstreamSecurityGroup =
+            params.existingResource?.downstreamSecurityGroup ||
+                new aws_ec2_1.SecurityGroup(this, this.getId('DownstreamSG'), {
+                    securityGroupName: this.getResourceName('downstream'),
+                    vpc: params.vpc,
+                    allowAllOutbound: true,
+                    ...params.resourceProps?.downstreamSecurityGroup,
+                });
+        this.downstreamSecurityGroup.connections.allowFrom(this.upstreamSecurityGroup, aws_ec2_1.Port.allTcp(), 'Outbound traffic from ALB to Cluster');
         // ADD PATH TO CDN DISTRIBUTION
         if (params.cdnApiPrefab) {
             if (!params.basePath)
-                throw new common_1.SynthError('basePath is required when cdnApi is enabled');
+                throw new Error('basePath is required when cdnApi is enabled');
             params.cdnApiPrefab.addAlb(params.basePath, this.alb);
         }
     }
@@ -94,18 +101,18 @@ class PublicAlbPrefab extends constructs_1.Construct {
         return this.priorityIndex++;
     }
     getAlbToClusterSG() {
-        return this.albToClusterSG;
+        return this.downstreamSecurityGroup;
     }
-    appendTargetGroup({ name, basePath, mappingPort, fargateService, healthCheckPath, fixedPriority }) {
-        const targetGroup = new awsALB.ApplicationTargetGroup(this, (0, common_1.getLogicalName)(name, 'targetGroup'), {
-            targetGroupName: (0, common_1.getResourceName)('', { ...this.service.props, serviceName: name }),
+    appendTargetGroup(fargateService, containerName, { basePath, mappingPort, healthCheckPath, fixedPriority }) {
+        const targetGroup = new awsALB.ApplicationTargetGroup(this, this.getId('TargetGroup'), {
+            targetGroupName: this.getResourceName('target-group'),
             port: mappingPort,
             vpc: this.vpc,
             protocol: awsALB.ApplicationProtocol.HTTP,
             healthCheck: { protocol: awsALB.Protocol.HTTP, path: healthCheckPath },
-            targets: [fargateService.loadBalancerTarget({ containerName: name, containerPort: mappingPort })],
+            targets: [fargateService.loadBalancerTarget({ containerName, containerPort: mappingPort })],
         });
-        this.listener.addTargetGroups((0, common_1.getLogicalName)(name, 'listenerTG'), {
+        this.listener.addTargetGroups(this.getId('ListenerTG'), {
             targetGroups: [targetGroup],
             conditions: [aws_elasticloadbalancingv2_1.ListenerCondition.pathPatterns([`${basePath}*`])],
             priority: fixedPriority || this.getNextPriorityIndex(),

package/prefab/gateway/alb-public/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../prefab/gateway/alb-public/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../prefab/gateway/alb-public/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+EAAiE;AAEjE,iDAA0G;AAE1G,uFAA2F;AAE3F,4CAA8F;AAsB9F,MAAa,eAA6E,SAAQ,eAGjG;IACkB,qBAAqB,CAAiB;IACvC,GAAG,CAAiC;IACnC,QAAQ,CAA8B;IACtC,uBAAuB,CAAiB;IACxC,GAAG,CAAO;IACnB,aAAa,CAAS;IAE9B,YACE,OAAmC,EACnC,MAA6B,EAC7B,aAAkD;QAElD,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE5D,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QAEtB,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QAEvB,iCAAiC;QACjC,0GAA0G;QAC1G,wDAAwD;QACxD,iIAAiI;QACjI,QAAQ;QACR,8HAA8H;QAC9H,iDAAiD;QACjD,iBAAiB;QACjB,IAAI;QAEJ,0BAA0B;QAC1B,IAAI,CAAC,qBAAqB;YACxB,MAAM,CAAC,gBAAgB,EAAE,qBAAqB;gBAC9C,IAAI,uBAAa,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;oBAChD,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;oBACnD,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,gBAAgB,EAAE,IAAI;oBACtB,GAAG,MAAM,CAAC,aAAa,EAAE,qBAAqB;iBAC/C,CAAC,CAAC;QACL,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,CAAC;YACpD,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,cAAI,CAAC,OAAO,EAAE,EAAE,cAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,qBAAqB,CAAC,CAAC;QAClG,CAAC;QAED,MAAM;QACN,IAAI,CAAC,GAAG;YACN,MAAM,CAAC,gBAAgB,EAAE,GAAG;gBAC5B,IAAI,MAAM,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBAC1D,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;oBAC7C,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE;oBACjD,cAAc,EAAE,IAAI;oBACpB,aAAa,EAAE,IAAI,CAAC,qBAAqB;oBACzC,GAAG,MAAM,CAAC,aAAa,EAAE,GAAG;iBAC7B,CAAC,CAAC;QAEL,WAAW;QACX,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;YAC3D,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,MAAM,CAAC,mBAAmB,CAAC,KAAK;YAC1C,IAAI,EAAE,GAAG;YACT,YAAY,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC;YAClC,aAAa,EAAE,2CAAc,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;YAChF,GAAG,MAAM,CAAC,aAAa,EAAE,QAAQ;SAClC,CAAC,CAAC;QAEH,4BAA4B;QAC5B,IAAI,CAAC,uBAAuB;YAC1B,MAAM,CAAC,gBAAgB,EAAE,uBAAuB;gBAChD,IAAI,uBAAa,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;oBAClD,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC;oBACrD,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,gBAAgB,EAAE,IAAI;oBACtB,GAAG,MAAM,CAAC,aAAa,EAAE,uBAAuB;iBACjD,CAAC,CAAC;QACL,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,SAAS,CAChD,IAAI,CAAC,qBAAqB,EAC1B,cAAI,CAAC,MAAM,EAAE,EACb,sCAAsC,CACvC,CAAC;QAEF,+BAA+B;QAC/B,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;YACrF,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IACO,oBAAoB;QAC1B,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;IACM,iBAAiB;QACtB,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACtC,CAAC;IACM,iBAAiB,CACtB,cAA8B,EAC9B,aAAqB,EACrB,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,aAAa,EAAqB;QAE5E,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;YACrF,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;YACrD,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,QAAQ,EAAE,MAAM,CAAC,mBAAmB,CAAC,IAAI;YACzC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE;YACtE,OAAO,EAAE,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC;SAC5F,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YACtD,YAAY,EAAE,CAAC,WAAW,CAAC;YAC3B,UAAU,EAAE,CAAC,8CAAiB,CAAC,YAAY,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC;YAC9D,QAAQ,EAAE,aAAa,IAAI,IAAI,CAAC,oBAAoB,EAAE;SACvD,CAAC,CAAC;IACL,CAAC;CACF;AAlHD,0CAkHC"}

package/prefab/gateway/api-gateway/api-http.d.ts

@@ -1,27 +1,38 @@
-import { HttpApi, IHttpRouteAuthorizer } from 'aws-cdk-lib/aws-apigatewayv2';
-import { UserPool, UserPoolClient } from 'aws-cdk-lib/aws-cognito';
+import * as awsApigatewayv2Authorizers from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
+import { HttpApi, HttpApiProps, IHttpRouteAuthorizer } from 'aws-cdk-lib/aws-apigatewayv2';
 import { IFunction } from 'aws-cdk-lib/aws-lambda';
-import { Construct } from 'constructs';
 import { ApiDefinition, ApiInterface } from '@takumi-stack/sdk';
-import { ServiceStack } from '../../../common';
-import { CdnApiPrefab } from '../../../prefab/cdn';
-export type ApiHttPrefabParams = {
-    basePath: string;
-    cdnApiPrefab?: CdnApiPrefab;
-    userPool?: UserPool;
-    userPoolClient?: UserPoolClient;
-    customAuthorizerHandler?: IFunction;
+import { BaseCustomConfigs, Prefab, PrefabPropsOverride, TakumiStack } from '../../../common';
+import { CognitoUserPoolPrefab } from '../../auth';
+import { CdnApiPrefab } from '../../cdn';
+import { ApiFunctionsPrefab, FunctionPrefab } from '../../compute';
+export type ApiHttpPrefabParams<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> = {
+    name: string;
+    basePath?: string;
+    cdnApiPrefab?: CdnApiPrefab<CustomConfigs>;
+    authorizerConfig?: {
+        cognitoUserPoolPrefab?: CognitoUserPoolPrefab<CustomConfigs>;
+        lambdaAuthorizer?: FunctionPrefab<CustomConfigs>;
+    };
+    resourceProps?: {
+        api?: Partial<HttpApiProps>;
+        cognitoUserPoolPrefab?: Partial<awsApigatewayv2Authorizers.HttpUserPoolAuthorizerProps>;
+        lambdaAuthorizer?: Partial<awsApigatewayv2Authorizers.HttpLambdaAuthorizerProps>;
+    };
+    existingResource?: {
+        api?: HttpApi;
+        authorizer?: IHttpRouteAuthorizer;
+    };
 };
-export declare class ApiHttpPrefab extends Construct {
+export declare class ApiHttpPrefab<CustomConfigs extends BaseCustomConfigs = BaseCustomConfigs> extends Prefab<ApiHttpPrefabParams<CustomConfigs>, CustomConfigs> {
     readonly api: HttpApi;
-    readonly authorizer: IHttpRouteAuthorizer;
-    constructor(service: ServiceStack, params: ApiHttPrefabParams);
+    readonly basePath: string | undefined;
+    readonly authorizer: IHttpRouteAuthorizer | undefined;
+    constructor(service: TakumiStack<CustomConfigs>, params: ApiHttpPrefabParams<CustomConfigs>, propsOverride?: PrefabPropsOverride<CustomConfigs>);
     addPath(params: {
-        basePath: string;
-        path: string;
-        method: ApiDefinition<ApiInterface>['method'];
+        apiDefinition: ApiDefinition<ApiInterface>;
+        apiFunctionsPrefab: ApiFunctionsPrefab<CustomConfigs>;
         lambdaFunction: IFunction;
-        isPublic?: true;
     }): void;
 }
 //# sourceMappingURL=api-http.d.ts.map

package/prefab/gateway/api-gateway/api-http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-http.d.ts","sourceRoot":"","sources":["../../../../prefab/gateway/api-gateway/api-http.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,OAAO,EAAc,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGzG,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAmC,MAAM,QAAQ,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,uBAAuB,CAAC,EAAE,SAAS,CAAC;CACrC,CAAC;AAEF,qBAAa,aAAc,SAAQ,SAAS;IAC1C,SAAgB,GAAG,EAAE,OAAO,CAAC;IAC7B,SAAgB,UAAU,EAAG,oBAAoB,CAAC;gBAEtC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,kBAAkB;IA8BtD,OAAO,CAAC,MAAM,EAAE;QACrB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9C,cAAc,EAAE,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,IAAI,CAAC;KACjB,GAAG,IAAI;CAST"}
+{"version":3,"file":"api-http.d.ts","sourceRoot":"","sources":["../../../../prefab/gateway/api-gateway/api-http.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,0BAA0B,MAAM,0CAA0C,CAAC;AAEvF,OAAO,EAEL,OAAO,EACP,YAAY,EAIZ,oBAAoB,EACrB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEnE,MAAM,MAAM,mBAAmB,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,IAAI;IAC7F,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IAC3C,gBAAgB,CAAC,EAAE;QACjB,qBAAqB,CAAC,EAAE,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAC7D,gBAAgB,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;KAClD,CAAC;IACF,aAAa,CAAC,EAAE;QACd,GAAG,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC5B,qBAAqB,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,2BAA2B,CAAC,CAAC;QACxF,gBAAgB,CAAC,EAAE,OAAO,CAAC,0BAA0B,CAAC,yBAAyB,CAAC,CAAC;KAClF,CAAC;IACF,gBAAgB,CAAC,EAAE;QACjB,GAAG,CAAC,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,oBAAoB,CAAC;KACnC,CAAC;CACH,CAAC;AAEF,qBAAa,aAAa,CAAC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,CAAE,SAAQ,MAAM,CACpG,mBAAmB,CAAC,aAAa,CAAC,EAClC,aAAa,CACd;IACC,SAAgB,GAAG,EAAE,OAAO,CAAC;IAC7B,SAAgB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7C,SAAgB,UAAU,EAAE,oBAAoB,GAAG,SAAS,CAAC;gBAG3D,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,EACnC,MAAM,EAAE,mBAAmB,CAAC,aAAa,CAAC,EAC1C,aAAa,CAAC,EAAE,mBAAmB,CAAC,aAAa,CAAC;IAkD7C,OAAO,CAAC,MAAM,EAAE;QACrB,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;QAC3C,kBAAkB,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC;QACtD,cAAc,EAAE,SAAS,CAAC;KAC3B,GAAG,IAAI;CA0BT"}

package/prefab/gateway/api-gateway/api-http.js

@@ -1,47 +1,94 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiHttpPrefab = void 0;
+const awsApigatewayv2Authorizers = __importStar(require("aws-cdk-lib/aws-apigatewayv2-authorizers"));
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_apigatewayv2_1 = require("aws-cdk-lib/aws-apigatewayv2");
-const aws_apigatewayv2_authorizers_1 = require("aws-cdk-lib/aws-apigatewayv2-authorizers");
 const aws_apigatewayv2_integrations_1 = require("aws-cdk-lib/aws-apigatewayv2-integrations");
-const constructs_1 = require("constructs");
 const common_1 = require("../../../common");
-class ApiHttpPrefab extends constructs_1.Construct {
+class ApiHttpPrefab extends common_1.Prefab {
     api;
+    basePath;
     authorizer;
-    constructor(service, params) {
-        super(service, (0, common_1.getLogicalName)(ApiHttpPrefab.name));
-        if (params.userPool && params.userPoolClient)
-            this.authorizer = new aws_apigatewayv2_authorizers_1.HttpUserPoolAuthorizer('Authorizer', params.userPool, {
-                userPoolClients: [params.userPoolClient],
+    constructor(service, params, propsOverride) {
+        super(ApiHttpPrefab.name, service, params, propsOverride);
+        if (params.authorizerConfig?.cognitoUserPoolPrefab && params.authorizerConfig?.lambdaAuthorizer) {
+            throw new Error('Cannot specify both cognitoUserPoolPrefab and lambdaAuthorizer.');
+        }
+        this.basePath = params.basePath || '/';
+        if (params.authorizerConfig?.cognitoUserPoolPrefab)
+            this.authorizer = new awsApigatewayv2Authorizers.HttpUserPoolAuthorizer(this.getId('Authorizer'), params.authorizerConfig.cognitoUserPoolPrefab.userPool, {
+                userPoolClients: [params.authorizerConfig.cognitoUserPoolPrefab.userPoolClient],
                 identitySource: ['$request.header.Authorization'],
+                ...params.resourceProps?.cognitoUserPoolPrefab,
             });
-        if (params.customAuthorizerHandler)
-            this.authorizer = new aws_apigatewayv2_authorizers_1.HttpLambdaAuthorizer('LambdaAuthorizer', params.customAuthorizerHandler, {
-                responseTypes: [aws_apigatewayv2_authorizers_1.HttpLambdaResponseType.SIMPLE],
+        if (params.authorizerConfig?.lambdaAuthorizer)
+            this.authorizer = new awsApigatewayv2Authorizers.HttpLambdaAuthorizer(this.getId('LambdaAuthorizer'), params.authorizerConfig.lambdaAuthorizer.lambdaFunction, {
+                responseTypes: [awsApigatewayv2Authorizers.HttpLambdaResponseType.SIMPLE],
+                ...params.resourceProps?.lambdaAuthorizer,
             });
-        this.api = new aws_apigatewayv2_1.HttpApi(this, 'HttpApi', {
-            apiName: (0, common_1.getResourceName)('', service.props),
-            corsPreflight: {
-                allowOrigins: ['*'],
-                allowMethods: [aws_apigatewayv2_1.CorsHttpMethod.ANY],
-                allowHeaders: ['*'],
-                maxAge: aws_cdk_lib_1.Duration.seconds(10),
-            },
-        });
-        const apiUrl = aws_cdk_lib_1.Fn.join('', [this.api.apiId, '.execute-api.', service.props.regionName, '.amazonaws.com']);
-        params.cdnApiPrefab?.addApiGateway(params.basePath, apiUrl);
-        new aws_cdk_lib_1.CfnOutput(this, 'ApiUrl', { value: apiUrl });
+        this.api =
+            params.existingResource?.api ||
+                new aws_apigatewayv2_1.HttpApi(this, this.getId('HttpApi'), {
+                    apiName: this.getResourceName('http-api'),
+                    corsPreflight: {
+                        allowOrigins: ['*'],
+                        allowHeaders: ['*'],
+                        allowMethods: [aws_apigatewayv2_1.CorsHttpMethod.ANY],
+                        maxAge: aws_cdk_lib_1.Duration.seconds(this.props.apiDefaultConfigs?.cacheMaxAge),
+                    },
+                    ...params.resourceProps?.api,
+                });
+        // If CDN present, add it
+        const apiUrl = aws_cdk_lib_1.Fn.join('', [this.api.apiId, '.execute-api.', this.props.deployment.region, '.amazonaws.com']);
+        params.cdnApiPrefab?.addApiGateway(this.basePath, apiUrl);
+        new aws_cdk_lib_1.CfnOutput(this, this.getId('ApiUrl'), { value: apiUrl });
     }
     addPath(params) {
-        const path = params.path === '/' ? '' : params.path;
-        this.api.addRoutes({
-            path: `/${params.basePath}${path}`,
-            methods: [params.method],
-            integration: new aws_apigatewayv2_integrations_1.HttpLambdaIntegration(params.lambdaFunction.functionName, params.lambdaFunction),
-            ...(params.isPublic ? {} : { authorizer: this.authorizer }),
+        const { apiDefinition, apiFunctionsPrefab, lambdaFunction } = params;
+        if (!apiDefinition.isPublic && !this.authorizer) {
+            throw new Error('Missing Authorizer. Provide one, or change the API to be public (isPublic: true)');
+        }
+        if (this.basePath !== apiDefinition.basePath) {
+            throw new Error('basePath does not match with current ApiGateway basePath');
+        }
+        const basePath = apiDefinition.basePath === '/' ? '' : apiDefinition.basePath;
+        const resourcePath = apiDefinition.path === '/' ? '' : apiDefinition.path;
+        const path = `${basePath}${resourcePath}`;
+        new aws_apigatewayv2_1.HttpRoute(apiFunctionsPrefab, this.getId(`${apiDefinition.method}-${path}`), {
+            httpApi: this.api,
+            integration: new aws_apigatewayv2_integrations_1.HttpLambdaIntegration(this.getId(`${apiDefinition.method}-${path}`), lambdaFunction),
+            routeKey: aws_apigatewayv2_1.HttpRouteKey.with(path, apiDefinition.method),
         });
+        // this.api.addRoutes({
+        //   path: path,
+        //   methods: [params.apiDefinition.method as HttpMethod],
+        //   integration: new HttpLambdaIntegration(this.getId(`${params.apiDefinition.method}-${path}`), params.lambdaFunction),
+        //   ...(params.apiDefinition.isPublic ? {} : { authorizer: this.authorizer }),
+        // });
     }
 }
 exports.ApiHttpPrefab = ApiHttpPrefab;

package/prefab/gateway/api-gateway/api-http.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-http.js","sourceRoot":"","sources":["../../../../prefab/gateway/api-gateway/api-http.ts"],"names":[],"mappings":";;;AAAA,6CAAsD;AACtD,mEAAyG;AACzG,2FAAgI;AAChI,6FAAkF;AAGlF,2CAAuC;AAIvC,mCAAuE;AAYvE,MAAa,aAAc,SAAQ,sBAAS;IAC1B,GAAG,CAAU;IACb,UAAU,CAAwB;IAElD,YAAY,OAAqB,EAAE,MAA0B;QAC3D,KAAK,CAAC,OAAO,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAEnD,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,cAAc;YAC1C,IAAI,CAAC,UAAU,GAAG,IAAI,qDAAsB,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,EAAE;gBAC1E,eAAe,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC;gBACxC,cAAc,EAAE,CAAC,+BAA+B,CAAC;aAClD,CAAC,CAAC;QAEL,IAAI,MAAM,CAAC,uBAAuB;YAChC,IAAI,CAAC,UAAU,GAAG,IAAI,mDAAoB,CAAC,kBAAkB,EAAE,MAAM,CAAC,uBAAuB,EAAE;gBAC7F,aAAa,EAAE,CAAC,qDAAsB,CAAC,MAAM,CAAC;aAC/C,CAAC,CAAC;QAEL,IAAI,CAAC,GAAG,GAAG,IAAI,0BAAO,CAAC,IAAI,EAAE,SAAS,EAAE;YACtC,OAAO,EAAE,IAAA,wBAAe,EAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC;YAC3C,aAAa,EAAE;gBACb,YAAY,EAAE,CAAC,GAAG,CAAC;gBACnB,YAAY,EAAE,CAAC,iCAAc,CAAC,GAAG,CAAC;gBAClC,YAAY,EAAE,CAAC,GAAG,CAAC;gBACnB,MAAM,EAAE,sBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;aAC7B;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAW,gBAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAElH,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAE5D,IAAI,uBAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;IACM,OAAO,CAAC,MAMd;QACC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;QACpD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;YACjB,IAAI,EAAE,IAAI,MAAM,CAAC,QAAQ,GAAG,IAAI,EAAE;YAClC,OAAO,EAAE,CAAC,MAAM,CAAC,MAAoB,CAAC;YACtC,WAAW,EAAE,IAAI,qDAAqB,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC;YACjG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;SAC5D,CAAC,CAAC;IACL,CAAC;CACF;AAjDD,sCAiDC"}
+{"version":3,"file":"api-http.js","sourceRoot":"","sources":["../../../../prefab/gateway/api-gateway/api-http.ts"],"names":[],"mappings":"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"}