@fjall/components-infrastructure 0.79.1 → 0.80.4
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/lib/app.d.ts +39 -2
- package/dist/lib/app.js +85 -4
- package/dist/lib/aspects/resourceInventory.d.ts +41 -0
- package/dist/lib/aspects/resourceInventory.js +56 -0
- package/dist/lib/config/audit.d.ts +18 -0
- package/dist/lib/config/audit.js +22 -0
- package/dist/lib/config/aws/accountId.js +3 -3
- package/dist/lib/config/aws/ecrDefaultImage.js +7 -7
- package/dist/lib/config/aws/identityCenter.js +7 -8
- package/dist/lib/config/aws/identityCenterGroupMembership.js +6 -6
- package/dist/lib/config/aws/ipam.js +3 -3
- package/dist/lib/config/aws/ipamPoolId.js +4 -4
- package/dist/lib/config/aws/organisation.js +2 -3
- package/dist/lib/config/aws/organisationId.js +4 -4
- package/dist/lib/patterns/aws/auditRole.d.ts +44 -0
- package/dist/lib/patterns/aws/auditRole.js +58 -0
- package/dist/lib/patterns/aws/buildkite.js +12 -12
- package/dist/lib/patterns/aws/cdn.d.ts +133 -0
- package/dist/lib/patterns/aws/cdn.js +216 -0
- package/dist/lib/patterns/aws/compute.d.ts +32 -13
- package/dist/lib/patterns/aws/compute.js +24 -14
- package/dist/lib/patterns/aws/database.d.ts +8 -1
- package/dist/lib/patterns/aws/database.js +13 -5
- package/dist/lib/patterns/aws/dynamodb.d.ts +66 -0
- package/dist/lib/patterns/aws/dynamodb.js +106 -0
- package/dist/lib/patterns/aws/hostedZone.js +7 -2
- package/dist/lib/patterns/aws/index.d.ts +1 -0
- package/dist/lib/patterns/aws/index.js +2 -1
- package/dist/lib/patterns/aws/loadBalancer.d.ts +163 -0
- package/dist/lib/patterns/aws/loadBalancer.js +278 -0
- package/dist/lib/patterns/aws/managedAccount.js +3 -4
- package/dist/lib/patterns/aws/queue.d.ts +61 -0
- package/dist/lib/patterns/aws/queue.js +103 -0
- package/dist/lib/patterns/aws/storage.js +3 -2
- package/dist/lib/patterns/aws/subdomainHostedZone.js +2 -2
- package/dist/lib/resources/aws/audit/auditRole.d.ts +32 -0
- package/dist/lib/resources/aws/audit/auditRole.js +44 -0
- package/dist/lib/resources/aws/backup/backupPlan.js +3 -4
- package/dist/lib/resources/aws/backup/backupVault.js +3 -4
- package/dist/lib/resources/aws/base/awsStack.js +1 -2
- package/dist/lib/resources/aws/cdn/cloudFront.d.ts +65 -0
- package/dist/lib/resources/aws/cdn/cloudFront.js +135 -0
- package/dist/lib/resources/aws/cdn/index.d.ts +1 -0
- package/dist/lib/resources/aws/cdn/index.js +18 -0
- package/dist/lib/resources/aws/compute/capacityProviderDrainWaiter.d.ts +20 -0
- package/dist/lib/resources/aws/compute/capacityProviderDrainWaiter.js +180 -0
- package/dist/lib/resources/aws/compute/ecs.d.ts +65 -11
- package/dist/lib/resources/aws/compute/ecs.js +293 -124
- package/dist/lib/resources/aws/compute/ecsFreeTier.d.ts +1 -2
- package/dist/lib/resources/aws/compute/ecsFreeTier.js +1 -4
- package/dist/lib/resources/aws/compute/ecsSpot.d.ts +1 -2
- package/dist/lib/resources/aws/compute/ecsSpot.js +1 -4
- package/dist/lib/resources/aws/compute/lambda.d.ts +10 -1
- package/dist/lib/resources/aws/compute/lambda.js +71 -4
- package/dist/lib/resources/aws/database/database.js +1 -1
- package/dist/lib/resources/aws/database/dynamodb.d.ts +70 -0
- package/dist/lib/resources/aws/database/dynamodb.js +170 -0
- package/dist/lib/resources/aws/database/rdsAurora.d.ts +2 -0
- package/dist/lib/resources/aws/database/rdsAurora.js +9 -6
- package/dist/lib/resources/aws/database/rdsAuroraGlobal.d.ts +2 -0
- package/dist/lib/resources/aws/database/rdsAuroraGlobal.js +9 -8
- package/dist/lib/resources/aws/database/rdsDeletionWaiter.d.ts +33 -0
- package/dist/lib/resources/aws/database/rdsDeletionWaiter.js +74 -0
- package/dist/lib/resources/aws/database/rdsInstance.d.ts +2 -0
- package/dist/lib/resources/aws/database/rdsInstance.js +7 -4
- package/dist/lib/resources/aws/iam/identityCenter/assignment.js +2 -2
- package/dist/lib/resources/aws/iam/identityCenter/attachManagedPolicy.js +1 -1
- package/dist/lib/resources/aws/iam/identityCenter/group.js +1 -1
- package/dist/lib/resources/aws/iam/identityCenter/permissionSet.js +1 -1
- package/dist/lib/resources/aws/logging/cloudTrail.js +1 -1
- package/dist/lib/resources/aws/messaging/index.d.ts +1 -0
- package/dist/lib/resources/aws/messaging/index.js +18 -0
- package/dist/lib/resources/aws/messaging/sqs.d.ts +65 -0
- package/dist/lib/resources/aws/messaging/sqs.js +195 -0
- package/dist/lib/resources/aws/monitoring/monitoringRole.js +2 -3
- package/dist/lib/resources/aws/networking/ipamPool.js +1 -1
- package/dist/lib/resources/aws/networking/vpc.d.ts +1 -0
- package/dist/lib/resources/aws/networking/vpc.js +7 -3
- package/dist/lib/resources/aws/networking/vpcEndpoint.d.ts +20 -0
- package/dist/lib/resources/aws/networking/vpcEndpoint.js +59 -0
- package/dist/lib/resources/aws/networking/vpcEndpoints.d.ts +71 -0
- package/dist/lib/resources/aws/networking/vpcEndpoints.js +125 -0
- package/dist/lib/resources/aws/secrets/secret.js +1 -1
- package/dist/lib/resources/aws/storage/ecr.d.ts +1 -2
- package/dist/lib/resources/aws/storage/ecr.js +2 -2
- package/dist/lib/resources/aws/utilities/cfnOutput.test.d.ts +1 -0
- package/dist/lib/resources/aws/utilities/cfnOutput.test.js +102 -0
- package/dist/lib/resources/aws/utilities/codeBuild.d.ts +1 -2
- package/dist/lib/resources/aws/utilities/codeBuild.js +1 -1
- package/dist/lib/resources/aws/utilities/customResource.d.ts +2 -1
- package/dist/lib/resources/aws/utilities/customResource.js +1 -1
- package/dist/lib/utils/getStackOutput.js +2 -2
- package/dist/lib/utils/sanitizeCfnKey.d.ts +5 -0
- package/dist/lib/utils/sanitizeCfnKey.js +11 -0
- package/dist/lib/utils/tagResource.d.ts +24 -0
- package/dist/lib/utils/tagResource.js +30 -0
- package/package.json +6 -5
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import { Construct } from "constructs";
|
|
2
|
+
import { ApplicationLoadBalancer, ApplicationListener, ApplicationTargetGroup, type IApplicationTargetGroup } from "aws-cdk-lib/aws-elasticloadbalancingv2";
|
|
3
|
+
import { Certificate } from "aws-cdk-lib/aws-certificatemanager";
|
|
4
|
+
import { Connections, type IConnectable, type IVpc, Port, SecurityGroup } from "aws-cdk-lib/aws-ec2";
|
|
5
|
+
import type App from "../../app";
|
|
6
|
+
import { HostedZone as FjallHostedZone } from "./hostedZone";
|
|
7
|
+
/**
|
|
8
|
+
* Routing configuration for registering services with the load balancer.
|
|
9
|
+
*/
|
|
10
|
+
export interface LoadBalancerRoutingConfig {
|
|
11
|
+
/**
|
|
12
|
+
* Path pattern(s) to match. Examples: "/api/*", ["/api/*", "/v1/*"]
|
|
13
|
+
*/
|
|
14
|
+
path?: string | string[];
|
|
15
|
+
/**
|
|
16
|
+
* Host pattern(s) to match. Examples: "api.example.com", ["api.example.com", "www.example.com"]
|
|
17
|
+
*/
|
|
18
|
+
host?: string | string[];
|
|
19
|
+
/**
|
|
20
|
+
* Priority for this routing rule. Lower numbers = higher priority.
|
|
21
|
+
* Must be unique per listener. Range: 1-50000.
|
|
22
|
+
*/
|
|
23
|
+
priority: number;
|
|
24
|
+
/**
|
|
25
|
+
* Health check path for this target group. Default: "/"
|
|
26
|
+
*/
|
|
27
|
+
healthCheckPath?: string;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Health check configuration for the load balancer.
|
|
31
|
+
*/
|
|
32
|
+
export interface LoadBalancerHealthCheckConfig {
|
|
33
|
+
/** Health check path. Default: "/" */
|
|
34
|
+
path?: string;
|
|
35
|
+
/** Interval between health checks in seconds. Default: 30 */
|
|
36
|
+
interval?: number;
|
|
37
|
+
/** Health check timeout in seconds. Default: 5 */
|
|
38
|
+
timeout?: number;
|
|
39
|
+
/** Number of consecutive successes before healthy. Default: 2 */
|
|
40
|
+
healthyThreshold?: number;
|
|
41
|
+
/** Number of consecutive failures before unhealthy. Default: 3 */
|
|
42
|
+
unhealthyThreshold?: number;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Domain configuration for HTTPS and DNS.
|
|
46
|
+
*/
|
|
47
|
+
export interface LoadBalancerDomainConfig {
|
|
48
|
+
/** Domain name (e.g., "api.example.com") */
|
|
49
|
+
name: string;
|
|
50
|
+
/** Existing hosted zone. If omitted, creates new one. */
|
|
51
|
+
hostedZone?: FjallHostedZone;
|
|
52
|
+
/** Existing certificate. If omitted, creates new one with DNS validation. */
|
|
53
|
+
certificate?: Certificate;
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* Properties for LoadBalancerFactory.build()
|
|
57
|
+
*/
|
|
58
|
+
export interface ILoadBalancerProps {
|
|
59
|
+
/** VPC to place the load balancer in. Default: app's default VPC */
|
|
60
|
+
vpc?: IVpc;
|
|
61
|
+
/**
|
|
62
|
+
* Domain configuration for HTTPS.
|
|
63
|
+
* - string: Domain name (creates hosted zone and certificate)
|
|
64
|
+
* - LoadBalancerDomainConfig: Full configuration
|
|
65
|
+
* - Omit: HTTP only
|
|
66
|
+
*/
|
|
67
|
+
domain?: string | LoadBalancerDomainConfig;
|
|
68
|
+
/**
|
|
69
|
+
* Whether the load balancer is internet-facing.
|
|
70
|
+
* Default: true
|
|
71
|
+
*/
|
|
72
|
+
public?: boolean;
|
|
73
|
+
/**
|
|
74
|
+
* Default health check configuration.
|
|
75
|
+
* Individual services can override this.
|
|
76
|
+
*/
|
|
77
|
+
healthCheck?: LoadBalancerHealthCheckConfig;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Internal props with resolved VPC.
|
|
81
|
+
*/
|
|
82
|
+
interface LoadBalancerPropsResolved extends ILoadBalancerProps {
|
|
83
|
+
vpc: IVpc;
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* Factory for creating LoadBalancer constructs.
|
|
87
|
+
*
|
|
88
|
+
* @example
|
|
89
|
+
* // Simple HTTP load balancer
|
|
90
|
+
* const alb = app.addCompute(
|
|
91
|
+
* LoadBalancerFactory.build("MainALB", {})
|
|
92
|
+
* );
|
|
93
|
+
*
|
|
94
|
+
* @example
|
|
95
|
+
* // HTTPS load balancer with domain
|
|
96
|
+
* const alb = app.addCompute(
|
|
97
|
+
* LoadBalancerFactory.build("MainALB", {
|
|
98
|
+
* domain: "app.example.com"
|
|
99
|
+
* })
|
|
100
|
+
* );
|
|
101
|
+
*
|
|
102
|
+
* @example
|
|
103
|
+
* // Internal load balancer
|
|
104
|
+
* const alb = app.addCompute(
|
|
105
|
+
* LoadBalancerFactory.build("InternalALB", {
|
|
106
|
+
* public: false
|
|
107
|
+
* })
|
|
108
|
+
* );
|
|
109
|
+
*/
|
|
110
|
+
export declare class LoadBalancerFactory {
|
|
111
|
+
static build(id: string, props: ILoadBalancerProps): (app: App, scope: Construct) => LoadBalancer;
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Application Load Balancer construct that can be shared across multiple ECS services.
|
|
115
|
+
*
|
|
116
|
+
* Use LoadBalancerFactory.build() to create instances via app.addCompute().
|
|
117
|
+
*/
|
|
118
|
+
export declare class LoadBalancer extends Construct implements IConnectable {
|
|
119
|
+
readonly alb: ApplicationLoadBalancer;
|
|
120
|
+
readonly listener: ApplicationListener;
|
|
121
|
+
readonly securityGroup: SecurityGroup;
|
|
122
|
+
readonly url: string;
|
|
123
|
+
readonly connections: Connections;
|
|
124
|
+
private readonly hostedZone?;
|
|
125
|
+
private readonly certificate?;
|
|
126
|
+
private readonly defaultHealthCheck;
|
|
127
|
+
private readonly isHttps;
|
|
128
|
+
constructor(scope: Construct, id: string, props: LoadBalancerPropsResolved);
|
|
129
|
+
/**
|
|
130
|
+
* Register a target group with routing rules.
|
|
131
|
+
* Called internally by EcsCluster when loadBalancer.target is specified.
|
|
132
|
+
*
|
|
133
|
+
* @param targetGroup - The target group to register
|
|
134
|
+
* @param routing - Routing configuration (path, host, priority)
|
|
135
|
+
*/
|
|
136
|
+
registerTargetGroup(targetGroup: IApplicationTargetGroup, routing: LoadBalancerRoutingConfig): void;
|
|
137
|
+
/**
|
|
138
|
+
* Create a target group for an ECS service.
|
|
139
|
+
* Returns the target group for the service to register with.
|
|
140
|
+
*
|
|
141
|
+
* @param id - Unique identifier for the target group
|
|
142
|
+
* @param port - Container port
|
|
143
|
+
* @param vpc - VPC for the target group
|
|
144
|
+
* @param healthCheckPath - Optional health check path override
|
|
145
|
+
*/
|
|
146
|
+
createTargetGroup(id: string, port: number, vpc: IVpc, healthCheckPath?: string): ApplicationTargetGroup;
|
|
147
|
+
/**
|
|
148
|
+
* Allow traffic from this load balancer to a connectable resource.
|
|
149
|
+
*/
|
|
150
|
+
allowTo(connectable: IConnectable, port?: Port): void;
|
|
151
|
+
private normaliseDomainConfig;
|
|
152
|
+
private setupDomain;
|
|
153
|
+
private truncateName;
|
|
154
|
+
/**
|
|
155
|
+
* Get the DNS name of the load balancer.
|
|
156
|
+
*/
|
|
157
|
+
getDnsName(): string;
|
|
158
|
+
/**
|
|
159
|
+
* Get the ARN of the load balancer.
|
|
160
|
+
*/
|
|
161
|
+
getArn(): string;
|
|
162
|
+
}
|
|
163
|
+
export {};
|
|
@@ -0,0 +1,278 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LoadBalancer = exports.LoadBalancerFactory = void 0;
|
|
4
|
+
const constructs_1 = require("constructs");
|
|
5
|
+
const aws_elasticloadbalancingv2_1 = require("aws-cdk-lib/aws-elasticloadbalancingv2");
|
|
6
|
+
const aws_certificatemanager_1 = require("aws-cdk-lib/aws-certificatemanager");
|
|
7
|
+
const aws_route53_1 = require("aws-cdk-lib/aws-route53");
|
|
8
|
+
const aws_route53_targets_1 = require("aws-cdk-lib/aws-route53-targets");
|
|
9
|
+
const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
|
|
10
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
11
|
+
const cfnOutput_1 = require("../../resources/aws/utilities/cfnOutput");
|
|
12
|
+
const hostedZone_1 = require("./hostedZone");
|
|
13
|
+
/**
|
|
14
|
+
* Validates load balancer props and logs warnings for misconfigured options.
|
|
15
|
+
*/
|
|
16
|
+
function validateLoadBalancerProps(props) {
|
|
17
|
+
if (props.healthCheck) {
|
|
18
|
+
if (props.healthCheck.interval !== undefined) {
|
|
19
|
+
if (props.healthCheck.interval < 5 || props.healthCheck.interval > 300) {
|
|
20
|
+
throw new Error("Health check interval must be between 5 and 300 seconds.");
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
if (props.healthCheck.timeout !== undefined) {
|
|
24
|
+
if (props.healthCheck.timeout < 2 || props.healthCheck.timeout > 120) {
|
|
25
|
+
throw new Error("Health check timeout must be between 2 and 120 seconds.");
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Factory for creating LoadBalancer constructs.
|
|
32
|
+
*
|
|
33
|
+
* @example
|
|
34
|
+
* // Simple HTTP load balancer
|
|
35
|
+
* const alb = app.addCompute(
|
|
36
|
+
* LoadBalancerFactory.build("MainALB", {})
|
|
37
|
+
* );
|
|
38
|
+
*
|
|
39
|
+
* @example
|
|
40
|
+
* // HTTPS load balancer with domain
|
|
41
|
+
* const alb = app.addCompute(
|
|
42
|
+
* LoadBalancerFactory.build("MainALB", {
|
|
43
|
+
* domain: "app.example.com"
|
|
44
|
+
* })
|
|
45
|
+
* );
|
|
46
|
+
*
|
|
47
|
+
* @example
|
|
48
|
+
* // Internal load balancer
|
|
49
|
+
* const alb = app.addCompute(
|
|
50
|
+
* LoadBalancerFactory.build("InternalALB", {
|
|
51
|
+
* public: false
|
|
52
|
+
* })
|
|
53
|
+
* );
|
|
54
|
+
*/
|
|
55
|
+
class LoadBalancerFactory {
|
|
56
|
+
static build(id, props) {
|
|
57
|
+
return (app, scope) => {
|
|
58
|
+
validateLoadBalancerProps(props);
|
|
59
|
+
const resolvedProps = {
|
|
60
|
+
...props,
|
|
61
|
+
vpc: props.vpc || app.getVpc()
|
|
62
|
+
};
|
|
63
|
+
return new LoadBalancer(scope, id, resolvedProps);
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
exports.LoadBalancerFactory = LoadBalancerFactory;
|
|
68
|
+
/**
|
|
69
|
+
* Application Load Balancer construct that can be shared across multiple ECS services.
|
|
70
|
+
*
|
|
71
|
+
* Use LoadBalancerFactory.build() to create instances via app.addCompute().
|
|
72
|
+
*/
|
|
73
|
+
class LoadBalancer extends constructs_1.Construct {
|
|
74
|
+
constructor(scope, id, props) {
|
|
75
|
+
super(scope, id);
|
|
76
|
+
this.defaultHealthCheck = props.healthCheck || {};
|
|
77
|
+
this.isHttps = !!props.domain;
|
|
78
|
+
// Create security group
|
|
79
|
+
this.securityGroup = new aws_ec2_1.SecurityGroup(this, "SecurityGroup", {
|
|
80
|
+
vpc: props.vpc,
|
|
81
|
+
description: `Security group for ${id} load balancer`,
|
|
82
|
+
allowAllOutbound: true
|
|
83
|
+
});
|
|
84
|
+
// Allow inbound traffic
|
|
85
|
+
const inboundPort = this.isHttps ? 443 : 80;
|
|
86
|
+
this.securityGroup.addIngressRule({ connections: { allowFromAnyIpv4: () => { } } }, aws_ec2_1.Port.tcp(inboundPort), `Allow inbound ${this.isHttps ? "HTTPS" : "HTTP"}`);
|
|
87
|
+
// Create ALB
|
|
88
|
+
const loadBalancerName = this.truncateName(`${id}ALB`, 32);
|
|
89
|
+
this.alb = new aws_elasticloadbalancingv2_1.ApplicationLoadBalancer(this, "ALB", {
|
|
90
|
+
vpc: props.vpc,
|
|
91
|
+
internetFacing: props.public !== false,
|
|
92
|
+
securityGroup: this.securityGroup,
|
|
93
|
+
loadBalancerName,
|
|
94
|
+
vpcSubnets: {
|
|
95
|
+
subnetType: props.public !== false ? aws_ec2_1.SubnetType.PUBLIC : aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
// Set up domain if configured
|
|
99
|
+
if (props.domain) {
|
|
100
|
+
const domainConfig = this.normaliseDomainConfig(props.domain);
|
|
101
|
+
this.setupDomain(domainConfig);
|
|
102
|
+
}
|
|
103
|
+
// Create listener
|
|
104
|
+
if (this.isHttps && this.certificate) {
|
|
105
|
+
this.listener = this.alb.addListener("Listener", {
|
|
106
|
+
port: 443,
|
|
107
|
+
protocol: aws_elasticloadbalancingv2_1.ApplicationProtocol.HTTPS,
|
|
108
|
+
certificates: [this.certificate]
|
|
109
|
+
});
|
|
110
|
+
// Add HTTP redirect
|
|
111
|
+
this.alb.addListener("HttpRedirect", {
|
|
112
|
+
port: 80,
|
|
113
|
+
protocol: aws_elasticloadbalancingv2_1.ApplicationProtocol.HTTP,
|
|
114
|
+
defaultAction: {
|
|
115
|
+
redirect: {
|
|
116
|
+
protocol: "HTTPS",
|
|
117
|
+
port: "443",
|
|
118
|
+
permanent: true
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
this.listener = this.alb.addListener("Listener", {
|
|
125
|
+
port: 80,
|
|
126
|
+
protocol: aws_elasticloadbalancingv2_1.ApplicationProtocol.HTTP
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
// Add default action (returns 503 if no targets match)
|
|
130
|
+
this.listener.addAction("DefaultAction", {
|
|
131
|
+
action: {
|
|
132
|
+
fixedResponse: {
|
|
133
|
+
statusCode: 503,
|
|
134
|
+
contentType: "text/plain",
|
|
135
|
+
messageBody: "No service available"
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
// Set URL
|
|
140
|
+
this.url = this.isHttps
|
|
141
|
+
? `https://${this.alb.loadBalancerDnsName}`
|
|
142
|
+
: `http://${this.alb.loadBalancerDnsName}`;
|
|
143
|
+
// Set up connections
|
|
144
|
+
this.connections = new aws_ec2_1.Connections({
|
|
145
|
+
securityGroups: [this.securityGroup],
|
|
146
|
+
defaultPort: aws_ec2_1.Port.tcp(inboundPort)
|
|
147
|
+
});
|
|
148
|
+
// Outputs
|
|
149
|
+
new cfnOutput_1.CfnOutput(this, "LoadBalancerDnsName", {
|
|
150
|
+
key: `${id}LoadBalancerDnsName`,
|
|
151
|
+
exportName: `${id}LoadBalancerDnsName`,
|
|
152
|
+
value: this.alb.loadBalancerDnsName
|
|
153
|
+
});
|
|
154
|
+
new cfnOutput_1.CfnOutput(this, "LoadBalancerUrl", {
|
|
155
|
+
key: `${id}LoadBalancerUrl`,
|
|
156
|
+
exportName: `${id}LoadBalancerUrl`,
|
|
157
|
+
value: this.url,
|
|
158
|
+
description: `Load Balancer URL for ${id}`
|
|
159
|
+
});
|
|
160
|
+
new cfnOutput_1.CfnOutput(this, "LoadBalancerArn", {
|
|
161
|
+
key: `${id}LoadBalancerArn`,
|
|
162
|
+
exportName: `${id}LoadBalancerArn`,
|
|
163
|
+
value: this.alb.loadBalancerArn,
|
|
164
|
+
description: `Load Balancer ARN for ${id}`
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
/**
|
|
168
|
+
* Register a target group with routing rules.
|
|
169
|
+
* Called internally by EcsCluster when loadBalancer.target is specified.
|
|
170
|
+
*
|
|
171
|
+
* @param targetGroup - The target group to register
|
|
172
|
+
* @param routing - Routing configuration (path, host, priority)
|
|
173
|
+
*/
|
|
174
|
+
registerTargetGroup(targetGroup, routing) {
|
|
175
|
+
const conditions = [];
|
|
176
|
+
if (routing.path) {
|
|
177
|
+
const paths = Array.isArray(routing.path) ? routing.path : [routing.path];
|
|
178
|
+
conditions.push(aws_elasticloadbalancingv2_1.ListenerCondition.pathPatterns(paths));
|
|
179
|
+
}
|
|
180
|
+
if (routing.host) {
|
|
181
|
+
const hosts = Array.isArray(routing.host) ? routing.host : [routing.host];
|
|
182
|
+
conditions.push(aws_elasticloadbalancingv2_1.ListenerCondition.hostHeaders(hosts));
|
|
183
|
+
}
|
|
184
|
+
if (conditions.length === 0) {
|
|
185
|
+
throw new Error("At least one routing condition (path or host) must be specified.");
|
|
186
|
+
}
|
|
187
|
+
this.listener.addTargetGroups(`Rule${routing.priority}`, {
|
|
188
|
+
targetGroups: [targetGroup],
|
|
189
|
+
conditions,
|
|
190
|
+
priority: routing.priority
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
/**
|
|
194
|
+
* Create a target group for an ECS service.
|
|
195
|
+
* Returns the target group for the service to register with.
|
|
196
|
+
*
|
|
197
|
+
* @param id - Unique identifier for the target group
|
|
198
|
+
* @param port - Container port
|
|
199
|
+
* @param vpc - VPC for the target group
|
|
200
|
+
* @param healthCheckPath - Optional health check path override
|
|
201
|
+
*/
|
|
202
|
+
createTargetGroup(id, port, vpc, healthCheckPath) {
|
|
203
|
+
const targetGroup = new aws_elasticloadbalancingv2_1.ApplicationTargetGroup(this, `${id}TargetGroup`, {
|
|
204
|
+
vpc,
|
|
205
|
+
port,
|
|
206
|
+
protocol: aws_elasticloadbalancingv2_1.ApplicationProtocol.HTTP,
|
|
207
|
+
targetType: aws_elasticloadbalancingv2_1.TargetType.IP,
|
|
208
|
+
healthCheck: {
|
|
209
|
+
path: healthCheckPath || this.defaultHealthCheck.path || "/",
|
|
210
|
+
interval: aws_cdk_lib_1.Duration.seconds(this.defaultHealthCheck.interval || 30),
|
|
211
|
+
timeout: aws_cdk_lib_1.Duration.seconds(this.defaultHealthCheck.timeout || 5),
|
|
212
|
+
healthyThresholdCount: this.defaultHealthCheck.healthyThreshold || 2,
|
|
213
|
+
unhealthyThresholdCount: this.defaultHealthCheck.unhealthyThreshold || 3
|
|
214
|
+
}
|
|
215
|
+
});
|
|
216
|
+
return targetGroup;
|
|
217
|
+
}
|
|
218
|
+
/**
|
|
219
|
+
* Allow traffic from this load balancer to a connectable resource.
|
|
220
|
+
*/
|
|
221
|
+
allowTo(connectable, port) {
|
|
222
|
+
this.connections.allowTo(connectable, port || connectable.connections.defaultPort || aws_ec2_1.Port.allTcp());
|
|
223
|
+
}
|
|
224
|
+
normaliseDomainConfig(domain) {
|
|
225
|
+
if (typeof domain === "string") {
|
|
226
|
+
return { name: domain };
|
|
227
|
+
}
|
|
228
|
+
return domain;
|
|
229
|
+
}
|
|
230
|
+
setupDomain(config) {
|
|
231
|
+
// Get or create hosted zone
|
|
232
|
+
if (config.hostedZone) {
|
|
233
|
+
this.hostedZone = config.hostedZone.getInternalHostedZone();
|
|
234
|
+
}
|
|
235
|
+
else {
|
|
236
|
+
const hostedZone = new hostedZone_1.HostedZone(this, "HostedZone", {
|
|
237
|
+
zoneName: config.name
|
|
238
|
+
});
|
|
239
|
+
this.hostedZone = hostedZone.getInternalHostedZone();
|
|
240
|
+
}
|
|
241
|
+
// Get or create certificate
|
|
242
|
+
if (config.certificate) {
|
|
243
|
+
this.certificate = config.certificate;
|
|
244
|
+
}
|
|
245
|
+
else {
|
|
246
|
+
this.certificate = new aws_certificatemanager_1.Certificate(this, "Certificate", {
|
|
247
|
+
domainName: config.name,
|
|
248
|
+
validation: aws_certificatemanager_1.CertificateValidation.fromDns(this.hostedZone)
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
// Create DNS record pointing to ALB
|
|
252
|
+
new aws_route53_1.ARecord(this, "AliasRecord", {
|
|
253
|
+
zone: this.hostedZone,
|
|
254
|
+
recordName: config.name,
|
|
255
|
+
target: aws_route53_1.RecordTarget.fromAlias(new aws_route53_targets_1.LoadBalancerTarget(this.alb))
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
truncateName(name, maxLength) {
|
|
259
|
+
if (name.length <= maxLength) {
|
|
260
|
+
return name;
|
|
261
|
+
}
|
|
262
|
+
return name.substring(0, maxLength).replace(/-+$/, "");
|
|
263
|
+
}
|
|
264
|
+
/**
|
|
265
|
+
* Get the DNS name of the load balancer.
|
|
266
|
+
*/
|
|
267
|
+
getDnsName() {
|
|
268
|
+
return this.alb.loadBalancerDnsName;
|
|
269
|
+
}
|
|
270
|
+
/**
|
|
271
|
+
* Get the ARN of the load balancer.
|
|
272
|
+
*/
|
|
273
|
+
getArn() {
|
|
274
|
+
return this.alb.loadBalancerArn;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
exports.LoadBalancer = LoadBalancer;
|
|
278
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"loadBalancer.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/loadBalancer.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport {\n  ApplicationLoadBalancer,\n  ApplicationListener,\n  ApplicationProtocol,\n  ApplicationTargetGroup,\n  ListenerCondition,\n  TargetType,\n  type IApplicationTargetGroup\n} from \"aws-cdk-lib/aws-elasticloadbalancingv2\";\nimport {\n  Certificate,\n  CertificateValidation\n} from \"aws-cdk-lib/aws-certificatemanager\";\nimport { ARecord, RecordTarget, type IHostedZone } from \"aws-cdk-lib/aws-route53\";\nimport { LoadBalancerTarget } from \"aws-cdk-lib/aws-route53-targets\";\nimport {\n  Connections,\n  type IConnectable,\n  type IVpc,\n  Port,\n  SecurityGroup,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport { Duration } from \"aws-cdk-lib\";\n\nimport type App from \"../../app\";\nimport { CfnOutput } from \"../../resources/aws/utilities/cfnOutput\";\nimport { HostedZone as FjallHostedZone } from \"./hostedZone\";\n\n/**\n * Routing configuration for registering services with the load balancer.\n */\nexport interface LoadBalancerRoutingConfig {\n  /**\n   * Path pattern(s) to match. Examples: \"/api/*\", [\"/api/*\", \"/v1/*\"]\n   */\n  path?: string | string[];\n  /**\n   * Host pattern(s) to match. Examples: \"api.example.com\", [\"api.example.com\", \"www.example.com\"]\n   */\n  host?: string | string[];\n  /**\n   * Priority for this routing rule. Lower numbers = higher priority.\n   * Must be unique per listener. Range: 1-50000.\n   */\n  priority: number;\n  /**\n   * Health check path for this target group. Default: \"/\"\n   */\n  healthCheckPath?: string;\n}\n\n/**\n * Health check configuration for the load balancer.\n */\nexport interface LoadBalancerHealthCheckConfig {\n  /** Health check path. Default: \"/\" */\n  path?: string;\n  /** Interval between health checks in seconds. Default: 30 */\n  interval?: number;\n  /** Health check timeout in seconds. Default: 5 */\n  timeout?: number;\n  /** Number of consecutive successes before healthy. Default: 2 */\n  healthyThreshold?: number;\n  /** Number of consecutive failures before unhealthy. Default: 3 */\n  unhealthyThreshold?: number;\n}\n\n/**\n * Domain configuration for HTTPS and DNS.\n */\nexport interface LoadBalancerDomainConfig {\n  /** Domain name (e.g., \"api.example.com\") */\n  name: string;\n  /** Existing hosted zone. If omitted, creates new one. */\n  hostedZone?: FjallHostedZone;\n  /** Existing certificate. If omitted, creates new one with DNS validation. */\n  certificate?: Certificate;\n}\n\n/**\n * Properties for LoadBalancerFactory.build()\n */\nexport interface ILoadBalancerProps {\n  /** VPC to place the load balancer in. Default: app's default VPC */\n  vpc?: IVpc;\n  /**\n   * Domain configuration for HTTPS.\n   * - string: Domain name (creates hosted zone and certificate)\n   * - LoadBalancerDomainConfig: Full configuration\n   * - Omit: HTTP only\n   */\n  domain?: string | LoadBalancerDomainConfig;\n  /**\n   * Whether the load balancer is internet-facing.\n   * Default: true\n   */\n  public?: boolean;\n  /**\n   * Default health check configuration.\n   * Individual services can override this.\n   */\n  healthCheck?: LoadBalancerHealthCheckConfig;\n}\n\n/**\n * Internal props with resolved VPC.\n */\ninterface LoadBalancerPropsResolved extends ILoadBalancerProps {\n  vpc: IVpc;\n}\n\n/**\n * Validates load balancer props and logs warnings for misconfigured options.\n */\nfunction validateLoadBalancerProps(props: ILoadBalancerProps): void {\n  if (props.healthCheck) {\n    if (props.healthCheck.interval !== undefined) {\n      if (props.healthCheck.interval < 5 || props.healthCheck.interval > 300) {\n        throw new Error(\n          \"Health check interval must be between 5 and 300 seconds.\"\n        );\n      }\n    }\n    if (props.healthCheck.timeout !== undefined) {\n      if (props.healthCheck.timeout < 2 || props.healthCheck.timeout > 120) {\n        throw new Error(\n          \"Health check timeout must be between 2 and 120 seconds.\"\n        );\n      }\n    }\n  }\n}\n\n/**\n * Factory for creating LoadBalancer constructs.\n *\n * @example\n * // Simple HTTP load balancer\n * const alb = app.addCompute(\n *   LoadBalancerFactory.build(\"MainALB\", {})\n * );\n *\n * @example\n * // HTTPS load balancer with domain\n * const alb = app.addCompute(\n *   LoadBalancerFactory.build(\"MainALB\", {\n *     domain: \"app.example.com\"\n *   })\n * );\n *\n * @example\n * // Internal load balancer\n * const alb = app.addCompute(\n *   LoadBalancerFactory.build(\"InternalALB\", {\n *     public: false\n *   })\n * );\n */\nexport class LoadBalancerFactory {\n  static build(id: string, props: ILoadBalancerProps) {\n    return (app: App, scope: Construct): LoadBalancer => {\n      validateLoadBalancerProps(props);\n\n      const resolvedProps: LoadBalancerPropsResolved = {\n        ...props,\n        vpc: props.vpc || app.getVpc()\n      };\n\n      return new LoadBalancer(scope, id, resolvedProps);\n    };\n  }\n}\n\n/**\n * Application Load Balancer construct that can be shared across multiple ECS services.\n *\n * Use LoadBalancerFactory.build() to create instances via app.addCompute().\n */\nexport class LoadBalancer extends Construct implements IConnectable {\n  public readonly alb: ApplicationLoadBalancer;\n  public readonly listener: ApplicationListener;\n  public readonly securityGroup: SecurityGroup;\n  public readonly url: string;\n  public readonly connections: Connections;\n\n  private readonly hostedZone?: IHostedZone;\n  private readonly certificate?: Certificate;\n  private readonly defaultHealthCheck: LoadBalancerHealthCheckConfig;\n  private readonly isHttps: boolean;\n\n  constructor(scope: Construct, id: string, props: LoadBalancerPropsResolved) {\n    super(scope, id);\n\n    this.defaultHealthCheck = props.healthCheck || {};\n    this.isHttps = !!props.domain;\n\n    // Create security group\n    this.securityGroup = new SecurityGroup(this, \"SecurityGroup\", {\n      vpc: props.vpc,\n      description: `Security group for ${id} load balancer`,\n      allowAllOutbound: true\n    });\n\n    // Allow inbound traffic\n    const inboundPort = this.isHttps ? 443 : 80;\n    this.securityGroup.addIngressRule(\n      { connections: { allowFromAnyIpv4: () => {} } } as any,\n      Port.tcp(inboundPort),\n      `Allow inbound ${this.isHttps ? \"HTTPS\" : \"HTTP\"}`\n    );\n\n    // Create ALB\n    const loadBalancerName = this.truncateName(`${id}ALB`, 32);\n    this.alb = new ApplicationLoadBalancer(this, \"ALB\", {\n      vpc: props.vpc,\n      internetFacing: props.public !== false,\n      securityGroup: this.securityGroup,\n      loadBalancerName,\n      vpcSubnets: {\n        subnetType:\n          props.public !== false ? SubnetType.PUBLIC : SubnetType.PRIVATE_WITH_EGRESS\n      }\n    });\n\n    // Set up domain if configured\n    if (props.domain) {\n      const domainConfig = this.normaliseDomainConfig(props.domain);\n      this.setupDomain(domainConfig);\n    }\n\n    // Create listener\n    if (this.isHttps && this.certificate) {\n      this.listener = this.alb.addListener(\"Listener\", {\n        port: 443,\n        protocol: ApplicationProtocol.HTTPS,\n        certificates: [this.certificate]\n      });\n\n      // Add HTTP redirect\n      this.alb.addListener(\"HttpRedirect\", {\n        port: 80,\n        protocol: ApplicationProtocol.HTTP,\n        defaultAction: {\n          redirect: {\n            protocol: \"HTTPS\",\n            port: \"443\",\n            permanent: true\n          }\n        } as any\n      });\n    } else {\n      this.listener = this.alb.addListener(\"Listener\", {\n        port: 80,\n        protocol: ApplicationProtocol.HTTP\n      });\n    }\n\n    // Add default action (returns 503 if no targets match)\n    this.listener.addAction(\"DefaultAction\", {\n      action: {\n        fixedResponse: {\n          statusCode: 503,\n          contentType: \"text/plain\",\n          messageBody: \"No service available\"\n        }\n      } as any\n    });\n\n    // Set URL\n    this.url = this.isHttps\n      ? `https://${this.alb.loadBalancerDnsName}`\n      : `http://${this.alb.loadBalancerDnsName}`;\n\n    // Set up connections\n    this.connections = new Connections({\n      securityGroups: [this.securityGroup],\n      defaultPort: Port.tcp(inboundPort)\n    });\n\n    // Outputs\n    new CfnOutput(this, \"LoadBalancerDnsName\", {\n      key: `${id}LoadBalancerDnsName`,\n      exportName: `${id}LoadBalancerDnsName`,\n      value: this.alb.loadBalancerDnsName\n    });\n\n    new CfnOutput(this, \"LoadBalancerUrl\", {\n      key: `${id}LoadBalancerUrl`,\n      exportName: `${id}LoadBalancerUrl`,\n      value: this.url,\n      description: `Load Balancer URL for ${id}`\n    });\n\n    new CfnOutput(this, \"LoadBalancerArn\", {\n      key: `${id}LoadBalancerArn`,\n      exportName: `${id}LoadBalancerArn`,\n      value: this.alb.loadBalancerArn,\n      description: `Load Balancer ARN for ${id}`\n    });\n  }\n\n  /**\n   * Register a target group with routing rules.\n   * Called internally by EcsCluster when loadBalancer.target is specified.\n   *\n   * @param targetGroup - The target group to register\n   * @param routing - Routing configuration (path, host, priority)\n   */\n  public registerTargetGroup(\n    targetGroup: IApplicationTargetGroup,\n    routing: LoadBalancerRoutingConfig\n  ): void {\n    const conditions: ListenerCondition[] = [];\n\n    if (routing.path) {\n      const paths = Array.isArray(routing.path) ? routing.path : [routing.path];\n      conditions.push(ListenerCondition.pathPatterns(paths));\n    }\n\n    if (routing.host) {\n      const hosts = Array.isArray(routing.host) ? routing.host : [routing.host];\n      conditions.push(ListenerCondition.hostHeaders(hosts));\n    }\n\n    if (conditions.length === 0) {\n      throw new Error(\n        \"At least one routing condition (path or host) must be specified.\"\n      );\n    }\n\n    this.listener.addTargetGroups(`Rule${routing.priority}`, {\n      targetGroups: [targetGroup],\n      conditions,\n      priority: routing.priority\n    });\n  }\n\n  /**\n   * Create a target group for an ECS service.\n   * Returns the target group for the service to register with.\n   *\n   * @param id - Unique identifier for the target group\n   * @param port - Container port\n   * @param vpc - VPC for the target group\n   * @param healthCheckPath - Optional health check path override\n   */\n  public createTargetGroup(\n    id: string,\n    port: number,\n    vpc: IVpc,\n    healthCheckPath?: string\n  ): ApplicationTargetGroup {\n    const targetGroup = new ApplicationTargetGroup(this, `${id}TargetGroup`, {\n      vpc,\n      port,\n      protocol: ApplicationProtocol.HTTP,\n      targetType: TargetType.IP,\n      healthCheck: {\n        path: healthCheckPath || this.defaultHealthCheck.path || \"/\",\n        interval: Duration.seconds(\n          this.defaultHealthCheck.interval || 30\n        ),\n        timeout: Duration.seconds(\n          this.defaultHealthCheck.timeout || 5\n        ),\n        healthyThresholdCount: this.defaultHealthCheck.healthyThreshold || 2,\n        unhealthyThresholdCount: this.defaultHealthCheck.unhealthyThreshold || 3\n      }\n    });\n\n    return targetGroup;\n  }\n\n  /**\n   * Allow traffic from this load balancer to a connectable resource.\n   */\n  public allowTo(connectable: IConnectable, port?: Port): void {\n    this.connections.allowTo(\n      connectable,\n      port || connectable.connections.defaultPort || Port.allTcp()\n    );\n  }\n\n  private normaliseDomainConfig(\n    domain: string | LoadBalancerDomainConfig\n  ): LoadBalancerDomainConfig {\n    if (typeof domain === \"string\") {\n      return { name: domain };\n    }\n    return domain;\n  }\n\n  private setupDomain(config: LoadBalancerDomainConfig): void {\n    // Get or create hosted zone\n    if (config.hostedZone) {\n      (this as any).hostedZone = config.hostedZone.getInternalHostedZone();\n    } else {\n      const hostedZone = new FjallHostedZone(this, \"HostedZone\", {\n        zoneName: config.name\n      });\n      (this as any).hostedZone = hostedZone.getInternalHostedZone();\n    }\n\n    // Get or create certificate\n    if (config.certificate) {\n      (this as any).certificate = config.certificate;\n    } else {\n      (this as any).certificate = new Certificate(this, \"Certificate\", {\n        domainName: config.name,\n        validation: CertificateValidation.fromDns(this.hostedZone)\n      });\n    }\n\n    // Create DNS record pointing to ALB\n    new ARecord(this, \"AliasRecord\", {\n      zone: this.hostedZone!,\n      recordName: config.name,\n      target: RecordTarget.fromAlias(new LoadBalancerTarget(this.alb))\n    });\n  }\n\n  private truncateName(name: string, maxLength: number): string {\n    if (name.length <= maxLength) {\n      return name;\n    }\n    return name.substring(0, maxLength).replace(/-+$/, \"\");\n  }\n\n  /**\n   * Get the DNS name of the load balancer.\n   */\n  public getDnsName(): string {\n    return this.alb.loadBalancerDnsName;\n  }\n\n  /**\n   * Get the ARN of the load balancer.\n   */\n  public getArn(): string {\n    return this.alb.loadBalancerArn;\n  }\n}\n"]}
|
|
@@ -4,7 +4,6 @@ exports.ManagedAccount = void 0;
|
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
5
|
const aws_1 = require("../../config/aws");
|
|
6
6
|
const cloudTrail_1 = require("../../config/aws/cloudTrail");
|
|
7
|
-
const aws_cdk_lib_2 = require("aws-cdk-lib");
|
|
8
7
|
const getConfig_1 = require("../../utils/getConfig");
|
|
9
8
|
const disasterRecovery_1 = require("../../config/aws/disasterRecovery");
|
|
10
9
|
const util_1 = require("@fjall/util");
|
|
@@ -32,7 +31,7 @@ class ManagedAccount extends aws_cdk_lib_1.Stack {
|
|
|
32
31
|
});
|
|
33
32
|
const config = (0, getConfig_1.getConfig)();
|
|
34
33
|
const environment = config.environment || "unknown";
|
|
35
|
-
const
|
|
34
|
+
const _fjallConfig = util_1.Config.loadConfig();
|
|
36
35
|
const isComplianceAccount = environment === "compliance";
|
|
37
36
|
const isReplicationRegion = config.disasterRecoveryRegion &&
|
|
38
37
|
props.region === config.disasterRecoveryRegion;
|
|
@@ -44,7 +43,7 @@ class ManagedAccount extends aws_cdk_lib_1.Stack {
|
|
|
44
43
|
accountId: props.accountId
|
|
45
44
|
});
|
|
46
45
|
}
|
|
47
|
-
new
|
|
46
|
+
new aws_cdk_lib_1.CfnOutput(this, "Environment", {
|
|
48
47
|
key: "Environment",
|
|
49
48
|
value: environment,
|
|
50
49
|
exportName: "Environment",
|
|
@@ -53,4 +52,4 @@ class ManagedAccount extends aws_cdk_lib_1.Stack {
|
|
|
53
52
|
}
|
|
54
53
|
}
|
|
55
54
|
exports.ManagedAccount = ManagedAccount;
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFuYWdlZEFjY291bnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9saWIvcGF0dGVybnMvYXdzL21hbmFnZWRBY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUFnRTtBQUNoRSwwQ0FNMEI7QUFFMUIsNERBQW9FO0FBQ3BFLHFEQUFrRDtBQUNsRCx3RUFBcUU7QUFDckUsc0NBQW9EO0FBT3BELE1BQWEsY0FBZSxTQUFRLG1CQUFLO0lBQ3ZDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBMEI7UUFDbEUsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFeEIsTUFBTSxZQUFZLEdBQUcsSUFBSSxvQkFBYyxDQUFDLElBQUksRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO1FBRWhFLE1BQU0sT0FBTyxHQUFHLElBQUksZUFBUyxDQUFDLElBQUksRUFBRSxXQUFXLENBQUMsQ0FBQztRQUVqRCxNQUFNLFFBQVEsR0FBRyxJQUFJLHFCQUFlLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRXZELElBQUksRUFBRSxLQUFLLGdCQUFnQixFQUFFLENBQUM7WUFDNUIsSUFBSSxnQkFBVSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUU7Z0JBQ2pDLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUztnQkFDMUIsTUFBTSxFQUFFLEtBQUssQ0FBQyxNQUFNO2dCQUNwQixPQUFPLEVBQUUsWUFBWSxDQUFDLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ2pFLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFRCxJQUFJLGtDQUFxQixDQUFDLElBQUksRUFBRSxZQUFZLEVBQUU7WUFDNUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSztZQUNsQyxNQUFNLEVBQUUsS0FBSyxDQUFDLE1BQU07U0FDckIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxxQkFBZSxDQUFDLElBQUksRUFBRSxpQkFBaUIsRUFBRTtZQUMzQyxNQUFNLEVBQUUsS0FBSyxDQUFDLE1BQU07WUFDcEIsU0FBUyxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSztZQUNsQyxXQUFXLEVBQUUsUUFBUSxDQUFDLGtCQUFrQixDQUFDLEtBQUs7U0FDL0MsQ0FBQyxDQUFDO1FBRUgsTUFBTSxNQUFNLEdBQUcsSUFBQSxxQkFBUyxHQUFFLENBQUM7UUFDM0IsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLFdBQVcsSUFBSSxTQUFTLENBQUM7UUFDcEQsTUFBTSxZQUFZLEdBQUcsYUFBVyxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBRTlDLE1BQU0sbUJBQW1CLEdBQUcsV0FBVyxLQUFLLFlBQVksQ0FBQztRQUN6RCxNQUFNLG1CQUFtQixHQUN2QixNQUFNLENBQUMsc0JBQXNCO1lBQzdCLEtBQUssQ0FBQyxNQUFNLEtBQUssTUFBTSxDQUFDLHNCQUFzQixDQUFDO1FBRWpELElBQ0UsV0FBVyxLQUFLLFlBQVk7WUFDNUIsbUJBQW1CO1lBQ25CLG1CQUFtQixFQUNuQixDQUFDO1lBQ0QsSUFBSSxtQ0FBZ0IsQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLEVBQUU7Z0JBQzdDLE1BQU0sRUFBRSxLQUFLLENBQUMsTUFBTTtnQkFDcEIsU0FBUyxFQUFFLEtBQUssQ0FBQyxTQUFTO2FBQzNCLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFRCxJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLGFBQWEsRUFBRTtZQUNqQyxHQUFHLEVBQUUsYUFBYTtZQUNsQixLQUFLLEVBQUUsV0FBVztZQUNsQixVQUFVLEVBQUUsYUFBYTtZQUN6QixXQUFXLEVBQ1QsNEVBQTRFO1NBQy9FLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQXpERCx3Q0F5REMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDZm5PdXRwdXQsIFN0YWNrLCB0eXBlIFN0YWNrUHJvcHMgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7XG4gIE9yZ2FuaXNhdGlvbklkLFxuICBBY2NvdW50SWQsXG4gIElwYW1Qb29sSWQsXG4gIEVjckRlZmF1bHRJbWFnZSxcbiAgRGVmYXVsdEV2ZW50QnVzXG59IGZyb20gXCIuLi8uLi9jb25maWcvYXdzXCI7XG5pbXBvcnQgeyB0eXBlIENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBNYW5hZ2VtZW50RXZlbnRzVHJhaWwgfSBmcm9tIFwiLi4vLi4vY29uZmlnL2F3cy9jbG91ZFRyYWlsXCI7XG5pbXBvcnQgeyBnZXRDb25maWcgfSBmcm9tIFwiLi4vLi4vdXRpbHMvZ2V0Q29uZmlnXCI7XG5pbXBvcnQgeyBEaXNhc3RlclJlY292ZXJ5IH0gZnJvbSBcIi4uLy4uL2NvbmZpZy9hd3MvZGlzYXN0ZXJSZWNvdmVyeVwiO1xuaW1wb3J0IHsgQ29uZmlnIGFzIEZqYWxsQ29uZmlnIH0gZnJvbSBcIkBmamFsbC91dGlsXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgTWFuYWdlZEFjY291bnRQcm9wcyBleHRlbmRzIFN0YWNrUHJvcHMge1xuICBhY2NvdW50SWQ6IHN0cmluZztcbiAgcmVnaW9uOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjbGFzcyBNYW5hZ2VkQWNjb3VudCBleHRlbmRzIFN0YWNrIHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IE1hbmFnZWRBY2NvdW50UHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQsIHByb3BzKTtcblxuICAgIGNvbnN0IG9yZ2FuaXNhdGlvbiA9IG5ldyBPcmdhbmlzYXRpb25JZCh0aGlzLCBcIk9yZ2FuaXNhdGlvbklkXCIpO1xuXG4gICAgY29uc3QgYWNjb3VudCA9IG5ldyBBY2NvdW50SWQodGhpcywgXCJBY2NvdW50SWRcIik7XG5cbiAgICBjb25zdCBldmVudEJ1cyA9IG5ldyBEZWZhdWx0RXZlbnRCdXModGhpcywgXCJFdmVudEJ1c1wiKTtcblxuICAgIGlmIChpZCA9PT0gXCJNYW5hZ2VkQWNjb3VudFwiKSB7XG4gICAgICBuZXcgSXBhbVBvb2xJZCh0aGlzLCBcIklwYW1Qb29sSWRcIiwge1xuICAgICAgICBhY2NvdW50SWQ6IHByb3BzLmFjY291bnRJZCxcbiAgICAgICAgcmVnaW9uOiBwcm9wcy5yZWdpb24sXG4gICAgICAgIG93bmVySWQ6IG9yZ2FuaXNhdGlvbi5vcmdhbmlzYXRpb25BY2NvdW50QXJuLnZhbHVlLnNwbGl0KFwiOlwiKVs0XVxuICAgICAgfSk7XG4gICAgfVxuXG4gICAgbmV3IE1hbmFnZW1lbnRFdmVudHNUcmFpbCh0aGlzLCBcIkNsb3VkVHJhaWxcIiwge1xuICAgICAgYWNjb3VudElkOiBhY2NvdW50LmFjY291bnRJZC52YWx1ZSxcbiAgICAgIHJlZ2lvbjogcHJvcHMucmVnaW9uXG4gICAgfSk7XG5cbiAgICBuZXcgRWNyRGVmYXVsdEltYWdlKHRoaXMsIFwiRWNyRGVmYXVsdEltYWdlXCIsIHtcbiAgICAgIHJlZ2lvbjogcHJvcHMucmVnaW9uLFxuICAgICAgYWNjb3VudElkOiBhY2NvdW50LmFjY291bnRJZC52YWx1ZSxcbiAgICAgIGV2ZW50QnVzQXJuOiBldmVudEJ1cy5kZWZhdWx0RXZlbnRCdXNBcm4udmFsdWVcbiAgICB9KTtcblxuICAgIGNvbnN0IGNvbmZpZyA9IGdldENvbmZpZygpO1xuICAgIGNvbnN0IGVudmlyb25tZW50ID0gY29uZmlnLmVudmlyb25tZW50IHx8IFwidW5rbm93blwiO1xuICAgIGNvbnN0IF9mamFsbENvbmZpZyA9IEZqYWxsQ29uZmlnLmxvYWRDb25maWcoKTtcblxuICAgIGNvbnN0IGlzQ29tcGxpYW5jZUFjY291bnQgPSBlbnZpcm9ubWVudCA9PT0gXCJjb21wbGlhbmNlXCI7XG4gICAgY29uc3QgaXNSZXBsaWNhdGlvblJlZ2lvbiA9XG4gICAgICBjb25maWcuZGlzYXN0ZXJSZWNvdmVyeVJlZ2lvbiAmJlxuICAgICAgcHJvcHMucmVnaW9uID09PSBjb25maWcuZGlzYXN0ZXJSZWNvdmVyeVJlZ2lvbjtcblxuICAgIGlmIChcbiAgICAgIGVudmlyb25tZW50ID09PSBcInByb2R1Y3Rpb25cIiB8fFxuICAgICAgaXNDb21wbGlhbmNlQWNjb3VudCB8fFxuICAgICAgaXNSZXBsaWNhdGlvblJlZ2lvblxuICAgICkge1xuICAgICAgbmV3IERpc2FzdGVyUmVjb3ZlcnkodGhpcywgXCJEaXNhc3RlclJlY292ZXJ5XCIsIHtcbiAgICAgICAgcmVnaW9uOiBwcm9wcy5yZWdpb24sXG4gICAgICAgIGFjY291bnRJZDogcHJvcHMuYWNjb3VudElkXG4gICAgICB9KTtcbiAgICB9XG5cbiAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIFwiRW52aXJvbm1lbnRcIiwge1xuICAgICAga2V5OiBcIkVudmlyb25tZW50XCIsXG4gICAgICB2YWx1ZTogZW52aXJvbm1lbnQsXG4gICAgICBleHBvcnROYW1lOiBcIkVudmlyb25tZW50XCIsXG4gICAgICBkZXNjcmlwdGlvbjpcbiAgICAgICAgXCJFbnZpcm9ubWVudCB0eXBlIGZvciB0aGlzIGFjY291bnQgKGUuZy4sIHByb2R1Y3Rpb24sIHN0YWdpbmcsIGRldmVsb3BtZW50KVwiXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { Construct } from "constructs";
|
|
2
|
+
import type App from "../../app";
|
|
3
|
+
import { SQSQueue } from "../../resources/aws/messaging/sqs";
|
|
4
|
+
export interface ISQSProps {
|
|
5
|
+
queueType?: "standard" | "fifo";
|
|
6
|
+
visibilityTimeout?: number;
|
|
7
|
+
messageRetentionPeriod?: number;
|
|
8
|
+
receiveMessageWaitTime?: number;
|
|
9
|
+
maxMessageSize?: number;
|
|
10
|
+
deliveryDelay?: number;
|
|
11
|
+
deadLetterQueue?: {
|
|
12
|
+
enabled: boolean;
|
|
13
|
+
maxReceiveCount?: number;
|
|
14
|
+
};
|
|
15
|
+
encryption?: "SSE_SQS" | "SSE_KMS" | "NONE";
|
|
16
|
+
kmsKeyArn?: string;
|
|
17
|
+
contentBasedDeduplication?: boolean;
|
|
18
|
+
fifoThroughputLimit?: "perQueue" | "perMessageGroupId";
|
|
19
|
+
deduplicationScope?: "queue" | "messageGroup";
|
|
20
|
+
removalPolicy?: "DESTROY" | "RETAIN";
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* SQS queue wrapper with grant methods and Fjall patterns.
|
|
24
|
+
*/
|
|
25
|
+
export declare class Queue extends SQSQueue {
|
|
26
|
+
constructor(scope: Construct, id: string, props: ISQSProps);
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Factory for creating SQS queues.
|
|
30
|
+
*
|
|
31
|
+
* @example
|
|
32
|
+
* // Standard queue with DLQ
|
|
33
|
+
* const notifications = app.addQueue(QueueFactory.build("Notifications", {
|
|
34
|
+
* queueType: "standard",
|
|
35
|
+
* deadLetterQueue: { enabled: true, maxReceiveCount: 3 }
|
|
36
|
+
* }));
|
|
37
|
+
*
|
|
38
|
+
* @example
|
|
39
|
+
* // FIFO queue for OpenNext revalidation
|
|
40
|
+
* const revalidation = app.addQueue(QueueFactory.build("Revalidation", {
|
|
41
|
+
* queueType: "fifo",
|
|
42
|
+
* visibilityTimeout: 300,
|
|
43
|
+
* contentBasedDeduplication: true
|
|
44
|
+
* }));
|
|
45
|
+
*
|
|
46
|
+
* @example
|
|
47
|
+
* // Grant permissions
|
|
48
|
+
* revalidation.grantSend(serverFunction);
|
|
49
|
+
* revalidation.grantConsume(revalidationFunction);
|
|
50
|
+
*/
|
|
51
|
+
export declare class QueueFactory {
|
|
52
|
+
/**
|
|
53
|
+
* Build an SQS queue factory function.
|
|
54
|
+
*
|
|
55
|
+
* @param id - Unique identifier for the queue
|
|
56
|
+
* @param props - SQS queue configuration properties
|
|
57
|
+
* @returns Factory function that creates the queue when invoked
|
|
58
|
+
*/
|
|
59
|
+
static build(id: string, props?: ISQSProps): (_app: App, scope: Construct) => Queue;
|
|
60
|
+
}
|
|
61
|
+
export type { SQSQueueProps } from "../../resources/aws/messaging/sqs";
|