@guardian/cdk 64.1.0 → 64.3.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/lib/bin/commands/new-project/index.d.ts.map +1 -1
- package/lib/bin/commands/new-project/index.js +4 -2
- package/lib/bin/commands/new-project/index.js.map +1 -1
- package/lib/bin/commands/new-project/utils/imports.d.ts.map +1 -1
- package/lib/bin/commands/new-project/utils/imports.js +8 -0
- package/lib/bin/commands/new-project/utils/imports.js.map +1 -1
- package/lib/constructs/acm/certificate.js +1 -1
- package/lib/constructs/acm/certificate.js.map +1 -1
- package/lib/constructs/cloudwatch/api-gateway-alarms.js +1 -1
- package/lib/constructs/cloudwatch/api-gateway-alarms.js.map +1 -1
- package/lib/constructs/cloudwatch/ec2-alarms.js +3 -3
- package/lib/constructs/cloudwatch/ec2-alarms.js.map +1 -1
- package/lib/constructs/core/identity.d.ts +3 -1
- package/lib/constructs/core/identity.d.ts.map +1 -1
- package/lib/constructs/core/identity.js +8 -3
- package/lib/constructs/core/identity.js.map +1 -1
- package/lib/constructs/core/parameters/acm.js +1 -1
- package/lib/constructs/core/parameters/acm.js.map +1 -1
- package/lib/constructs/core/parameters/ec2.js +1 -1
- package/lib/constructs/core/parameters/ec2.js.map +1 -1
- package/lib/constructs/ecs/ecs-task.js +1 -1
- package/lib/constructs/ecs/ecs-task.js.map +1 -1
- package/lib/constructs/loadbalancing/alb/application-load-balancer.js +1 -1
- package/lib/constructs/loadbalancing/alb/application-load-balancer.js.map +1 -1
- package/lib/experimental/patterns/gu-load-balanced-app.d.ts.map +1 -1
- package/lib/experimental/patterns/gu-load-balanced-app.js +20 -13
- package/lib/experimental/patterns/gu-load-balanced-app.js.map +1 -1
- package/lib/patterns/ec2-app/base.js +1 -1
- package/lib/patterns/ec2-app/base.js.map +1 -1
- package/lib/utils/mixin/app-aware-construct.js +1 -1
- package/lib/utils/mixin/app-aware-construct.js.map +1 -1
- package/lib/utils/test/assertions.d.ts.map +1 -1
- package/lib/utils/test/assertions.js +5 -1
- package/lib/utils/test/assertions.js.map +1 -1
- package/package.json +17 -17
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../../src/utils/test/assertions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../../src/utils/test/assertions.ts"],"names":[],"mappings":"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","sourcesContent":["import { Match, Template } from \"aws-cdk-lib/assertions\";\nimport type { Resource } from \"aws-cdk-lib/assertions/lib/private/template\";\nimport { MetadataKeys, TrackingTag } from \"../../constants\";\nimport type { AppIdentity, GuStack } from \"../../constructs/core\";\n\ninterface Tag {\n Key: string;\n Value: unknown;\n PropagateAtLaunch?: boolean;\n}\n\ninterface GuTagMatcherProps {\n appIdentity?: AppIdentity;\n additionalTags?: Tag[];\n propagateAtLaunch?: boolean;\n}\n\nfunction sortTagsByKey(tags: Tag[]): Tag[] {\n return [...tags].sort((first, second) => {\n if (first.Key.toLowerCase() < second.Key.toLowerCase()) {\n return -1;\n }\n if (first.Key.toLowerCase() > second.Key.toLowerCase()) {\n return 1;\n }\n return 0;\n });\n}\n\nexport class GuTemplate {\n private readonly template: Template;\n private readonly stack: GuStack;\n\n private constructor(scope: GuStack) {\n this.stack = scope;\n this.template = Template.fromStack(scope);\n }\n\n static fromStack(stack: GuStack) {\n return new GuTemplate(stack);\n }\n\n findResourceByLogicalId(type: string, logicalId: string | RegExp): Record<string, Resource> | undefined {\n const resources = this.template.findResources(type) as Record<string, Resource>;\n\n const match = Object.entries(resources).find(([id, resource]) => {\n const idMatch = logicalId instanceof RegExp ? logicalId.test(id) : id === logicalId;\n return idMatch && resource;\n });\n\n if (match) {\n const [logicalId, resource] = match;\n return { [logicalId]: resource };\n }\n\n return undefined;\n }\n\n hasResourceWithLogicalId(type: string, logicalId: string | RegExp) {\n const result = this.findResourceByLogicalId(type, logicalId);\n\n if (!result) {\n throw new Error(`No resource found matching logicalId ${logicalId.toString()} and Type ${type}`);\n }\n }\n\n hasGuTaggedResource(type: string, props?: GuTagMatcherProps) {\n const { stack, stage } = this.stack;\n const { appIdentity, additionalTags, propagateAtLaunch } = props ?? {};\n\n const coreTags = [\n {\n Key: \"Stack\",\n Value: stack,\n },\n {\n Key: \"Stage\",\n Value: stage,\n },\n TrackingTag,\n {\n Key: MetadataKeys.REPOSITORY_NAME,\n Value: \"guardian/cdk\",\n },\n ];\n\n const tagMap = new Map<string, Tag>();\n coreTags.forEach((tag) => tagMap.set(tag.Key, tag));\n\n if (appIdentity) {\n tagMap.set(\"App\", { Key: \"App\", Value: appIdentity.app });\n }\n\n if (additionalTags) {\n additionalTags.forEach((tag) => tagMap.set(tag.Key, tag));\n }\n\n // set `PropagateAtLaunch` if the prop is defined\n if (propagateAtLaunch !== undefined) {\n tagMap.forEach((tag) => {\n tagMap.set(tag.Key, { ...tag, PropagateAtLaunch: propagateAtLaunch });\n });\n }\n\n // Default behaviour (`Match.object`) seems to be \"is exact\".\n // Use `Match.arrayWith` for \"includes\" matching, as AWS CDK also tags some resources which we're not checking for.\n this.template.hasResourceProperties(type, {\n Tags: Match.arrayWith(sortTagsByKey(Array.from(tagMap.values()))),\n });\n }\n\n hasResourceWithTag(type: string, tag: Tag) {\n this.template.hasResourceProperties(type, {\n Tags: Match.arrayWith([tag]),\n });\n }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@guardian/cdk",
|
|
3
3
|
"description": "Generic Guardian flavoured AWS CDK components",
|
|
4
|
-
"version": "64.
|
|
4
|
+
"version": "64.3.0",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
7
7
|
"files": [
|
|
@@ -36,37 +36,37 @@
|
|
|
36
36
|
"@guardian/eslint-plugin-tsdoc-required": "^0.1.3",
|
|
37
37
|
"@guardian/tsconfig": "^2.0.0",
|
|
38
38
|
"@types/git-url-parse": "^9.0.3",
|
|
39
|
-
"@types/jest": "^
|
|
39
|
+
"@types/jest": "^30.0.0",
|
|
40
40
|
"@types/js-yaml": "^4.0.9",
|
|
41
|
-
"@types/node": "26.1.
|
|
41
|
+
"@types/node": "26.1.1",
|
|
42
42
|
"@types/yargs": "^17.0.33",
|
|
43
|
-
"aws-cdk": "2.
|
|
44
|
-
"aws-cdk-lib": "2.
|
|
45
|
-
"constructs": "10.
|
|
43
|
+
"aws-cdk": "2.1135.0",
|
|
44
|
+
"aws-cdk-lib": "2.263.0",
|
|
45
|
+
"constructs": "10.8.1",
|
|
46
46
|
"eslint": "^9.39.2",
|
|
47
47
|
"eslint-plugin-custom-rules": "file:tools/eslint",
|
|
48
48
|
"gh-pages": "^6.3.0",
|
|
49
|
-
"jest": "30.
|
|
49
|
+
"jest": "30.4.2",
|
|
50
50
|
"prettier": "^3.8.3",
|
|
51
|
-
"ts-jest": "^29.4.
|
|
51
|
+
"ts-jest": "^29.4.11",
|
|
52
52
|
"ts-node": "^10.9.2",
|
|
53
|
-
"typedoc": "^0.28.
|
|
53
|
+
"typedoc": "^0.28.20",
|
|
54
54
|
"typescript": "5.9.3"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@aws-sdk/client-ec2": "^3.
|
|
58
|
-
"@aws-sdk/client-ssm": "^3.
|
|
59
|
-
"@aws-sdk/credential-providers": "^3.
|
|
57
|
+
"@aws-sdk/client-ec2": "^3.1087.0",
|
|
58
|
+
"@aws-sdk/client-ssm": "^3.1087.0",
|
|
59
|
+
"@aws-sdk/credential-providers": "^3.1087.0",
|
|
60
60
|
"chalk": "^4.1.2",
|
|
61
|
-
"codemaker": "^1.
|
|
61
|
+
"codemaker": "^1.138.0",
|
|
62
62
|
"git-url-parse": "^16.0.1",
|
|
63
|
-
"js-yaml": "^4.
|
|
63
|
+
"js-yaml": "^4.3.0",
|
|
64
64
|
"read-pkg-up": "7.0.1",
|
|
65
65
|
"yargs": "^17.7.2"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
|
-
"aws-cdk": "^2.
|
|
69
|
-
"aws-cdk-lib": "^2.
|
|
70
|
-
"constructs": "^10.
|
|
68
|
+
"aws-cdk": "^2.1135.0",
|
|
69
|
+
"aws-cdk-lib": "^2.263.0",
|
|
70
|
+
"constructs": "^10.8.1"
|
|
71
71
|
}
|
|
72
72
|
}
|