@fjall/components-infrastructure 0.86.1 → 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,181 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DynamoDBTable = void 0;
|
|
4
|
+
const constructs_1 = require("constructs");
|
|
5
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
6
|
+
const aws_dynamodb_1 = require("aws-cdk-lib/aws-dynamodb");
|
|
7
|
+
function toAttributeType(type) {
|
|
8
|
+
switch (type) {
|
|
9
|
+
case "S":
|
|
10
|
+
return aws_dynamodb_1.AttributeType.STRING;
|
|
11
|
+
case "N":
|
|
12
|
+
return aws_dynamodb_1.AttributeType.NUMBER;
|
|
13
|
+
case "B":
|
|
14
|
+
return aws_dynamodb_1.AttributeType.BINARY;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function toBillingMode(mode) {
|
|
18
|
+
switch (mode) {
|
|
19
|
+
case "PROVISIONED":
|
|
20
|
+
return aws_dynamodb_1.BillingMode.PROVISIONED;
|
|
21
|
+
case "PAY_PER_REQUEST":
|
|
22
|
+
default:
|
|
23
|
+
return aws_dynamodb_1.BillingMode.PAY_PER_REQUEST;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
function toStreamViewType(stream) {
|
|
27
|
+
switch (stream) {
|
|
28
|
+
case "NEW_IMAGE":
|
|
29
|
+
return aws_dynamodb_1.StreamViewType.NEW_IMAGE;
|
|
30
|
+
case "OLD_IMAGE":
|
|
31
|
+
return aws_dynamodb_1.StreamViewType.OLD_IMAGE;
|
|
32
|
+
case "NEW_AND_OLD_IMAGES":
|
|
33
|
+
return aws_dynamodb_1.StreamViewType.NEW_AND_OLD_IMAGES;
|
|
34
|
+
case "KEYS_ONLY":
|
|
35
|
+
return aws_dynamodb_1.StreamViewType.KEYS_ONLY;
|
|
36
|
+
default:
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
function toRemovalPolicy(policy) {
|
|
41
|
+
switch (policy) {
|
|
42
|
+
case "RETAIN":
|
|
43
|
+
return aws_cdk_lib_1.RemovalPolicy.RETAIN;
|
|
44
|
+
case "SNAPSHOT":
|
|
45
|
+
return aws_cdk_lib_1.RemovalPolicy.SNAPSHOT;
|
|
46
|
+
case "DESTROY":
|
|
47
|
+
default:
|
|
48
|
+
return aws_cdk_lib_1.RemovalPolicy.DESTROY;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
function toProjectionType(type) {
|
|
52
|
+
switch (type) {
|
|
53
|
+
case "ALL":
|
|
54
|
+
return aws_dynamodb_1.ProjectionType.ALL;
|
|
55
|
+
case "KEYS_ONLY":
|
|
56
|
+
return aws_dynamodb_1.ProjectionType.KEYS_ONLY;
|
|
57
|
+
case "INCLUDE":
|
|
58
|
+
return aws_dynamodb_1.ProjectionType.INCLUDE;
|
|
59
|
+
default:
|
|
60
|
+
return undefined;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
class DynamoDBTable extends constructs_1.Construct {
|
|
64
|
+
constructor(scope, id, props) {
|
|
65
|
+
super(scope, id);
|
|
66
|
+
this.id = id;
|
|
67
|
+
this.table = new aws_dynamodb_1.Table(this, `${id}Table`, {
|
|
68
|
+
tableName: props.tableName,
|
|
69
|
+
partitionKey: {
|
|
70
|
+
name: props.partitionKey.name,
|
|
71
|
+
type: toAttributeType(props.partitionKey.type)
|
|
72
|
+
},
|
|
73
|
+
sortKey: props.sortKey
|
|
74
|
+
? {
|
|
75
|
+
name: props.sortKey.name,
|
|
76
|
+
type: toAttributeType(props.sortKey.type)
|
|
77
|
+
}
|
|
78
|
+
: undefined,
|
|
79
|
+
billingMode: toBillingMode(props.billingMode),
|
|
80
|
+
readCapacity: props.billingMode === "PROVISIONED" ? props.readCapacity : undefined,
|
|
81
|
+
writeCapacity: props.billingMode === "PROVISIONED" ? props.writeCapacity : undefined,
|
|
82
|
+
stream: toStreamViewType(props.stream),
|
|
83
|
+
pointInTimeRecovery: props.pointInTimeRecovery ?? true,
|
|
84
|
+
removalPolicy: toRemovalPolicy(props.removalPolicy),
|
|
85
|
+
timeToLiveAttribute: props.timeToLiveAttribute
|
|
86
|
+
});
|
|
87
|
+
if (props.globalSecondaryIndexes) {
|
|
88
|
+
for (const gsi of props.globalSecondaryIndexes) {
|
|
89
|
+
const gsiProps = {
|
|
90
|
+
indexName: gsi.indexName,
|
|
91
|
+
partitionKey: {
|
|
92
|
+
name: gsi.partitionKey.name,
|
|
93
|
+
type: toAttributeType(gsi.partitionKey.type)
|
|
94
|
+
},
|
|
95
|
+
sortKey: gsi.sortKey
|
|
96
|
+
? {
|
|
97
|
+
name: gsi.sortKey.name,
|
|
98
|
+
type: toAttributeType(gsi.sortKey.type)
|
|
99
|
+
}
|
|
100
|
+
: undefined,
|
|
101
|
+
projectionType: toProjectionType(gsi.projectionType),
|
|
102
|
+
nonKeyAttributes: gsi.nonKeyAttributes
|
|
103
|
+
};
|
|
104
|
+
this.table.addGlobalSecondaryIndex(gsiProps);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
new aws_cdk_lib_1.CfnOutput(this, `${id}TableName`, {
|
|
108
|
+
key: `${id}TableName`,
|
|
109
|
+
value: this.table.tableName,
|
|
110
|
+
description: `DynamoDB table name for ${id}`
|
|
111
|
+
});
|
|
112
|
+
new aws_cdk_lib_1.CfnOutput(this, `${id}TableArn`, {
|
|
113
|
+
key: `${id}TableArn`,
|
|
114
|
+
value: this.table.tableArn,
|
|
115
|
+
description: `DynamoDB table ARN for ${id}`
|
|
116
|
+
});
|
|
117
|
+
if (props.stream) {
|
|
118
|
+
new aws_cdk_lib_1.CfnOutput(this, `${id}TableStreamArn`, {
|
|
119
|
+
key: `${id}TableStreamArn`,
|
|
120
|
+
value: this.table.tableStreamArn || "",
|
|
121
|
+
description: `DynamoDB table stream ARN for ${id}`
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Get the DynamoDB table name.
|
|
127
|
+
*/
|
|
128
|
+
getTableName() {
|
|
129
|
+
return this.table.tableName;
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* Get the DynamoDB table ARN.
|
|
133
|
+
*/
|
|
134
|
+
getTableArn() {
|
|
135
|
+
return this.table.tableArn;
|
|
136
|
+
}
|
|
137
|
+
/**
|
|
138
|
+
* Get the DynamoDB table stream ARN (if streaming is enabled).
|
|
139
|
+
*/
|
|
140
|
+
getTableStreamArn() {
|
|
141
|
+
return this.table.tableStreamArn;
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Get the underlying CDK Table construct.
|
|
145
|
+
*/
|
|
146
|
+
getTable() {
|
|
147
|
+
return this.table;
|
|
148
|
+
}
|
|
149
|
+
/**
|
|
150
|
+
* Grant read permissions to the grantee.
|
|
151
|
+
*/
|
|
152
|
+
grantRead(grantee) {
|
|
153
|
+
return this.table.grantReadData(grantee);
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* Grant write permissions to the grantee.
|
|
157
|
+
*/
|
|
158
|
+
grantWrite(grantee) {
|
|
159
|
+
return this.table.grantWriteData(grantee);
|
|
160
|
+
}
|
|
161
|
+
/**
|
|
162
|
+
* Grant read and write permissions to the grantee.
|
|
163
|
+
*/
|
|
164
|
+
grantReadWrite(grantee) {
|
|
165
|
+
return this.table.grantReadWriteData(grantee);
|
|
166
|
+
}
|
|
167
|
+
/**
|
|
168
|
+
* Grant full access (read, write, delete) to the grantee.
|
|
169
|
+
*/
|
|
170
|
+
grantFullAccess(grantee) {
|
|
171
|
+
return this.table.grantFullAccess(grantee);
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* Grant stream read permissions to the grantee.
|
|
175
|
+
*/
|
|
176
|
+
grantStreamRead(grantee) {
|
|
177
|
+
return this.table.grantStreamRead(grantee);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
exports.DynamoDBTable = DynamoDBTable;
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dynamodb.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/dynamodb.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { CfnOutput, RemovalPolicy } from \"aws-cdk-lib\";\nimport {\n  Table,\n  AttributeType,\n  BillingMode,\n  StreamViewType,\n  ProjectionType,\n  type GlobalSecondaryIndexProps,\n  type ITable\n} from \"aws-cdk-lib/aws-dynamodb\";\nimport { type IGrantable, type Grant } from \"aws-cdk-lib/aws-iam\";\n\nexport type DynamoDBAttributeType = \"S\" | \"N\" | \"B\";\n\nexport interface DynamoDBKeySchema {\n  name: string;\n  type: DynamoDBAttributeType;\n}\n\nexport interface DynamoDBGlobalSecondaryIndex {\n  indexName: string;\n  partitionKey: DynamoDBKeySchema;\n  sortKey?: DynamoDBKeySchema;\n  projectionType?: \"ALL\" | \"KEYS_ONLY\" | \"INCLUDE\";\n  nonKeyAttributes?: string[];\n}\n\nexport interface DynamoDBTableProps {\n  tableName?: string;\n  partitionKey: DynamoDBKeySchema;\n  sortKey?: DynamoDBKeySchema;\n  billingMode?: \"PAY_PER_REQUEST\" | \"PROVISIONED\";\n  readCapacity?: number;\n  writeCapacity?: number;\n  globalSecondaryIndexes?: DynamoDBGlobalSecondaryIndex[];\n  timeToLiveAttribute?: string;\n  stream?: \"NEW_IMAGE\" | \"OLD_IMAGE\" | \"NEW_AND_OLD_IMAGES\" | \"KEYS_ONLY\";\n  pointInTimeRecovery?: boolean;\n  encryption?: \"AWS_OWNED\" | \"AWS_MANAGED\" | \"CUSTOMER_MANAGED\";\n  removalPolicy?: \"DESTROY\" | \"RETAIN\" | \"SNAPSHOT\";\n}\n\nfunction toAttributeType(type: DynamoDBAttributeType): AttributeType {\n  switch (type) {\n    case \"S\":\n      return AttributeType.STRING;\n    case \"N\":\n      return AttributeType.NUMBER;\n    case \"B\":\n      return AttributeType.BINARY;\n  }\n}\n\nfunction toBillingMode(mode?: \"PAY_PER_REQUEST\" | \"PROVISIONED\"): BillingMode {\n  switch (mode) {\n    case \"PROVISIONED\":\n      return BillingMode.PROVISIONED;\n    case \"PAY_PER_REQUEST\":\n    default:\n      return BillingMode.PAY_PER_REQUEST;\n  }\n}\n\nfunction toStreamViewType(\n  stream?: \"NEW_IMAGE\" | \"OLD_IMAGE\" | \"NEW_AND_OLD_IMAGES\" | \"KEYS_ONLY\"\n): StreamViewType | undefined {\n  switch (stream) {\n    case \"NEW_IMAGE\":\n      return StreamViewType.NEW_IMAGE;\n    case \"OLD_IMAGE\":\n      return StreamViewType.OLD_IMAGE;\n    case \"NEW_AND_OLD_IMAGES\":\n      return StreamViewType.NEW_AND_OLD_IMAGES;\n    case \"KEYS_ONLY\":\n      return StreamViewType.KEYS_ONLY;\n    default:\n      return undefined;\n  }\n}\n\nfunction toRemovalPolicy(\n  policy?: \"DESTROY\" | \"RETAIN\" | \"SNAPSHOT\"\n): RemovalPolicy {\n  switch (policy) {\n    case \"RETAIN\":\n      return RemovalPolicy.RETAIN;\n    case \"SNAPSHOT\":\n      return RemovalPolicy.SNAPSHOT;\n    case \"DESTROY\":\n    default:\n      return RemovalPolicy.DESTROY;\n  }\n}\n\nfunction toProjectionType(\n  type?: \"ALL\" | \"KEYS_ONLY\" | \"INCLUDE\"\n): ProjectionType | undefined {\n  switch (type) {\n    case \"ALL\":\n      return ProjectionType.ALL;\n    case \"KEYS_ONLY\":\n      return ProjectionType.KEYS_ONLY;\n    case \"INCLUDE\":\n      return ProjectionType.INCLUDE;\n    default:\n      return undefined;\n  }\n}\n\nexport class DynamoDBTable extends Construct {\n  public readonly id: string;\n  private table: Table;\n\n  constructor(scope: Construct, id: string, props: DynamoDBTableProps) {\n    super(scope, id);\n    this.id = id;\n\n    this.table = new Table(this, `${id}Table`, {\n      tableName: props.tableName,\n      partitionKey: {\n        name: props.partitionKey.name,\n        type: toAttributeType(props.partitionKey.type)\n      },\n      sortKey: props.sortKey\n        ? {\n            name: props.sortKey.name,\n            type: toAttributeType(props.sortKey.type)\n          }\n        : undefined,\n      billingMode: toBillingMode(props.billingMode),\n      readCapacity:\n        props.billingMode === \"PROVISIONED\" ? props.readCapacity : undefined,\n      writeCapacity:\n        props.billingMode === \"PROVISIONED\" ? props.writeCapacity : undefined,\n      stream: toStreamViewType(props.stream),\n      pointInTimeRecovery: props.pointInTimeRecovery ?? true,\n      removalPolicy: toRemovalPolicy(props.removalPolicy),\n      timeToLiveAttribute: props.timeToLiveAttribute\n    });\n\n    if (props.globalSecondaryIndexes) {\n      for (const gsi of props.globalSecondaryIndexes) {\n        const gsiProps: GlobalSecondaryIndexProps = {\n          indexName: gsi.indexName,\n          partitionKey: {\n            name: gsi.partitionKey.name,\n            type: toAttributeType(gsi.partitionKey.type)\n          },\n          sortKey: gsi.sortKey\n            ? {\n                name: gsi.sortKey.name,\n                type: toAttributeType(gsi.sortKey.type)\n              }\n            : undefined,\n          projectionType: toProjectionType(gsi.projectionType),\n          nonKeyAttributes: gsi.nonKeyAttributes\n        };\n        this.table.addGlobalSecondaryIndex(gsiProps);\n      }\n    }\n\n    new CfnOutput(this, `${id}TableName`, {\n      key: `${id}TableName`,\n      value: this.table.tableName,\n      description: `DynamoDB table name for ${id}`\n    });\n\n    new CfnOutput(this, `${id}TableArn`, {\n      key: `${id}TableArn`,\n      value: this.table.tableArn,\n      description: `DynamoDB table ARN for ${id}`\n    });\n\n    if (props.stream) {\n      new CfnOutput(this, `${id}TableStreamArn`, {\n        key: `${id}TableStreamArn`,\n        value: this.table.tableStreamArn || \"\",\n        description: `DynamoDB table stream ARN for ${id}`\n      });\n    }\n  }\n\n  /**\n   * Get the DynamoDB table name.\n   */\n  public getTableName(): string {\n    return this.table.tableName;\n  }\n\n  /**\n   * Get the DynamoDB table ARN.\n   */\n  public getTableArn(): string {\n    return this.table.tableArn;\n  }\n\n  /**\n   * Get the DynamoDB table stream ARN (if streaming is enabled).\n   */\n  public getTableStreamArn(): string | undefined {\n    return this.table.tableStreamArn;\n  }\n\n  /**\n   * Get the underlying CDK Table construct.\n   */\n  public getTable(): ITable {\n    return this.table;\n  }\n\n  /**\n   * Grant read permissions to the grantee.\n   */\n  public grantRead(grantee: IGrantable): Grant {\n    return this.table.grantReadData(grantee);\n  }\n\n  /**\n   * Grant write permissions to the grantee.\n   */\n  public grantWrite(grantee: IGrantable): Grant {\n    return this.table.grantWriteData(grantee);\n  }\n\n  /**\n   * Grant read and write permissions to the grantee.\n   */\n  public grantReadWrite(grantee: IGrantable): Grant {\n    return this.table.grantReadWriteData(grantee);\n  }\n\n  /**\n   * Grant full access (read, write, delete) to the grantee.\n   */\n  public grantFullAccess(grantee: IGrantable): Grant {\n    return this.table.grantFullAccess(grantee);\n  }\n\n  /**\n   * Grant stream read permissions to the grantee.\n   */\n  public grantStreamRead(grantee: IGrantable): Grant {\n    return this.table.grantStreamRead(grantee);\n  }\n}\n"]}
|
|
@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./database"), exports);
|
|
18
18
|
__exportStar(require("./rdsAurora"), exports);
|
|
19
19
|
__exportStar(require("./rdsInstance"), exports);
|
|
20
|
-
|
|
20
|
+
__exportStar(require("./dynamodb"), exports);
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9kYXRhYmFzZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkNBQTJCO0FBQzNCLDhDQUE0QjtBQUM1QixnREFBOEI7QUFDOUIsNkNBQTJCIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSBcIi4vZGF0YWJhc2VcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3Jkc0F1cm9yYVwiO1xuZXhwb3J0ICogZnJvbSBcIi4vcmRzSW5zdGFuY2VcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2R5bmFtb2RiXCI7XG4iXX0=
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { Construct } from "constructs";
|
|
2
|
+
import { Function } from "aws-cdk-lib/aws-lambda";
|
|
3
|
+
import { type IVpc, type IConnectable } from "aws-cdk-lib/aws-ec2";
|
|
4
|
+
/**
|
|
5
|
+
* Props for creating a Migration Lambda
|
|
6
|
+
*/
|
|
7
|
+
export interface MigrationLambdaProps {
|
|
8
|
+
/**
|
|
9
|
+
* VPC where the Lambda will be deployed.
|
|
10
|
+
* Must be the same VPC as the database.
|
|
11
|
+
*/
|
|
12
|
+
vpc: IVpc;
|
|
13
|
+
/**
|
|
14
|
+
* Database construct to connect to.
|
|
15
|
+
* Used for security group configuration.
|
|
16
|
+
*/
|
|
17
|
+
database: IConnectable;
|
|
18
|
+
/**
|
|
19
|
+
* Database credentials secret ARN.
|
|
20
|
+
* Lambda will fetch credentials from this secret.
|
|
21
|
+
*/
|
|
22
|
+
secretArn: string;
|
|
23
|
+
/**
|
|
24
|
+
* Database endpoint hostname.
|
|
25
|
+
*/
|
|
26
|
+
databaseEndpoint: string;
|
|
27
|
+
/**
|
|
28
|
+
* Database port.
|
|
29
|
+
*/
|
|
30
|
+
databasePort: string;
|
|
31
|
+
/**
|
|
32
|
+
* Database name.
|
|
33
|
+
*/
|
|
34
|
+
databaseName: string;
|
|
35
|
+
/**
|
|
36
|
+
* Database engine type.
|
|
37
|
+
* Currently only PostgreSQL is supported.
|
|
38
|
+
*/
|
|
39
|
+
databaseEngine: "postgresql";
|
|
40
|
+
/**
|
|
41
|
+
* Optional timeout in seconds.
|
|
42
|
+
* Default: 300 (5 minutes)
|
|
43
|
+
*/
|
|
44
|
+
timeout?: number;
|
|
45
|
+
/**
|
|
46
|
+
* Optional memory size in MB.
|
|
47
|
+
* Default: 256
|
|
48
|
+
*/
|
|
49
|
+
memorySize?: number;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Migration Lambda construct for executing database migrations inside a VPC.
|
|
53
|
+
*
|
|
54
|
+
* This Lambda can be invoked by the Fjall CLI to run migrations against databases
|
|
55
|
+
* that are not accessible from the deployment machine (e.g., private VPC databases).
|
|
56
|
+
*
|
|
57
|
+
* The Lambda:
|
|
58
|
+
* 1. Fetches database credentials from Secrets Manager
|
|
59
|
+
* 2. Connects to the database using the bundled pg driver
|
|
60
|
+
* 3. Executes provided SQL statements
|
|
61
|
+
*
|
|
62
|
+
* @example
|
|
63
|
+
* ```typescript
|
|
64
|
+
* const migrationLambda = new MigrationLambda(this, "Migration", {
|
|
65
|
+
* vpc: network.getVpc(),
|
|
66
|
+
* database: databaseConstruct,
|
|
67
|
+
* secretArn: credentials.secret.secretArn,
|
|
68
|
+
* databaseEndpoint: cluster.clusterEndpoint.hostname,
|
|
69
|
+
* databasePort: "5432",
|
|
70
|
+
* databaseName: "payload",
|
|
71
|
+
* databaseEngine: "postgresql"
|
|
72
|
+
* });
|
|
73
|
+
* ```
|
|
74
|
+
*/
|
|
75
|
+
export declare class MigrationLambda extends Construct {
|
|
76
|
+
readonly function: Function;
|
|
77
|
+
readonly functionArn: string;
|
|
78
|
+
readonly functionName: string;
|
|
79
|
+
constructor(scope: Construct, id: string, props: MigrationLambdaProps);
|
|
80
|
+
}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MigrationLambda = void 0;
|
|
4
|
+
const constructs_1 = require("constructs");
|
|
5
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
6
|
+
const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
|
|
7
|
+
const aws_iam_1 = require("aws-cdk-lib/aws-iam");
|
|
8
|
+
const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
|
|
9
|
+
const aws_logs_1 = require("aws-cdk-lib/aws-logs");
|
|
10
|
+
const path = require("path");
|
|
11
|
+
/**
|
|
12
|
+
* Migration Lambda construct for executing database migrations inside a VPC.
|
|
13
|
+
*
|
|
14
|
+
* This Lambda can be invoked by the Fjall CLI to run migrations against databases
|
|
15
|
+
* that are not accessible from the deployment machine (e.g., private VPC databases).
|
|
16
|
+
*
|
|
17
|
+
* The Lambda:
|
|
18
|
+
* 1. Fetches database credentials from Secrets Manager
|
|
19
|
+
* 2. Connects to the database using the bundled pg driver
|
|
20
|
+
* 3. Executes provided SQL statements
|
|
21
|
+
*
|
|
22
|
+
* @example
|
|
23
|
+
* ```typescript
|
|
24
|
+
* const migrationLambda = new MigrationLambda(this, "Migration", {
|
|
25
|
+
* vpc: network.getVpc(),
|
|
26
|
+
* database: databaseConstruct,
|
|
27
|
+
* secretArn: credentials.secret.secretArn,
|
|
28
|
+
* databaseEndpoint: cluster.clusterEndpoint.hostname,
|
|
29
|
+
* databasePort: "5432",
|
|
30
|
+
* databaseName: "payload",
|
|
31
|
+
* databaseEngine: "postgresql"
|
|
32
|
+
* });
|
|
33
|
+
* ```
|
|
34
|
+
*/
|
|
35
|
+
class MigrationLambda extends constructs_1.Construct {
|
|
36
|
+
constructor(scope, id, props) {
|
|
37
|
+
super(scope, id);
|
|
38
|
+
const stackName = aws_cdk_lib_1.Stack.of(this).stackName;
|
|
39
|
+
// Create security group for the Lambda
|
|
40
|
+
const securityGroup = new aws_ec2_1.SecurityGroup(this, `${id}SecurityGroup`, {
|
|
41
|
+
vpc: props.vpc,
|
|
42
|
+
description: `Security group for ${id} migration Lambda`,
|
|
43
|
+
allowAllOutbound: true
|
|
44
|
+
});
|
|
45
|
+
// Allow Lambda to connect to the database
|
|
46
|
+
props.database.connections.allowFrom(securityGroup, aws_ec2_1.Port.tcp(parseInt(props.databasePort, 10)), `Allow ${id} migration Lambda to connect to database`);
|
|
47
|
+
// Create execution role with necessary permissions
|
|
48
|
+
const executionRole = new aws_iam_1.Role(this, `${id}ExecutionRole`, {
|
|
49
|
+
assumedBy: new aws_iam_1.ServicePrincipal("lambda.amazonaws.com"),
|
|
50
|
+
description: `Execution role for ${id} migration Lambda`,
|
|
51
|
+
managedPolicies: [
|
|
52
|
+
aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}VpcExecutionPolicy`, "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole")
|
|
53
|
+
]
|
|
54
|
+
});
|
|
55
|
+
// Add Secrets Manager permissions
|
|
56
|
+
executionRole.addToPolicy(new aws_iam_1.PolicyStatement({
|
|
57
|
+
effect: aws_iam_1.Effect.ALLOW,
|
|
58
|
+
actions: ["secretsmanager:GetSecretValue"],
|
|
59
|
+
resources: [props.secretArn]
|
|
60
|
+
}));
|
|
61
|
+
// Create log group with retention
|
|
62
|
+
const logGroup = new aws_logs_1.LogGroup(this, `${id}LogGroup`, {
|
|
63
|
+
logGroupName: `/aws/lambda/${stackName}-${id}`,
|
|
64
|
+
retention: aws_logs_1.RetentionDays.ONE_WEEK
|
|
65
|
+
});
|
|
66
|
+
// Path to the Lambda handler code
|
|
67
|
+
// This directory contains index.mjs and package.json with pg dependency
|
|
68
|
+
const handlerPath = path.join(__dirname, "migration-lambda-handler");
|
|
69
|
+
// Create the Lambda function with bundled dependencies
|
|
70
|
+
// The handler directory must have node_modules installed during CDK synth
|
|
71
|
+
// or use CDK's bundling feature
|
|
72
|
+
this.function = new aws_lambda_1.Function(this, `${id}Function`, {
|
|
73
|
+
functionName: `${stackName}-${id}`,
|
|
74
|
+
runtime: aws_lambda_1.Runtime.NODEJS_20_X,
|
|
75
|
+
handler: "index.handler",
|
|
76
|
+
code: aws_lambda_1.Code.fromAsset(handlerPath, {
|
|
77
|
+
bundling: {
|
|
78
|
+
image: aws_lambda_1.Runtime.NODEJS_20_X.bundlingImage,
|
|
79
|
+
command: [
|
|
80
|
+
"bash",
|
|
81
|
+
"-c",
|
|
82
|
+
["npm install --omit=dev", "cp -r . /asset-output/"].join(" && ")
|
|
83
|
+
]
|
|
84
|
+
}
|
|
85
|
+
}),
|
|
86
|
+
vpc: props.vpc,
|
|
87
|
+
vpcSubnets: { subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS },
|
|
88
|
+
securityGroups: [securityGroup],
|
|
89
|
+
role: executionRole,
|
|
90
|
+
timeout: aws_cdk_lib_1.Duration.seconds(props.timeout ?? 300),
|
|
91
|
+
memorySize: props.memorySize ?? 256,
|
|
92
|
+
environment: {
|
|
93
|
+
SECRET_ARN: props.secretArn,
|
|
94
|
+
DATABASE_ENDPOINT: props.databaseEndpoint,
|
|
95
|
+
DATABASE_PORT: props.databasePort,
|
|
96
|
+
DATABASE_NAME: props.databaseName,
|
|
97
|
+
DATABASE_ENGINE: props.databaseEngine
|
|
98
|
+
},
|
|
99
|
+
logGroup
|
|
100
|
+
});
|
|
101
|
+
this.functionArn = this.function.functionArn;
|
|
102
|
+
this.functionName = this.function.functionName;
|
|
103
|
+
// Export function ARN for CLI use
|
|
104
|
+
new aws_cdk_lib_1.CfnOutput(this, `${id}FunctionArn`, {
|
|
105
|
+
key: `${stackName}${id}FunctionArn`,
|
|
106
|
+
exportName: `${stackName}${id}FunctionArn`,
|
|
107
|
+
value: this.functionArn,
|
|
108
|
+
description: `ARN of the ${id} migration Lambda function`
|
|
109
|
+
});
|
|
110
|
+
new aws_cdk_lib_1.CfnOutput(this, `${id}FunctionName`, {
|
|
111
|
+
key: `${stackName}${id}FunctionName`,
|
|
112
|
+
exportName: `${stackName}${id}FunctionName`,
|
|
113
|
+
value: this.functionName,
|
|
114
|
+
description: `Name of the ${id} migration Lambda function`
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
exports.MigrationLambda = MigrationLambda;
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"migrationLambda.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/migrationLambda.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { Duration, CfnOutput, Stack } from \"aws-cdk-lib\";\nimport { Code, Runtime, Function } from \"aws-cdk-lib/aws-lambda\";\nimport {\n  PolicyStatement,\n  Effect,\n  Role,\n  ServicePrincipal,\n  ManagedPolicy\n} from \"aws-cdk-lib/aws-iam\";\nimport {\n  type IVpc,\n  SubnetType,\n  SecurityGroup,\n  Port,\n  type IConnectable\n} from \"aws-cdk-lib/aws-ec2\";\nimport { LogGroup, RetentionDays } from \"aws-cdk-lib/aws-logs\";\nimport * as path from \"path\";\n\n/**\n * Props for creating a Migration Lambda\n */\nexport interface MigrationLambdaProps {\n  /**\n   * VPC where the Lambda will be deployed.\n   * Must be the same VPC as the database.\n   */\n  vpc: IVpc;\n\n  /**\n   * Database construct to connect to.\n   * Used for security group configuration.\n   */\n  database: IConnectable;\n\n  /**\n   * Database credentials secret ARN.\n   * Lambda will fetch credentials from this secret.\n   */\n  secretArn: string;\n\n  /**\n   * Database endpoint hostname.\n   */\n  databaseEndpoint: string;\n\n  /**\n   * Database port.\n   */\n  databasePort: string;\n\n  /**\n   * Database name.\n   */\n  databaseName: string;\n\n  /**\n   * Database engine type.\n   * Currently only PostgreSQL is supported.\n   */\n  databaseEngine: \"postgresql\";\n\n  /**\n   * Optional timeout in seconds.\n   * Default: 300 (5 minutes)\n   */\n  timeout?: number;\n\n  /**\n   * Optional memory size in MB.\n   * Default: 256\n   */\n  memorySize?: number;\n}\n\n/**\n * Migration Lambda construct for executing database migrations inside a VPC.\n *\n * This Lambda can be invoked by the Fjall CLI to run migrations against databases\n * that are not accessible from the deployment machine (e.g., private VPC databases).\n *\n * The Lambda:\n * 1. Fetches database credentials from Secrets Manager\n * 2. Connects to the database using the bundled pg driver\n * 3. Executes provided SQL statements\n *\n * @example\n * ```typescript\n * const migrationLambda = new MigrationLambda(this, \"Migration\", {\n *   vpc: network.getVpc(),\n *   database: databaseConstruct,\n *   secretArn: credentials.secret.secretArn,\n *   databaseEndpoint: cluster.clusterEndpoint.hostname,\n *   databasePort: \"5432\",\n *   databaseName: \"payload\",\n *   databaseEngine: \"postgresql\"\n * });\n * ```\n */\nexport class MigrationLambda extends Construct {\n  public readonly function: Function;\n  public readonly functionArn: string;\n  public readonly functionName: string;\n\n  constructor(scope: Construct, id: string, props: MigrationLambdaProps) {\n    super(scope, id);\n\n    const stackName = Stack.of(this).stackName;\n\n    // Create security group for the Lambda\n    const securityGroup = new SecurityGroup(this, `${id}SecurityGroup`, {\n      vpc: props.vpc,\n      description: `Security group for ${id} migration Lambda`,\n      allowAllOutbound: true\n    });\n\n    // Allow Lambda to connect to the database\n    props.database.connections.allowFrom(\n      securityGroup,\n      Port.tcp(parseInt(props.databasePort, 10)),\n      `Allow ${id} migration Lambda to connect to database`\n    );\n\n    // Create execution role with necessary permissions\n    const executionRole = new Role(this, `${id}ExecutionRole`, {\n      assumedBy: new ServicePrincipal(\"lambda.amazonaws.com\"),\n      description: `Execution role for ${id} migration Lambda`,\n      managedPolicies: [\n        ManagedPolicy.fromManagedPolicyArn(\n          scope,\n          `${id}VpcExecutionPolicy`,\n          \"arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole\"\n        )\n      ]\n    });\n\n    // Add Secrets Manager permissions\n    executionRole.addToPolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [\"secretsmanager:GetSecretValue\"],\n        resources: [props.secretArn]\n      })\n    );\n\n    // Create log group with retention\n    const logGroup = new LogGroup(this, `${id}LogGroup`, {\n      logGroupName: `/aws/lambda/${stackName}-${id}`,\n      retention: RetentionDays.ONE_WEEK\n    });\n\n    // Path to the Lambda handler code\n    // This directory contains index.mjs and package.json with pg dependency\n    const handlerPath = path.join(__dirname, \"migration-lambda-handler\");\n\n    // Create the Lambda function with bundled dependencies\n    // The handler directory must have node_modules installed during CDK synth\n    // or use CDK's bundling feature\n    this.function = new Function(this, `${id}Function`, {\n      functionName: `${stackName}-${id}`,\n      runtime: Runtime.NODEJS_20_X,\n      handler: \"index.handler\",\n      code: Code.fromAsset(handlerPath, {\n        bundling: {\n          image: Runtime.NODEJS_20_X.bundlingImage,\n          command: [\n            \"bash\",\n            \"-c\",\n            [\"npm install --omit=dev\", \"cp -r . /asset-output/\"].join(\" && \")\n          ]\n        }\n      }),\n      vpc: props.vpc,\n      vpcSubnets: { subnetType: SubnetType.PRIVATE_WITH_EGRESS },\n      securityGroups: [securityGroup],\n      role: executionRole,\n      timeout: Duration.seconds(props.timeout ?? 300),\n      memorySize: props.memorySize ?? 256,\n      environment: {\n        SECRET_ARN: props.secretArn,\n        DATABASE_ENDPOINT: props.databaseEndpoint,\n        DATABASE_PORT: props.databasePort,\n        DATABASE_NAME: props.databaseName,\n        DATABASE_ENGINE: props.databaseEngine\n      },\n      logGroup\n    });\n\n    this.functionArn = this.function.functionArn;\n    this.functionName = this.function.functionName;\n\n    // Export function ARN for CLI use\n    new CfnOutput(this, `${id}FunctionArn`, {\n      key: `${stackName}${id}FunctionArn`,\n      exportName: `${stackName}${id}FunctionArn`,\n      value: this.functionArn,\n      description: `ARN of the ${id} migration Lambda function`\n    });\n\n    new CfnOutput(this, `${id}FunctionName`, {\n      key: `${stackName}${id}FunctionName`,\n      exportName: `${stackName}${id}FunctionName`,\n      value: this.functionName,\n      description: `Name of the ${id} migration Lambda function`\n    });\n  }\n}\n"]}
|
|
@@ -28,6 +28,21 @@ interface RdsProps {
|
|
|
28
28
|
snapshotIdentifier?: string;
|
|
29
29
|
/** Username from the snapshot (required when restoring from snapshot to reset password) */
|
|
30
30
|
snapshotUsername?: string;
|
|
31
|
+
/** Allow access from VPC CIDR (avoids cross-stack cyclic dependencies with Lambda) */
|
|
32
|
+
allowVpcAccess?: boolean;
|
|
33
|
+
/**
|
|
34
|
+
* Make database publicly accessible from the internet.
|
|
35
|
+
* WARNING: This is a security risk and should only be used for development
|
|
36
|
+
* or when building Payload apps locally that need database access.
|
|
37
|
+
* When enabled, the database is placed in public subnets.
|
|
38
|
+
*/
|
|
39
|
+
publiclyAccessible?: boolean;
|
|
40
|
+
/**
|
|
41
|
+
* IP address to allow access from when publiclyAccessible is true.
|
|
42
|
+
* If not specified, access is restricted to VPC only even when public.
|
|
43
|
+
* Format: CIDR notation (e.g., "203.0.113.0/32" for single IP)
|
|
44
|
+
*/
|
|
45
|
+
allowedIpCidr?: string;
|
|
31
46
|
}
|
|
32
47
|
export declare class RdsAurora extends Construct implements IConnectable {
|
|
33
48
|
connections: Connections;
|