@fjall/components-infrastructure 0.79.1 → 0.80.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (97) hide show
  1. package/dist/lib/app.d.ts +39 -2
  2. package/dist/lib/app.js +85 -4
  3. package/dist/lib/aspects/resourceInventory.d.ts +41 -0
  4. package/dist/lib/aspects/resourceInventory.js +56 -0
  5. package/dist/lib/config/audit.d.ts +18 -0
  6. package/dist/lib/config/audit.js +22 -0
  7. package/dist/lib/config/aws/accountId.js +3 -3
  8. package/dist/lib/config/aws/ecrDefaultImage.js +7 -7
  9. package/dist/lib/config/aws/identityCenter.js +7 -8
  10. package/dist/lib/config/aws/identityCenterGroupMembership.js +6 -6
  11. package/dist/lib/config/aws/ipam.js +3 -3
  12. package/dist/lib/config/aws/ipamPoolId.js +4 -4
  13. package/dist/lib/config/aws/organisation.js +2 -3
  14. package/dist/lib/config/aws/organisationId.js +4 -4
  15. package/dist/lib/patterns/aws/auditRole.d.ts +44 -0
  16. package/dist/lib/patterns/aws/auditRole.js +58 -0
  17. package/dist/lib/patterns/aws/buildkite.js +12 -12
  18. package/dist/lib/patterns/aws/cdn.d.ts +133 -0
  19. package/dist/lib/patterns/aws/cdn.js +216 -0
  20. package/dist/lib/patterns/aws/compute.d.ts +32 -13
  21. package/dist/lib/patterns/aws/compute.js +24 -14
  22. package/dist/lib/patterns/aws/database.d.ts +8 -1
  23. package/dist/lib/patterns/aws/database.js +13 -5
  24. package/dist/lib/patterns/aws/dynamodb.d.ts +66 -0
  25. package/dist/lib/patterns/aws/dynamodb.js +106 -0
  26. package/dist/lib/patterns/aws/hostedZone.js +7 -2
  27. package/dist/lib/patterns/aws/index.d.ts +1 -0
  28. package/dist/lib/patterns/aws/index.js +2 -1
  29. package/dist/lib/patterns/aws/loadBalancer.d.ts +163 -0
  30. package/dist/lib/patterns/aws/loadBalancer.js +278 -0
  31. package/dist/lib/patterns/aws/managedAccount.js +3 -4
  32. package/dist/lib/patterns/aws/queue.d.ts +61 -0
  33. package/dist/lib/patterns/aws/queue.js +103 -0
  34. package/dist/lib/patterns/aws/storage.js +3 -2
  35. package/dist/lib/patterns/aws/subdomainHostedZone.js +2 -2
  36. package/dist/lib/resources/aws/audit/auditRole.d.ts +32 -0
  37. package/dist/lib/resources/aws/audit/auditRole.js +44 -0
  38. package/dist/lib/resources/aws/backup/backupPlan.js +3 -4
  39. package/dist/lib/resources/aws/backup/backupVault.js +3 -4
  40. package/dist/lib/resources/aws/base/awsStack.js +1 -2
  41. package/dist/lib/resources/aws/cdn/cloudFront.d.ts +65 -0
  42. package/dist/lib/resources/aws/cdn/cloudFront.js +135 -0
  43. package/dist/lib/resources/aws/cdn/index.d.ts +1 -0
  44. package/dist/lib/resources/aws/cdn/index.js +18 -0
  45. package/dist/lib/resources/aws/compute/capacityProviderDrainWaiter.d.ts +20 -0
  46. package/dist/lib/resources/aws/compute/capacityProviderDrainWaiter.js +180 -0
  47. package/dist/lib/resources/aws/compute/ecs.d.ts +65 -11
  48. package/dist/lib/resources/aws/compute/ecs.js +293 -124
  49. package/dist/lib/resources/aws/compute/ecsFreeTier.d.ts +1 -2
  50. package/dist/lib/resources/aws/compute/ecsFreeTier.js +1 -4
  51. package/dist/lib/resources/aws/compute/ecsSpot.d.ts +1 -2
  52. package/dist/lib/resources/aws/compute/ecsSpot.js +1 -4
  53. package/dist/lib/resources/aws/compute/lambda.d.ts +10 -1
  54. package/dist/lib/resources/aws/compute/lambda.js +71 -4
  55. package/dist/lib/resources/aws/database/database.js +1 -1
  56. package/dist/lib/resources/aws/database/dynamodb.d.ts +70 -0
  57. package/dist/lib/resources/aws/database/dynamodb.js +170 -0
  58. package/dist/lib/resources/aws/database/rdsAurora.d.ts +2 -0
  59. package/dist/lib/resources/aws/database/rdsAurora.js +9 -6
  60. package/dist/lib/resources/aws/database/rdsAuroraGlobal.d.ts +2 -0
  61. package/dist/lib/resources/aws/database/rdsAuroraGlobal.js +9 -8
  62. package/dist/lib/resources/aws/database/rdsDeletionWaiter.d.ts +33 -0
  63. package/dist/lib/resources/aws/database/rdsDeletionWaiter.js +74 -0
  64. package/dist/lib/resources/aws/database/rdsInstance.d.ts +2 -0
  65. package/dist/lib/resources/aws/database/rdsInstance.js +7 -4
  66. package/dist/lib/resources/aws/iam/identityCenter/assignment.js +2 -2
  67. package/dist/lib/resources/aws/iam/identityCenter/attachManagedPolicy.js +1 -1
  68. package/dist/lib/resources/aws/iam/identityCenter/group.js +1 -1
  69. package/dist/lib/resources/aws/iam/identityCenter/permissionSet.js +1 -1
  70. package/dist/lib/resources/aws/logging/cloudTrail.js +1 -1
  71. package/dist/lib/resources/aws/messaging/index.d.ts +1 -0
  72. package/dist/lib/resources/aws/messaging/index.js +18 -0
  73. package/dist/lib/resources/aws/messaging/sqs.d.ts +65 -0
  74. package/dist/lib/resources/aws/messaging/sqs.js +195 -0
  75. package/dist/lib/resources/aws/monitoring/monitoringRole.js +2 -3
  76. package/dist/lib/resources/aws/networking/ipamPool.js +1 -1
  77. package/dist/lib/resources/aws/networking/vpc.d.ts +1 -0
  78. package/dist/lib/resources/aws/networking/vpc.js +7 -3
  79. package/dist/lib/resources/aws/networking/vpcEndpoint.d.ts +20 -0
  80. package/dist/lib/resources/aws/networking/vpcEndpoint.js +59 -0
  81. package/dist/lib/resources/aws/networking/vpcEndpoints.d.ts +71 -0
  82. package/dist/lib/resources/aws/networking/vpcEndpoints.js +125 -0
  83. package/dist/lib/resources/aws/secrets/secret.js +1 -1
  84. package/dist/lib/resources/aws/storage/ecr.d.ts +1 -2
  85. package/dist/lib/resources/aws/storage/ecr.js +2 -2
  86. package/dist/lib/resources/aws/utilities/cfnOutput.test.d.ts +1 -0
  87. package/dist/lib/resources/aws/utilities/cfnOutput.test.js +102 -0
  88. package/dist/lib/resources/aws/utilities/codeBuild.d.ts +1 -2
  89. package/dist/lib/resources/aws/utilities/codeBuild.js +1 -1
  90. package/dist/lib/resources/aws/utilities/customResource.d.ts +2 -1
  91. package/dist/lib/resources/aws/utilities/customResource.js +1 -1
  92. package/dist/lib/utils/getStackOutput.js +2 -2
  93. package/dist/lib/utils/sanitizeCfnKey.d.ts +5 -0
  94. package/dist/lib/utils/sanitizeCfnKey.js +11 -0
  95. package/dist/lib/utils/tagResource.d.ts +24 -0
  96. package/dist/lib/utils/tagResource.js +30 -0
  97. package/package.json +6 -5
@@ -0,0 +1,216 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CdnFactory = exports.Cdn = void 0;
4
+ const cdn_1 = require("../../resources/aws/cdn");
5
+ const storage_1 = require("./storage");
6
+ const compute_1 = require("./compute");
7
+ /**
8
+ * Validates CDN props and logs warnings for misconfigured options.
9
+ */
10
+ function validateCdnProps(props) {
11
+ // Validate certificate region warning
12
+ if (props.certificate && props.domainNames && props.domainNames.length > 0) {
13
+ console.info("[Fjall] Note: CloudFront certificates must be in us-east-1 region. " +
14
+ "Ensure your certificate was created in us-east-1.");
15
+ }
16
+ // Validate domain names require certificate
17
+ if (props.domainNames && props.domainNames.length > 0 && !props.certificate) {
18
+ console.warn("[Fjall] Warning: 'domainNames' provided but no 'certificate' specified. " +
19
+ "Custom domain names require an ACM certificate in us-east-1.");
20
+ }
21
+ // Validate ALB origin
22
+ if (props.originType === "alb") {
23
+ const albProps = props;
24
+ if (albProps.loadBalancer instanceof compute_1.Compute) {
25
+ const lb = albProps.loadBalancer.getLoadBalancer();
26
+ if (!lb) {
27
+ throw new Error("Compute resource does not have a load balancer. " +
28
+ "Ensure ECS compute has loadBalancer enabled for CDN origin.");
29
+ }
30
+ }
31
+ }
32
+ // Validate smart origin
33
+ if (props.originType === "auto") {
34
+ const smartProps = props;
35
+ if (smartProps.origin instanceof compute_1.Compute) {
36
+ const computeType = smartProps.origin.getComputeType();
37
+ if (computeType === "ec2") {
38
+ throw new Error("EC2 compute type is not supported for CDN origin. " +
39
+ "Use ECS with load balancer or Lambda with function URL.");
40
+ }
41
+ if (computeType === "ecs" && !smartProps.origin.getLoadBalancer()) {
42
+ throw new Error("ECS compute must have a load balancer for CDN origin. " +
43
+ "Enable loadBalancer in your ECS compute configuration.");
44
+ }
45
+ if (computeType === "lambda" && !smartProps.origin.getFunctionUrl()) {
46
+ throw new Error("Lambda compute must have a function URL for CDN origin. " +
47
+ "Enable functionUrl in your Lambda compute configuration.");
48
+ }
49
+ }
50
+ }
51
+ }
52
+ /**
53
+ * CDN wrapper class that extends CloudFrontDistribution with Fjall patterns.
54
+ */
55
+ class Cdn extends cdn_1.CloudFrontDistribution {
56
+ constructor(scope, id, props) {
57
+ const resolvedProps = Cdn.resolveProps(props);
58
+ super(scope, id, resolvedProps);
59
+ }
60
+ /**
61
+ * Resolve ICdnProps to CloudFrontDistributionProps.
62
+ */
63
+ static resolveProps(props) {
64
+ const defaultOrigin = Cdn.resolveDefaultOrigin(props);
65
+ return {
66
+ defaultOrigin,
67
+ defaultCachePolicy: props.cachePolicy,
68
+ behaviours: props.behaviours,
69
+ domainNames: props.domainNames,
70
+ certificate: props.certificate,
71
+ comment: props.comment,
72
+ enableLogging: props.enableLogging,
73
+ logBucket: props.logBucket
74
+ };
75
+ }
76
+ /**
77
+ * Resolve the default origin from ICdnProps.
78
+ */
79
+ static resolveDefaultOrigin(props) {
80
+ switch (props.originType) {
81
+ case "s3": {
82
+ const s3Props = props;
83
+ const bucket = s3Props.bucket instanceof storage_1.S3Storage
84
+ ? s3Props.bucket.getBucket()
85
+ : s3Props.bucket;
86
+ return {
87
+ type: "s3",
88
+ bucket,
89
+ originPath: s3Props.originPath
90
+ };
91
+ }
92
+ case "alb": {
93
+ const albProps = props;
94
+ const loadBalancer = albProps.loadBalancer instanceof compute_1.Compute
95
+ ? albProps.loadBalancer.getLoadBalancer()
96
+ : albProps.loadBalancer;
97
+ return {
98
+ type: "alb",
99
+ loadBalancer,
100
+ protocolPolicy: albProps.protocolPolicy
101
+ };
102
+ }
103
+ case "http": {
104
+ const httpProps = props;
105
+ return {
106
+ type: "http",
107
+ domainName: httpProps.domainName,
108
+ originPath: httpProps.originPath,
109
+ protocolPolicy: httpProps.protocolPolicy
110
+ };
111
+ }
112
+ case "auto": {
113
+ const smartProps = props;
114
+ return Cdn.detectOriginFromResource(smartProps.origin);
115
+ }
116
+ }
117
+ }
118
+ /**
119
+ * Auto-detect origin configuration from a Fjall resource.
120
+ */
121
+ static detectOriginFromResource(resource) {
122
+ // String → HTTP origin
123
+ if (typeof resource === "string") {
124
+ return {
125
+ type: "http",
126
+ domainName: resource
127
+ };
128
+ }
129
+ // S3Storage → S3 origin
130
+ if (resource instanceof storage_1.S3Storage) {
131
+ return {
132
+ type: "s3",
133
+ bucket: resource.getBucket()
134
+ };
135
+ }
136
+ // Compute → ALB or Lambda origin
137
+ if (resource instanceof compute_1.Compute) {
138
+ const computeType = resource.getComputeType();
139
+ if (computeType === "ecs") {
140
+ const loadBalancer = resource.getLoadBalancer();
141
+ if (loadBalancer) {
142
+ return {
143
+ type: "alb",
144
+ loadBalancer
145
+ };
146
+ }
147
+ }
148
+ if (computeType === "lambda") {
149
+ const functionUrl = resource.getFunctionUrl();
150
+ if (functionUrl) {
151
+ // Lambda function URL is an HTTP origin
152
+ const url = new URL(functionUrl);
153
+ return {
154
+ type: "http",
155
+ domainName: url.hostname
156
+ };
157
+ }
158
+ }
159
+ }
160
+ throw new Error(`Unable to detect CDN origin from resource: ${typeof resource}. ` +
161
+ "Provide explicit origin configuration using originType.");
162
+ }
163
+ }
164
+ exports.Cdn = Cdn;
165
+ /**
166
+ * Factory for creating CDN (CloudFront) distributions.
167
+ *
168
+ * @example
169
+ * // S3 origin
170
+ * const assets = app.addStorage(StorageFactory.build("Assets", { bucketType: "private" }));
171
+ * app.addCdn(CdnFactory.build("AssetsCdn", {
172
+ * originType: "s3",
173
+ * bucket: assets
174
+ * }));
175
+ *
176
+ * @example
177
+ * // ALB origin (ECS)
178
+ * const api = app.addCompute(ComputeFactory.build("Api", { type: "ecs", ... }));
179
+ * app.addCdn(CdnFactory.build("ApiCdn", {
180
+ * originType: "alb",
181
+ * loadBalancer: api
182
+ * }));
183
+ *
184
+ * @example
185
+ * // Smart detection
186
+ * app.addCdn(CdnFactory.build("AppCdn", {
187
+ * originType: "auto",
188
+ * origin: assets
189
+ * }));
190
+ *
191
+ * @example
192
+ * // Custom domain
193
+ * app.addCdn(CdnFactory.build("AppCdn", {
194
+ * originType: "s3",
195
+ * bucket: assets,
196
+ * domainNames: ["app.example.com"],
197
+ * certificate: myCert
198
+ * }));
199
+ */
200
+ class CdnFactory {
201
+ /**
202
+ * Build a CDN factory function.
203
+ *
204
+ * @param id - Unique identifier for the CDN
205
+ * @param props - CDN configuration properties
206
+ * @returns Factory function that creates the CDN when invoked
207
+ */
208
+ static build(id, props) {
209
+ return (_app, scope) => {
210
+ validateCdnProps(props);
211
+ return new Cdn(scope, id, props);
212
+ };
213
+ }
214
+ }
215
+ exports.CdnFactory = CdnFactory;
216
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cdn.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/cdn.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { type IBucket } from \"aws-cdk-lib/aws-s3\";\nimport { type IApplicationLoadBalancer } from \"aws-cdk-lib/aws-elasticloadbalancingv2\";\nimport { type ICertificate } from \"aws-cdk-lib/aws-certificatemanager\";\nimport { type ICachePolicy } from \"aws-cdk-lib/aws-cloudfront\";\n\nimport type App from \"../../app\";\nimport {\n  CloudFrontDistribution,\n  type CloudFrontDistributionProps,\n  type CdnOriginConfig,\n  type CdnBehaviour,\n  type CachePolicyPreset\n} from \"../../resources/aws/cdn\";\nimport { S3Storage } from \"./storage\";\nimport { Compute } from \"./compute\";\n\n/**\n * S3 origin CDN props - use with S3 bucket\n */\nexport interface S3CdnProps {\n  originType: \"s3\";\n  bucket: IBucket | S3Storage;\n  originPath?: string;\n  cachePolicy?: CachePolicyPreset | ICachePolicy;\n  behaviours?: CdnBehaviour[];\n  domainNames?: string[];\n  certificate?: ICertificate;\n  comment?: string;\n  enableLogging?: boolean;\n  logBucket?: IBucket;\n}\n\n/**\n * ALB origin CDN props - use with Application Load Balancer\n */\nexport interface AlbCdnProps {\n  originType: \"alb\";\n  loadBalancer: IApplicationLoadBalancer | Compute;\n  protocolPolicy?: \"HTTP_ONLY\" | \"HTTPS_ONLY\" | \"MATCH_VIEWER\";\n  cachePolicy?: CachePolicyPreset | ICachePolicy;\n  behaviours?: CdnBehaviour[];\n  domainNames?: string[];\n  certificate?: ICertificate;\n  comment?: string;\n  enableLogging?: boolean;\n  logBucket?: IBucket;\n}\n\n/**\n * HTTP origin CDN props - use with custom HTTP endpoint\n */\nexport interface HttpCdnProps {\n  originType: \"http\";\n  domainName: string;\n  originPath?: string;\n  protocolPolicy?: \"HTTP_ONLY\" | \"HTTPS_ONLY\" | \"MATCH_VIEWER\";\n  cachePolicy?: CachePolicyPreset | ICachePolicy;\n  behaviours?: CdnBehaviour[];\n  domainNames?: string[];\n  certificate?: ICertificate;\n  comment?: string;\n  enableLogging?: boolean;\n  logBucket?: IBucket;\n}\n\n/**\n * Smart origin CDN props - auto-detect origin type from Fjall resource\n */\nexport interface SmartCdnProps {\n  originType: \"auto\";\n  origin: S3Storage | Compute | string;\n  cachePolicy?: CachePolicyPreset | ICachePolicy;\n  behaviours?: CdnBehaviour[];\n  domainNames?: string[];\n  certificate?: ICertificate;\n  comment?: string;\n  enableLogging?: boolean;\n  logBucket?: IBucket;\n}\n\nexport type ICdnProps = S3CdnProps | AlbCdnProps | HttpCdnProps | SmartCdnProps;\n\n/**\n * Validates CDN props and logs warnings for misconfigured options.\n */\nfunction validateCdnProps(props: ICdnProps): void {\n  // Validate certificate region warning\n  if (props.certificate && props.domainNames && props.domainNames.length > 0) {\n    console.info(\n      \"[Fjall] Note: CloudFront certificates must be in us-east-1 region. \" +\n        \"Ensure your certificate was created in us-east-1.\"\n    );\n  }\n\n  // Validate domain names require certificate\n  if (props.domainNames && props.domainNames.length > 0 && !props.certificate) {\n    console.warn(\n      \"[Fjall] Warning: 'domainNames' provided but no 'certificate' specified. \" +\n        \"Custom domain names require an ACM certificate in us-east-1.\"\n    );\n  }\n\n  // Validate ALB origin\n  if (props.originType === \"alb\") {\n    const albProps = props as AlbCdnProps;\n    if (albProps.loadBalancer instanceof Compute) {\n      const lb = albProps.loadBalancer.getLoadBalancer();\n      if (!lb) {\n        throw new Error(\n          \"Compute resource does not have a load balancer. \" +\n            \"Ensure ECS compute has loadBalancer enabled for CDN origin.\"\n        );\n      }\n    }\n  }\n\n  // Validate smart origin\n  if (props.originType === \"auto\") {\n    const smartProps = props as SmartCdnProps;\n    if (smartProps.origin instanceof Compute) {\n      const computeType = smartProps.origin.getComputeType();\n      if (computeType === \"ec2\") {\n        throw new Error(\n          \"EC2 compute type is not supported for CDN origin. \" +\n            \"Use ECS with load balancer or Lambda with function URL.\"\n        );\n      }\n      if (computeType === \"ecs\" && !smartProps.origin.getLoadBalancer()) {\n        throw new Error(\n          \"ECS compute must have a load balancer for CDN origin. \" +\n            \"Enable loadBalancer in your ECS compute configuration.\"\n        );\n      }\n      if (computeType === \"lambda\" && !smartProps.origin.getFunctionUrl()) {\n        throw new Error(\n          \"Lambda compute must have a function URL for CDN origin. \" +\n            \"Enable functionUrl in your Lambda compute configuration.\"\n        );\n      }\n    }\n  }\n}\n\n/**\n * CDN wrapper class that extends CloudFrontDistribution with Fjall patterns.\n */\nexport class Cdn extends CloudFrontDistribution {\n  constructor(scope: Construct, id: string, props: ICdnProps) {\n    const resolvedProps = Cdn.resolveProps(props);\n    super(scope, id, resolvedProps);\n  }\n\n  /**\n   * Resolve ICdnProps to CloudFrontDistributionProps.\n   */\n  private static resolveProps(props: ICdnProps): CloudFrontDistributionProps {\n    const defaultOrigin = Cdn.resolveDefaultOrigin(props);\n\n    return {\n      defaultOrigin,\n      defaultCachePolicy: props.cachePolicy,\n      behaviours: props.behaviours,\n      domainNames: props.domainNames,\n      certificate: props.certificate,\n      comment: props.comment,\n      enableLogging: props.enableLogging,\n      logBucket: props.logBucket\n    };\n  }\n\n  /**\n   * Resolve the default origin from ICdnProps.\n   */\n  private static resolveDefaultOrigin(props: ICdnProps): CdnOriginConfig {\n    switch (props.originType) {\n      case \"s3\": {\n        const s3Props = props as S3CdnProps;\n        const bucket =\n          s3Props.bucket instanceof S3Storage\n            ? s3Props.bucket.getBucket()\n            : s3Props.bucket;\n        return {\n          type: \"s3\",\n          bucket,\n          originPath: s3Props.originPath\n        };\n      }\n\n      case \"alb\": {\n        const albProps = props as AlbCdnProps;\n        const loadBalancer =\n          albProps.loadBalancer instanceof Compute\n            ? albProps.loadBalancer.getLoadBalancer()!\n            : albProps.loadBalancer;\n        return {\n          type: \"alb\",\n          loadBalancer,\n          protocolPolicy: albProps.protocolPolicy\n        };\n      }\n\n      case \"http\": {\n        const httpProps = props as HttpCdnProps;\n        return {\n          type: \"http\",\n          domainName: httpProps.domainName,\n          originPath: httpProps.originPath,\n          protocolPolicy: httpProps.protocolPolicy\n        };\n      }\n\n      case \"auto\": {\n        const smartProps = props as SmartCdnProps;\n        return Cdn.detectOriginFromResource(smartProps.origin);\n      }\n    }\n  }\n\n  /**\n   * Auto-detect origin configuration from a Fjall resource.\n   */\n  private static detectOriginFromResource(\n    resource: S3Storage | Compute | string\n  ): CdnOriginConfig {\n    // String → HTTP origin\n    if (typeof resource === \"string\") {\n      return {\n        type: \"http\",\n        domainName: resource\n      };\n    }\n\n    // S3Storage → S3 origin\n    if (resource instanceof S3Storage) {\n      return {\n        type: \"s3\",\n        bucket: resource.getBucket()\n      };\n    }\n\n    // Compute → ALB or Lambda origin\n    if (resource instanceof Compute) {\n      const computeType = resource.getComputeType();\n\n      if (computeType === \"ecs\") {\n        const loadBalancer = resource.getLoadBalancer();\n        if (loadBalancer) {\n          return {\n            type: \"alb\",\n            loadBalancer\n          };\n        }\n      }\n\n      if (computeType === \"lambda\") {\n        const functionUrl = resource.getFunctionUrl();\n        if (functionUrl) {\n          // Lambda function URL is an HTTP origin\n          const url = new URL(functionUrl);\n          return {\n            type: \"http\",\n            domainName: url.hostname\n          };\n        }\n      }\n    }\n\n    throw new Error(\n      `Unable to detect CDN origin from resource: ${typeof resource}. ` +\n        \"Provide explicit origin configuration using originType.\"\n    );\n  }\n}\n\n/**\n * Factory for creating CDN (CloudFront) distributions.\n *\n * @example\n * // S3 origin\n * const assets = app.addStorage(StorageFactory.build(\"Assets\", { bucketType: \"private\" }));\n * app.addCdn(CdnFactory.build(\"AssetsCdn\", {\n *   originType: \"s3\",\n *   bucket: assets\n * }));\n *\n * @example\n * // ALB origin (ECS)\n * const api = app.addCompute(ComputeFactory.build(\"Api\", { type: \"ecs\", ... }));\n * app.addCdn(CdnFactory.build(\"ApiCdn\", {\n *   originType: \"alb\",\n *   loadBalancer: api\n * }));\n *\n * @example\n * // Smart detection\n * app.addCdn(CdnFactory.build(\"AppCdn\", {\n *   originType: \"auto\",\n *   origin: assets\n * }));\n *\n * @example\n * // Custom domain\n * app.addCdn(CdnFactory.build(\"AppCdn\", {\n *   originType: \"s3\",\n *   bucket: assets,\n *   domainNames: [\"app.example.com\"],\n *   certificate: myCert\n * }));\n */\nexport class CdnFactory {\n  /**\n   * Build a CDN factory function.\n   *\n   * @param id - Unique identifier for the CDN\n   * @param props - CDN configuration properties\n   * @returns Factory function that creates the CDN when invoked\n   */\n  static build(id: string, props: ICdnProps) {\n    return (_app: App, scope: Construct): Cdn => {\n      validateCdnProps(props);\n      return new Cdn(scope, id, props);\n    };\n  }\n}\n"]}
@@ -1,6 +1,6 @@
1
1
  import { type RepositoryImage } from "aws-cdk-lib/aws-ecs";
2
2
  import { Repository } from "aws-cdk-lib/aws-ecr";
3
- import { Connections, type IConnectable, type IVpc, type UserData, type IMachineImage } from "aws-cdk-lib/aws-ec2";
3
+ import { type Connections, type IConnectable, type IVpc, type UserData, type IMachineImage } from "aws-cdk-lib/aws-ec2";
4
4
  import { Code, Runtime, type FunctionUrlAuthType, type FunctionUrlCorsOptions } from "aws-cdk-lib/aws-lambda";
5
5
  import { type PolicyStatement, type PolicyDocument, type IManagedPolicy } from "aws-cdk-lib/aws-iam";
6
6
  import { Construct } from "constructs";
@@ -273,6 +273,26 @@ export interface EcsServiceConfig {
273
273
  * ]
274
274
  */
275
275
  connections?: IConnectable[];
276
+ /**
277
+ * Capacity provider for this service. REQUIRED.
278
+ * Each service specifies its own capacity provider.
279
+ *
280
+ * @example
281
+ * // Mixed FARGATE and EC2 services in same cluster
282
+ * {
283
+ * services: [
284
+ * { name: "api", capacityProvider: "FARGATE" },
285
+ * { name: "worker", capacityProvider: "EC2", ec2Config: { instanceType: "t3.micro" } }
286
+ * ]
287
+ * }
288
+ */
289
+ capacityProvider: EcsCapacityProvider;
290
+ /**
291
+ * EC2 capacity configuration for this service.
292
+ * Only used when service capacityProvider is "EC2".
293
+ * Services with matching ec2Config share an ASG for efficiency.
294
+ */
295
+ ec2Config?: Ec2CapacityConfig;
276
296
  }
277
297
  /**
278
298
  * SSH access configuration for EC2 instances.
@@ -347,21 +367,10 @@ export interface EcsComputeProps extends BaseComputeProps {
347
367
  /**
348
368
  * Services in this cluster.
349
369
  * Each service gets its own task definition, scaling, and target group.
370
+ * Each service MUST specify its own capacityProvider.
350
371
  * All services share the cluster's ALB (unless disabled).
351
372
  */
352
373
  services: EcsServiceConfig[];
353
- /**
354
- * Capacity provider determines infrastructure type.
355
- * - "FARGATE": Serverless containers (default)
356
- * - "FARGATE_SPOT": Serverless with Spot pricing
357
- * - "EC2": EC2-backed containers
358
- */
359
- capacityProvider?: EcsCapacityProvider;
360
- /**
361
- * EC2 capacity configuration.
362
- * Only used when capacityProvider is "EC2".
363
- */
364
- ec2Config?: Ec2CapacityConfig;
365
374
  /**
366
375
  * ECR repository for all services (default image).
367
376
  * Individual services can override with their own `image` property.
@@ -403,6 +412,7 @@ interface BaseLambdaProps extends BaseComputeProps {
403
412
  timeout?: number;
404
413
  /** Memory size in MB. Default: 128 */
405
414
  memorySize?: number;
415
+ ephemeralStorageSize?: number;
406
416
  /** Lambda function description */
407
417
  description?: string;
408
418
  /** IAM role description */
@@ -419,6 +429,15 @@ interface BaseLambdaProps extends BaseComputeProps {
419
429
  functionUrl?: FunctionUrlConfig | false;
420
430
  /** Environment variables */
421
431
  environment?: Record<string, string>;
432
+ /** Container secrets import (key: env var, value: SecretImport) */
433
+ containerSecretsImport?: {
434
+ [key: string]: SecretImport;
435
+ };
436
+ /**
437
+ * Resources this Lambda needs to connect to (e.g., databases).
438
+ * Creates security group rules to allow traffic from this Lambda.
439
+ */
440
+ connections?: IConnectable[];
422
441
  }
423
442
  /**
424
443
  * Container-based Lambda using ECR image.