@fjall/components-infrastructure 0.89.5 → 0.94.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.
Files changed (378) hide show
  1. package/LICENSE +50 -21
  2. package/dist/index.d.ts +1 -1
  3. package/dist/index.js +1 -18
  4. package/dist/lib/app.d.ts +12 -12
  5. package/dist/lib/app.js +61 -56
  6. package/dist/lib/aspects/index.d.ts +1 -1
  7. package/dist/lib/aspects/index.js +1 -6
  8. package/dist/lib/aspects/resourceInventory.js +6 -13
  9. package/dist/lib/config/audit.js +1 -5
  10. package/dist/lib/config/aws/accessAnalyser.d.ts +11 -0
  11. package/dist/lib/config/aws/accessAnalyser.js +17 -0
  12. package/dist/lib/config/aws/accountAuditRole.js +11 -15
  13. package/dist/lib/config/aws/accountMonitoringRole.js +25 -29
  14. package/dist/lib/config/aws/alarmTopic.d.ts +8 -0
  15. package/dist/lib/config/aws/alarmTopic.js +19 -0
  16. package/dist/lib/config/aws/cloudTrail.js +4 -9
  17. package/dist/lib/config/aws/configRecorder.d.ts +16 -0
  18. package/dist/lib/config/aws/configRecorder.js +51 -0
  19. package/dist/lib/config/aws/configRulePreset.d.ts +13 -0
  20. package/dist/lib/config/aws/configRulePreset.js +62 -0
  21. package/dist/lib/config/aws/disasterRecovery.d.ts +1 -1
  22. package/dist/lib/config/aws/disasterRecovery.js +56 -73
  23. package/dist/lib/config/aws/ebsDefaultEncryption.d.ts +8 -0
  24. package/dist/lib/config/aws/ebsDefaultEncryption.js +41 -0
  25. package/dist/lib/config/aws/ecrDefaultImage.js +25 -30
  26. package/dist/lib/config/aws/eventBus.js +8 -11
  27. package/dist/lib/config/aws/guardDutyDetector.d.ts +16 -0
  28. package/dist/lib/config/aws/guardDutyDetector.js +26 -0
  29. package/dist/lib/config/aws/identityCenter.d.ts +1 -1
  30. package/dist/lib/config/aws/identityCenter.js +23 -25
  31. package/dist/lib/config/aws/identityCenterGroupMembership.js +18 -22
  32. package/dist/lib/config/aws/index.d.ts +19 -8
  33. package/dist/lib/config/aws/index.js +19 -25
  34. package/dist/lib/config/aws/inspectorEnablement.d.ts +9 -0
  35. package/dist/lib/config/aws/inspectorEnablement.js +51 -0
  36. package/dist/lib/config/aws/ipam.js +9 -13
  37. package/dist/lib/config/aws/oidcConnector.js +8 -12
  38. package/dist/lib/config/aws/platform.js +1 -5
  39. package/dist/lib/config/aws/s3BlockPublicAccess.d.ts +9 -0
  40. package/dist/lib/config/aws/s3BlockPublicAccess.js +55 -0
  41. package/dist/lib/config/aws/scpPreset.d.ts +21 -0
  42. package/dist/lib/config/aws/scpPreset.js +311 -0
  43. package/dist/lib/config/aws/securityBaseline.d.ts +15 -0
  44. package/dist/lib/config/aws/securityBaseline.js +27 -0
  45. package/dist/lib/config/aws/securityHubHub.d.ts +15 -0
  46. package/dist/lib/config/aws/securityHubHub.js +28 -0
  47. package/dist/lib/config/aws/securityServicesAdmin.d.ts +20 -0
  48. package/dist/lib/config/aws/securityServicesAdmin.js +115 -0
  49. package/dist/lib/config/index.d.ts +2 -2
  50. package/dist/lib/config/index.js +2 -21
  51. package/dist/lib/index.d.ts +4 -4
  52. package/dist/lib/index.js +5 -26
  53. package/dist/lib/patterns/aws/account.d.ts +17 -1
  54. package/dist/lib/patterns/aws/account.js +60 -33
  55. package/dist/lib/patterns/aws/apexDomainPattern.d.ts +26 -0
  56. package/dist/lib/patterns/aws/apexDomainPattern.js +91 -0
  57. package/dist/lib/patterns/aws/auditRole.js +13 -16
  58. package/dist/lib/patterns/aws/buildkite.d.ts +1 -1
  59. package/dist/lib/patterns/aws/buildkite.js +70 -75
  60. package/dist/lib/patterns/aws/cdn.d.ts +5 -5
  61. package/dist/lib/patterns/aws/cdn.js +22 -28
  62. package/dist/lib/patterns/aws/compute.d.ts +1 -1
  63. package/dist/lib/patterns/aws/compute.js +31 -44
  64. package/dist/lib/patterns/aws/computeEc2.d.ts +1 -1
  65. package/dist/lib/patterns/aws/computeEc2.js +11 -14
  66. package/dist/lib/patterns/aws/computeEcs.d.ts +18 -2
  67. package/dist/lib/patterns/aws/computeEcs.js +41 -31
  68. package/dist/lib/patterns/aws/computeLambda.d.ts +2 -2
  69. package/dist/lib/patterns/aws/computeLambda.js +24 -31
  70. package/dist/lib/patterns/aws/database.d.ts +16 -7
  71. package/dist/lib/patterns/aws/database.js +81 -73
  72. package/dist/lib/patterns/aws/delegatedDomainPattern.d.ts +17 -0
  73. package/dist/lib/patterns/aws/delegatedDomainPattern.js +54 -0
  74. package/dist/lib/patterns/aws/dnsRecordComposer.d.ts +25 -0
  75. package/dist/lib/patterns/aws/dnsRecordComposer.js +225 -0
  76. package/dist/lib/patterns/aws/domain.d.ts +32 -0
  77. package/dist/lib/patterns/aws/domain.js +115 -0
  78. package/dist/lib/patterns/aws/domainDelegation.d.ts +3 -3
  79. package/dist/lib/patterns/aws/domainDelegation.js +28 -37
  80. package/dist/lib/patterns/aws/domainFactory.d.ts +20 -5
  81. package/dist/lib/patterns/aws/domainFactory.js +48 -10
  82. package/dist/lib/patterns/aws/domainValidation.d.ts +11 -0
  83. package/dist/lib/patterns/aws/domainValidation.js +145 -0
  84. package/dist/lib/patterns/aws/externalRecordsPattern.d.ts +18 -0
  85. package/dist/lib/patterns/aws/externalRecordsPattern.js +141 -0
  86. package/dist/lib/patterns/aws/fivetranProxy.d.ts +1 -1
  87. package/dist/lib/patterns/aws/fivetranProxy.js +6 -11
  88. package/dist/lib/patterns/aws/index.d.ts +21 -19
  89. package/dist/lib/patterns/aws/index.js +25 -36
  90. package/dist/lib/patterns/aws/interfaces/cdn.js +1 -5
  91. package/dist/lib/patterns/aws/interfaces/compute.js +4 -11
  92. package/dist/lib/patterns/aws/interfaces/connector.js +1 -15
  93. package/dist/lib/patterns/aws/interfaces/database.d.ts +1 -1
  94. package/dist/lib/patterns/aws/interfaces/database.js +6 -15
  95. package/dist/lib/patterns/aws/interfaces/domain.d.ts +80 -2
  96. package/dist/lib/patterns/aws/interfaces/domain.js +1 -6
  97. package/dist/lib/patterns/aws/interfaces/index.js +8 -41
  98. package/dist/lib/patterns/aws/interfaces/messaging.js +4 -11
  99. package/dist/lib/patterns/aws/interfaces/organisation.d.ts +1 -1
  100. package/dist/lib/patterns/aws/interfaces/organisation.js +4 -11
  101. package/dist/lib/patterns/aws/interfaces/pattern.js +2 -7
  102. package/dist/lib/patterns/aws/interfaces/storage.js +1 -5
  103. package/dist/lib/patterns/aws/managedIdentityCenter.js +7 -12
  104. package/dist/lib/patterns/aws/messaging.d.ts +7 -7
  105. package/dist/lib/patterns/aws/messaging.js +22 -33
  106. package/dist/lib/patterns/aws/network.d.ts +2 -2
  107. package/dist/lib/patterns/aws/network.js +9 -14
  108. package/dist/lib/patterns/aws/organisation.d.ts +6 -2
  109. package/dist/lib/patterns/aws/organisation.js +34 -35
  110. package/dist/lib/patterns/aws/organisationFactory.d.ts +3 -3
  111. package/dist/lib/patterns/aws/organisationFactory.js +7 -12
  112. package/dist/lib/patterns/aws/pattern.js +6 -12
  113. package/dist/lib/patterns/aws/payload.js +73 -63
  114. package/dist/lib/patterns/aws/platform.d.ts +6 -3
  115. package/dist/lib/patterns/aws/platform.js +15 -15
  116. package/dist/lib/patterns/aws/storage.d.ts +6 -4
  117. package/dist/lib/patterns/aws/storage.js +35 -40
  118. package/dist/lib/patterns/aws/subdomainHostedZone.js +11 -16
  119. package/dist/lib/patterns/aws/targets/fjallTargets.d.ts +37 -0
  120. package/dist/lib/patterns/aws/targets/fjallTargets.js +66 -0
  121. package/dist/lib/patterns/aws/targets/index.d.ts +2 -0
  122. package/dist/lib/patterns/aws/targets/index.js +2 -0
  123. package/dist/lib/patterns/aws/targets/targetResolution.d.ts +76 -0
  124. package/dist/lib/patterns/aws/targets/targetResolution.js +119 -0
  125. package/dist/lib/patterns/index.d.ts +1 -0
  126. package/dist/lib/patterns/index.js +1 -0
  127. package/dist/lib/resources/aws/analytics/clickhouse.d.ts +15 -0
  128. package/dist/lib/resources/aws/analytics/clickhouse.js +292 -0
  129. package/dist/lib/resources/aws/analytics/clickhouseConstants.d.ts +73 -0
  130. package/dist/lib/resources/aws/analytics/clickhouseConstants.js +87 -0
  131. package/dist/lib/resources/aws/analytics/clickhouseSecurityGroup.d.ts +13 -0
  132. package/dist/lib/resources/aws/analytics/clickhouseSecurityGroup.js +28 -0
  133. package/dist/lib/resources/aws/analytics/clickhouseTypes.d.ts +47 -0
  134. package/dist/lib/resources/aws/analytics/clickhouseTypes.js +1 -0
  135. package/dist/lib/resources/aws/analytics/clickhouseUserData.d.ts +5 -0
  136. package/dist/lib/resources/aws/analytics/clickhouseUserData.js +248 -0
  137. package/dist/lib/resources/aws/analytics/index.d.ts +2 -0
  138. package/dist/lib/resources/aws/analytics/index.js +1 -0
  139. package/dist/lib/resources/aws/audit/auditRole.js +10 -15
  140. package/dist/lib/resources/aws/audit/index.d.ts +1 -1
  141. package/dist/lib/resources/aws/audit/index.js +1 -6
  142. package/dist/lib/resources/aws/backup/backupPlan.d.ts +1 -1
  143. package/dist/lib/resources/aws/backup/backupPlan.js +14 -16
  144. package/dist/lib/resources/aws/backup/backupVault.d.ts +1 -1
  145. package/dist/lib/resources/aws/backup/backupVault.js +13 -15
  146. package/dist/lib/resources/aws/backup/index.d.ts +2 -2
  147. package/dist/lib/resources/aws/backup/index.js +2 -19
  148. package/dist/lib/resources/aws/base/awsStack.js +17 -19
  149. package/dist/lib/resources/aws/base/index.d.ts +1 -1
  150. package/dist/lib/resources/aws/base/index.js +1 -18
  151. package/dist/lib/resources/aws/cdn/cloudFront.js +40 -42
  152. package/dist/lib/resources/aws/cdn/index.d.ts +1 -1
  153. package/dist/lib/resources/aws/cdn/index.js +1 -18
  154. package/dist/lib/resources/aws/compute/ec2.js +39 -39
  155. package/dist/lib/resources/aws/compute/ecs.d.ts +18 -396
  156. package/dist/lib/resources/aws/compute/ecs.js +105 -976
  157. package/dist/lib/resources/aws/compute/ecsCapacityProviderAspect.d.ts +22 -0
  158. package/dist/lib/resources/aws/compute/ecsCapacityProviderAspect.js +35 -0
  159. package/dist/lib/resources/aws/compute/ecsConstants.d.ts +20 -0
  160. package/dist/lib/resources/aws/compute/ecsConstants.js +49 -0
  161. package/dist/lib/resources/aws/compute/ecsContext.d.ts +12 -0
  162. package/dist/lib/resources/aws/compute/ecsContext.js +1 -0
  163. package/dist/lib/resources/aws/compute/ecsImages.d.ts +4 -0
  164. package/dist/lib/resources/aws/compute/ecsImages.js +35 -0
  165. package/dist/lib/resources/aws/compute/ecsNetworking.d.ts +28 -0
  166. package/dist/lib/resources/aws/compute/ecsNetworking.js +290 -0
  167. package/dist/lib/resources/aws/compute/ecsRoles.d.ts +15 -0
  168. package/dist/lib/resources/aws/compute/ecsRoles.js +110 -0
  169. package/dist/lib/resources/aws/compute/ecsServiceFactory.d.ts +33 -0
  170. package/dist/lib/resources/aws/compute/ecsServiceFactory.js +183 -0
  171. package/dist/lib/resources/aws/compute/ecsTaskDefinition.d.ts +30 -0
  172. package/dist/lib/resources/aws/compute/ecsTaskDefinition.js +168 -0
  173. package/dist/lib/resources/aws/compute/ecsTypes.d.ts +337 -0
  174. package/dist/lib/resources/aws/compute/ecsTypes.js +10 -0
  175. package/dist/lib/resources/aws/compute/ecsValidation.d.ts +18 -0
  176. package/dist/lib/resources/aws/compute/ecsValidation.js +72 -0
  177. package/dist/lib/resources/aws/compute/index.d.ts +3 -3
  178. package/dist/lib/resources/aws/compute/index.js +3 -20
  179. package/dist/lib/resources/aws/compute/lambda.d.ts +10 -2
  180. package/dist/lib/resources/aws/compute/lambda.js +81 -71
  181. package/dist/lib/resources/aws/database/dynamodb.js +24 -27
  182. package/dist/lib/resources/aws/database/index.d.ts +7 -7
  183. package/dist/lib/resources/aws/database/index.js +14 -33
  184. package/dist/lib/resources/aws/database/rdsAurora.d.ts +10 -2
  185. package/dist/lib/resources/aws/database/rdsAurora.js +76 -61
  186. package/dist/lib/resources/aws/database/rdsAuroraGlobal.d.ts +2 -2
  187. package/dist/lib/resources/aws/database/rdsAuroraGlobal.js +24 -21
  188. package/dist/lib/resources/aws/database/rdsDefaults.js +3 -7
  189. package/dist/lib/resources/aws/database/rdsHelpers.d.ts +2 -2
  190. package/dist/lib/resources/aws/database/rdsHelpers.js +21 -29
  191. package/dist/lib/resources/aws/database/rdsInstance.d.ts +11 -3
  192. package/dist/lib/resources/aws/database/rdsInstance.js +101 -83
  193. package/dist/lib/resources/aws/database/rdsProxyOutput.js +5 -9
  194. package/dist/lib/resources/aws/iam/delegationRole.d.ts +18 -0
  195. package/dist/lib/resources/aws/iam/delegationRole.js +60 -0
  196. package/dist/lib/resources/aws/iam/identityCenter/assignment.js +4 -9
  197. package/dist/lib/resources/aws/iam/identityCenter/group.js +5 -9
  198. package/dist/lib/resources/aws/iam/identityCenter/index.d.ts +3 -3
  199. package/dist/lib/resources/aws/iam/identityCenter/index.js +3 -20
  200. package/dist/lib/resources/aws/iam/identityCenter/permissionSet.d.ts +1 -1
  201. package/dist/lib/resources/aws/iam/identityCenter/permissionSet.js +5 -9
  202. package/dist/lib/resources/aws/iam/index.d.ts +5 -4
  203. package/dist/lib/resources/aws/iam/index.js +5 -21
  204. package/dist/lib/resources/aws/iam/instanceProfile.js +2 -7
  205. package/dist/lib/resources/aws/iam/managedPolicy.js +2 -7
  206. package/dist/lib/resources/aws/iam/policy.js +2 -7
  207. package/dist/lib/resources/aws/iam/role.js +2 -7
  208. package/dist/lib/resources/aws/index.d.ts +7 -7
  209. package/dist/lib/resources/aws/index.js +7 -24
  210. package/dist/lib/resources/aws/logging/cloudTrail.d.ts +1 -1
  211. package/dist/lib/resources/aws/logging/cloudTrail.js +18 -22
  212. package/dist/lib/resources/aws/logging/index.d.ts +2 -2
  213. package/dist/lib/resources/aws/logging/index.js +2 -19
  214. package/dist/lib/resources/aws/logging/logGroup.js +4 -10
  215. package/dist/lib/resources/aws/messaging/eventbridge.js +11 -14
  216. package/dist/lib/resources/aws/messaging/index.d.ts +4 -4
  217. package/dist/lib/resources/aws/messaging/index.js +4 -21
  218. package/dist/lib/resources/aws/messaging/sns.js +11 -14
  219. package/dist/lib/resources/aws/messaging/sqs.js +32 -34
  220. package/dist/lib/resources/aws/messaging/utils.d.ts +1 -1
  221. package/dist/lib/resources/aws/messaging/utils.js +1 -6
  222. package/dist/lib/resources/aws/monitoring/alarmDefaults.d.ts +36 -0
  223. package/dist/lib/resources/aws/monitoring/alarmDefaults.js +34 -0
  224. package/dist/lib/resources/aws/monitoring/ecsAlarms.d.ts +21 -0
  225. package/dist/lib/resources/aws/monitoring/ecsAlarms.js +88 -0
  226. package/dist/lib/resources/aws/monitoring/index.d.ts +4 -0
  227. package/dist/lib/resources/aws/monitoring/index.js +4 -5
  228. package/dist/lib/resources/aws/monitoring/lambdaAlarms.d.ts +18 -0
  229. package/dist/lib/resources/aws/monitoring/lambdaAlarms.js +44 -0
  230. package/dist/lib/resources/aws/monitoring/rdsAlarms.d.ts +20 -0
  231. package/dist/lib/resources/aws/monitoring/rdsAlarms.js +52 -0
  232. package/dist/lib/resources/aws/networking/crossAccountDelegationRecord.d.ts +17 -0
  233. package/dist/lib/resources/aws/networking/crossAccountDelegationRecord.js +26 -0
  234. package/dist/lib/resources/aws/networking/dnsRecord/aRecord.d.ts +12 -0
  235. package/dist/lib/resources/aws/networking/dnsRecord/aRecord.js +21 -0
  236. package/dist/lib/resources/aws/networking/dnsRecord/aaaaRecord.d.ts +12 -0
  237. package/dist/lib/resources/aws/networking/dnsRecord/aaaaRecord.js +22 -0
  238. package/dist/lib/resources/aws/networking/dnsRecord/aliasRecord.d.ts +12 -0
  239. package/dist/lib/resources/aws/networking/dnsRecord/aliasRecord.js +23 -0
  240. package/dist/lib/resources/aws/networking/dnsRecord/caaRecord.d.ts +17 -0
  241. package/dist/lib/resources/aws/networking/dnsRecord/caaRecord.js +21 -0
  242. package/dist/lib/resources/aws/networking/dnsRecord/cnameRecord.d.ts +12 -0
  243. package/dist/lib/resources/aws/networking/dnsRecord/cnameRecord.js +22 -0
  244. package/dist/lib/resources/aws/networking/dnsRecord/dnsRecordBase.d.ts +17 -0
  245. package/dist/lib/resources/aws/networking/dnsRecord/dnsRecordBase.js +17 -0
  246. package/dist/lib/resources/aws/networking/dnsRecord/index.d.ts +10 -0
  247. package/dist/lib/resources/aws/networking/dnsRecord/index.js +10 -0
  248. package/dist/lib/resources/aws/networking/dnsRecord/mxRecord.d.ts +16 -0
  249. package/dist/lib/resources/aws/networking/dnsRecord/mxRecord.js +21 -0
  250. package/dist/lib/resources/aws/networking/dnsRecord/nsRecord.d.ts +12 -0
  251. package/dist/lib/resources/aws/networking/dnsRecord/nsRecord.js +21 -0
  252. package/dist/lib/resources/aws/networking/dnsRecord/srvRecord.d.ts +18 -0
  253. package/dist/lib/resources/aws/networking/dnsRecord/srvRecord.js +21 -0
  254. package/dist/lib/resources/aws/networking/dnsRecord/txtRecord.d.ts +12 -0
  255. package/dist/lib/resources/aws/networking/dnsRecord/txtRecord.js +21 -0
  256. package/dist/lib/resources/aws/networking/domain.d.ts +1 -1
  257. package/dist/lib/resources/aws/networking/domain.js +32 -34
  258. package/dist/lib/resources/aws/networking/domainCertificate.d.ts +8 -3
  259. package/dist/lib/resources/aws/networking/domainCertificate.js +22 -16
  260. package/dist/lib/resources/aws/networking/hostedZone.d.ts +23 -19
  261. package/dist/lib/resources/aws/networking/hostedZone.js +70 -134
  262. package/dist/lib/resources/aws/networking/index.d.ts +8 -7
  263. package/dist/lib/resources/aws/networking/index.js +8 -24
  264. package/dist/lib/resources/aws/networking/ipam.js +2 -7
  265. package/dist/lib/resources/aws/networking/ipamPool.d.ts +1 -1
  266. package/dist/lib/resources/aws/networking/ipamPool.js +45 -55
  267. package/dist/lib/resources/aws/networking/securityGroup.js +2 -7
  268. package/dist/lib/resources/aws/networking/vpc.d.ts +1 -1
  269. package/dist/lib/resources/aws/networking/vpc.js +17 -21
  270. package/dist/lib/resources/aws/organisation/costAllocationTagActivator.d.ts +1 -1
  271. package/dist/lib/resources/aws/organisation/costAllocationTagActivator.js +11 -15
  272. package/dist/lib/resources/aws/organisation/index.d.ts +5 -5
  273. package/dist/lib/resources/aws/organisation/index.js +4 -12
  274. package/dist/lib/resources/aws/organisation/organisation.js +5 -7
  275. package/dist/lib/resources/aws/organisation/organisationAccount.js +7 -10
  276. package/dist/lib/resources/aws/organisation/organisationPolicy.js +5 -9
  277. package/dist/lib/resources/aws/organisation/organisationalUnit.js +1 -3
  278. package/dist/lib/resources/aws/secrets/alias.js +2 -7
  279. package/dist/lib/resources/aws/secrets/index.d.ts +4 -4
  280. package/dist/lib/resources/aws/secrets/index.js +4 -21
  281. package/dist/lib/resources/aws/secrets/kms.js +15 -18
  282. package/dist/lib/resources/aws/secrets/parameter.d.ts +3 -3
  283. package/dist/lib/resources/aws/secrets/parameter.js +19 -22
  284. package/dist/lib/resources/aws/secrets/secret.d.ts +2 -2
  285. package/dist/lib/resources/aws/secrets/secret.js +12 -14
  286. package/dist/lib/resources/aws/storage/ecr.d.ts +2 -2
  287. package/dist/lib/resources/aws/storage/ecr.js +7 -13
  288. package/dist/lib/resources/aws/storage/index.d.ts +2 -2
  289. package/dist/lib/resources/aws/storage/index.js +2 -19
  290. package/dist/lib/resources/aws/storage/s3.d.ts +1 -1
  291. package/dist/lib/resources/aws/storage/s3.js +24 -12
  292. package/dist/lib/resources/aws/utilities/awsCustomResource.js +3 -7
  293. package/dist/lib/resources/aws/utilities/codeBuild.js +7 -12
  294. package/dist/lib/resources/aws/utilities/customResource.js +14 -17
  295. package/dist/lib/resources/aws/utilities/customResourceProvider.js +2 -7
  296. package/dist/lib/resources/aws/utilities/index.d.ts +5 -5
  297. package/dist/lib/resources/aws/utilities/index.js +5 -22
  298. package/dist/lib/resources/aws/utilities/resourceShare.js +2 -7
  299. package/dist/lib/resources/index.d.ts +1 -1
  300. package/dist/lib/resources/index.js +1 -18
  301. package/dist/lib/types.js +1 -3
  302. package/dist/lib/utils/accountsUtils.d.ts +5 -0
  303. package/dist/lib/utils/accountsUtils.js +18 -0
  304. package/dist/lib/utils/addSuffixToEmail.js +1 -5
  305. package/dist/lib/utils/backupTierMapping.js +2 -6
  306. package/dist/lib/utils/capitaliseString.js +1 -10
  307. package/dist/lib/utils/connections.js +9 -13
  308. package/dist/lib/utils/connector.js +10 -23
  309. package/dist/lib/utils/constructMap.d.ts +33 -0
  310. package/dist/lib/utils/constructMap.js +154 -0
  311. package/dist/lib/utils/databaseTypes.js +4 -10
  312. package/dist/lib/utils/dnsRecords.d.ts +1 -1
  313. package/dist/lib/utils/dnsRecords.js +23 -27
  314. package/dist/lib/utils/domainTypes.d.ts +0 -1
  315. package/dist/lib/utils/domainTypes.js +2 -10
  316. package/dist/lib/utils/env.js +14 -26
  317. package/dist/lib/utils/getAccountId.js +3 -7
  318. package/dist/lib/utils/getAsync.js +7 -10
  319. package/dist/lib/utils/getConfig.d.ts +0 -2
  320. package/dist/lib/utils/getConfig.js +29 -47
  321. package/dist/lib/utils/getStackOutput.js +4 -8
  322. package/dist/lib/utils/index.d.ts +12 -12
  323. package/dist/lib/utils/index.js +12 -29
  324. package/dist/lib/utils/manifestWriter.d.ts +14 -3
  325. package/dist/lib/utils/manifestWriter.js +60 -43
  326. package/dist/lib/utils/orgConfigParser.d.ts +14 -0
  327. package/dist/lib/utils/orgConfigParser.js +49 -0
  328. package/dist/lib/utils/removalPolicy.js +5 -9
  329. package/dist/lib/utils/resourceNaming.js +11 -16
  330. package/dist/lib/utils/standardTagsAspect.js +9 -16
  331. package/dist/lib/utils/stripAndCamelCase.js +1 -5
  332. package/dist/lib/utils/validationLogger.js +12 -18
  333. package/dist/lib/utils/vpcUtils.js +5 -10
  334. package/package.json +25 -8
  335. package/dist/lib/config/aws/accountId.d.ts +0 -6
  336. package/dist/lib/config/aws/accountId.js +0 -32
  337. package/dist/lib/config/aws/backupGlobalSettings.d.ts +0 -29
  338. package/dist/lib/config/aws/backupGlobalSettings.js +0 -49
  339. package/dist/lib/config/aws/costAllocationTags.d.ts +0 -12
  340. package/dist/lib/config/aws/costAllocationTags.js +0 -47
  341. package/dist/lib/config/aws/ipamDelegateAdmin.d.ts +0 -8
  342. package/dist/lib/config/aws/ipamDelegateAdmin.js +0 -57
  343. package/dist/lib/config/aws/ipamPoolId.d.ts +0 -16
  344. package/dist/lib/config/aws/ipamPoolId.js +0 -42
  345. package/dist/lib/config/aws/organisation.d.ts +0 -30
  346. package/dist/lib/config/aws/organisation.js +0 -92
  347. package/dist/lib/config/aws/organisationId.d.ts +0 -7
  348. package/dist/lib/config/aws/organisationId.js +0 -45
  349. package/dist/lib/config/aws/organisationsAccess.d.ts +0 -10
  350. package/dist/lib/config/aws/organisationsAccess.js +0 -49
  351. package/dist/lib/config/aws/ramSharing.d.ts +0 -4
  352. package/dist/lib/config/aws/ramSharing.js +0 -34
  353. package/dist/lib/config/monitoring.d.ts +0 -18
  354. package/dist/lib/config/monitoring.js +0 -22
  355. package/dist/lib/patterns/aws/connections.d.ts +0 -46
  356. package/dist/lib/patterns/aws/connections.js +0 -159
  357. package/dist/lib/patterns/aws/hostedZone.d.ts +0 -28
  358. package/dist/lib/patterns/aws/hostedZone.js +0 -150
  359. package/dist/lib/patterns/aws/managedAccount.d.ts +0 -9
  360. package/dist/lib/patterns/aws/managedAccount.js +0 -55
  361. package/dist/lib/patterns/aws/managedOrganisation.d.ts +0 -36
  362. package/dist/lib/patterns/aws/managedOrganisation.js +0 -97
  363. package/dist/lib/patterns/aws/managedPlatform.d.ts +0 -12
  364. package/dist/lib/patterns/aws/managedPlatform.js +0 -29
  365. package/dist/lib/resources/aws/database/database.d.ts +0 -14
  366. package/dist/lib/resources/aws/database/database.js +0 -28
  367. package/dist/lib/resources/aws/database/databaseInstance.d.ts +0 -15
  368. package/dist/lib/resources/aws/database/databaseInstance.js +0 -30
  369. package/dist/lib/resources/aws/database/migrationLambda.d.ts +0 -80
  370. package/dist/lib/resources/aws/database/migrationLambda.js +0 -119
  371. package/dist/lib/resources/aws/iam/identityCenter/attachManagedPolicy.d.ts +0 -13
  372. package/dist/lib/resources/aws/iam/identityCenter/attachManagedPolicy.js +0 -51
  373. package/dist/lib/resources/aws/iam/securityGroup.d.ts +0 -5
  374. package/dist/lib/resources/aws/iam/securityGroup.js +0 -14
  375. package/dist/lib/resources/aws/monitoring/monitoringRole.d.ts +0 -29
  376. package/dist/lib/resources/aws/monitoring/monitoringRole.js +0 -120
  377. package/dist/lib/utils/capitalizeString.d.ts +0 -12
  378. package/dist/lib/utils/capitalizeString.js +0 -30
@@ -1,17 +1,16 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.CloudFrontDistribution = void 0;
4
- const constructs_1 = require("constructs");
5
- const aws_cdk_lib_1 = require("aws-cdk-lib");
6
- const capitaliseString_1 = require("../../../utils/capitaliseString");
7
- const aws_cloudfront_1 = require("aws-cdk-lib/aws-cloudfront");
8
- const aws_cloudfront_origins_1 = require("aws-cdk-lib/aws-cloudfront-origins");
9
- class CloudFrontDistribution extends constructs_1.Construct {
1
+ import { Construct } from "constructs";
2
+ import { CfnOutput } from "aws-cdk-lib";
3
+ import { toPascalCase } from "../../../utils/capitaliseString.js";
4
+ import { Distribution, PriceClass, ViewerProtocolPolicy, CachePolicy, OriginRequestPolicy, AllowedMethods, OriginProtocolPolicy, Function as CloudFrontFunction, FunctionCode, FunctionRuntime, FunctionEventType } from "aws-cdk-lib/aws-cloudfront";
5
+ import { S3BucketOrigin, LoadBalancerV2Origin, HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
6
+ export class CloudFrontDistribution extends Construct {
7
+ id;
8
+ distribution;
10
9
  constructor(scope, id, props) {
11
10
  super(scope, id);
12
11
  this.id = id;
13
12
  // Sanitise id for CloudFormation output keys (must be alphanumeric)
14
- const outputName = (0, capitaliseString_1.toPascalCase)(id);
13
+ const outputName = toPascalCase(id);
15
14
  const defaultOrigin = this.createOrigin(props.defaultOrigin);
16
15
  const defaultCachePolicy = this.resolveCachePolicy(props.defaultCachePolicy);
17
16
  // Build composable viewer request function (accessGate + forwardHostHeader)
@@ -20,7 +19,7 @@ class CloudFrontDistribution extends constructs_1.Construct {
20
19
  ? [
21
20
  {
22
21
  function: viewerRequestFunction,
23
- eventType: aws_cloudfront_1.FunctionEventType.VIEWER_REQUEST
22
+ eventType: FunctionEventType.VIEWER_REQUEST
24
23
  }
25
24
  ]
26
25
  : undefined;
@@ -30,22 +29,22 @@ class CloudFrontDistribution extends constructs_1.Construct {
30
29
  additionalBehaviors[behaviour.pathPattern] = {
31
30
  origin: this.createOrigin(behaviour.origin),
32
31
  cachePolicy: this.resolveCachePolicy(behaviour.cachePolicy),
33
- viewerProtocolPolicy: aws_cloudfront_1.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
32
+ viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
34
33
  allowedMethods: this.resolveAllowedMethods(behaviour.allowedMethods),
35
34
  // Forward viewer headers (cookies, auth) to non-S3 origins
36
35
  ...(behaviour.origin.type !== "s3" && {
37
- originRequestPolicy: aws_cloudfront_1.OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER
36
+ originRequestPolicy: OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER
38
37
  }),
39
38
  ...(functionAssociations !== undefined && { functionAssociations })
40
39
  };
41
40
  }
42
41
  }
43
- this.distribution = new aws_cloudfront_1.Distribution(this, `${id}Distribution`, {
42
+ this.distribution = new Distribution(this, `${id}Distribution`, {
44
43
  defaultBehavior: {
45
44
  origin: defaultOrigin,
46
45
  cachePolicy: defaultCachePolicy,
47
- viewerProtocolPolicy: aws_cloudfront_1.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
48
- originRequestPolicy: aws_cloudfront_1.OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER,
46
+ viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
47
+ originRequestPolicy: OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER,
49
48
  allowedMethods: this.resolveAllowedMethods(props.defaultAllowedMethods),
50
49
  ...(functionAssociations !== undefined && { functionAssociations })
51
50
  },
@@ -59,19 +58,20 @@ class CloudFrontDistribution extends constructs_1.Construct {
59
58
  logBucket: props.logBucket,
60
59
  priceClass: this.resolvePriceClass(props.priceClass)
61
60
  });
62
- new aws_cdk_lib_1.CfnOutput(this, `${outputName}DistributionDomainName`, {
61
+ new CfnOutput(this, `${outputName}DistributionDomainName`, {
63
62
  key: `${outputName}DistributionDomainName`,
63
+ exportName: `${outputName}CdnDistributionDomainName`,
64
64
  value: this.distribution.distributionDomainName,
65
65
  description: `CloudFront distribution domain name for ${id}`
66
66
  });
67
- new aws_cdk_lib_1.CfnOutput(this, `${outputName}DistributionId`, {
67
+ new CfnOutput(this, `${outputName}DistributionId`, {
68
68
  key: `${outputName}DistributionId`,
69
69
  value: this.distribution.distributionId,
70
70
  description: `CloudFront distribution ID for ${id}`
71
71
  });
72
72
  // Output credentials hint when access gate is enabled
73
73
  if (props.accessGate) {
74
- new aws_cdk_lib_1.CfnOutput(this, `${outputName}AccessGateUsername`, {
74
+ new CfnOutput(this, `${outputName}AccessGateUsername`, {
75
75
  key: `${outputName}AccessGateUsername`,
76
76
  value: props.accessGate.username,
77
77
  description: `Access gate username for ${id}`
@@ -105,9 +105,9 @@ class CloudFrontDistribution extends constructs_1.Construct {
105
105
  " request.headers['x-forwarded-host'] = { value: request.headers.host.value };";
106
106
  }
107
107
  functionBody += " return request; }";
108
- return new aws_cloudfront_1.Function(this, `${id}ViewerRequestFn`, {
109
- code: aws_cloudfront_1.FunctionCode.fromInline(functionBody),
110
- runtime: aws_cloudfront_1.FunctionRuntime.JS_2_0
108
+ return new CloudFrontFunction(this, `${id}ViewerRequestFn`, {
109
+ code: FunctionCode.fromInline(functionBody),
110
+ runtime: FunctionRuntime.JS_2_0
111
111
  });
112
112
  }
113
113
  createOrigin(config) {
@@ -117,17 +117,17 @@ class CloudFrontDistribution extends constructs_1.Construct {
117
117
  // See: https://github.com/aws/aws-cdk/issues/31462
118
118
  // OAC creates bucket → CDN dependency (bucket policy references distribution)
119
119
  // OAI works across stacks without triggering cyclic dependency errors
120
- return aws_cloudfront_origins_1.S3BucketOrigin.withOriginAccessIdentity(config.bucket, {
120
+ return S3BucketOrigin.withOriginAccessIdentity(config.bucket, {
121
121
  originPath: config.originPath
122
122
  });
123
123
  case "alb":
124
- return new aws_cloudfront_origins_1.LoadBalancerV2Origin(config.loadBalancer, {
124
+ return new LoadBalancerV2Origin(config.loadBalancer, {
125
125
  httpPort: config.httpPort,
126
126
  httpsPort: config.httpsPort,
127
127
  protocolPolicy: this.resolveOriginProtocolPolicy(config.protocolPolicy)
128
128
  });
129
129
  case "http":
130
- return new aws_cloudfront_origins_1.HttpOrigin(config.domainName, {
130
+ return new HttpOrigin(config.domainName, {
131
131
  originPath: config.originPath,
132
132
  httpPort: config.httpPort,
133
133
  httpsPort: config.httpsPort,
@@ -137,16 +137,16 @@ class CloudFrontDistribution extends constructs_1.Construct {
137
137
  }
138
138
  resolveCachePolicy(policy) {
139
139
  if (!policy) {
140
- return aws_cloudfront_1.CachePolicy.CACHING_OPTIMIZED;
140
+ return CachePolicy.CACHING_OPTIMIZED;
141
141
  }
142
142
  if (typeof policy === "string") {
143
143
  switch (policy) {
144
144
  case "CACHING_OPTIMIZED":
145
- return aws_cloudfront_1.CachePolicy.CACHING_OPTIMIZED;
145
+ return CachePolicy.CACHING_OPTIMIZED;
146
146
  case "CACHING_DISABLED":
147
- return aws_cloudfront_1.CachePolicy.CACHING_DISABLED;
147
+ return CachePolicy.CACHING_DISABLED;
148
148
  case "CACHING_OPTIMIZED_FOR_UNCOMPRESSED_OBJECTS":
149
- return aws_cloudfront_1.CachePolicy.CACHING_OPTIMIZED_FOR_UNCOMPRESSED_OBJECTS;
149
+ return CachePolicy.CACHING_OPTIMIZED_FOR_UNCOMPRESSED_OBJECTS;
150
150
  }
151
151
  }
152
152
  return policy;
@@ -154,35 +154,35 @@ class CloudFrontDistribution extends constructs_1.Construct {
154
154
  resolveAllowedMethods(methods) {
155
155
  switch (methods) {
156
156
  case "GET_HEAD":
157
- return aws_cloudfront_1.AllowedMethods.ALLOW_GET_HEAD;
157
+ return AllowedMethods.ALLOW_GET_HEAD;
158
158
  case "GET_HEAD_OPTIONS":
159
- return aws_cloudfront_1.AllowedMethods.ALLOW_GET_HEAD_OPTIONS;
159
+ return AllowedMethods.ALLOW_GET_HEAD_OPTIONS;
160
160
  case "ALL":
161
- return aws_cloudfront_1.AllowedMethods.ALLOW_ALL;
161
+ return AllowedMethods.ALLOW_ALL;
162
162
  default:
163
- return aws_cloudfront_1.AllowedMethods.ALLOW_GET_HEAD;
163
+ return AllowedMethods.ALLOW_GET_HEAD;
164
164
  }
165
165
  }
166
166
  resolveOriginProtocolPolicy(policy) {
167
167
  switch (policy) {
168
168
  case "HTTP_ONLY":
169
- return aws_cloudfront_1.OriginProtocolPolicy.HTTP_ONLY;
169
+ return OriginProtocolPolicy.HTTP_ONLY;
170
170
  case "HTTPS_ONLY":
171
- return aws_cloudfront_1.OriginProtocolPolicy.HTTPS_ONLY;
171
+ return OriginProtocolPolicy.HTTPS_ONLY;
172
172
  case "MATCH_VIEWER":
173
- return aws_cloudfront_1.OriginProtocolPolicy.MATCH_VIEWER;
173
+ return OriginProtocolPolicy.MATCH_VIEWER;
174
174
  default:
175
- return aws_cloudfront_1.OriginProtocolPolicy.HTTPS_ONLY;
175
+ return OriginProtocolPolicy.HTTPS_ONLY;
176
176
  }
177
177
  }
178
178
  resolvePriceClass(priceClass) {
179
179
  switch (priceClass) {
180
180
  case "PriceClass_100":
181
- return aws_cloudfront_1.PriceClass.PRICE_CLASS_100;
181
+ return PriceClass.PRICE_CLASS_100;
182
182
  case "PriceClass_200":
183
- return aws_cloudfront_1.PriceClass.PRICE_CLASS_200;
183
+ return PriceClass.PRICE_CLASS_200;
184
184
  case "PriceClass_All":
185
- return aws_cloudfront_1.PriceClass.PRICE_CLASS_ALL;
185
+ return PriceClass.PRICE_CLASS_ALL;
186
186
  default:
187
187
  return undefined;
188
188
  }
@@ -206,5 +206,3 @@ class CloudFrontDistribution extends constructs_1.Construct {
206
206
  return this.distribution;
207
207
  }
208
208
  }
209
- exports.CloudFrontDistribution = CloudFrontDistribution;
210
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cloudFront.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/cdn/cloudFront.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { CfnOutput } from \"aws-cdk-lib\";\nimport { toPascalCase } from \"../../../utils/capitaliseString\";\nimport {\n  Distribution,\n  PriceClass,\n  type IOrigin,\n  ViewerProtocolPolicy,\n  CachePolicy,\n  type ICachePolicy,\n  OriginRequestPolicy,\n  AllowedMethods,\n  OriginProtocolPolicy,\n  type BehaviorOptions,\n  Function as CloudFrontFunction,\n  FunctionCode,\n  FunctionRuntime,\n  FunctionEventType\n} from \"aws-cdk-lib/aws-cloudfront\";\nimport {\n  S3BucketOrigin,\n  LoadBalancerV2Origin,\n  HttpOrigin\n} from \"aws-cdk-lib/aws-cloudfront-origins\";\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\";\n\nexport type CachePolicyPreset =\n  | \"CACHING_OPTIMIZED\"\n  | \"CACHING_DISABLED\"\n  | \"CACHING_OPTIMIZED_FOR_UNCOMPRESSED_OBJECTS\";\n\nexport interface S3OriginConfig {\n  type: \"s3\";\n  bucket: IBucket;\n  originPath?: string;\n}\n\nexport interface AlbOriginConfig {\n  type: \"alb\";\n  loadBalancer: IApplicationLoadBalancer;\n  protocolPolicy?: \"HTTP_ONLY\" | \"HTTPS_ONLY\" | \"MATCH_VIEWER\";\n  httpPort?: number;\n  httpsPort?: number;\n}\n\nexport interface HttpOriginConfig {\n  type: \"http\";\n  domainName: string;\n  originPath?: string;\n  protocolPolicy?: \"HTTP_ONLY\" | \"HTTPS_ONLY\" | \"MATCH_VIEWER\";\n  httpPort?: number;\n  httpsPort?: number;\n}\n\nexport type CdnOriginConfig =\n  | S3OriginConfig\n  | AlbOriginConfig\n  | HttpOriginConfig;\n\nexport interface CdnBehaviour {\n  pathPattern: string;\n  origin: CdnOriginConfig;\n  cachePolicy?: CachePolicyPreset | ICachePolicy;\n  allowedMethods?: \"GET_HEAD\" | \"GET_HEAD_OPTIONS\" | \"ALL\";\n}\n\nexport interface AccessGateConfig {\n  type: \"basic-auth\";\n  username: string;\n  password: string;\n}\n\nexport interface CloudFrontDistributionProps {\n  defaultOrigin: CdnOriginConfig;\n  defaultCachePolicy?: CachePolicyPreset | ICachePolicy;\n  defaultAllowedMethods?: \"GET_HEAD\" | \"GET_HEAD_OPTIONS\" | \"ALL\";\n  behaviours?: CdnBehaviour[];\n  domainNames?: string[];\n  certificate?: ICertificate;\n  comment?: string;\n  enableLogging?: boolean;\n  logBucket?: IBucket;\n  priceClass?: \"PriceClass_100\" | \"PriceClass_200\" | \"PriceClass_All\";\n  /** Adds a CloudFront Function to copy the viewer Host header into X-Forwarded-Host.\n   * Required when the origin is a Lambda Function URL or ALB behind CloudFront,\n   * because AllViewerExceptHostHeader replaces Host with the origin domain. */\n  forwardHostHeader?: boolean;\n  /** Adds access gating to the distribution via a CloudFront Function.\n   * Set to false to explicitly disable (or omit). */\n  accessGate?: false | AccessGateConfig;\n}\n\nexport class CloudFrontDistribution extends Construct {\n  public readonly id: string;\n  private distribution: Distribution;\n\n  constructor(\n    scope: Construct,\n    id: string,\n    props: CloudFrontDistributionProps\n  ) {\n    super(scope, id);\n    this.id = id;\n\n    // Sanitise id for CloudFormation output keys (must be alphanumeric)\n    const outputName = toPascalCase(id);\n\n    const defaultOrigin = this.createOrigin(props.defaultOrigin);\n    const defaultCachePolicy = this.resolveCachePolicy(\n      props.defaultCachePolicy\n    );\n\n    // Build composable viewer request function (accessGate + forwardHostHeader)\n    const viewerRequestFunction = this.buildViewerRequestFunction(\n      id,\n      props.forwardHostHeader,\n      props.accessGate\n    );\n\n    const functionAssociations = viewerRequestFunction\n      ? [\n          {\n            function: viewerRequestFunction,\n            eventType: FunctionEventType.VIEWER_REQUEST\n          }\n        ]\n      : undefined;\n\n    const additionalBehaviors: Record<string, BehaviorOptions> = {};\n    if (props.behaviours) {\n      for (const behaviour of props.behaviours) {\n        additionalBehaviors[behaviour.pathPattern] = {\n          origin: this.createOrigin(behaviour.origin),\n          cachePolicy: this.resolveCachePolicy(behaviour.cachePolicy),\n          viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n          allowedMethods: this.resolveAllowedMethods(behaviour.allowedMethods),\n          // Forward viewer headers (cookies, auth) to non-S3 origins\n          ...(behaviour.origin.type !== \"s3\" && {\n            originRequestPolicy:\n              OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER\n          }),\n          ...(functionAssociations !== undefined && { functionAssociations })\n        };\n      }\n    }\n\n    this.distribution = new Distribution(this, `${id}Distribution`, {\n      defaultBehavior: {\n        origin: defaultOrigin,\n        cachePolicy: defaultCachePolicy,\n        viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n        originRequestPolicy: OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER,\n        allowedMethods: this.resolveAllowedMethods(props.defaultAllowedMethods),\n        ...(functionAssociations !== undefined && { functionAssociations })\n      },\n      additionalBehaviors:\n        Object.keys(additionalBehaviors).length > 0\n          ? additionalBehaviors\n          : undefined,\n      domainNames: props.domainNames,\n      certificate: props.certificate,\n      comment: props.comment,\n      enableLogging: props.enableLogging,\n      logBucket: props.logBucket,\n      priceClass: this.resolvePriceClass(props.priceClass)\n    });\n\n    new CfnOutput(this, `${outputName}DistributionDomainName`, {\n      key: `${outputName}DistributionDomainName`,\n      value: this.distribution.distributionDomainName,\n      description: `CloudFront distribution domain name for ${id}`\n    });\n\n    new CfnOutput(this, `${outputName}DistributionId`, {\n      key: `${outputName}DistributionId`,\n      value: this.distribution.distributionId,\n      description: `CloudFront distribution ID for ${id}`\n    });\n\n    // Output credentials hint when access gate is enabled\n    if (props.accessGate) {\n      new CfnOutput(this, `${outputName}AccessGateUsername`, {\n        key: `${outputName}AccessGateUsername`,\n        value: props.accessGate.username,\n        description: `Access gate username for ${id}`\n      });\n    }\n  }\n\n  /**\n   * Build a composable CloudFront Function for VIEWER_REQUEST.\n   * Merges accessGate and forwardHostHeader into a single function\n   * (CloudFront allows only one function per event type).\n   */\n  private buildViewerRequestFunction(\n    id: string,\n    forwardHostHeader?: boolean,\n    accessGate?: false | AccessGateConfig\n  ): CloudFrontFunction | undefined {\n    if (!accessGate && !forwardHostHeader) {\n      return undefined;\n    }\n\n    let functionBody = \"function handler(event) { var request = event.request;\";\n\n    if (accessGate) {\n      const credentials = Buffer.from(\n        `${accessGate.username}:${accessGate.password}`\n      ).toString(\"base64\");\n\n      functionBody +=\n        ` var authHeader = request.headers.authorization;` +\n        ` if (!authHeader || authHeader.value !== \"Basic ${credentials}\") {` +\n        ` return {` +\n        ` statusCode: 401,` +\n        ` statusDescription: \"Unauthorized\",` +\n        ` headers: { \"www-authenticate\": { value: 'Basic realm=\"Restricted\"' } },` +\n        ` body: { encoding: \"text\", data: \"Unauthorized\" }` +\n        ` }; }`;\n    }\n\n    if (forwardHostHeader) {\n      functionBody +=\n        \" request.headers['x-forwarded-host'] = { value: request.headers.host.value };\";\n    }\n\n    functionBody += \" return request; }\";\n\n    return new CloudFrontFunction(this, `${id}ViewerRequestFn`, {\n      code: FunctionCode.fromInline(functionBody),\n      runtime: FunctionRuntime.JS_2_0\n    });\n  }\n\n  private createOrigin(config: CdnOriginConfig): IOrigin {\n    switch (config.type) {\n      case \"s3\":\n        // Using OAI instead of OAC to avoid cross-stack circular dependencies\n        // See: https://github.com/aws/aws-cdk/issues/31462\n        // OAC creates bucket → CDN dependency (bucket policy references distribution)\n        // OAI works across stacks without triggering cyclic dependency errors\n        return S3BucketOrigin.withOriginAccessIdentity(config.bucket, {\n          originPath: config.originPath\n        });\n\n      case \"alb\":\n        return new LoadBalancerV2Origin(config.loadBalancer, {\n          httpPort: config.httpPort,\n          httpsPort: config.httpsPort,\n          protocolPolicy: this.resolveOriginProtocolPolicy(\n            config.protocolPolicy\n          )\n        });\n\n      case \"http\":\n        return new HttpOrigin(config.domainName, {\n          originPath: config.originPath,\n          httpPort: config.httpPort,\n          httpsPort: config.httpsPort,\n          protocolPolicy: this.resolveOriginProtocolPolicy(\n            config.protocolPolicy\n          )\n        });\n    }\n  }\n\n  private resolveCachePolicy(\n    policy?: CachePolicyPreset | ICachePolicy\n  ): ICachePolicy {\n    if (!policy) {\n      return CachePolicy.CACHING_OPTIMIZED;\n    }\n\n    if (typeof policy === \"string\") {\n      switch (policy) {\n        case \"CACHING_OPTIMIZED\":\n          return CachePolicy.CACHING_OPTIMIZED;\n        case \"CACHING_DISABLED\":\n          return CachePolicy.CACHING_DISABLED;\n        case \"CACHING_OPTIMIZED_FOR_UNCOMPRESSED_OBJECTS\":\n          return CachePolicy.CACHING_OPTIMIZED_FOR_UNCOMPRESSED_OBJECTS;\n      }\n    }\n\n    return policy;\n  }\n\n  private resolveAllowedMethods(\n    methods?: \"GET_HEAD\" | \"GET_HEAD_OPTIONS\" | \"ALL\"\n  ): AllowedMethods {\n    switch (methods) {\n      case \"GET_HEAD\":\n        return AllowedMethods.ALLOW_GET_HEAD;\n      case \"GET_HEAD_OPTIONS\":\n        return AllowedMethods.ALLOW_GET_HEAD_OPTIONS;\n      case \"ALL\":\n        return AllowedMethods.ALLOW_ALL;\n      default:\n        return AllowedMethods.ALLOW_GET_HEAD;\n    }\n  }\n\n  private resolveOriginProtocolPolicy(\n    policy?: \"HTTP_ONLY\" | \"HTTPS_ONLY\" | \"MATCH_VIEWER\"\n  ): OriginProtocolPolicy {\n    switch (policy) {\n      case \"HTTP_ONLY\":\n        return OriginProtocolPolicy.HTTP_ONLY;\n      case \"HTTPS_ONLY\":\n        return OriginProtocolPolicy.HTTPS_ONLY;\n      case \"MATCH_VIEWER\":\n        return OriginProtocolPolicy.MATCH_VIEWER;\n      default:\n        return OriginProtocolPolicy.HTTPS_ONLY;\n    }\n  }\n\n  private resolvePriceClass(\n    priceClass?: \"PriceClass_100\" | \"PriceClass_200\" | \"PriceClass_All\"\n  ): PriceClass | undefined {\n    switch (priceClass) {\n      case \"PriceClass_100\":\n        return PriceClass.PRICE_CLASS_100;\n      case \"PriceClass_200\":\n        return PriceClass.PRICE_CLASS_200;\n      case \"PriceClass_All\":\n        return PriceClass.PRICE_CLASS_ALL;\n      default:\n        return undefined;\n    }\n  }\n\n  /**\n   * Get the CloudFront distribution domain name.\n   */\n  public getDistributionDomainName(): string {\n    return this.distribution.distributionDomainName;\n  }\n\n  /**\n   * Get the CloudFront distribution ID.\n   */\n  public getDistributionId(): string {\n    return this.distribution.distributionId;\n  }\n\n  /**\n   * Get the underlying CDK Distribution construct.\n   */\n  public getDistribution(): Distribution {\n    return this.distribution;\n  }\n}\n"]}
@@ -1 +1 @@
1
- export * from "./cloudFront";
1
+ export * from "./cloudFront.js";
@@ -1,18 +1 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
- };
16
- Object.defineProperty(exports, "__esModule", { value: true });
17
- __exportStar(require("./cloudFront"), exports);
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9jZG4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLCtDQUE2QiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gXCIuL2Nsb3VkRnJvbnRcIjtcbiJdfQ==
1
+ export * from "./cloudFront.js";
@@ -1,15 +1,18 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Ec2InstanceStack = exports.Ec2Instance = void 0;
4
- const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
5
- const constructs_1 = require("constructs");
6
- const vpcUtils_1 = require("../../../utils/vpcUtils");
7
- const aws_cdk_lib_1 = require("aws-cdk-lib");
8
- const aws_autoscaling_1 = require("aws-cdk-lib/aws-autoscaling");
9
- const awsCustomResource_1 = require("../utilities/awsCustomResource");
10
- const custom_resources_1 = require("aws-cdk-lib/custom-resources");
11
- const vpc_1 = require("../networking/vpc");
12
- class Ec2Instance extends constructs_1.Construct {
1
+ import { InstanceType, LaunchTemplate, SubnetType, MachineImage, LaunchTemplateHttpTokens, KeyPair, SecurityGroup, Peer, Port, Connections } from "aws-cdk-lib/aws-ec2";
2
+ import { Construct } from "constructs";
3
+ import { resolvePrivateSubnetType } from "../../../utils/vpcUtils.js";
4
+ import { Duration, Stack } from "aws-cdk-lib";
5
+ import { AutoScalingGroup, GroupMetrics, TerminationPolicy, UpdatePolicy, OnDemandAllocationStrategy, SpotAllocationStrategy } from "aws-cdk-lib/aws-autoscaling";
6
+ import { AwsCustomResource } from "../utilities/awsCustomResource.js";
7
+ import { PhysicalResourceId } from "aws-cdk-lib/custom-resources";
8
+ import { Vpc } from "../networking/vpc.js";
9
+ export class Ec2Instance extends Construct {
10
+ launchTemplate;
11
+ vpc;
12
+ asgSecurityGroup;
13
+ autoScalingGroup;
14
+ keyPair;
15
+ connections;
13
16
  constructor(scope, id, props) {
14
17
  super(scope, id);
15
18
  this.addVpc(props);
@@ -19,9 +22,9 @@ class Ec2Instance extends constructs_1.Construct {
19
22
  this.suspendAutoScaling(props);
20
23
  // Initialise connections with the security group and optional defaultPort
21
24
  // When defaultPort is set, other resources can use allowToDefaultPort(ec2Instance)
22
- this.connections = new aws_ec2_1.Connections({
25
+ this.connections = new Connections({
23
26
  securityGroups: [this.asgSecurityGroup],
24
- defaultPort: props.defaultPort ? aws_ec2_1.Port.tcp(props.defaultPort) : undefined
27
+ defaultPort: props.defaultPort ? Port.tcp(props.defaultPort) : undefined
25
28
  });
26
29
  }
27
30
  addVpc(props) {
@@ -29,7 +32,7 @@ class Ec2Instance extends constructs_1.Construct {
29
32
  this.vpc = props.vpc;
30
33
  }
31
34
  else {
32
- this.vpc = new vpc_1.Vpc(this, `${props.serviceName}Vpc`, {
35
+ this.vpc = new Vpc(this, `${props.serviceName}Vpc`, {
33
36
  accountId: props.accountId,
34
37
  subnetConfiguration: props.subnetConfiguration
35
38
  });
@@ -41,23 +44,23 @@ class Ec2Instance extends constructs_1.Construct {
41
44
  }
42
45
  else {
43
46
  // TODO: Break out into a separate construct for use with better prop handling
44
- this.keyPair = new aws_ec2_1.KeyPair(this, "KeyPair", {
47
+ this.keyPair = new KeyPair(this, "KeyPair", {
45
48
  keyPairName: `${props.serviceName}KeyPair`
46
49
  });
47
50
  }
48
51
  }
49
52
  addLaunchTemplate(props) {
50
- this.asgSecurityGroup = new aws_ec2_1.SecurityGroup(this, `AsgSecurityGroup`, {
53
+ this.asgSecurityGroup = new SecurityGroup(this, `AsgSecurityGroup`, {
51
54
  vpc: this.vpc,
52
55
  description: `Security group for the ${props.serviceName} auto scaling group`
53
56
  });
54
57
  if (props.enableSSH) {
55
- this.asgSecurityGroup.addIngressRule(aws_ec2_1.Peer.anyIpv4(), aws_ec2_1.Port.tcp(22), "Allow SSH");
58
+ this.asgSecurityGroup.addIngressRule(Peer.anyIpv4(), Port.tcp(22), "Allow SSH");
56
59
  }
57
- this.launchTemplate = new aws_ec2_1.LaunchTemplate(this, "LaunchTemplate", {
60
+ this.launchTemplate = new LaunchTemplate(this, "LaunchTemplate", {
58
61
  launchTemplateName: `${props.serviceName}LaunchTemplate`,
59
- instanceType: new aws_ec2_1.InstanceType(`${props.instanceType}`),
60
- machineImage: props.machineImage || aws_ec2_1.MachineImage.latestAmazonLinux2023(),
62
+ instanceType: new InstanceType(`${props.instanceType}`),
63
+ machineImage: props.machineImage || MachineImage.latestAmazonLinux2023(),
61
64
  userData: props.userData,
62
65
  role: props.role,
63
66
  blockDevices: props?.blockDevices,
@@ -65,7 +68,7 @@ class Ec2Instance extends constructs_1.Construct {
65
68
  detailedMonitoring: true,
66
69
  requireImdsv2: true,
67
70
  httpPutResponseHopLimit: 2,
68
- httpTokens: aws_ec2_1.LaunchTemplateHttpTokens.REQUIRED,
71
+ httpTokens: LaunchTemplateHttpTokens.REQUIRED,
69
72
  instanceMetadataTags: true,
70
73
  keyPair: this.keyPair,
71
74
  associatePublicIpAddress: !!this.keyPair
@@ -77,18 +80,18 @@ class Ec2Instance extends constructs_1.Construct {
77
80
  vpc: this.vpc,
78
81
  vpcSubnets: {
79
82
  subnetType: props.enableSSH
80
- ? aws_ec2_1.SubnetType.PUBLIC
81
- : (0, vpcUtils_1.resolvePrivateSubnetType)(this.vpc)
83
+ ? SubnetType.PUBLIC
84
+ : resolvePrivateSubnetType(this.vpc)
82
85
  },
83
86
  minCapacity: props.minCapacity,
84
87
  maxCapacity: props.maxCapacity,
85
- cooldown: aws_cdk_lib_1.Duration.seconds(60),
86
- groupMetrics: [aws_autoscaling_1.GroupMetrics.all()],
87
- updatePolicy: aws_autoscaling_1.UpdatePolicy.replacingUpdate(),
88
+ cooldown: Duration.seconds(60),
89
+ groupMetrics: [GroupMetrics.all()],
90
+ updatePolicy: UpdatePolicy.replacingUpdate(),
88
91
  newInstancesProtectedFromScaleIn: true,
89
92
  terminationPolicies: [
90
- aws_autoscaling_1.TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,
91
- aws_autoscaling_1.TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR
93
+ TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,
94
+ TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR
92
95
  ],
93
96
  ssmSessionPermissions: true
94
97
  };
@@ -97,21 +100,21 @@ class Ec2Instance extends constructs_1.Construct {
97
100
  props.spotCapacityPercentage > 0) {
98
101
  const spotPercentage = Math.min(100, Math.max(0, props.spotCapacityPercentage));
99
102
  const onDemandPercentage = 100 - spotPercentage;
100
- this.autoScalingGroup = new aws_autoscaling_1.AutoScalingGroup(this, "AutoScalingGroup", {
103
+ this.autoScalingGroup = new AutoScalingGroup(this, "AutoScalingGroup", {
101
104
  ...baseAsgProps,
102
105
  mixedInstancesPolicy: {
103
106
  instancesDistribution: {
104
- onDemandAllocationStrategy: aws_autoscaling_1.OnDemandAllocationStrategy.PRIORITIZED,
107
+ onDemandAllocationStrategy: OnDemandAllocationStrategy.PRIORITIZED,
105
108
  onDemandBaseCapacity: 0,
106
109
  onDemandPercentageAboveBaseCapacity: onDemandPercentage,
107
- spotAllocationStrategy: aws_autoscaling_1.SpotAllocationStrategy.PRICE_CAPACITY_OPTIMIZED
110
+ spotAllocationStrategy: SpotAllocationStrategy.PRICE_CAPACITY_OPTIMIZED
108
111
  },
109
112
  launchTemplate: this.launchTemplate
110
113
  }
111
114
  });
112
115
  }
113
116
  else {
114
- this.autoScalingGroup = new aws_autoscaling_1.AutoScalingGroup(this, "AutoScalingGroup", {
117
+ this.autoScalingGroup = new AutoScalingGroup(this, "AutoScalingGroup", {
115
118
  ...baseAsgProps,
116
119
  launchTemplate: this.launchTemplate
117
120
  });
@@ -131,17 +134,16 @@ class Ec2Instance extends constructs_1.Construct {
131
134
  AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,
132
135
  ScalingProcesses: ["AZRebalance"]
133
136
  },
134
- physicalResourceId: custom_resources_1.PhysicalResourceId.of("suspendAutoScaling")
137
+ physicalResourceId: PhysicalResourceId.of("suspendAutoScaling")
135
138
  };
136
- new awsCustomResource_1.AwsCustomResource(this, "SuspendAutoscaling", {
139
+ new AwsCustomResource(this, "SuspendAutoscaling", {
137
140
  onCreate: suspendCall,
138
141
  onUpdate: suspendCall,
139
142
  resourceType: "Custom::suspendAutoscaling"
140
143
  });
141
144
  }
142
145
  }
143
- exports.Ec2Instance = Ec2Instance;
144
- class Ec2InstanceStack extends aws_cdk_lib_1.Stack {
146
+ export class Ec2InstanceStack extends Stack {
145
147
  constructor(scope, id, props) {
146
148
  super(scope, id, props);
147
149
  new Ec2Instance(this, id, {
@@ -149,5 +151,3 @@ class Ec2InstanceStack extends aws_cdk_lib_1.Stack {
149
151
  });
150
152
  }
151
153
  }
152
- exports.Ec2InstanceStack = Ec2InstanceStack;
153
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/compute/ec2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type BlockDevice,\n  type IMachineImage,\n  InstanceType,\n  type IVpc,\n  LaunchTemplate,\n  SubnetType,\n  type UserData,\n  MachineImage,\n  LaunchTemplateHttpTokens,\n  KeyPair,\n  type IKeyPair,\n  SecurityGroup,\n  Peer,\n  Port,\n  type IConnectable,\n  Connections,\n  type SubnetConfiguration\n} from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\nimport { resolvePrivateSubnetType } from \"../../../utils/vpcUtils\";\nimport { Duration, Stack, type StackProps } from \"aws-cdk-lib\";\nimport { type Role } from \"aws-cdk-lib/aws-iam\";\nimport {\n  AutoScalingGroup,\n  GroupMetrics,\n  TerminationPolicy,\n  UpdatePolicy,\n  OnDemandAllocationStrategy,\n  SpotAllocationStrategy\n} from \"aws-cdk-lib/aws-autoscaling\";\nimport { AwsCustomResource } from \"../utilities/awsCustomResource\";\nimport { PhysicalResourceId } from \"aws-cdk-lib/custom-resources\";\nimport { Vpc } from \"../networking/vpc\";\n\ninterface Ec2InstanceProps extends StackProps {\n  spotCapacityPercentage?: number;\n  blockDevices?: BlockDevice[];\n  accountId?: string;\n  serviceName: string;\n  vpc?: IVpc;\n  subnetConfiguration?: SubnetConfiguration[];\n  minCapacity?: number;\n  maxCapacity?: number;\n  instanceType: string;\n  machineImage?: IMachineImage;\n  userData?: UserData;\n  role?: Role;\n  enableSSH?: boolean;\n  defaultPort?: number;\n}\n\nexport class Ec2Instance extends Construct implements IConnectable {\n  private launchTemplate!: LaunchTemplate;\n  public vpc!: IVpc;\n  public asgSecurityGroup!: SecurityGroup;\n  private autoScalingGroup!: AutoScalingGroup;\n  private keyPair: IKeyPair | undefined;\n  public connections: Connections;\n\n  constructor(scope: Construct, id: string, props: Ec2InstanceProps) {\n    super(scope, id);\n\n    this.addVpc(props);\n    this.addKeyPair(props);\n    this.addLaunchTemplate(props);\n    this.addAutoScalingGroup(props);\n    this.suspendAutoScaling(props);\n\n    // Initialise connections with the security group and optional defaultPort\n    // When defaultPort is set, other resources can use allowToDefaultPort(ec2Instance)\n    this.connections = new Connections({\n      securityGroups: [this.asgSecurityGroup],\n      defaultPort: props.defaultPort ? Port.tcp(props.defaultPort) : undefined\n    });\n  }\n\n  addVpc(props: Ec2InstanceProps) {\n    if (props.vpc) {\n      this.vpc = props.vpc;\n    } else {\n      this.vpc = new Vpc(this, `${props.serviceName}Vpc`, {\n        accountId: props.accountId,\n        subnetConfiguration: props.subnetConfiguration\n      });\n    }\n  }\n\n  addKeyPair(props: Ec2InstanceProps) {\n    if (!props.enableSSH) {\n      this.keyPair = undefined;\n    } else {\n      // TODO: Break out into a separate construct for use with better prop handling\n      this.keyPair = new KeyPair(this, \"KeyPair\", {\n        keyPairName: `${props.serviceName}KeyPair`\n      });\n    }\n  }\n\n  addLaunchTemplate(props: Ec2InstanceProps) {\n    this.asgSecurityGroup = new SecurityGroup(this, `AsgSecurityGroup`, {\n      vpc: this.vpc,\n      description: `Security group for the ${props.serviceName} auto scaling group`\n    });\n\n    if (props.enableSSH) {\n      this.asgSecurityGroup.addIngressRule(\n        Peer.anyIpv4(),\n        Port.tcp(22),\n        \"Allow SSH\"\n      );\n    }\n\n    this.launchTemplate = new LaunchTemplate(this, \"LaunchTemplate\", {\n      launchTemplateName: `${props.serviceName}LaunchTemplate`,\n      instanceType: new InstanceType(`${props.instanceType}`),\n      machineImage: props.machineImage || MachineImage.latestAmazonLinux2023(),\n      userData: props.userData,\n      role: props.role,\n      blockDevices: props?.blockDevices,\n      securityGroup: this.asgSecurityGroup,\n      detailedMonitoring: true,\n      requireImdsv2: true,\n      httpPutResponseHopLimit: 2,\n      httpTokens: LaunchTemplateHttpTokens.REQUIRED,\n      instanceMetadataTags: true,\n      keyPair: this.keyPair,\n      associatePublicIpAddress: !!this.keyPair\n    });\n  }\n\n  addAutoScalingGroup(props: Ec2InstanceProps) {\n    // TODO: Handle terminating EC2 instances when updating, currently hangs.\n    const baseAsgProps = {\n      vpc: this.vpc,\n      vpcSubnets: {\n        subnetType: props.enableSSH\n          ? SubnetType.PUBLIC\n          : resolvePrivateSubnetType(this.vpc)\n      },\n      minCapacity: props.minCapacity,\n      maxCapacity: props.maxCapacity,\n      cooldown: Duration.seconds(60),\n      groupMetrics: [GroupMetrics.all()],\n      updatePolicy: UpdatePolicy.replacingUpdate(),\n      newInstancesProtectedFromScaleIn: true,\n      terminationPolicies: [\n        TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,\n        TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR\n      ],\n      ssmSessionPermissions: true\n    };\n\n    // Support spot instances via mixed instances policy\n    if (\n      props.spotCapacityPercentage !== undefined &&\n      props.spotCapacityPercentage > 0\n    ) {\n      const spotPercentage = Math.min(\n        100,\n        Math.max(0, props.spotCapacityPercentage)\n      );\n      const onDemandPercentage = 100 - spotPercentage;\n\n      this.autoScalingGroup = new AutoScalingGroup(this, \"AutoScalingGroup\", {\n        ...baseAsgProps,\n        mixedInstancesPolicy: {\n          instancesDistribution: {\n            onDemandAllocationStrategy: OnDemandAllocationStrategy.PRIORITIZED,\n            onDemandBaseCapacity: 0,\n            onDemandPercentageAboveBaseCapacity: onDemandPercentage,\n            spotAllocationStrategy:\n              SpotAllocationStrategy.PRICE_CAPACITY_OPTIMIZED\n          },\n          launchTemplate: this.launchTemplate\n        }\n      });\n    } else {\n      this.autoScalingGroup = new AutoScalingGroup(this, \"AutoScalingGroup\", {\n        ...baseAsgProps,\n        launchTemplate: this.launchTemplate\n      });\n    }\n  }\n\n  /**\n   * Get the Auto Scaling Group.\n   */\n  public getAutoScalingGroup(): AutoScalingGroup {\n    return this.autoScalingGroup;\n  }\n\n  suspendAutoScaling(_props: Ec2InstanceProps) {\n    const suspendCall = {\n      service: \"AutoScaling\",\n      action: \"suspendProcesses\",\n      parameters: {\n        AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,\n        ScalingProcesses: [\"AZRebalance\"]\n      },\n      physicalResourceId: PhysicalResourceId.of(\"suspendAutoScaling\")\n    };\n\n    new AwsCustomResource(this, \"SuspendAutoscaling\", {\n      onCreate: suspendCall,\n      onUpdate: suspendCall,\n      resourceType: \"Custom::suspendAutoscaling\"\n    });\n  }\n}\n\nexport class Ec2InstanceStack extends Stack {\n  constructor(scope: Construct, id: string, props: Ec2InstanceProps) {\n    super(scope, id, props);\n\n    new Ec2Instance(this, id, {\n      ...props\n    });\n  }\n}\n"]}