@fjall/components-infrastructure 0.86.0 → 0.87.3
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/README.md +3 -3
- package/dist/lib/app.d.ts +166 -6
- package/dist/lib/app.js +212 -20
- package/dist/lib/aspects/resourceInventory.d.ts +4 -4
- package/dist/lib/aspects/resourceInventory.js +3 -3
- package/dist/lib/config/aws/backupGlobalSettings.js +1 -2
- package/dist/lib/config/aws/identityCenter.js +1 -5
- package/dist/lib/config/aws/organisation.js +1 -4
- package/dist/lib/index.d.ts +1 -0
- package/dist/lib/index.js +7 -1
- package/dist/lib/patterns/aws/buildkite.js +3 -2
- package/dist/lib/patterns/aws/cdn.d.ts +164 -0
- package/dist/lib/patterns/aws/cdn.js +264 -0
- package/dist/lib/patterns/aws/compute.d.ts +278 -59
- package/dist/lib/patterns/aws/compute.js +384 -188
- package/dist/lib/patterns/aws/connections.d.ts +46 -0
- package/dist/lib/patterns/aws/connections.js +159 -0
- package/dist/lib/patterns/aws/database.d.ts +124 -11
- package/dist/lib/patterns/aws/database.js +188 -66
- package/dist/lib/patterns/aws/hostedZone.js +1 -1
- package/dist/lib/patterns/aws/index.d.ts +3 -0
- package/dist/lib/patterns/aws/index.js +4 -1
- package/dist/lib/patterns/aws/interfaces/compute.d.ts +121 -0
- package/dist/lib/patterns/aws/interfaces/compute.js +48 -0
- package/dist/lib/patterns/aws/interfaces/connector.d.ts +183 -0
- package/dist/lib/patterns/aws/interfaces/connector.js +117 -0
- package/dist/lib/patterns/aws/interfaces/database.d.ts +136 -0
- package/dist/lib/patterns/aws/interfaces/database.js +65 -0
- package/dist/lib/patterns/aws/interfaces/index.d.ts +12 -0
- package/dist/lib/patterns/aws/interfaces/index.js +49 -0
- package/dist/lib/patterns/aws/interfaces/messaging.d.ts +146 -0
- package/dist/lib/patterns/aws/interfaces/messaging.js +56 -0
- package/dist/lib/patterns/aws/interfaces/pattern.d.ts +403 -0
- package/dist/lib/patterns/aws/interfaces/pattern.js +36 -0
- package/dist/lib/patterns/aws/interfaces/storage.d.ts +136 -0
- package/dist/lib/patterns/aws/interfaces/storage.js +48 -0
- package/dist/lib/patterns/aws/messaging.d.ts +183 -0
- package/dist/lib/patterns/aws/messaging.js +239 -0
- package/dist/lib/patterns/aws/network.js +4 -4
- package/dist/lib/patterns/aws/pattern.d.ts +67 -0
- package/dist/lib/patterns/aws/pattern.js +69 -0
- package/dist/lib/patterns/aws/payload.d.ts +87 -0
- package/dist/lib/patterns/aws/payload.js +526 -0
- package/dist/lib/patterns/aws/storage.d.ts +127 -15
- package/dist/lib/patterns/aws/storage.js +234 -38
- package/dist/lib/resources/aws/backup/backupPlan.js +1 -6
- package/dist/lib/resources/aws/backup/backupVault.js +1 -2
- package/dist/lib/resources/aws/base/awsStack.d.ts +0 -2
- package/dist/lib/resources/aws/base/awsStack.js +1 -7
- package/dist/lib/resources/aws/cdn/cloudFront.d.ts +71 -0
- package/dist/lib/resources/aws/cdn/cloudFront.js +176 -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/ec2.d.ts +5 -0
- package/dist/lib/resources/aws/compute/ec2.js +33 -6
- package/dist/lib/resources/aws/compute/ecs.d.ts +32 -25
- package/dist/lib/resources/aws/compute/ecs.js +31 -115
- package/dist/lib/resources/aws/compute/lambda.d.ts +94 -5
- package/dist/lib/resources/aws/compute/lambda.js +209 -32
- 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 +181 -0
- package/dist/lib/resources/aws/database/index.d.ts +1 -0
- package/dist/lib/resources/aws/database/index.js +2 -1
- package/dist/lib/resources/aws/database/migrationLambda.d.ts +80 -0
- package/dist/lib/resources/aws/database/migrationLambda.js +119 -0
- package/dist/lib/resources/aws/database/rdsAurora.d.ts +15 -0
- package/dist/lib/resources/aws/database/rdsAurora.js +41 -18
- package/dist/lib/resources/aws/database/rdsAuroraGlobal.js +12 -8
- package/dist/lib/resources/aws/database/rdsInstance.js +2 -2
- package/dist/lib/resources/aws/index.d.ts +2 -0
- package/dist/lib/resources/aws/index.js +3 -1
- package/dist/lib/resources/aws/messaging/eventbridge.d.ts +28 -0
- package/dist/lib/resources/aws/messaging/eventbridge.js +53 -0
- package/dist/lib/resources/aws/messaging/index.d.ts +3 -0
- package/dist/lib/resources/aws/messaging/index.js +20 -0
- package/dist/lib/resources/aws/messaging/sns.d.ts +35 -0
- package/dist/lib/resources/aws/messaging/sns.js +70 -0
- package/dist/lib/resources/aws/messaging/sqs.d.ts +105 -0
- package/dist/lib/resources/aws/messaging/sqs.js +231 -0
- package/dist/lib/resources/aws/messaging/utils.d.ts +3 -0
- package/dist/lib/resources/aws/messaging/utils.js +7 -0
- package/dist/lib/resources/aws/networking/ipam.js +1 -2
- package/dist/lib/resources/aws/networking/ipamPool.js +3 -2
- package/dist/lib/resources/aws/networking/vpc.js +1 -2
- package/dist/lib/resources/aws/storage/ecr.js +8 -5
- package/dist/lib/resources/aws/storage/s3.js +1 -2
- package/dist/lib/resources/aws/utilities/awsCustomResource.js +1 -1
- package/dist/lib/resources/aws/utilities/customResource.js +1 -1
- package/dist/lib/utils/getConfig.js +3 -2
- package/dist/lib/utils/index.d.ts +1 -0
- package/dist/lib/utils/index.js +2 -1
- package/dist/lib/utils/manifestWriter.d.ts +174 -0
- package/dist/lib/utils/manifestWriter.js +233 -0
- package/dist/lib/utils/standardTagsAspect.js +1 -8
- package/dist/lib/utils/validationLogger.d.ts +34 -0
- package/dist/lib/utils/validationLogger.js +83 -0
- package/package.json +3 -3
- package/dist/lib/__tests__/setup.d.ts +0 -48
- package/dist/lib/__tests__/setup.js +0 -1
- package/dist/lib/patterns/aws/cicdRole.d.ts +0 -67
- package/dist/lib/patterns/aws/cicdRole.js +0 -68
- package/dist/lib/resources/aws/cicd/cicdRole.d.ts +0 -65
- package/dist/lib/resources/aws/cicd/cicdRole.js +0 -191
- package/dist/lib/resources/aws/compute/ecsFreeTier.d.ts +0 -75
- package/dist/lib/resources/aws/compute/ecsFreeTier.js +0 -1
- package/dist/lib/resources/aws/compute/ecsSpot.d.ts +0 -75
- package/dist/lib/resources/aws/compute/ecsSpot.js +0 -1
- package/dist/lib/resources/aws/compute/utilities/capacityProviderDrainWaiter.d.ts +0 -20
- package/dist/lib/resources/aws/compute/utilities/capacityProviderDrainWaiter.js +0 -1
- package/dist/lib/resources/aws/utilities/cfnOutput.d.ts +0 -5
- package/dist/lib/resources/aws/utilities/cfnOutput.js +0 -1
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared connection processor for unified connector interface.
|
|
3
|
+
*
|
|
4
|
+
* This module provides the `processConnections` function that handles
|
|
5
|
+
* both security group rules (IConnectable) and IAM grants (IGrantable)
|
|
6
|
+
* in a unified way.
|
|
7
|
+
*
|
|
8
|
+
* @example
|
|
9
|
+
* // In ECS service setup
|
|
10
|
+
* processConnections(
|
|
11
|
+
* serviceProps.connections,
|
|
12
|
+
* serviceData.taskRole, // IGrantable for IAM
|
|
13
|
+
* service // IConnectable for security groups
|
|
14
|
+
* );
|
|
15
|
+
*
|
|
16
|
+
* @example
|
|
17
|
+
* // In Lambda setup
|
|
18
|
+
* processConnections(
|
|
19
|
+
* props.connections,
|
|
20
|
+
* this.lambdaFunction, // IGrantable (execution role)
|
|
21
|
+
* this.lambdaFunction // IConnectable (security group)
|
|
22
|
+
* );
|
|
23
|
+
*/
|
|
24
|
+
import { type IConnectable } from "aws-cdk-lib/aws-ec2";
|
|
25
|
+
import { type IGrantable } from "aws-cdk-lib/aws-iam";
|
|
26
|
+
import { type ConnectionSpec, type ConnectionResult } from "./interfaces/connector.js";
|
|
27
|
+
/**
|
|
28
|
+
* Process connections from compute resources to data resources.
|
|
29
|
+
*
|
|
30
|
+
* Handles the unified connector interface, dispatching to:
|
|
31
|
+
* - Security group rules for IConnectable and ISecurityGroupConnector resources
|
|
32
|
+
* - IAM grants for IStorageConnector, IDynamoDBConnector, and IQueueConnector resources
|
|
33
|
+
*
|
|
34
|
+
* @param connections - Array of connection specifications
|
|
35
|
+
* @param grantee - The IAM grantee (task role, execution role, etc.)
|
|
36
|
+
* @param connectable - Optional IConnectable for security group rules
|
|
37
|
+
* @returns Array of connection results
|
|
38
|
+
*
|
|
39
|
+
* @example
|
|
40
|
+
* processConnections(
|
|
41
|
+
* [database, { resource: bucket, access: "read" }, queue],
|
|
42
|
+
* taskRole,
|
|
43
|
+
* service
|
|
44
|
+
* );
|
|
45
|
+
*/
|
|
46
|
+
export declare function processConnections(connections: ConnectionSpec[], grantee: IGrantable, connectable?: IConnectable): ConnectionResult[];
|
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Shared connection processor for unified connector interface.
|
|
4
|
+
*
|
|
5
|
+
* This module provides the `processConnections` function that handles
|
|
6
|
+
* both security group rules (IConnectable) and IAM grants (IGrantable)
|
|
7
|
+
* in a unified way.
|
|
8
|
+
*
|
|
9
|
+
* @example
|
|
10
|
+
* // In ECS service setup
|
|
11
|
+
* processConnections(
|
|
12
|
+
* serviceProps.connections,
|
|
13
|
+
* serviceData.taskRole, // IGrantable for IAM
|
|
14
|
+
* service // IConnectable for security groups
|
|
15
|
+
* );
|
|
16
|
+
*
|
|
17
|
+
* @example
|
|
18
|
+
* // In Lambda setup
|
|
19
|
+
* processConnections(
|
|
20
|
+
* props.connections,
|
|
21
|
+
* this.lambdaFunction, // IGrantable (execution role)
|
|
22
|
+
* this.lambdaFunction // IConnectable (security group)
|
|
23
|
+
* );
|
|
24
|
+
*/
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.processConnections = processConnections;
|
|
27
|
+
const connector_js_1 = require("./interfaces/connector.js");
|
|
28
|
+
/** Default access levels for each connector type. */
|
|
29
|
+
const DEFAULT_ACCESS = {
|
|
30
|
+
storage: "readWrite",
|
|
31
|
+
dynamodb: "readWrite",
|
|
32
|
+
queue: "full"
|
|
33
|
+
};
|
|
34
|
+
/** Grant storage access based on access level. */
|
|
35
|
+
function processStorageConnection(connector, grantee, access) {
|
|
36
|
+
switch (access) {
|
|
37
|
+
case "read":
|
|
38
|
+
return connector.grantRead(grantee);
|
|
39
|
+
case "write":
|
|
40
|
+
return connector.grantWrite(grantee);
|
|
41
|
+
case "readWrite":
|
|
42
|
+
return connector.grantReadWrite(grantee);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
/** Grant DynamoDB access based on access level. */
|
|
46
|
+
function processDynamoDBConnection(connector, grantee, access) {
|
|
47
|
+
switch (access) {
|
|
48
|
+
case "read":
|
|
49
|
+
return connector.grantReadData(grantee);
|
|
50
|
+
case "write":
|
|
51
|
+
return connector.grantWriteData(grantee);
|
|
52
|
+
case "readWrite":
|
|
53
|
+
return connector.grantReadWriteData(grantee);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
/** Grant queue access based on access level. */
|
|
57
|
+
function processQueueConnection(connector, grantee, access) {
|
|
58
|
+
switch (access) {
|
|
59
|
+
case "send":
|
|
60
|
+
return connector.grantSendMessages(grantee);
|
|
61
|
+
case "consume":
|
|
62
|
+
return connector.grantConsumeMessages(grantee);
|
|
63
|
+
case "full":
|
|
64
|
+
return connector.grantFull(grantee);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
/** Build an IAM connection result. */
|
|
68
|
+
function buildIamResult(connector, grant) {
|
|
69
|
+
return { resource: connector, grant, connectionType: connector_js_1.CONNECTION_TYPE.IAM };
|
|
70
|
+
}
|
|
71
|
+
/** Build a security group connection result. */
|
|
72
|
+
function buildSecurityGroupResult(resource) {
|
|
73
|
+
return { resource, connectionType: connector_js_1.CONNECTION_TYPE.SECURITY_GROUP };
|
|
74
|
+
}
|
|
75
|
+
/** Validate and narrow access type for storage/dynamodb connectors. */
|
|
76
|
+
function validateConnectionAccess(access, connectorType, defaultAccess) {
|
|
77
|
+
if (access === undefined)
|
|
78
|
+
return defaultAccess;
|
|
79
|
+
if ((0, connector_js_1.isConnectionAccess)(access))
|
|
80
|
+
return access;
|
|
81
|
+
throw new Error(`Invalid access "${access}" for ${connectorType} connector. ` +
|
|
82
|
+
`Valid values: read, write, readWrite`);
|
|
83
|
+
}
|
|
84
|
+
/** Validate and narrow access type for queue connectors. */
|
|
85
|
+
function validateMessagingAccess(access, defaultAccess) {
|
|
86
|
+
if (access === undefined)
|
|
87
|
+
return defaultAccess;
|
|
88
|
+
if ((0, connector_js_1.isMessagingAccess)(access))
|
|
89
|
+
return access;
|
|
90
|
+
throw new Error(`Invalid access "${access}" for queue connector. ` +
|
|
91
|
+
`Valid values: send, consume, full`);
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Require IConnectable for security group operations.
|
|
95
|
+
* Throws a descriptive error if not provided.
|
|
96
|
+
*/
|
|
97
|
+
function requireConnectable(connectable, context) {
|
|
98
|
+
if (!connectable) {
|
|
99
|
+
throw new Error(`${context} requires an IConnectable to be provided. ` +
|
|
100
|
+
"Ensure the compute resource (ECS, EC2, Lambda with VPC) implements IConnectable.");
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* Process connections from compute resources to data resources.
|
|
105
|
+
*
|
|
106
|
+
* Handles the unified connector interface, dispatching to:
|
|
107
|
+
* - Security group rules for IConnectable and ISecurityGroupConnector resources
|
|
108
|
+
* - IAM grants for IStorageConnector, IDynamoDBConnector, and IQueueConnector resources
|
|
109
|
+
*
|
|
110
|
+
* @param connections - Array of connection specifications
|
|
111
|
+
* @param grantee - The IAM grantee (task role, execution role, etc.)
|
|
112
|
+
* @param connectable - Optional IConnectable for security group rules
|
|
113
|
+
* @returns Array of connection results
|
|
114
|
+
*
|
|
115
|
+
* @example
|
|
116
|
+
* processConnections(
|
|
117
|
+
* [database, { resource: bucket, access: "read" }, queue],
|
|
118
|
+
* taskRole,
|
|
119
|
+
* service
|
|
120
|
+
* );
|
|
121
|
+
*/
|
|
122
|
+
function processConnections(connections, grantee, connectable) {
|
|
123
|
+
return connections.map((spec) => {
|
|
124
|
+
const { resource, access } = (0, connector_js_1.isConnectionConfig)(spec)
|
|
125
|
+
? { resource: spec.resource, access: spec.access }
|
|
126
|
+
: { resource: spec, access: undefined };
|
|
127
|
+
// Handle unified connector interface (isConnector now returns AnyConnector)
|
|
128
|
+
if ((0, connector_js_1.isConnector)(resource)) {
|
|
129
|
+
switch (resource.connectorType) {
|
|
130
|
+
case "storage": {
|
|
131
|
+
const validAccess = validateConnectionAccess(access, "storage", DEFAULT_ACCESS.storage);
|
|
132
|
+
return buildIamResult(resource, processStorageConnection(resource, grantee, validAccess));
|
|
133
|
+
}
|
|
134
|
+
case "dynamodb": {
|
|
135
|
+
const validAccess = validateConnectionAccess(access, "dynamodb", DEFAULT_ACCESS.dynamodb);
|
|
136
|
+
return buildIamResult(resource, processDynamoDBConnection(resource, grantee, validAccess));
|
|
137
|
+
}
|
|
138
|
+
case "queue": {
|
|
139
|
+
const validAccess = validateMessagingAccess(access, DEFAULT_ACCESS.queue);
|
|
140
|
+
return buildIamResult(resource, processQueueConnection(resource, grantee, validAccess));
|
|
141
|
+
}
|
|
142
|
+
case "securityGroup":
|
|
143
|
+
case "relational": {
|
|
144
|
+
requireConnectable(connectable, `${resource.connectorType} connector`);
|
|
145
|
+
connectable.connections.allowToDefaultPort(resource);
|
|
146
|
+
return buildSecurityGroupResult(resource);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
// Legacy IConnectable path
|
|
151
|
+
if ((0, connector_js_1.isConnectable)(resource)) {
|
|
152
|
+
requireConnectable(connectable, "IConnectable resource");
|
|
153
|
+
connectable.connections.allowToDefaultPort(resource);
|
|
154
|
+
return buildSecurityGroupResult(resource);
|
|
155
|
+
}
|
|
156
|
+
throw new Error("Connection resource must be either an IConnector or IConnectable");
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/connections.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Shared connection processor for unified connector interface.\n *\n * This module provides the `processConnections` function that handles\n * both security group rules (IConnectable) and IAM grants (IGrantable)\n * in a unified way.\n *\n * @example\n * // In ECS service setup\n * processConnections(\n *   serviceProps.connections,\n *   serviceData.taskRole,  // IGrantable for IAM\n *   service               // IConnectable for security groups\n * );\n *\n * @example\n * // In Lambda setup\n * processConnections(\n *   props.connections,\n *   this.lambdaFunction,  // IGrantable (execution role)\n *   this.lambdaFunction   // IConnectable (security group)\n * );\n */\n\nimport { type IConnectable } from \"aws-cdk-lib/aws-ec2\";\nimport { type IGrantable, type Grant } from \"aws-cdk-lib/aws-iam\";\nimport {\n  type ConnectionSpec,\n  type ConnectionResult,\n  type ConnectionAccess,\n  type MessagingAccess,\n  type AnyConnector,\n  type IStorageConnector,\n  type IDynamoDBConnector,\n  type IQueueConnector,\n  CONNECTION_TYPE,\n  isConnectionConfig,\n  isConnector,\n  isConnectable,\n  isConnectionAccess,\n  isMessagingAccess\n} from \"./interfaces/connector.js\";\n\n/** Default access levels for each connector type. */\nconst DEFAULT_ACCESS = {\n  storage: \"readWrite\",\n  dynamodb: \"readWrite\",\n  queue: \"full\"\n} as const;\n\n/** Grant storage access based on access level. */\nfunction processStorageConnection(\n  connector: IStorageConnector,\n  grantee: IGrantable,\n  access: ConnectionAccess\n): Grant {\n  switch (access) {\n    case \"read\":\n      return connector.grantRead(grantee);\n    case \"write\":\n      return connector.grantWrite(grantee);\n    case \"readWrite\":\n      return connector.grantReadWrite(grantee);\n  }\n}\n\n/** Grant DynamoDB access based on access level. */\nfunction processDynamoDBConnection(\n  connector: IDynamoDBConnector,\n  grantee: IGrantable,\n  access: ConnectionAccess\n): Grant {\n  switch (access) {\n    case \"read\":\n      return connector.grantReadData(grantee);\n    case \"write\":\n      return connector.grantWriteData(grantee);\n    case \"readWrite\":\n      return connector.grantReadWriteData(grantee);\n  }\n}\n\n/** Grant queue access based on access level. */\nfunction processQueueConnection(\n  connector: IQueueConnector,\n  grantee: IGrantable,\n  access: MessagingAccess\n): Grant {\n  switch (access) {\n    case \"send\":\n      return connector.grantSendMessages(grantee);\n    case \"consume\":\n      return connector.grantConsumeMessages(grantee);\n    case \"full\":\n      return connector.grantFull(grantee);\n  }\n}\n\n/** Build an IAM connection result. */\nfunction buildIamResult(\n  connector: AnyConnector,\n  grant: Grant\n): ConnectionResult {\n  return { resource: connector, grant, connectionType: CONNECTION_TYPE.IAM };\n}\n\n/** Build a security group connection result. */\nfunction buildSecurityGroupResult(\n  resource: AnyConnector | IConnectable\n): ConnectionResult {\n  return { resource, connectionType: CONNECTION_TYPE.SECURITY_GROUP };\n}\n\n/** Validate and narrow access type for storage/dynamodb connectors. */\nfunction validateConnectionAccess(\n  access: ConnectionAccess | MessagingAccess | undefined,\n  connectorType: string,\n  defaultAccess: ConnectionAccess\n): ConnectionAccess {\n  if (access === undefined) return defaultAccess;\n  if (isConnectionAccess(access)) return access;\n  throw new Error(\n    `Invalid access \"${access}\" for ${connectorType} connector. ` +\n      `Valid values: read, write, readWrite`\n  );\n}\n\n/** Validate and narrow access type for queue connectors. */\nfunction validateMessagingAccess(\n  access: ConnectionAccess | MessagingAccess | undefined,\n  defaultAccess: MessagingAccess\n): MessagingAccess {\n  if (access === undefined) return defaultAccess;\n  if (isMessagingAccess(access)) return access;\n  throw new Error(\n    `Invalid access \"${access}\" for queue connector. ` +\n      `Valid values: send, consume, full`\n  );\n}\n\n/**\n * Require IConnectable for security group operations.\n * Throws a descriptive error if not provided.\n */\nfunction requireConnectable(\n  connectable: IConnectable | undefined,\n  context: string\n): asserts connectable is IConnectable {\n  if (!connectable) {\n    throw new Error(\n      `${context} requires an IConnectable to be provided. ` +\n        \"Ensure the compute resource (ECS, EC2, Lambda with VPC) implements IConnectable.\"\n    );\n  }\n}\n\n/**\n * Process connections from compute resources to data resources.\n *\n * Handles the unified connector interface, dispatching to:\n * - Security group rules for IConnectable and ISecurityGroupConnector resources\n * - IAM grants for IStorageConnector, IDynamoDBConnector, and IQueueConnector resources\n *\n * @param connections - Array of connection specifications\n * @param grantee - The IAM grantee (task role, execution role, etc.)\n * @param connectable - Optional IConnectable for security group rules\n * @returns Array of connection results\n *\n * @example\n * processConnections(\n *   [database, { resource: bucket, access: \"read\" }, queue],\n *   taskRole,\n *   service\n * );\n */\nexport function processConnections(\n  connections: ConnectionSpec[],\n  grantee: IGrantable,\n  connectable?: IConnectable\n): ConnectionResult[] {\n  return connections.map((spec) => {\n    const { resource, access } = isConnectionConfig(spec)\n      ? { resource: spec.resource, access: spec.access }\n      : { resource: spec, access: undefined };\n\n    // Handle unified connector interface (isConnector now returns AnyConnector)\n    if (isConnector(resource)) {\n      switch (resource.connectorType) {\n        case \"storage\": {\n          const validAccess = validateConnectionAccess(\n            access,\n            \"storage\",\n            DEFAULT_ACCESS.storage\n          );\n          return buildIamResult(\n            resource,\n            processStorageConnection(resource, grantee, validAccess)\n          );\n        }\n\n        case \"dynamodb\": {\n          const validAccess = validateConnectionAccess(\n            access,\n            \"dynamodb\",\n            DEFAULT_ACCESS.dynamodb\n          );\n          return buildIamResult(\n            resource,\n            processDynamoDBConnection(resource, grantee, validAccess)\n          );\n        }\n\n        case \"queue\": {\n          const validAccess = validateMessagingAccess(\n            access,\n            DEFAULT_ACCESS.queue\n          );\n          return buildIamResult(\n            resource,\n            processQueueConnection(resource, grantee, validAccess)\n          );\n        }\n\n        case \"securityGroup\":\n        case \"relational\": {\n          requireConnectable(\n            connectable,\n            `${resource.connectorType} connector`\n          );\n          connectable.connections.allowToDefaultPort(resource);\n          return buildSecurityGroupResult(resource);\n        }\n      }\n    }\n\n    // Legacy IConnectable path\n    if (isConnectable(resource)) {\n      requireConnectable(connectable, \"IConnectable resource\");\n      connectable.connections.allowToDefaultPort(resource);\n      return buildSecurityGroupResult(resource);\n    }\n\n    throw new Error(\n      \"Connection resource must be either an IConnector or IConnectable\"\n    );\n  });\n}\n"]}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { Construct } from "constructs";
|
|
2
2
|
import type App from "../../app";
|
|
3
|
-
import { type
|
|
3
|
+
import { type DynamoDBKeySchema, type DynamoDBGlobalSecondaryIndex } from "../../resources/aws/database/dynamodb";
|
|
4
4
|
import { type Connections, type IConnectable, type IVpc, type SubnetSelection } from "aws-cdk-lib/aws-ec2";
|
|
5
|
+
import { type ITable } from "aws-cdk-lib/aws-dynamodb";
|
|
6
|
+
import { type Secret } from "../../resources/aws/secrets";
|
|
7
|
+
import { type IGrantable, type Grant } from "aws-cdk-lib/aws-iam";
|
|
8
|
+
import { type IRelationalDatabase, type IDynamoDBDatabase, type RelationalDatabaseType } from "./interfaces/database.js";
|
|
9
|
+
import { type IDynamoDBConnector, type ISecurityGroupConnector } from "./interfaces/connector.js";
|
|
5
10
|
import { type IInstanceEngine, type IClusterEngine } from "aws-cdk-lib/aws-rds";
|
|
6
11
|
import { Duration } from "aws-cdk-lib";
|
|
7
12
|
import { type IKey } from "aws-cdk-lib/aws-kms";
|
|
@@ -132,6 +137,21 @@ export interface AuroraDatabaseProps extends BaseDatabaseProps {
|
|
|
132
137
|
snapshotIdentifier?: string;
|
|
133
138
|
/** Username from the snapshot (required when restoring from snapshot to reset password) */
|
|
134
139
|
snapshotUsername?: string;
|
|
140
|
+
/** Allow access from VPC CIDR (avoids cross-stack cyclic dependencies with Lambda) */
|
|
141
|
+
allowVpcAccess?: boolean;
|
|
142
|
+
/**
|
|
143
|
+
* Make database publicly accessible from the internet.
|
|
144
|
+
* WARNING: This is a security risk and should only be used for development
|
|
145
|
+
* or when building Payload apps locally that need database access.
|
|
146
|
+
* When enabled, the database is placed in public subnets.
|
|
147
|
+
*/
|
|
148
|
+
publiclyAccessible?: boolean;
|
|
149
|
+
/**
|
|
150
|
+
* IP address to allow access from when publiclyAccessible is true.
|
|
151
|
+
* If not specified, access is restricted to VPC only even when public.
|
|
152
|
+
* Format: CIDR notation (e.g., "203.0.113.0/32" for single IP)
|
|
153
|
+
*/
|
|
154
|
+
allowedIpCidr?: string;
|
|
135
155
|
}
|
|
136
156
|
export interface GlobalAuroraDatabaseProps extends BaseDatabaseProps {
|
|
137
157
|
type: "GlobalAurora";
|
|
@@ -178,19 +198,106 @@ export interface InstanceDatabaseProps extends BaseDatabaseProps {
|
|
|
178
198
|
/** Username from the snapshot (required when restoring from snapshot to reset password) */
|
|
179
199
|
snapshotUsername?: string;
|
|
180
200
|
}
|
|
181
|
-
|
|
201
|
+
/**
|
|
202
|
+
* DynamoDB table configuration properties.
|
|
203
|
+
*/
|
|
204
|
+
export interface DynamoDBDatabaseProps {
|
|
205
|
+
type: "DynamoDB";
|
|
206
|
+
partitionKey: DynamoDBKeySchema;
|
|
207
|
+
sortKey?: DynamoDBKeySchema;
|
|
208
|
+
billingMode?: "PAY_PER_REQUEST" | "PROVISIONED";
|
|
209
|
+
readCapacity?: number;
|
|
210
|
+
writeCapacity?: number;
|
|
211
|
+
globalSecondaryIndexes?: DynamoDBGlobalSecondaryIndex[];
|
|
212
|
+
timeToLiveAttribute?: string;
|
|
213
|
+
stream?: "NEW_IMAGE" | "OLD_IMAGE" | "NEW_AND_OLD_IMAGES" | "KEYS_ONLY";
|
|
214
|
+
pointInTimeRecovery?: boolean;
|
|
215
|
+
encryption?: "AWS_OWNED" | "AWS_MANAGED" | "CUSTOMER_MANAGED";
|
|
216
|
+
removalPolicy?: "DESTROY" | "RETAIN" | "SNAPSHOT";
|
|
217
|
+
}
|
|
218
|
+
/**
|
|
219
|
+
* Relational database props union (Aurora, Instance, GlobalAurora).
|
|
220
|
+
*/
|
|
221
|
+
export type IRelationalDatabaseProps = AuroraDatabaseProps | InstanceDatabaseProps | GlobalAuroraDatabaseProps;
|
|
222
|
+
/**
|
|
223
|
+
* All database props union.
|
|
224
|
+
*/
|
|
225
|
+
export type IDatabaseProps = AuroraDatabaseProps | InstanceDatabaseProps | GlobalAuroraDatabaseProps | DynamoDBDatabaseProps;
|
|
226
|
+
/**
|
|
227
|
+
* Factory for creating type-safe database resources.
|
|
228
|
+
*
|
|
229
|
+
* @example
|
|
230
|
+
* // Aurora database - returns RelationalDatabase
|
|
231
|
+
* const aurora = app.addDatabase(DatabaseFactory.build("Main", {
|
|
232
|
+
* type: "Aurora",
|
|
233
|
+
* databaseName: "myapp"
|
|
234
|
+
* }));
|
|
235
|
+
* aurora.getHostEndpoint(); // Available
|
|
236
|
+
*
|
|
237
|
+
* @example
|
|
238
|
+
* // DynamoDB table - returns DynamoDBDatabase
|
|
239
|
+
* const cache = app.addDatabase(DatabaseFactory.build("Cache", {
|
|
240
|
+
* type: "DynamoDB",
|
|
241
|
+
* partitionKey: { name: "id", type: "S" }
|
|
242
|
+
* }));
|
|
243
|
+
* cache.getTableName(); // Available
|
|
244
|
+
* cache.grantReadWriteData(lambda); // Available
|
|
245
|
+
*/
|
|
182
246
|
export declare class DatabaseFactory {
|
|
183
|
-
static build
|
|
247
|
+
static build(id: string, props: AuroraDatabaseProps): (app: App, scope: Construct) => RelationalDatabase;
|
|
248
|
+
static build(id: string, props: InstanceDatabaseProps): (app: App, scope: Construct) => RelationalDatabase;
|
|
249
|
+
static build(id: string, props: GlobalAuroraDatabaseProps): (app: App, scope: Construct) => RelationalDatabase;
|
|
250
|
+
static build(id: string, props: DynamoDBDatabaseProps): (app: App, scope: Construct) => DynamoDBDatabase;
|
|
251
|
+
}
|
|
252
|
+
/**
|
|
253
|
+
* DynamoDB database wrapper implementing IDynamoDBDatabase interface.
|
|
254
|
+
* Provides type-safe access to DynamoDB table operations.
|
|
255
|
+
*
|
|
256
|
+
* @example
|
|
257
|
+
* const cache = app.addDatabase(DatabaseFactory.build("Cache", {
|
|
258
|
+
* type: "DynamoDB",
|
|
259
|
+
* partitionKey: { name: "id", type: "S" }
|
|
260
|
+
* }));
|
|
261
|
+
* cache.grantReadWriteData(lambda);
|
|
262
|
+
*/
|
|
263
|
+
export declare class DynamoDBDatabase extends Construct implements IDynamoDBDatabase, IDynamoDBConnector {
|
|
264
|
+
readonly databaseType: "DynamoDB";
|
|
265
|
+
readonly connectorType: "dynamodb";
|
|
266
|
+
readonly id: string;
|
|
267
|
+
private readonly table;
|
|
268
|
+
constructor(scope: Construct, id: string, props: DynamoDBDatabaseProps);
|
|
269
|
+
getTableName(): string;
|
|
270
|
+
getTableArn(): string;
|
|
271
|
+
getTable(): ITable;
|
|
272
|
+
getStreamArn(): string | undefined;
|
|
273
|
+
grantReadData(grantee: IGrantable): Grant;
|
|
274
|
+
grantWriteData(grantee: IGrantable): Grant;
|
|
275
|
+
grantReadWriteData(grantee: IGrantable): Grant;
|
|
276
|
+
grantFullAccess(grantee: IGrantable): Grant;
|
|
277
|
+
grantStreamRead(grantee: IGrantable): Grant;
|
|
184
278
|
}
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
279
|
+
/**
|
|
280
|
+
* Relational database wrapper implementing IRelationalDatabase interface.
|
|
281
|
+
* Supports Aurora, RDS Instance, and GlobalAurora database types.
|
|
282
|
+
*
|
|
283
|
+
* @example
|
|
284
|
+
* const db = app.addDatabase(DatabaseFactory.build("Main", {
|
|
285
|
+
* type: "Aurora",
|
|
286
|
+
* databaseName: "myapp"
|
|
287
|
+
* }));
|
|
288
|
+
* db.grantConnect(lambda);
|
|
289
|
+
*/
|
|
290
|
+
export declare class RelationalDatabase extends Construct implements IRelationalDatabase, ISecurityGroupConnector {
|
|
291
|
+
readonly id: string;
|
|
292
|
+
readonly scope: Construct;
|
|
293
|
+
readonly vpc: IVpc;
|
|
294
|
+
readonly databaseType: RelationalDatabaseType;
|
|
295
|
+
readonly connectorType: "relational";
|
|
189
296
|
connections: Connections;
|
|
190
|
-
private
|
|
297
|
+
private readonly _databaseName;
|
|
191
298
|
private database;
|
|
192
|
-
constructor(scope: Construct, id: string, props:
|
|
193
|
-
addDatabase(props:
|
|
299
|
+
constructor(scope: Construct, id: string, props: IRelationalDatabaseProps);
|
|
300
|
+
addDatabase(props: IRelationalDatabaseProps): void;
|
|
194
301
|
private addAurora;
|
|
195
302
|
private addAuroraGlobal;
|
|
196
303
|
private addRdsInstance;
|
|
@@ -199,5 +306,11 @@ export declare class Database extends Construct implements IConnectable {
|
|
|
199
306
|
getHostEndpoint(): string;
|
|
200
307
|
getHostPort(): string;
|
|
201
308
|
getDatabaseName(): string;
|
|
309
|
+
/**
|
|
310
|
+
* Grant connect permissions to a grantee by adding it to the database security group.
|
|
311
|
+
* @param grantee The connectable principal to grant connect permissions to
|
|
312
|
+
*/
|
|
313
|
+
grantConnect(grantee: IConnectable): void;
|
|
202
314
|
}
|
|
203
|
-
export {};
|
|
315
|
+
export type { DynamoDBKeySchema, DynamoDBGlobalSecondaryIndex, DynamoDBTableProps } from "../../resources/aws/database/dynamodb";
|
|
316
|
+
export { type IRelationalDatabase, type IDynamoDBDatabase, type AnyDatabase, type DatabaseType, type RelationalDatabaseType, isRelationalDatabase, isDynamoDBDatabase, isAuroraDatabase, isInstanceDatabase, isGlobalAuroraDatabase } from "./interfaces/database.js";
|