@aligent/cdk-aspects 0.3.0 → 0.4.0
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/CHANGELOG.md +18 -0
- package/index.d.ts +1 -0
- package/index.js +2 -1
- package/lib/resource-prefix.d.ts +68 -0
- package/lib/resource-prefix.js +187 -0
- package/package.json +10 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @aligent/cdk-aspects
|
|
2
2
|
|
|
3
|
+
## 0.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#1627](https://github.com/aligent/cdk-constructs/pull/1627) [`a53bad0`](https://github.com/aligent/cdk-constructs/commit/a53bad0c3b8156ec3b57476b4007cdb854785ba6) Thanks [@kai-nguyen-aligent](https://github.com/kai-nguyen-aligent)! - Add new ResourcePrefixAspect
|
|
8
|
+
|
|
9
|
+
## 0.3.2
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [#1606](https://github.com/aligent/cdk-constructs/pull/1606) [`0e35d91`](https://github.com/aligent/cdk-constructs/commit/0e35d91ab5244d90625ebe19d943694af875a422) Thanks [@porhkz](https://github.com/porhkz)! - Update repository URLs in package.json to match npm provenance expectations
|
|
14
|
+
|
|
15
|
+
## 0.3.1
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [#1601](https://github.com/aligent/cdk-constructs/pull/1601) [`1488e90`](https://github.com/aligent/cdk-constructs/commit/1488e90d7f468f7646142a9968a3d4e06389b358) Thanks [@porhkz](https://github.com/porhkz)! - Fix badges on readmes
|
|
20
|
+
|
|
3
21
|
## 0.3.0
|
|
4
22
|
|
|
5
23
|
### Minor Changes
|
package/index.d.ts
CHANGED
package/index.js
CHANGED
|
@@ -19,4 +19,5 @@ __exportStar(require("./lib/defaults/nodejs-function"), exports);
|
|
|
19
19
|
__exportStar(require("./lib/defaults/step-functions"), exports);
|
|
20
20
|
__exportStar(require("./lib/lambda-sfn-versioning"), exports);
|
|
21
21
|
__exportStar(require("./lib/microservice-checks"), exports);
|
|
22
|
-
|
|
22
|
+
__exportStar(require("./lib/resource-prefix"), exports);
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkRBQXlDO0FBQ3pDLGlFQUErQztBQUMvQyxnRUFBOEM7QUFDOUMsOERBQTRDO0FBQzVDLDREQUEwQztBQUMxQyx3REFBc0MiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tIFwiLi9saWIvZGVmYXVsdHMvbG9nLWdyb3VwXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9saWIvZGVmYXVsdHMvbm9kZWpzLWZ1bmN0aW9uXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9saWIvZGVmYXVsdHMvc3RlcC1mdW5jdGlvbnNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2xpYi9sYW1iZGEtc2ZuLXZlcnNpb25pbmdcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2xpYi9taWNyb3NlcnZpY2UtY2hlY2tzXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9saWIvcmVzb3VyY2UtcHJlZml4XCI7XG4iXX0=
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { IAspect } from "aws-cdk-lib";
|
|
2
|
+
import { IConstruct } from "constructs";
|
|
3
|
+
export interface ResourcePrefixAspectProps {
|
|
4
|
+
/**
|
|
5
|
+
* The prefix to apply to all resource names.
|
|
6
|
+
* e.g. 'myapp-prod' → 'myapp-prod-orders'
|
|
7
|
+
*/
|
|
8
|
+
prefix: string;
|
|
9
|
+
/**
|
|
10
|
+
* Resource types to skip entirely.
|
|
11
|
+
* e.g. ['AWS::IAM::Role'] to leave IAM role names untouched.
|
|
12
|
+
* @default []
|
|
13
|
+
*/
|
|
14
|
+
exclude?: string[];
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* CDK Aspect that automatically prefixes physical resource names across AWS resources.
|
|
18
|
+
*
|
|
19
|
+
* @remarks
|
|
20
|
+
* **Critical Implementation Notes:**
|
|
21
|
+
*
|
|
22
|
+
* 1. **Stage Synthesis Boundaries**:
|
|
23
|
+
* - CDK `Stage` constructs create synthesis boundaries that prevent App-level aspects
|
|
24
|
+
* from traversing into them
|
|
25
|
+
* - This aspect MUST be applied to each Stage individually, not to the App
|
|
26
|
+
* - Example: `Aspects.of(stage).add(new ResourcePrefixAspect({...}))`
|
|
27
|
+
*
|
|
28
|
+
* 2. **Property Name Casing**:
|
|
29
|
+
* - CloudFormation properties use PascalCase (e.g., `FunctionName`, `BucketName`)
|
|
30
|
+
* - Using camelCase (e.g., `functionName`) will cause errors with versioning aspects
|
|
31
|
+
* - When using `addPropertyOverride()`, always use the exact CloudFormation property name
|
|
32
|
+
*
|
|
33
|
+
* 3. **Aspect Priority with Versioning**:
|
|
34
|
+
* - When combining with LambdaAndStepFunctionVersioningAspect, apply this aspect BEFORE versioning
|
|
35
|
+
* - Use CDK's priority system: `Aspects.of(stage).add(prefixAspect, { priority: 100 })`
|
|
36
|
+
* - Then: `Aspects.of(stage).add(versioningAspect, { priority: 200 })`
|
|
37
|
+
* - Lower priority numbers run first
|
|
38
|
+
*
|
|
39
|
+
* @example
|
|
40
|
+
* ```typescript
|
|
41
|
+
* // Correct usage with staging
|
|
42
|
+
* const stage = new ApplicationStage(app, 'prod');
|
|
43
|
+
* Aspects.of(stage).add(new ResourcePrefixAspect({ prefix: 'myapp' }), { priority: 100 });
|
|
44
|
+
* Aspects.of(stage).add(new LambdaAndStepFunctionVersioningAspect(), { priority: 200 });
|
|
45
|
+
* ```
|
|
46
|
+
*/
|
|
47
|
+
export declare class ResourcePrefixAspect implements IAspect {
|
|
48
|
+
private readonly prefix;
|
|
49
|
+
private readonly exclude;
|
|
50
|
+
constructor(props: ResourcePrefixAspectProps);
|
|
51
|
+
visit(node: IConstruct): void;
|
|
52
|
+
private isAlreadyPrefixed;
|
|
53
|
+
private deriveNameFromLogicalId;
|
|
54
|
+
/**
|
|
55
|
+
* Builds the prefixed name, handling special cases for specific resource types.
|
|
56
|
+
*
|
|
57
|
+
* @param baseName - The base resource name (without prefix)
|
|
58
|
+
* @param cfnResourceType - The CloudFormation resource type
|
|
59
|
+
* @param cfnProperties - The CloudFormation resource properties
|
|
60
|
+
* @returns The final prefixed name with any special case handling applied
|
|
61
|
+
*/
|
|
62
|
+
private buildPrefixedName;
|
|
63
|
+
/**
|
|
64
|
+
* Validates resource-specific naming requirements that AWS enforces.
|
|
65
|
+
* Throws synthesis errors for violations.
|
|
66
|
+
*/
|
|
67
|
+
private validateResourceName;
|
|
68
|
+
}
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ResourcePrefixAspect = void 0;
|
|
4
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
+
/**
|
|
6
|
+
* Maps CloudFormation resource types to their name property and AWS length limits.
|
|
7
|
+
* Sources: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html
|
|
8
|
+
*/
|
|
9
|
+
const RESOURCE_CONFIG = {
|
|
10
|
+
// Compute
|
|
11
|
+
"AWS::Lambda::Function": { cfnName: "FunctionName", maxLength: 64 },
|
|
12
|
+
// Storage
|
|
13
|
+
"AWS::S3::Bucket": { cfnName: "BucketName", maxLength: 63 },
|
|
14
|
+
"AWS::DynamoDB::Table": { cfnName: "TableName", maxLength: 255 },
|
|
15
|
+
"AWS::DynamoDB::GlobalTable": { cfnName: "TableName", maxLength: 255 },
|
|
16
|
+
// Messaging
|
|
17
|
+
"AWS::SQS::Queue": { cfnName: "QueueName", maxLength: 80 },
|
|
18
|
+
"AWS::SNS::Topic": { cfnName: "TopicName", maxLength: 256 },
|
|
19
|
+
// Eventing & Orchestration
|
|
20
|
+
"AWS::Events::EventBus": { cfnName: "Name", maxLength: 256 },
|
|
21
|
+
"AWS::Events::Rule": { cfnName: "Name", maxLength: 64 },
|
|
22
|
+
"AWS::Events::Connection": { cfnName: "Name", maxLength: 64 },
|
|
23
|
+
"AWS::Pipes::Pipe": { cfnName: "Name", maxLength: 64 },
|
|
24
|
+
"AWS::StepFunctions::StateMachine": {
|
|
25
|
+
cfnName: "StateMachineName",
|
|
26
|
+
maxLength: 80,
|
|
27
|
+
},
|
|
28
|
+
"AWS::StepFunctions::Activity": { cfnName: "Name", maxLength: 80 },
|
|
29
|
+
"AWS::Scheduler::Schedule": { cfnName: "Name", maxLength: 64 },
|
|
30
|
+
"AWS::Scheduler::ScheduleGroup": { cfnName: "Name", maxLength: 64 },
|
|
31
|
+
// API
|
|
32
|
+
"AWS::ApiGateway::RestApi": { cfnName: "Name", maxLength: 128 },
|
|
33
|
+
"AWS::ApiGateway::UsagePlan": { cfnName: "UsagePlanName", maxLength: 128 },
|
|
34
|
+
"AWS::ApiGateway::ApiKey": { cfnName: "Name", maxLength: 128 },
|
|
35
|
+
"AWS::ApiGatewayV2::Api": { cfnName: "Name", maxLength: 128 },
|
|
36
|
+
"AWS::ApiGatewayV2::Authorizer": { cfnName: "Name", maxLength: 128 },
|
|
37
|
+
// Secrets & Config
|
|
38
|
+
"AWS::SecretsManager::Secret": { cfnName: "Name", maxLength: 512 },
|
|
39
|
+
"AWS::SSM::Parameter": { cfnName: "Name", maxLength: 2048 },
|
|
40
|
+
"AWS::AppConfig::Application": { cfnName: "Name", maxLength: 64 },
|
|
41
|
+
"AWS::AppConfig::Environment": { cfnName: "Name", maxLength: 64 },
|
|
42
|
+
// Notifications
|
|
43
|
+
"AWS::Notifications::NotificationConfiguration": {
|
|
44
|
+
cfnName: "Name",
|
|
45
|
+
maxLength: 64,
|
|
46
|
+
},
|
|
47
|
+
// Observability
|
|
48
|
+
"AWS::Logs::LogGroup": { cfnName: "LogGroupName", maxLength: 512 },
|
|
49
|
+
"AWS::CloudWatch::Alarm": { cfnName: "AlarmName", maxLength: 255 },
|
|
50
|
+
// IAM
|
|
51
|
+
"AWS::IAM::Role": { cfnName: "RoleName", maxLength: 64 },
|
|
52
|
+
};
|
|
53
|
+
/**
|
|
54
|
+
* CDK Aspect that automatically prefixes physical resource names across AWS resources.
|
|
55
|
+
*
|
|
56
|
+
* @remarks
|
|
57
|
+
* **Critical Implementation Notes:**
|
|
58
|
+
*
|
|
59
|
+
* 1. **Stage Synthesis Boundaries**:
|
|
60
|
+
* - CDK `Stage` constructs create synthesis boundaries that prevent App-level aspects
|
|
61
|
+
* from traversing into them
|
|
62
|
+
* - This aspect MUST be applied to each Stage individually, not to the App
|
|
63
|
+
* - Example: `Aspects.of(stage).add(new ResourcePrefixAspect({...}))`
|
|
64
|
+
*
|
|
65
|
+
* 2. **Property Name Casing**:
|
|
66
|
+
* - CloudFormation properties use PascalCase (e.g., `FunctionName`, `BucketName`)
|
|
67
|
+
* - Using camelCase (e.g., `functionName`) will cause errors with versioning aspects
|
|
68
|
+
* - When using `addPropertyOverride()`, always use the exact CloudFormation property name
|
|
69
|
+
*
|
|
70
|
+
* 3. **Aspect Priority with Versioning**:
|
|
71
|
+
* - When combining with LambdaAndStepFunctionVersioningAspect, apply this aspect BEFORE versioning
|
|
72
|
+
* - Use CDK's priority system: `Aspects.of(stage).add(prefixAspect, { priority: 100 })`
|
|
73
|
+
* - Then: `Aspects.of(stage).add(versioningAspect, { priority: 200 })`
|
|
74
|
+
* - Lower priority numbers run first
|
|
75
|
+
*
|
|
76
|
+
* @example
|
|
77
|
+
* ```typescript
|
|
78
|
+
* // Correct usage with staging
|
|
79
|
+
* const stage = new ApplicationStage(app, 'prod');
|
|
80
|
+
* Aspects.of(stage).add(new ResourcePrefixAspect({ prefix: 'myapp' }), { priority: 100 });
|
|
81
|
+
* Aspects.of(stage).add(new LambdaAndStepFunctionVersioningAspect(), { priority: 200 });
|
|
82
|
+
* ```
|
|
83
|
+
*/
|
|
84
|
+
class ResourcePrefixAspect {
|
|
85
|
+
constructor(props) {
|
|
86
|
+
var _a;
|
|
87
|
+
if (!props.prefix || !/^[a-z0-9-]+$/.test(props.prefix))
|
|
88
|
+
throw new Error(`ResourcePrefixAspect: prefix must contain only lowercase alphanumeric characters and hyphens, got "${props.prefix}"`);
|
|
89
|
+
this.prefix = props.prefix;
|
|
90
|
+
this.exclude = new Set((_a = props.exclude) !== null && _a !== void 0 ? _a : []);
|
|
91
|
+
}
|
|
92
|
+
visit(node) {
|
|
93
|
+
var _a, _b;
|
|
94
|
+
if (!(node instanceof aws_cdk_lib_1.CfnResource))
|
|
95
|
+
return;
|
|
96
|
+
const resourceType = node.cfnResourceType;
|
|
97
|
+
const config = RESOURCE_CONFIG[resourceType];
|
|
98
|
+
if (!config || this.exclude.has(resourceType)) {
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
const { cfnName, maxLength } = config;
|
|
102
|
+
const cfnProperties = (_b = (_a = node._cfnProperties) !== null && _a !== void 0 ? _a : node.cfnProperties) !== null && _b !== void 0 ? _b : {};
|
|
103
|
+
// Get any explicitly set name, or derive one from the logical ID
|
|
104
|
+
const existingName = typeof cfnProperties[cfnName] === "string"
|
|
105
|
+
? cfnProperties[cfnName]
|
|
106
|
+
: undefined;
|
|
107
|
+
const baseName = existingName !== null && existingName !== void 0 ? existingName : this.deriveNameFromLogicalId(node);
|
|
108
|
+
if (this.isAlreadyPrefixed(baseName)) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
const finalName = this.buildPrefixedName(baseName, resourceType, cfnProperties);
|
|
112
|
+
const hasError = this.validateResourceName(finalName, resourceType, maxLength, node);
|
|
113
|
+
if (hasError)
|
|
114
|
+
return;
|
|
115
|
+
node.addPropertyOverride(cfnName, finalName);
|
|
116
|
+
}
|
|
117
|
+
isAlreadyPrefixed(name) {
|
|
118
|
+
return (name.startsWith(`${this.prefix}-`) || name.startsWith(`/${this.prefix}/`));
|
|
119
|
+
}
|
|
120
|
+
deriveNameFromLogicalId(node) {
|
|
121
|
+
const logicalId = aws_cdk_lib_1.Stack.of(node).getLogicalId(node);
|
|
122
|
+
return logicalId
|
|
123
|
+
.replace(/[^a-zA-Z0-9]+/g, "-") // non-alphanumeric → dash
|
|
124
|
+
.replace(/^-+|-+$/g, ""); // trim leading/trailing dashes
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* Builds the prefixed name, handling special cases for specific resource types.
|
|
128
|
+
*
|
|
129
|
+
* @param baseName - The base resource name (without prefix)
|
|
130
|
+
* @param cfnResourceType - The CloudFormation resource type
|
|
131
|
+
* @param cfnProperties - The CloudFormation resource properties
|
|
132
|
+
* @returns The final prefixed name with any special case handling applied
|
|
133
|
+
*/
|
|
134
|
+
buildPrefixedName(baseName, cfnResourceType, cfnProperties) {
|
|
135
|
+
// Special case: FIFO queues must end with .fifo suffix
|
|
136
|
+
if (cfnResourceType === "AWS::SQS::Queue" &&
|
|
137
|
+
cfnProperties.fifoQueue === true &&
|
|
138
|
+
!baseName.endsWith(".fifo")) {
|
|
139
|
+
return `${this.prefix}-${baseName}.fifo`;
|
|
140
|
+
}
|
|
141
|
+
// Special case: FIFO topics must end with .fifo suffix
|
|
142
|
+
if (cfnResourceType === "AWS::SNS::Topic" &&
|
|
143
|
+
cfnProperties.fifoTopic === true &&
|
|
144
|
+
!baseName.endsWith(".fifo")) {
|
|
145
|
+
return `${this.prefix}-${baseName}.fifo`;
|
|
146
|
+
}
|
|
147
|
+
// Special case: SSM parameter names use path-style prefix
|
|
148
|
+
if (cfnResourceType === "AWS::SSM::Parameter") {
|
|
149
|
+
return `/${this.prefix}/${baseName}`;
|
|
150
|
+
}
|
|
151
|
+
// Special case: S3 bucket name be lowercase only
|
|
152
|
+
if (cfnResourceType === "AWS::S3::Bucket") {
|
|
153
|
+
return `${this.prefix}-${baseName}`.toLowerCase();
|
|
154
|
+
}
|
|
155
|
+
// Default: simple prefix
|
|
156
|
+
return `${this.prefix}-${baseName}`;
|
|
157
|
+
}
|
|
158
|
+
/**
|
|
159
|
+
* Validates resource-specific naming requirements that AWS enforces.
|
|
160
|
+
* Throws synthesis errors for violations.
|
|
161
|
+
*/
|
|
162
|
+
validateResourceName(name, cfnResourceType, maxLength, node) {
|
|
163
|
+
let hasError = false;
|
|
164
|
+
// S3 bucket names cannot contain underscores
|
|
165
|
+
if (cfnResourceType === "AWS::S3::Bucket") {
|
|
166
|
+
if (name !== name.toLowerCase()) {
|
|
167
|
+
aws_cdk_lib_1.Annotations.of(node).addError(`[ResourcePrefixAspect] S3 bucket name "${name}" contains uppercase letters. ` +
|
|
168
|
+
`Bucket names must be lowercase only.`);
|
|
169
|
+
hasError = true;
|
|
170
|
+
}
|
|
171
|
+
if (name.includes("_")) {
|
|
172
|
+
aws_cdk_lib_1.Annotations.of(node).addError(`[ResourcePrefixAspect] S3 bucket name "${name}" contains underscores. ` +
|
|
173
|
+
`Bucket names cannot contain underscores. Use hyphens instead.`);
|
|
174
|
+
hasError = true;
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
if (name.length > maxLength) {
|
|
178
|
+
aws_cdk_lib_1.Annotations.of(node).addError(`[ResourcePrefixAspect] "${name}" (${name.length} chars) exceeds the ` +
|
|
179
|
+
`maximum allowed length of ${maxLength} for ${cfnResourceType}. ` +
|
|
180
|
+
`Shorten the resource base name or your prefix ("${this.prefix}").`);
|
|
181
|
+
hasError = true;
|
|
182
|
+
}
|
|
183
|
+
return hasError;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
exports.ResourcePrefixAspect = ResourcePrefixAspect;
|
|
187
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resource-prefix.js","sourceRoot":"","sources":["resource-prefix.ts"],"names":[],"mappings":"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","sourcesContent":["import { Annotations, CfnResource, IAspect, Stack } from \"aws-cdk-lib\";\nimport { IConstruct } from \"constructs\";\n\ninterface ResourceNameConfig {\n  /** The CloudFormation property that holds the resource's physical name */\n  cfnName: string;\n  /** Maximum allowed character length for this resource type */\n  maxLength: number;\n}\n\n/**\n * Extension type to access internal CloudFormation properties on CfnResource.\n *\n * CDK does not provide a public API to read raw CloudFormation properties that have\n * been set on a CfnResource. The properties `_cfnProperties` and `cfnProperties` are\n * protected and only accessible within the CfnResource class hierarchy.\n *\n * We investigated using CDK's public APIs, but there is no public method to retrieve\n * the raw property values that have been set (e.g., via constructor props or addPropertyOverride).\n * The only public APIs are for writing (addPropertyOverride, addPropertyDeletionOverride) or\n * getting attribute references (getAtt), not for reading literal property values.\n *\n * This type assertion is safe because:\n * - We only read these properties, never modify them\n * - We need to check if a user explicitly set a name property before applying our prefix\n * - The properties exist at runtime and are part of CDK's internal implementation\n */\ntype CfnResourceWithProps = CfnResource & {\n  readonly _cfnProperties?: Record<string, unknown>;\n  readonly cfnProperties?: Record<string, unknown>;\n};\n\n/**\n * Maps CloudFormation resource types to their name property and AWS length limits.\n * Sources: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html\n */\nconst RESOURCE_CONFIG: Record<string, ResourceNameConfig> = {\n  // Compute\n  \"AWS::Lambda::Function\": { cfnName: \"FunctionName\", maxLength: 64 },\n\n  // Storage\n  \"AWS::S3::Bucket\": { cfnName: \"BucketName\", maxLength: 63 },\n  \"AWS::DynamoDB::Table\": { cfnName: \"TableName\", maxLength: 255 },\n  \"AWS::DynamoDB::GlobalTable\": { cfnName: \"TableName\", maxLength: 255 },\n\n  // Messaging\n  \"AWS::SQS::Queue\": { cfnName: \"QueueName\", maxLength: 80 },\n  \"AWS::SNS::Topic\": { cfnName: \"TopicName\", maxLength: 256 },\n\n  // Eventing & Orchestration\n  \"AWS::Events::EventBus\": { cfnName: \"Name\", maxLength: 256 },\n  \"AWS::Events::Rule\": { cfnName: \"Name\", maxLength: 64 },\n  \"AWS::Events::Connection\": { cfnName: \"Name\", maxLength: 64 },\n  \"AWS::Pipes::Pipe\": { cfnName: \"Name\", maxLength: 64 },\n  \"AWS::StepFunctions::StateMachine\": {\n    cfnName: \"StateMachineName\",\n    maxLength: 80,\n  },\n  \"AWS::StepFunctions::Activity\": { cfnName: \"Name\", maxLength: 80 },\n  \"AWS::Scheduler::Schedule\": { cfnName: \"Name\", maxLength: 64 },\n  \"AWS::Scheduler::ScheduleGroup\": { cfnName: \"Name\", maxLength: 64 },\n\n  // API\n  \"AWS::ApiGateway::RestApi\": { cfnName: \"Name\", maxLength: 128 },\n  \"AWS::ApiGateway::UsagePlan\": { cfnName: \"UsagePlanName\", maxLength: 128 },\n  \"AWS::ApiGateway::ApiKey\": { cfnName: \"Name\", maxLength: 128 },\n  \"AWS::ApiGatewayV2::Api\": { cfnName: \"Name\", maxLength: 128 },\n  \"AWS::ApiGatewayV2::Authorizer\": { cfnName: \"Name\", maxLength: 128 },\n\n  // Secrets & Config\n  \"AWS::SecretsManager::Secret\": { cfnName: \"Name\", maxLength: 512 },\n  \"AWS::SSM::Parameter\": { cfnName: \"Name\", maxLength: 2048 },\n  \"AWS::AppConfig::Application\": { cfnName: \"Name\", maxLength: 64 },\n  \"AWS::AppConfig::Environment\": { cfnName: \"Name\", maxLength: 64 },\n\n  // Notifications\n  \"AWS::Notifications::NotificationConfiguration\": {\n    cfnName: \"Name\",\n    maxLength: 64,\n  },\n\n  // Observability\n  \"AWS::Logs::LogGroup\": { cfnName: \"LogGroupName\", maxLength: 512 },\n  \"AWS::CloudWatch::Alarm\": { cfnName: \"AlarmName\", maxLength: 255 },\n\n  // IAM\n  \"AWS::IAM::Role\": { cfnName: \"RoleName\", maxLength: 64 },\n};\n\nexport interface ResourcePrefixAspectProps {\n  /**\n   * The prefix to apply to all resource names.\n   * e.g. 'myapp-prod' → 'myapp-prod-orders'\n   */\n  prefix: string;\n\n  /**\n   * Resource types to skip entirely.\n   * e.g. ['AWS::IAM::Role'] to leave IAM role names untouched.\n   * @default []\n   */\n  exclude?: string[];\n}\n\n/**\n * CDK Aspect that automatically prefixes physical resource names across AWS resources.\n *\n * @remarks\n * **Critical Implementation Notes:**\n *\n * 1. **Stage Synthesis Boundaries**:\n *    - CDK `Stage` constructs create synthesis boundaries that prevent App-level aspects\n *      from traversing into them\n *    - This aspect MUST be applied to each Stage individually, not to the App\n *    - Example: `Aspects.of(stage).add(new ResourcePrefixAspect({...}))`\n *\n * 2. **Property Name Casing**:\n *    - CloudFormation properties use PascalCase (e.g., `FunctionName`, `BucketName`)\n *    - Using camelCase (e.g., `functionName`) will cause errors with versioning aspects\n *    - When using `addPropertyOverride()`, always use the exact CloudFormation property name\n *\n * 3. **Aspect Priority with Versioning**:\n *    - When combining with LambdaAndStepFunctionVersioningAspect, apply this aspect BEFORE versioning\n *    - Use CDK's priority system: `Aspects.of(stage).add(prefixAspect, { priority: 100 })`\n *    - Then: `Aspects.of(stage).add(versioningAspect, { priority: 200 })`\n *    - Lower priority numbers run first\n *\n * @example\n * ```typescript\n * // Correct usage with staging\n * const stage = new ApplicationStage(app, 'prod');\n * Aspects.of(stage).add(new ResourcePrefixAspect({ prefix: 'myapp' }), { priority: 100 });\n * Aspects.of(stage).add(new LambdaAndStepFunctionVersioningAspect(), { priority: 200 });\n * ```\n */\nexport class ResourcePrefixAspect implements IAspect {\n  private readonly prefix: string;\n  private readonly exclude: Set<string>;\n\n  constructor(props: ResourcePrefixAspectProps) {\n    if (!props.prefix || !/^[a-z0-9-]+$/.test(props.prefix))\n      throw new Error(\n        `ResourcePrefixAspect: prefix must contain only lowercase alphanumeric characters and hyphens, got \"${props.prefix}\"`\n      );\n\n    this.prefix = props.prefix;\n    this.exclude = new Set(props.exclude ?? []);\n  }\n\n  visit(node: IConstruct) {\n    if (!(node instanceof CfnResource)) return;\n\n    const resourceType = node.cfnResourceType;\n    const config = RESOURCE_CONFIG[resourceType];\n\n    if (!config || this.exclude.has(resourceType)) {\n      return;\n    }\n\n    const { cfnName, maxLength } = config;\n    const cfnProperties: Record<string, unknown> =\n      (node as CfnResourceWithProps)._cfnProperties ??\n      (node as CfnResourceWithProps).cfnProperties ??\n      {};\n\n    // Get any explicitly set name, or derive one from the logical ID\n    const existingName =\n      typeof cfnProperties[cfnName] === \"string\"\n        ? cfnProperties[cfnName]\n        : undefined;\n    const baseName = existingName ?? this.deriveNameFromLogicalId(node);\n\n    if (this.isAlreadyPrefixed(baseName)) {\n      return;\n    }\n\n    const finalName = this.buildPrefixedName(\n      baseName,\n      resourceType,\n      cfnProperties\n    );\n\n    const hasError = this.validateResourceName(\n      finalName,\n      resourceType,\n      maxLength,\n      node\n    );\n\n    if (hasError) return;\n\n    node.addPropertyOverride(cfnName, finalName);\n  }\n\n  private isAlreadyPrefixed(name: string): boolean {\n    return (\n      name.startsWith(`${this.prefix}-`) || name.startsWith(`/${this.prefix}/`)\n    );\n  }\n\n  private deriveNameFromLogicalId(node: CfnResource) {\n    const logicalId = Stack.of(node).getLogicalId(node);\n    return logicalId\n      .replace(/[^a-zA-Z0-9]+/g, \"-\") // non-alphanumeric → dash\n      .replace(/^-+|-+$/g, \"\"); // trim leading/trailing dashes\n  }\n\n  /**\n   * Builds the prefixed name, handling special cases for specific resource types.\n   *\n   * @param baseName - The base resource name (without prefix)\n   * @param cfnResourceType - The CloudFormation resource type\n   * @param cfnProperties - The CloudFormation resource properties\n   * @returns The final prefixed name with any special case handling applied\n   */\n  private buildPrefixedName(\n    baseName: string,\n    cfnResourceType: string,\n    cfnProperties: Record<string, unknown>\n  ): string {\n    // Special case: FIFO queues must end with .fifo suffix\n    if (\n      cfnResourceType === \"AWS::SQS::Queue\" &&\n      cfnProperties.fifoQueue === true &&\n      !baseName.endsWith(\".fifo\")\n    ) {\n      return `${this.prefix}-${baseName}.fifo`;\n    }\n\n    // Special case: FIFO topics must end with .fifo suffix\n    if (\n      cfnResourceType === \"AWS::SNS::Topic\" &&\n      cfnProperties.fifoTopic === true &&\n      !baseName.endsWith(\".fifo\")\n    ) {\n      return `${this.prefix}-${baseName}.fifo`;\n    }\n\n    // Special case: SSM parameter names use path-style prefix\n    if (cfnResourceType === \"AWS::SSM::Parameter\") {\n      return `/${this.prefix}/${baseName}`;\n    }\n\n    // Special case: S3 bucket name be lowercase only\n    if (cfnResourceType === \"AWS::S3::Bucket\") {\n      return `${this.prefix}-${baseName}`.toLowerCase();\n    }\n\n    // Default: simple prefix\n    return `${this.prefix}-${baseName}`;\n  }\n\n  /**\n   * Validates resource-specific naming requirements that AWS enforces.\n   * Throws synthesis errors for violations.\n   */\n  private validateResourceName(\n    name: string,\n    cfnResourceType: string,\n    maxLength: number,\n    node: IConstruct\n  ): boolean {\n    let hasError = false;\n\n    // S3 bucket names cannot contain underscores\n    if (cfnResourceType === \"AWS::S3::Bucket\") {\n      if (name !== name.toLowerCase()) {\n        Annotations.of(node).addError(\n          `[ResourcePrefixAspect] S3 bucket name \"${name}\" contains uppercase letters. ` +\n            `Bucket names must be lowercase only.`\n        );\n        hasError = true;\n      }\n\n      if (name.includes(\"_\")) {\n        Annotations.of(node).addError(\n          `[ResourcePrefixAspect] S3 bucket name \"${name}\" contains underscores. ` +\n            `Bucket names cannot contain underscores. Use hyphens instead.`\n        );\n        hasError = true;\n      }\n    }\n\n    if (name.length > maxLength) {\n      Annotations.of(node).addError(\n        `[ResourcePrefixAspect] \"${name}\" (${name.length} chars) exceeds the ` +\n          `maximum allowed length of ${maxLength} for ${cfnResourceType}. ` +\n          `Shorten the resource base name or your prefix (\"${this.prefix}\").`\n      );\n      hasError = true;\n    }\n\n    return hasError;\n  }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aligent/cdk-aspects",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "Collection of CDK Asppects",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
7
7
|
"license": "MIT",
|
|
8
|
+
"repository": {
|
|
9
|
+
"type": "git",
|
|
10
|
+
"url": "git+https://github.com/aligent/cdk-constructs.git"
|
|
11
|
+
},
|
|
12
|
+
"bugs": {
|
|
13
|
+
"url": "https://github.com/aligent/cdk-constructs/issues"
|
|
14
|
+
},
|
|
15
|
+
"homepage": "https://github.com/aligent/cdk-constructs/tree/main/packages/cdk-aspects#readme",
|
|
8
16
|
"scripts": {
|
|
9
17
|
"build": "tsc",
|
|
10
18
|
"test": "npx nx test cdk-aspects",
|
|
@@ -12,7 +20,7 @@
|
|
|
12
20
|
},
|
|
13
21
|
"devDependencies": {
|
|
14
22
|
"@types/jest": "^29.5.10",
|
|
15
|
-
"@types/node": "^20.
|
|
23
|
+
"@types/node": "^20.19.33",
|
|
16
24
|
"aws-cdk": "^2.1019.1",
|
|
17
25
|
"jest": "^29.7.0",
|
|
18
26
|
"ts-jest": "^29.1.1",
|