@fjall/components-infrastructure 0.89.4 → 0.89.6
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/LICENSE +50 -21
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -18
- package/dist/lib/app.d.ts +12 -12
- package/dist/lib/app.js +61 -56
- package/dist/lib/aspects/index.d.ts +1 -1
- package/dist/lib/aspects/index.js +1 -6
- package/dist/lib/aspects/resourceInventory.js +6 -13
- package/dist/lib/config/audit.js +1 -5
- package/dist/lib/config/aws/accessAnalyser.d.ts +11 -0
- package/dist/lib/config/aws/accessAnalyser.js +17 -0
- package/dist/lib/config/aws/accountAuditRole.js +11 -15
- package/dist/lib/config/aws/accountMonitoringRole.js +25 -29
- package/dist/lib/config/aws/alarmTopic.d.ts +8 -0
- package/dist/lib/config/aws/alarmTopic.js +19 -0
- package/dist/lib/config/aws/cloudTrail.js +4 -9
- package/dist/lib/config/aws/configRecorder.d.ts +16 -0
- package/dist/lib/config/aws/configRecorder.js +51 -0
- package/dist/lib/config/aws/configRulePreset.d.ts +13 -0
- package/dist/lib/config/aws/configRulePreset.js +62 -0
- package/dist/lib/config/aws/disasterRecovery.d.ts +1 -1
- package/dist/lib/config/aws/disasterRecovery.js +56 -73
- package/dist/lib/config/aws/ebsDefaultEncryption.d.ts +8 -0
- package/dist/lib/config/aws/ebsDefaultEncryption.js +41 -0
- package/dist/lib/config/aws/ecrDefaultImage.js +25 -30
- package/dist/lib/config/aws/eventBus.js +8 -11
- package/dist/lib/config/aws/guardDutyDetector.d.ts +16 -0
- package/dist/lib/config/aws/guardDutyDetector.js +26 -0
- package/dist/lib/config/aws/identityCenter.d.ts +1 -1
- package/dist/lib/config/aws/identityCenter.js +23 -25
- package/dist/lib/config/aws/identityCenterGroupMembership.js +18 -22
- package/dist/lib/config/aws/index.d.ts +19 -8
- package/dist/lib/config/aws/index.js +19 -25
- package/dist/lib/config/aws/inspectorEnablement.d.ts +9 -0
- package/dist/lib/config/aws/inspectorEnablement.js +51 -0
- package/dist/lib/config/aws/ipam.js +9 -13
- package/dist/lib/config/aws/oidcConnector.js +8 -12
- package/dist/lib/config/aws/platform.js +1 -5
- package/dist/lib/config/aws/s3BlockPublicAccess.d.ts +9 -0
- package/dist/lib/config/aws/s3BlockPublicAccess.js +55 -0
- package/dist/lib/config/aws/scpPreset.d.ts +21 -0
- package/dist/lib/config/aws/scpPreset.js +311 -0
- package/dist/lib/config/aws/securityBaseline.d.ts +15 -0
- package/dist/lib/config/aws/securityBaseline.js +27 -0
- package/dist/lib/config/aws/securityHubHub.d.ts +15 -0
- package/dist/lib/config/aws/securityHubHub.js +28 -0
- package/dist/lib/config/aws/securityServicesAdmin.d.ts +20 -0
- package/dist/lib/config/aws/securityServicesAdmin.js +115 -0
- package/dist/lib/config/index.d.ts +2 -2
- package/dist/lib/config/index.js +2 -21
- package/dist/lib/index.d.ts +4 -4
- package/dist/lib/index.js +5 -26
- package/dist/lib/patterns/aws/account.d.ts +17 -1
- package/dist/lib/patterns/aws/account.js +61 -33
- package/dist/lib/patterns/aws/apexDomainPattern.d.ts +26 -0
- package/dist/lib/patterns/aws/apexDomainPattern.js +91 -0
- package/dist/lib/patterns/aws/auditRole.js +13 -16
- package/dist/lib/patterns/aws/buildkite.d.ts +1 -1
- package/dist/lib/patterns/aws/buildkite.js +70 -75
- package/dist/lib/patterns/aws/cdn.d.ts +5 -5
- package/dist/lib/patterns/aws/cdn.js +22 -28
- package/dist/lib/patterns/aws/compute.d.ts +1 -1
- package/dist/lib/patterns/aws/compute.js +31 -44
- package/dist/lib/patterns/aws/computeEc2.d.ts +1 -1
- package/dist/lib/patterns/aws/computeEc2.js +11 -14
- package/dist/lib/patterns/aws/computeEcs.d.ts +18 -2
- package/dist/lib/patterns/aws/computeEcs.js +41 -31
- package/dist/lib/patterns/aws/computeLambda.d.ts +2 -2
- package/dist/lib/patterns/aws/computeLambda.js +24 -31
- package/dist/lib/patterns/aws/database.d.ts +16 -7
- package/dist/lib/patterns/aws/database.js +81 -73
- package/dist/lib/patterns/aws/delegatedDomainPattern.d.ts +17 -0
- package/dist/lib/patterns/aws/delegatedDomainPattern.js +54 -0
- package/dist/lib/patterns/aws/dnsRecordComposer.d.ts +25 -0
- package/dist/lib/patterns/aws/dnsRecordComposer.js +225 -0
- package/dist/lib/patterns/aws/domain.d.ts +32 -0
- package/dist/lib/patterns/aws/domain.js +115 -0
- package/dist/lib/patterns/aws/domainDelegation.d.ts +3 -3
- package/dist/lib/patterns/aws/domainDelegation.js +28 -37
- package/dist/lib/patterns/aws/domainFactory.d.ts +20 -5
- package/dist/lib/patterns/aws/domainFactory.js +48 -10
- package/dist/lib/patterns/aws/domainValidation.d.ts +11 -0
- package/dist/lib/patterns/aws/domainValidation.js +145 -0
- package/dist/lib/patterns/aws/externalRecordsPattern.d.ts +18 -0
- package/dist/lib/patterns/aws/externalRecordsPattern.js +141 -0
- package/dist/lib/patterns/aws/fivetranProxy.d.ts +1 -1
- package/dist/lib/patterns/aws/fivetranProxy.js +6 -11
- package/dist/lib/patterns/aws/index.d.ts +21 -19
- package/dist/lib/patterns/aws/index.js +25 -36
- package/dist/lib/patterns/aws/interfaces/cdn.js +1 -5
- package/dist/lib/patterns/aws/interfaces/compute.js +4 -11
- package/dist/lib/patterns/aws/interfaces/connector.js +1 -15
- package/dist/lib/patterns/aws/interfaces/database.d.ts +1 -1
- package/dist/lib/patterns/aws/interfaces/database.js +6 -15
- package/dist/lib/patterns/aws/interfaces/domain.d.ts +80 -2
- package/dist/lib/patterns/aws/interfaces/domain.js +1 -6
- package/dist/lib/patterns/aws/interfaces/index.js +8 -41
- package/dist/lib/patterns/aws/interfaces/messaging.js +4 -11
- package/dist/lib/patterns/aws/interfaces/organisation.d.ts +1 -1
- package/dist/lib/patterns/aws/interfaces/organisation.js +4 -11
- package/dist/lib/patterns/aws/interfaces/pattern.js +2 -7
- package/dist/lib/patterns/aws/interfaces/storage.js +1 -5
- package/dist/lib/patterns/aws/managedIdentityCenter.js +7 -12
- package/dist/lib/patterns/aws/messaging.d.ts +7 -7
- package/dist/lib/patterns/aws/messaging.js +22 -33
- package/dist/lib/patterns/aws/network.d.ts +2 -2
- package/dist/lib/patterns/aws/network.js +9 -14
- package/dist/lib/patterns/aws/organisation.d.ts +6 -2
- package/dist/lib/patterns/aws/organisation.js +34 -35
- package/dist/lib/patterns/aws/organisationFactory.d.ts +3 -3
- package/dist/lib/patterns/aws/organisationFactory.js +7 -12
- package/dist/lib/patterns/aws/pattern.js +6 -12
- package/dist/lib/patterns/aws/payload.js +73 -63
- package/dist/lib/patterns/aws/platform.d.ts +6 -3
- package/dist/lib/patterns/aws/platform.js +15 -15
- package/dist/lib/patterns/aws/storage.d.ts +6 -4
- package/dist/lib/patterns/aws/storage.js +35 -40
- package/dist/lib/patterns/aws/subdomainHostedZone.js +11 -16
- package/dist/lib/patterns/aws/targets/fjallTargets.d.ts +37 -0
- package/dist/lib/patterns/aws/targets/fjallTargets.js +66 -0
- package/dist/lib/patterns/aws/targets/index.d.ts +2 -0
- package/dist/lib/patterns/aws/targets/index.js +2 -0
- package/dist/lib/patterns/aws/targets/targetResolution.d.ts +76 -0
- package/dist/lib/patterns/aws/targets/targetResolution.js +119 -0
- package/dist/lib/patterns/index.d.ts +1 -0
- package/dist/lib/patterns/index.js +1 -0
- package/dist/lib/resources/aws/analytics/clickhouse.d.ts +15 -0
- package/dist/lib/resources/aws/analytics/clickhouse.js +292 -0
- package/dist/lib/resources/aws/analytics/clickhouseConstants.d.ts +73 -0
- package/dist/lib/resources/aws/analytics/clickhouseConstants.js +87 -0
- package/dist/lib/resources/aws/analytics/clickhouseSecurityGroup.d.ts +13 -0
- package/dist/lib/resources/aws/analytics/clickhouseSecurityGroup.js +28 -0
- package/dist/lib/resources/aws/analytics/clickhouseTypes.d.ts +47 -0
- package/dist/lib/resources/aws/analytics/clickhouseTypes.js +1 -0
- package/dist/lib/resources/aws/analytics/clickhouseUserData.d.ts +5 -0
- package/dist/lib/resources/aws/analytics/clickhouseUserData.js +248 -0
- package/dist/lib/resources/aws/analytics/index.d.ts +2 -0
- package/dist/lib/resources/aws/analytics/index.js +1 -0
- package/dist/lib/resources/aws/audit/auditRole.js +10 -15
- package/dist/lib/resources/aws/audit/index.d.ts +1 -1
- package/dist/lib/resources/aws/audit/index.js +1 -6
- package/dist/lib/resources/aws/backup/backupPlan.d.ts +1 -1
- package/dist/lib/resources/aws/backup/backupPlan.js +14 -16
- package/dist/lib/resources/aws/backup/backupVault.d.ts +1 -1
- package/dist/lib/resources/aws/backup/backupVault.js +13 -15
- package/dist/lib/resources/aws/backup/index.d.ts +2 -2
- package/dist/lib/resources/aws/backup/index.js +2 -19
- package/dist/lib/resources/aws/base/awsStack.js +17 -19
- package/dist/lib/resources/aws/base/index.d.ts +1 -1
- package/dist/lib/resources/aws/base/index.js +1 -18
- package/dist/lib/resources/aws/cdn/cloudFront.js +40 -42
- package/dist/lib/resources/aws/cdn/index.d.ts +1 -1
- package/dist/lib/resources/aws/cdn/index.js +1 -18
- package/dist/lib/resources/aws/compute/ec2.js +39 -39
- package/dist/lib/resources/aws/compute/ecs.d.ts +18 -396
- package/dist/lib/resources/aws/compute/ecs.js +105 -976
- package/dist/lib/resources/aws/compute/ecsCapacityProviderAspect.d.ts +22 -0
- package/dist/lib/resources/aws/compute/ecsCapacityProviderAspect.js +35 -0
- package/dist/lib/resources/aws/compute/ecsConstants.d.ts +20 -0
- package/dist/lib/resources/aws/compute/ecsConstants.js +49 -0
- package/dist/lib/resources/aws/compute/ecsContext.d.ts +12 -0
- package/dist/lib/resources/aws/compute/ecsContext.js +1 -0
- package/dist/lib/resources/aws/compute/ecsImages.d.ts +4 -0
- package/dist/lib/resources/aws/compute/ecsImages.js +35 -0
- package/dist/lib/resources/aws/compute/ecsNetworking.d.ts +28 -0
- package/dist/lib/resources/aws/compute/ecsNetworking.js +290 -0
- package/dist/lib/resources/aws/compute/ecsRoles.d.ts +15 -0
- package/dist/lib/resources/aws/compute/ecsRoles.js +110 -0
- package/dist/lib/resources/aws/compute/ecsServiceFactory.d.ts +33 -0
- package/dist/lib/resources/aws/compute/ecsServiceFactory.js +183 -0
- package/dist/lib/resources/aws/compute/ecsTaskDefinition.d.ts +30 -0
- package/dist/lib/resources/aws/compute/ecsTaskDefinition.js +168 -0
- package/dist/lib/resources/aws/compute/ecsTypes.d.ts +337 -0
- package/dist/lib/resources/aws/compute/ecsTypes.js +10 -0
- package/dist/lib/resources/aws/compute/ecsValidation.d.ts +18 -0
- package/dist/lib/resources/aws/compute/ecsValidation.js +72 -0
- package/dist/lib/resources/aws/compute/index.d.ts +3 -3
- package/dist/lib/resources/aws/compute/index.js +3 -20
- package/dist/lib/resources/aws/compute/lambda.d.ts +10 -2
- package/dist/lib/resources/aws/compute/lambda.js +82 -70
- package/dist/lib/resources/aws/database/dynamodb.js +27 -28
- package/dist/lib/resources/aws/database/index.d.ts +7 -7
- package/dist/lib/resources/aws/database/index.js +14 -33
- package/dist/lib/resources/aws/database/rdsAurora.d.ts +10 -2
- package/dist/lib/resources/aws/database/rdsAurora.js +76 -61
- package/dist/lib/resources/aws/database/rdsAuroraGlobal.d.ts +2 -2
- package/dist/lib/resources/aws/database/rdsAuroraGlobal.js +24 -21
- package/dist/lib/resources/aws/database/rdsDefaults.js +3 -7
- package/dist/lib/resources/aws/database/rdsHelpers.d.ts +2 -2
- package/dist/lib/resources/aws/database/rdsHelpers.js +21 -29
- package/dist/lib/resources/aws/database/rdsInstance.d.ts +11 -3
- package/dist/lib/resources/aws/database/rdsInstance.js +101 -83
- package/dist/lib/resources/aws/database/rdsProxyOutput.js +5 -9
- package/dist/lib/resources/aws/iam/delegationRole.d.ts +18 -0
- package/dist/lib/resources/aws/iam/delegationRole.js +60 -0
- package/dist/lib/resources/aws/iam/identityCenter/assignment.js +4 -9
- package/dist/lib/resources/aws/iam/identityCenter/group.js +5 -9
- package/dist/lib/resources/aws/iam/identityCenter/index.d.ts +3 -3
- package/dist/lib/resources/aws/iam/identityCenter/index.js +3 -20
- package/dist/lib/resources/aws/iam/identityCenter/permissionSet.d.ts +1 -1
- package/dist/lib/resources/aws/iam/identityCenter/permissionSet.js +5 -9
- package/dist/lib/resources/aws/iam/index.d.ts +5 -4
- package/dist/lib/resources/aws/iam/index.js +5 -21
- package/dist/lib/resources/aws/iam/instanceProfile.js +2 -7
- package/dist/lib/resources/aws/iam/managedPolicy.js +2 -7
- package/dist/lib/resources/aws/iam/policy.js +2 -7
- package/dist/lib/resources/aws/iam/role.js +2 -7
- package/dist/lib/resources/aws/index.d.ts +7 -7
- package/dist/lib/resources/aws/index.js +7 -24
- package/dist/lib/resources/aws/logging/cloudTrail.d.ts +1 -1
- package/dist/lib/resources/aws/logging/cloudTrail.js +18 -22
- package/dist/lib/resources/aws/logging/index.d.ts +2 -2
- package/dist/lib/resources/aws/logging/index.js +2 -19
- package/dist/lib/resources/aws/logging/logGroup.js +4 -10
- package/dist/lib/resources/aws/messaging/eventbridge.js +11 -14
- package/dist/lib/resources/aws/messaging/index.d.ts +4 -4
- package/dist/lib/resources/aws/messaging/index.js +4 -21
- package/dist/lib/resources/aws/messaging/sns.js +11 -14
- package/dist/lib/resources/aws/messaging/sqs.js +32 -34
- package/dist/lib/resources/aws/messaging/utils.d.ts +1 -1
- package/dist/lib/resources/aws/messaging/utils.js +1 -6
- package/dist/lib/resources/aws/monitoring/alarmDefaults.d.ts +36 -0
- package/dist/lib/resources/aws/monitoring/alarmDefaults.js +34 -0
- package/dist/lib/resources/aws/monitoring/ecsAlarms.d.ts +21 -0
- package/dist/lib/resources/aws/monitoring/ecsAlarms.js +88 -0
- package/dist/lib/resources/aws/monitoring/index.d.ts +4 -0
- package/dist/lib/resources/aws/monitoring/index.js +4 -5
- package/dist/lib/resources/aws/monitoring/lambdaAlarms.d.ts +18 -0
- package/dist/lib/resources/aws/monitoring/lambdaAlarms.js +44 -0
- package/dist/lib/resources/aws/monitoring/rdsAlarms.d.ts +20 -0
- package/dist/lib/resources/aws/monitoring/rdsAlarms.js +52 -0
- package/dist/lib/resources/aws/networking/crossAccountDelegationRecord.d.ts +17 -0
- package/dist/lib/resources/aws/networking/crossAccountDelegationRecord.js +26 -0
- package/dist/lib/resources/aws/networking/dnsRecord/aRecord.d.ts +12 -0
- package/dist/lib/resources/aws/networking/dnsRecord/aRecord.js +21 -0
- package/dist/lib/resources/aws/networking/dnsRecord/aaaaRecord.d.ts +12 -0
- package/dist/lib/resources/aws/networking/dnsRecord/aaaaRecord.js +22 -0
- package/dist/lib/resources/aws/networking/dnsRecord/aliasRecord.d.ts +12 -0
- package/dist/lib/resources/aws/networking/dnsRecord/aliasRecord.js +23 -0
- package/dist/lib/resources/aws/networking/dnsRecord/caaRecord.d.ts +17 -0
- package/dist/lib/resources/aws/networking/dnsRecord/caaRecord.js +21 -0
- package/dist/lib/resources/aws/networking/dnsRecord/cnameRecord.d.ts +12 -0
- package/dist/lib/resources/aws/networking/dnsRecord/cnameRecord.js +22 -0
- package/dist/lib/resources/aws/networking/dnsRecord/dnsRecordBase.d.ts +17 -0
- package/dist/lib/resources/aws/networking/dnsRecord/dnsRecordBase.js +17 -0
- package/dist/lib/resources/aws/networking/dnsRecord/index.d.ts +10 -0
- package/dist/lib/resources/aws/networking/dnsRecord/index.js +10 -0
- package/dist/lib/resources/aws/networking/dnsRecord/mxRecord.d.ts +16 -0
- package/dist/lib/resources/aws/networking/dnsRecord/mxRecord.js +21 -0
- package/dist/lib/resources/aws/networking/dnsRecord/nsRecord.d.ts +12 -0
- package/dist/lib/resources/aws/networking/dnsRecord/nsRecord.js +21 -0
- package/dist/lib/resources/aws/networking/dnsRecord/srvRecord.d.ts +18 -0
- package/dist/lib/resources/aws/networking/dnsRecord/srvRecord.js +21 -0
- package/dist/lib/resources/aws/networking/dnsRecord/txtRecord.d.ts +12 -0
- package/dist/lib/resources/aws/networking/dnsRecord/txtRecord.js +21 -0
- package/dist/lib/resources/aws/networking/domain.d.ts +1 -1
- package/dist/lib/resources/aws/networking/domain.js +32 -34
- package/dist/lib/resources/aws/networking/domainCertificate.d.ts +8 -3
- package/dist/lib/resources/aws/networking/domainCertificate.js +22 -16
- package/dist/lib/resources/aws/networking/hostedZone.d.ts +23 -19
- package/dist/lib/resources/aws/networking/hostedZone.js +70 -134
- package/dist/lib/resources/aws/networking/index.d.ts +8 -7
- package/dist/lib/resources/aws/networking/index.js +8 -24
- package/dist/lib/resources/aws/networking/ipam.js +2 -7
- package/dist/lib/resources/aws/networking/ipamPool.d.ts +1 -1
- package/dist/lib/resources/aws/networking/ipamPool.js +45 -55
- package/dist/lib/resources/aws/networking/securityGroup.js +2 -7
- package/dist/lib/resources/aws/networking/vpc.d.ts +1 -1
- package/dist/lib/resources/aws/networking/vpc.js +17 -21
- package/dist/lib/resources/aws/organisation/costAllocationTagActivator.d.ts +1 -1
- package/dist/lib/resources/aws/organisation/costAllocationTagActivator.js +11 -15
- package/dist/lib/resources/aws/organisation/index.d.ts +5 -5
- package/dist/lib/resources/aws/organisation/index.js +4 -12
- package/dist/lib/resources/aws/organisation/organisation.js +5 -7
- package/dist/lib/resources/aws/organisation/organisationAccount.js +7 -10
- package/dist/lib/resources/aws/organisation/organisationPolicy.js +5 -9
- package/dist/lib/resources/aws/organisation/organisationalUnit.js +1 -3
- package/dist/lib/resources/aws/secrets/alias.js +2 -7
- package/dist/lib/resources/aws/secrets/index.d.ts +4 -4
- package/dist/lib/resources/aws/secrets/index.js +4 -21
- package/dist/lib/resources/aws/secrets/kms.js +15 -18
- package/dist/lib/resources/aws/secrets/parameter.d.ts +3 -3
- package/dist/lib/resources/aws/secrets/parameter.js +19 -22
- package/dist/lib/resources/aws/secrets/secret.d.ts +2 -2
- package/dist/lib/resources/aws/secrets/secret.js +12 -14
- package/dist/lib/resources/aws/storage/ecr.d.ts +2 -2
- package/dist/lib/resources/aws/storage/ecr.js +7 -13
- package/dist/lib/resources/aws/storage/index.d.ts +2 -2
- package/dist/lib/resources/aws/storage/index.js +2 -19
- package/dist/lib/resources/aws/storage/s3.d.ts +1 -1
- package/dist/lib/resources/aws/storage/s3.js +24 -12
- package/dist/lib/resources/aws/utilities/awsCustomResource.js +3 -7
- package/dist/lib/resources/aws/utilities/codeBuild.js +7 -12
- package/dist/lib/resources/aws/utilities/customResource.js +14 -17
- package/dist/lib/resources/aws/utilities/customResourceProvider.js +2 -7
- package/dist/lib/resources/aws/utilities/index.d.ts +5 -5
- package/dist/lib/resources/aws/utilities/index.js +5 -22
- package/dist/lib/resources/aws/utilities/resourceShare.js +2 -7
- package/dist/lib/resources/index.d.ts +1 -1
- package/dist/lib/resources/index.js +1 -18
- package/dist/lib/types.js +1 -3
- package/dist/lib/utils/accountsUtils.d.ts +5 -0
- package/dist/lib/utils/accountsUtils.js +18 -0
- package/dist/lib/utils/addSuffixToEmail.js +1 -5
- package/dist/lib/utils/backupTierMapping.js +2 -6
- package/dist/lib/utils/capitaliseString.js +1 -10
- package/dist/lib/utils/connections.js +9 -13
- package/dist/lib/utils/connector.js +10 -23
- package/dist/lib/utils/constructMap.d.ts +33 -0
- package/dist/lib/utils/constructMap.js +154 -0
- package/dist/lib/utils/databaseTypes.js +4 -10
- package/dist/lib/utils/dnsRecords.d.ts +1 -1
- package/dist/lib/utils/dnsRecords.js +23 -27
- package/dist/lib/utils/domainTypes.d.ts +0 -1
- package/dist/lib/utils/domainTypes.js +2 -10
- package/dist/lib/utils/env.js +14 -26
- package/dist/lib/utils/getAccountId.js +3 -7
- package/dist/lib/utils/getAsync.js +7 -10
- package/dist/lib/utils/getConfig.d.ts +0 -2
- package/dist/lib/utils/getConfig.js +29 -47
- package/dist/lib/utils/getStackOutput.js +4 -8
- package/dist/lib/utils/index.d.ts +12 -12
- package/dist/lib/utils/index.js +12 -29
- package/dist/lib/utils/manifestWriter.d.ts +14 -3
- package/dist/lib/utils/manifestWriter.js +60 -43
- package/dist/lib/utils/orgConfigParser.d.ts +14 -0
- package/dist/lib/utils/orgConfigParser.js +49 -0
- package/dist/lib/utils/removalPolicy.js +5 -9
- package/dist/lib/utils/resourceNaming.js +11 -16
- package/dist/lib/utils/standardTagsAspect.js +9 -16
- package/dist/lib/utils/stripAndCamelCase.js +1 -5
- package/dist/lib/utils/validationLogger.js +12 -18
- package/dist/lib/utils/vpcUtils.js +5 -10
- package/package.json +25 -8
- package/dist/lib/config/aws/accountId.d.ts +0 -6
- package/dist/lib/config/aws/accountId.js +0 -32
- package/dist/lib/config/aws/backupGlobalSettings.d.ts +0 -29
- package/dist/lib/config/aws/backupGlobalSettings.js +0 -49
- package/dist/lib/config/aws/costAllocationTags.d.ts +0 -12
- package/dist/lib/config/aws/costAllocationTags.js +0 -47
- package/dist/lib/config/aws/ipamDelegateAdmin.d.ts +0 -8
- package/dist/lib/config/aws/ipamDelegateAdmin.js +0 -57
- package/dist/lib/config/aws/ipamPoolId.d.ts +0 -16
- package/dist/lib/config/aws/ipamPoolId.js +0 -42
- package/dist/lib/config/aws/organisation.d.ts +0 -30
- package/dist/lib/config/aws/organisation.js +0 -92
- package/dist/lib/config/aws/organisationId.d.ts +0 -7
- package/dist/lib/config/aws/organisationId.js +0 -45
- package/dist/lib/config/aws/organisationsAccess.d.ts +0 -10
- package/dist/lib/config/aws/organisationsAccess.js +0 -49
- package/dist/lib/config/aws/ramSharing.d.ts +0 -4
- package/dist/lib/config/aws/ramSharing.js +0 -34
- package/dist/lib/config/monitoring.d.ts +0 -18
- package/dist/lib/config/monitoring.js +0 -22
- package/dist/lib/patterns/aws/connections.d.ts +0 -46
- package/dist/lib/patterns/aws/connections.js +0 -159
- package/dist/lib/patterns/aws/hostedZone.d.ts +0 -28
- package/dist/lib/patterns/aws/hostedZone.js +0 -150
- package/dist/lib/patterns/aws/managedAccount.d.ts +0 -9
- package/dist/lib/patterns/aws/managedAccount.js +0 -55
- package/dist/lib/patterns/aws/managedOrganisation.d.ts +0 -36
- package/dist/lib/patterns/aws/managedOrganisation.js +0 -97
- package/dist/lib/patterns/aws/managedPlatform.d.ts +0 -12
- package/dist/lib/patterns/aws/managedPlatform.js +0 -29
- package/dist/lib/resources/aws/database/database.d.ts +0 -14
- package/dist/lib/resources/aws/database/database.js +0 -28
- package/dist/lib/resources/aws/database/databaseInstance.d.ts +0 -15
- package/dist/lib/resources/aws/database/databaseInstance.js +0 -30
- package/dist/lib/resources/aws/database/migrationLambda.d.ts +0 -80
- package/dist/lib/resources/aws/database/migrationLambda.js +0 -119
- package/dist/lib/resources/aws/iam/identityCenter/attachManagedPolicy.d.ts +0 -13
- package/dist/lib/resources/aws/iam/identityCenter/attachManagedPolicy.js +0 -51
- package/dist/lib/resources/aws/iam/securityGroup.d.ts +0 -5
- package/dist/lib/resources/aws/iam/securityGroup.js +0 -14
- package/dist/lib/resources/aws/monitoring/monitoringRole.d.ts +0 -29
- package/dist/lib/resources/aws/monitoring/monitoringRole.js +0 -120
- package/dist/lib/utils/capitalizeString.d.ts +0 -12
- package/dist/lib/utils/capitalizeString.js +0 -30
|
@@ -1,32 +1,27 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
10
|
-
const storage_1 = require("../../resources/aws/storage");
|
|
11
|
-
const validationLogger_js_1 = require("../../utils/validationLogger.js");
|
|
12
|
-
var storage_js_1 = require("./interfaces/storage.js");
|
|
13
|
-
Object.defineProperty(exports, "isStorage", { enumerable: true, get: function () { return storage_js_1.isStorage; } });
|
|
1
|
+
import { Construct } from "constructs";
|
|
2
|
+
import { BucketEncryption, HttpMethods } from "aws-cdk-lib/aws-s3";
|
|
3
|
+
import { BucketDeployment, Source, CacheControl } from "aws-cdk-lib/aws-s3-deployment";
|
|
4
|
+
import { Key } from "aws-cdk-lib/aws-kms";
|
|
5
|
+
import { CfnOutput, Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
|
|
6
|
+
import { S3Bucket } from "../../resources/aws/storage/index.js";
|
|
7
|
+
import { FjallLogger } from "../../utils/validationLogger.js";
|
|
8
|
+
export { isStorage } from "./interfaces/storage.js";
|
|
14
9
|
function toBucketEncryption(encryption) {
|
|
15
10
|
if (!encryption)
|
|
16
11
|
return undefined;
|
|
17
12
|
return encryption === "AES256"
|
|
18
|
-
?
|
|
19
|
-
:
|
|
13
|
+
? BucketEncryption.S3_MANAGED
|
|
14
|
+
: BucketEncryption.KMS;
|
|
20
15
|
}
|
|
21
16
|
function toHttpMethod(method) {
|
|
22
17
|
const methodMap = {
|
|
23
|
-
GET:
|
|
24
|
-
PUT:
|
|
25
|
-
POST:
|
|
26
|
-
DELETE:
|
|
27
|
-
HEAD:
|
|
18
|
+
GET: HttpMethods.GET,
|
|
19
|
+
PUT: HttpMethods.PUT,
|
|
20
|
+
POST: HttpMethods.POST,
|
|
21
|
+
DELETE: HttpMethods.DELETE,
|
|
22
|
+
HEAD: HttpMethods.HEAD
|
|
28
23
|
};
|
|
29
|
-
return methodMap[method] ??
|
|
24
|
+
return methodMap[method] ?? HttpMethods.GET;
|
|
30
25
|
}
|
|
31
26
|
function toCorsRules(cors) {
|
|
32
27
|
if (!cors)
|
|
@@ -39,24 +34,26 @@ function toCorsRules(cors) {
|
|
|
39
34
|
...(rule.maxAge !== undefined && { maxAge: rule.maxAge })
|
|
40
35
|
}));
|
|
41
36
|
}
|
|
42
|
-
function validateStorageProps(props) {
|
|
37
|
+
export function validateStorageProps(props) {
|
|
43
38
|
if (props.encryption === "KMS" && !props.kmsKeyArn) {
|
|
44
|
-
|
|
39
|
+
FjallLogger.warn("'encryption' is set to 'KMS' but 'kmsKeyArn' is not provided. " +
|
|
45
40
|
"The bucket will use the default AWS managed key.");
|
|
46
41
|
}
|
|
47
42
|
if (props.kmsKeyArn && props.encryption !== "KMS") {
|
|
48
|
-
|
|
43
|
+
FjallLogger.warn("'kmsKeyArn' is provided but 'encryption' is not set to 'KMS'. " +
|
|
49
44
|
"The KMS key will be ignored. Set encryption: 'KMS' to use the key.");
|
|
50
45
|
}
|
|
51
46
|
}
|
|
52
|
-
class Storage extends
|
|
47
|
+
export class Storage extends Construct {
|
|
48
|
+
connectorType = "storage";
|
|
49
|
+
bucket;
|
|
50
|
+
bucketDeployment;
|
|
53
51
|
constructor(scope, id, props) {
|
|
54
52
|
super(scope, id);
|
|
55
|
-
this.connectorType = "storage";
|
|
56
53
|
const encryptionKey = props.kmsKeyArn
|
|
57
|
-
?
|
|
54
|
+
? Key.fromKeyArn(this, `${id}KmsKey`, props.kmsKeyArn)
|
|
58
55
|
: undefined;
|
|
59
|
-
this.bucket = new
|
|
56
|
+
this.bucket = new S3Bucket(this, `${id}Bucket`, {
|
|
60
57
|
bucketName: props.bucketName,
|
|
61
58
|
versioned: props.versioned,
|
|
62
59
|
encryption: toBucketEncryption(props.encryption),
|
|
@@ -64,7 +61,8 @@ class Storage extends constructs_1.Construct {
|
|
|
64
61
|
backupVaultTier: props.backupVaultTier,
|
|
65
62
|
publicReadAccess: props.publicReadAccess,
|
|
66
63
|
websiteHosting: props.websiteHosting,
|
|
67
|
-
...(props.cors && { cors: toCorsRules(props.cors) })
|
|
64
|
+
...(props.cors && { cors: toCorsRules(props.cors) }),
|
|
65
|
+
...(props.retain && { removalPolicy: RemovalPolicy.RETAIN })
|
|
68
66
|
});
|
|
69
67
|
if (props.deployment) {
|
|
70
68
|
this.bucketDeployment = this.createDeployment(id, props.deployment);
|
|
@@ -74,13 +72,13 @@ class Storage extends constructs_1.Construct {
|
|
|
74
72
|
createDeployment(id, config) {
|
|
75
73
|
const cacheControlHeaders = [];
|
|
76
74
|
if (config.cacheControl?.maxAge !== undefined) {
|
|
77
|
-
cacheControlHeaders.push(
|
|
75
|
+
cacheControlHeaders.push(CacheControl.maxAge(Duration.seconds(config.cacheControl.maxAge)));
|
|
78
76
|
}
|
|
79
77
|
if (config.cacheControl?.immutable) {
|
|
80
|
-
cacheControlHeaders.push(
|
|
78
|
+
cacheControlHeaders.push(CacheControl.immutable());
|
|
81
79
|
}
|
|
82
|
-
return new
|
|
83
|
-
sources: [
|
|
80
|
+
return new BucketDeployment(this, `${id}Deployment`, {
|
|
81
|
+
sources: [Source.asset(config.source)],
|
|
84
82
|
destinationBucket: this.bucket,
|
|
85
83
|
prune: config.prune ?? true,
|
|
86
84
|
...(cacheControlHeaders.length > 0 && {
|
|
@@ -89,14 +87,14 @@ class Storage extends constructs_1.Construct {
|
|
|
89
87
|
});
|
|
90
88
|
}
|
|
91
89
|
addOutputs(id) {
|
|
92
|
-
const stackName =
|
|
93
|
-
new
|
|
90
|
+
const stackName = Stack.of(this).stackName;
|
|
91
|
+
new CfnOutput(this, `${id}BucketArn`, {
|
|
94
92
|
key: `${stackName}${id}BucketArn`,
|
|
95
93
|
exportName: `${stackName}${id}BucketArn`,
|
|
96
94
|
value: this.bucket.bucketArn,
|
|
97
95
|
description: `S3 Bucket ARN for ${id}`
|
|
98
96
|
});
|
|
99
|
-
new
|
|
97
|
+
new CfnOutput(this, `${id}BucketName`, {
|
|
100
98
|
key: `${stackName}${id}BucketName`,
|
|
101
99
|
exportName: `${stackName}${id}BucketName`,
|
|
102
100
|
value: this.bucket.bucketName,
|
|
@@ -152,8 +150,7 @@ class Storage extends constructs_1.Construct {
|
|
|
152
150
|
this.bucket.addObjectRemovedNotification(dest, ...filters);
|
|
153
151
|
}
|
|
154
152
|
}
|
|
155
|
-
|
|
156
|
-
class StorageFactory {
|
|
153
|
+
export class StorageFactory {
|
|
157
154
|
static build(id, props = {}) {
|
|
158
155
|
const { stackPlacement, ...s3Props } = props;
|
|
159
156
|
const fn = (_app, scope) => {
|
|
@@ -166,5 +163,3 @@ class StorageFactory {
|
|
|
166
163
|
return fn;
|
|
167
164
|
}
|
|
168
165
|
}
|
|
169
|
-
exports.StorageFactory = StorageFactory;
|
|
170
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/storage.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport {\n  type IBucket,\n  type EventType,\n  type IBucketNotificationDestination,\n  type NotificationKeyFilter,\n  BucketEncryption,\n  HttpMethods,\n  type CorsRule as CdkCorsRule\n} from \"aws-cdk-lib/aws-s3\";\nimport {\n  BucketDeployment,\n  Source,\n  CacheControl\n} from \"aws-cdk-lib/aws-s3-deployment\";\nimport { type IGrantable, type Grant } from \"aws-cdk-lib/aws-iam\";\nimport { Key } from \"aws-cdk-lib/aws-kms\";\nimport { CfnOutput, Duration, Stack } from \"aws-cdk-lib\";\n\nimport type App from \"../../app\";\nimport {\n  S3Bucket,\n  type WebsiteHostingConfig\n} from \"../../resources/aws/storage\";\nimport { type BackupTier } from \"../../utils/backupTierMapping\";\nimport { FjallLogger } from \"../../utils/validationLogger.js\";\nimport { type IStorage } from \"./interfaces/storage.js\";\nimport { type IStorageConnector } from \"./interfaces/connector.js\";\n\nexport { type IStorage, isStorage } from \"./interfaces/storage.js\";\nexport { type WebsiteHostingConfig } from \"../../resources/aws/storage\";\n\nexport interface CorsRule {\n  readonly allowedOrigins: string[];\n  readonly allowedMethods: string[];\n  readonly allowedHeaders?: string[];\n  readonly exposedHeaders?: string[];\n  readonly maxAge?: number;\n}\n\nexport interface S3DeploymentConfig {\n  /** Path to the asset directory (relative to CDK app root) */\n  source: string;\n  /** Whether to remove files from bucket that are not in the source. Default: true */\n  prune?: boolean;\n  /** Cache control settings for uploaded files */\n  cacheControl?: {\n    /** Max age in seconds (e.g., 31536000 for 1 year) */\n    maxAge?: number;\n    /** Mark as immutable (browser will not revalidate) */\n    immutable?: boolean;\n  };\n}\n\nexport interface S3Props {\n  readonly bucketName?: string;\n  readonly publicReadAccess?: boolean;\n  readonly websiteHosting?: WebsiteHostingConfig;\n  readonly versioned?: boolean;\n  readonly encryption?: \"AES256\" | \"KMS\";\n  readonly kmsKeyArn?: string;\n  readonly backupVaultTier?: BackupTier;\n  readonly cors?: CorsRule[];\n  readonly deployment?: S3DeploymentConfig;\n}\n\nexport interface StorageBuildProps extends S3Props {\n  readonly stackPlacement?: \"storage\" | \"cdn\" | \"compute\";\n}\n\nexport type StorageFactoryFn = ((app: App, scope: Construct) => Storage) & {\n  stackPlacement?: \"storage\" | \"cdn\" | \"compute\";\n};\n\nfunction toBucketEncryption(\n  encryption?: \"AES256\" | \"KMS\"\n): BucketEncryption | undefined {\n  if (!encryption) return undefined;\n  return encryption === \"AES256\"\n    ? BucketEncryption.S3_MANAGED\n    : BucketEncryption.KMS;\n}\n\nfunction toHttpMethod(method: string): HttpMethods {\n  const methodMap: Record<string, HttpMethods> = {\n    GET: HttpMethods.GET,\n    PUT: HttpMethods.PUT,\n    POST: HttpMethods.POST,\n    DELETE: HttpMethods.DELETE,\n    HEAD: HttpMethods.HEAD\n  };\n  return methodMap[method] ?? HttpMethods.GET;\n}\n\nfunction toCorsRules(cors?: CorsRule[]): CdkCorsRule[] | undefined {\n  if (!cors) return undefined;\n  return cors.map((rule) => ({\n    allowedOrigins: rule.allowedOrigins,\n    allowedMethods: rule.allowedMethods.map(toHttpMethod),\n    ...(rule.allowedHeaders && { allowedHeaders: rule.allowedHeaders }),\n    ...(rule.exposedHeaders && { exposedHeaders: rule.exposedHeaders }),\n    ...(rule.maxAge !== undefined && { maxAge: rule.maxAge })\n  }));\n}\n\nexport function validateStorageProps(props: S3Props): void {\n  if (props.encryption === \"KMS\" && !props.kmsKeyArn) {\n    FjallLogger.warn(\n      \"'encryption' is set to 'KMS' but 'kmsKeyArn' is not provided. \" +\n        \"The bucket will use the default AWS managed key.\"\n    );\n  }\n\n  if (props.kmsKeyArn && props.encryption !== \"KMS\") {\n    FjallLogger.warn(\n      \"'kmsKeyArn' is provided but 'encryption' is not set to 'KMS'. \" +\n        \"The KMS key will be ignored. Set encryption: 'KMS' to use the key.\"\n    );\n  }\n}\n\nexport class Storage extends Construct implements IStorage, IStorageConnector {\n  public readonly connectorType = \"storage\" as const;\n  private readonly bucket: S3Bucket;\n  private readonly bucketDeployment?: BucketDeployment;\n\n  constructor(scope: Construct, id: string, props: S3Props) {\n    super(scope, id);\n\n    const encryptionKey = props.kmsKeyArn\n      ? Key.fromKeyArn(this, `${id}KmsKey`, props.kmsKeyArn)\n      : undefined;\n\n    this.bucket = new S3Bucket(this, `${id}Bucket`, {\n      bucketName: props.bucketName,\n      versioned: props.versioned,\n      encryption: toBucketEncryption(props.encryption),\n      encryptionKey,\n      backupVaultTier: props.backupVaultTier,\n      publicReadAccess: props.publicReadAccess,\n      websiteHosting: props.websiteHosting,\n      ...(props.cors && { cors: toCorsRules(props.cors) })\n    });\n\n    if (props.deployment) {\n      this.bucketDeployment = this.createDeployment(id, props.deployment);\n    }\n\n    this.addOutputs(id);\n  }\n\n  private createDeployment(\n    id: string,\n    config: S3DeploymentConfig\n  ): BucketDeployment {\n    const cacheControlHeaders: CacheControl[] = [];\n\n    if (config.cacheControl?.maxAge !== undefined) {\n      cacheControlHeaders.push(\n        CacheControl.maxAge(Duration.seconds(config.cacheControl.maxAge))\n      );\n    }\n    if (config.cacheControl?.immutable) {\n      cacheControlHeaders.push(CacheControl.immutable());\n    }\n\n    return new BucketDeployment(this, `${id}Deployment`, {\n      sources: [Source.asset(config.source)],\n      destinationBucket: this.bucket,\n      prune: config.prune ?? true,\n      ...(cacheControlHeaders.length > 0 && {\n        cacheControl: cacheControlHeaders\n      })\n    });\n  }\n\n  private addOutputs(id: string): void {\n    const stackName = Stack.of(this).stackName;\n\n    new CfnOutput(this, `${id}BucketArn`, {\n      key: `${stackName}${id}BucketArn`,\n      exportName: `${stackName}${id}BucketArn`,\n      value: this.bucket.bucketArn,\n      description: `S3 Bucket ARN for ${id}`\n    });\n\n    new CfnOutput(this, `${id}BucketName`, {\n      key: `${stackName}${id}BucketName`,\n      exportName: `${stackName}${id}BucketName`,\n      value: this.bucket.bucketName,\n      description: `S3 Bucket Name for ${id}`\n    });\n  }\n\n  getBucket(): IBucket {\n    return this.bucket;\n  }\n\n  getBucketName(): string {\n    return this.bucket.bucketName;\n  }\n\n  getBucketArn(): string {\n    return this.bucket.bucketArn;\n  }\n\n  getBucketDomainName(): string {\n    return this.bucket.bucketDomainName;\n  }\n\n  getBucketRegionalDomainName(): string {\n    return this.bucket.bucketRegionalDomainName;\n  }\n\n  getWebsiteUrl(): string | undefined {\n    return this.bucket.bucketWebsiteUrl;\n  }\n\n  getDeployment(): BucketDeployment | undefined {\n    return this.bucketDeployment;\n  }\n\n  grantRead(grantee: IGrantable): Grant {\n    return this.bucket.grantRead(grantee);\n  }\n\n  grantWrite(grantee: IGrantable): Grant {\n    return this.bucket.grantWrite(grantee);\n  }\n\n  grantReadWrite(grantee: IGrantable): Grant {\n    return this.bucket.grantReadWrite(grantee);\n  }\n\n  grantDelete(grantee: IGrantable): Grant {\n    return this.bucket.grantDelete(grantee);\n  }\n\n  grantPut(grantee: IGrantable): Grant {\n    return this.bucket.grantPut(grantee);\n  }\n\n  grantPublicAccess(...keyPrefix: string[]): Grant {\n    return this.bucket.grantPublicAccess(...keyPrefix);\n  }\n\n  addEventNotification(\n    event: EventType,\n    dest: IBucketNotificationDestination,\n    ...filters: NotificationKeyFilter[]\n  ): void {\n    this.bucket.addEventNotification(event, dest, ...filters);\n  }\n\n  addObjectCreatedNotification(\n    dest: IBucketNotificationDestination,\n    ...filters: NotificationKeyFilter[]\n  ): void {\n    this.bucket.addObjectCreatedNotification(dest, ...filters);\n  }\n\n  addObjectRemovedNotification(\n    dest: IBucketNotificationDestination,\n    ...filters: NotificationKeyFilter[]\n  ): void {\n    this.bucket.addObjectRemovedNotification(dest, ...filters);\n  }\n}\n\nexport class StorageFactory {\n  static build(id: string, props: StorageBuildProps = {}): StorageFactoryFn {\n    const { stackPlacement, ...s3Props } = props;\n    const fn: StorageFactoryFn = (_app: App, scope: Construct) => {\n      validateStorageProps(s3Props);\n      return new Storage(scope, id, s3Props);\n    };\n    if (stackPlacement) {\n      fn.stackPlacement = stackPlacement;\n    }\n    return fn;\n  }\n}\n"]}
|
|
@@ -1,24 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const getAccountId_1 = require("../../utils/getAccountId");
|
|
8
|
-
const app_1 = require("../../app");
|
|
9
|
-
class SubdomainHostedZone extends aws_cdk_lib_1.Stack {
|
|
1
|
+
import * as route53 from "aws-cdk-lib/aws-route53";
|
|
2
|
+
import { CfnOutput, Stack } from "aws-cdk-lib";
|
|
3
|
+
import { Role } from "../../resources/aws/iam/index.js";
|
|
4
|
+
import getAccountId from "../../utils/getAccountId.js";
|
|
5
|
+
import App from "../../app.js";
|
|
6
|
+
export class SubdomainHostedZone extends Stack {
|
|
10
7
|
constructor(id, props) {
|
|
11
|
-
super(
|
|
8
|
+
super(App.getInstance(), id);
|
|
12
9
|
// DelegationRoleArn
|
|
13
|
-
const delegationRoleArn =
|
|
14
|
-
account: (
|
|
10
|
+
const delegationRoleArn = Stack.of(this).formatArn({
|
|
11
|
+
account: getAccountId(props.parentAccountName),
|
|
15
12
|
region: "",
|
|
16
13
|
resource: "role",
|
|
17
14
|
resourceName: `${props.parentHostedZoneName.split(".", 1)}DelegateHostedZoneRole`,
|
|
18
15
|
service: "iam"
|
|
19
16
|
});
|
|
20
17
|
// Delegate Hosted Zone Role
|
|
21
|
-
const hostedZoneDelegationRole =
|
|
18
|
+
const hostedZoneDelegationRole = Role.fromRoleArn(this, "hostedZoneDelegationRole", delegationRoleArn);
|
|
22
19
|
// Subdomains
|
|
23
20
|
const delegatedHostedZone = new route53.HostedZone(this, `${props.delegatedZone}HostedZone`, {
|
|
24
21
|
zoneName: props.delegatedZone
|
|
@@ -28,12 +25,10 @@ class SubdomainHostedZone extends aws_cdk_lib_1.Stack {
|
|
|
28
25
|
delegatedZone: delegatedHostedZone,
|
|
29
26
|
parentHostedZoneName: props.parentHostedZoneName
|
|
30
27
|
});
|
|
31
|
-
new
|
|
28
|
+
new CfnOutput(this, `${props.delegatedZone.split(".").join("")}HostedZoneId`, {
|
|
32
29
|
key: `${props.delegatedZone.split(".").join("")}HostedZoneId`,
|
|
33
30
|
value: delegatedHostedZone.hostedZoneId,
|
|
34
31
|
exportName: `${props.delegatedZone.split(".").join("")}HostedZoneId`
|
|
35
32
|
});
|
|
36
33
|
}
|
|
37
34
|
}
|
|
38
|
-
exports.SubdomainHostedZone = SubdomainHostedZone;
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ViZG9tYWluSG9zdGVkWm9uZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3Mvc3ViZG9tYWluSG9zdGVkWm9uZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFBbUQ7QUFDbkQsNkNBQStDO0FBQy9DLGlEQUErQztBQUMvQywyREFBb0Q7QUFDcEQsbUNBQTRCO0FBUTVCLE1BQWEsbUJBQW9CLFNBQVEsbUJBQUs7SUFDNUMsWUFBWSxFQUFVLEVBQUUsS0FBK0I7UUFDckQsS0FBSyxDQUFDLGFBQUcsQ0FBQyxXQUFXLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUU3QixvQkFBb0I7UUFDcEIsTUFBTSxpQkFBaUIsR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxTQUFTLENBQUM7WUFDakQsT0FBTyxFQUFFLElBQUEsc0JBQVksRUFBQyxLQUFLLENBQUMsaUJBQWlCLENBQUM7WUFDOUMsTUFBTSxFQUFFLEVBQUU7WUFDVixRQUFRLEVBQUUsTUFBTTtZQUNoQixZQUFZLEVBQUUsR0FBRyxLQUFLLENBQUMsb0JBQW9CLENBQUMsS0FBSyxDQUMvQyxHQUFHLEVBQ0gsQ0FBQyxDQUNGLHdCQUF3QjtZQUN6QixPQUFPLEVBQUUsS0FBSztTQUNmLENBQUMsQ0FBQztRQUVILDRCQUE0QjtRQUM1QixNQUFNLHdCQUF3QixHQUFHLFVBQUksQ0FBQyxXQUFXLENBQy9DLElBQUksRUFDSiwwQkFBMEIsRUFDMUIsaUJBQWlCLENBQ2xCLENBQUM7UUFFRixhQUFhO1FBQ2IsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQ2hELElBQUksRUFDSixHQUFHLEtBQUssQ0FBQyxhQUFhLFlBQVksRUFDbEM7WUFDRSxRQUFRLEVBQUUsS0FBSyxDQUFDLGFBQWE7U0FDOUIsQ0FDRixDQUFDO1FBRUYsSUFBSSxPQUFPLENBQUMsZ0NBQWdDLENBQzFDLElBQUksRUFDSixHQUFHLEtBQUssQ0FBQyxhQUFhLGdCQUFnQixFQUN0QztZQUNFLGNBQWMsRUFBRSx3QkFBd0I7WUFDeEMsYUFBYSxFQUFFLG1CQUFtQjtZQUNsQyxvQkFBb0IsRUFBRSxLQUFLLENBQUMsb0JBQW9CO1NBQ2pELENBQ0YsQ0FBQztRQUVGLElBQUksdUJBQVMsQ0FDWCxJQUFJLEVBQ0osR0FBRyxLQUFLLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLGNBQWMsRUFDeEQ7WUFDRSxHQUFHLEVBQUUsR0FBRyxLQUFLLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLGNBQWM7WUFDN0QsS0FBSyxFQUFFLG1CQUFtQixDQUFDLFlBQVk7WUFDdkMsVUFBVSxFQUFFLEdBQUcsS0FBSyxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxjQUFjO1NBQ3JFLENBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQXBERCxrREFvREMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyByb3V0ZTUzIGZyb20gXCJhd3MtY2RrLWxpYi9hd3Mtcm91dGU1M1wiO1xuaW1wb3J0IHsgQ2ZuT3V0cHV0LCBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgUm9sZSB9IGZyb20gXCIuLi8uLi9yZXNvdXJjZXMvYXdzL2lhbVwiO1xuaW1wb3J0IGdldEFjY291bnRJZCBmcm9tIFwiLi4vLi4vdXRpbHMvZ2V0QWNjb3VudElkXCI7XG5pbXBvcnQgQXBwIGZyb20gXCIuLi8uLi9hcHBcIjtcblxuZXhwb3J0IGludGVyZmFjZSBzdWJkb21haW5Ib3N0ZWRab25lUHJvcHMge1xuICBkZWxlZ2F0ZWRab25lOiBzdHJpbmc7XG4gIHBhcmVudEhvc3RlZFpvbmVOYW1lOiBzdHJpbmc7XG4gIHBhcmVudEFjY291bnROYW1lOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjbGFzcyBTdWJkb21haW5Ib3N0ZWRab25lIGV4dGVuZHMgU3RhY2sge1xuICBjb25zdHJ1Y3RvcihpZDogc3RyaW5nLCBwcm9wczogc3ViZG9tYWluSG9zdGVkWm9uZVByb3BzKSB7XG4gICAgc3VwZXIoQXBwLmdldEluc3RhbmNlKCksIGlkKTtcblxuICAgIC8vIERlbGVnYXRpb25Sb2xlQXJuXG4gICAgY29uc3QgZGVsZWdhdGlvblJvbGVBcm4gPSBTdGFjay5vZih0aGlzKS5mb3JtYXRBcm4oe1xuICAgICAgYWNjb3VudDogZ2V0QWNjb3VudElkKHByb3BzLnBhcmVudEFjY291bnROYW1lKSxcbiAgICAgIHJlZ2lvbjogXCJcIixcbiAgICAgIHJlc291cmNlOiBcInJvbGVcIixcbiAgICAgIHJlc291cmNlTmFtZTogYCR7cHJvcHMucGFyZW50SG9zdGVkWm9uZU5hbWUuc3BsaXQoXG4gICAgICAgIFwiLlwiLFxuICAgICAgICAxXG4gICAgICApfURlbGVnYXRlSG9zdGVkWm9uZVJvbGVgLFxuICAgICAgc2VydmljZTogXCJpYW1cIlxuICAgIH0pO1xuXG4gICAgLy8gRGVsZWdhdGUgSG9zdGVkIFpvbmUgUm9sZVxuICAgIGNvbnN0IGhvc3RlZFpvbmVEZWxlZ2F0aW9uUm9sZSA9IFJvbGUuZnJvbVJvbGVBcm4oXG4gICAgICB0aGlzLFxuICAgICAgXCJob3N0ZWRab25lRGVsZWdhdGlvblJvbGVcIixcbiAgICAgIGRlbGVnYXRpb25Sb2xlQXJuXG4gICAgKTtcblxuICAgIC8vIFN1YmRvbWFpbnNcbiAgICBjb25zdCBkZWxlZ2F0ZWRIb3N0ZWRab25lID0gbmV3IHJvdXRlNTMuSG9zdGVkWm9uZShcbiAgICAgIHRoaXMsXG4gICAgICBgJHtwcm9wcy5kZWxlZ2F0ZWRab25lfUhvc3RlZFpvbmVgLFxuICAgICAge1xuICAgICAgICB6b25lTmFtZTogcHJvcHMuZGVsZWdhdGVkWm9uZVxuICAgICAgfVxuICAgICk7XG5cbiAgICBuZXcgcm91dGU1My5Dcm9zc0FjY291bnRab25lRGVsZWdhdGlvblJlY29yZChcbiAgICAgIHRoaXMsXG4gICAgICBgJHtwcm9wcy5kZWxlZ2F0ZWRab25lfURlbGVnYXRpb25Sb2xlYCxcbiAgICAgIHtcbiAgICAgICAgZGVsZWdhdGlvblJvbGU6IGhvc3RlZFpvbmVEZWxlZ2F0aW9uUm9sZSxcbiAgICAgICAgZGVsZWdhdGVkWm9uZTogZGVsZWdhdGVkSG9zdGVkWm9uZSxcbiAgICAgICAgcGFyZW50SG9zdGVkWm9uZU5hbWU6IHByb3BzLnBhcmVudEhvc3RlZFpvbmVOYW1lXG4gICAgICB9XG4gICAgKTtcblxuICAgIG5ldyBDZm5PdXRwdXQoXG4gICAgICB0aGlzLFxuICAgICAgYCR7cHJvcHMuZGVsZWdhdGVkWm9uZS5zcGxpdChcIi5cIikuam9pbihcIlwiKX1Ib3N0ZWRab25lSWRgLFxuICAgICAge1xuICAgICAgICBrZXk6IGAke3Byb3BzLmRlbGVnYXRlZFpvbmUuc3BsaXQoXCIuXCIpLmpvaW4oXCJcIil9SG9zdGVkWm9uZUlkYCxcbiAgICAgICAgdmFsdWU6IGRlbGVnYXRlZEhvc3RlZFpvbmUuaG9zdGVkWm9uZUlkLFxuICAgICAgICBleHBvcnROYW1lOiBgJHtwcm9wcy5kZWxlZ2F0ZWRab25lLnNwbGl0KFwiLlwiKS5qb2luKFwiXCIpfUhvc3RlZFpvbmVJZGBcbiAgICAgIH1cbiAgICApO1xuICB9XG59XG4iXX0=
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { type IAliasRecordTarget } from "aws-cdk-lib/aws-route53";
|
|
2
|
+
import type { FjallTarget } from "../interfaces/domain.js";
|
|
3
|
+
/**
|
|
4
|
+
* Intersection of the introspectable `FjallTarget` discriminant (used for
|
|
5
|
+
* eject + deploy ordering) and CDK's `IAliasRecordTarget` (used for synth).
|
|
6
|
+
* Every helper in this module returns this intersection so downstream code
|
|
7
|
+
* can treat the same value as either without re-resolving.
|
|
8
|
+
*/
|
|
9
|
+
export type FjallAliasTarget = FjallTarget & IAliasRecordTarget;
|
|
10
|
+
/**
|
|
11
|
+
* Target helper for a Fjall ECS/ALB-fronted app.
|
|
12
|
+
*
|
|
13
|
+
* Requires the app stack to publish exports `${safeApp}AlbDnsName` and
|
|
14
|
+
* `${safeApp}AlbHostedZoneId`. Phase 2 wires these emitters; until then,
|
|
15
|
+
* deploys fail at CloudFormation execution with "No export named … found".
|
|
16
|
+
*/
|
|
17
|
+
export declare function fjallApp(appName: string): FjallAliasTarget;
|
|
18
|
+
/**
|
|
19
|
+
* Target helper for a Fjall CloudFront-fronted app.
|
|
20
|
+
*
|
|
21
|
+
* Requires the CDN stack to publish export `${safeApp}CdnDistributionDomainName`.
|
|
22
|
+
* Phase 2 wires the emitter.
|
|
23
|
+
*/
|
|
24
|
+
export declare function fjallCdn(appName: string): FjallAliasTarget;
|
|
25
|
+
/**
|
|
26
|
+
* Target helper for a Fjall S3 static-site bucket.
|
|
27
|
+
*
|
|
28
|
+
* Requires the bucket stack to publish exports `${safeBucket}WebsiteEndpoint`
|
|
29
|
+
* and `${safeBucket}WebsiteHostedZoneId`. Phase 2 wires these emitters.
|
|
30
|
+
*/
|
|
31
|
+
export declare function fjallBucket(bucketName: string): FjallAliasTarget;
|
|
32
|
+
/**
|
|
33
|
+
* Target helper for an arbitrary `(dnsName, hostedZoneId)` pair. Accepts
|
|
34
|
+
* literal strings or CDK tokens (e.g. a `CfnOutput.value`). No
|
|
35
|
+
* `Fn.importValue` wrapping — the values pass through verbatim.
|
|
36
|
+
*/
|
|
37
|
+
export declare function aliasTo(dnsName: string, hostedZoneId: string): FjallAliasTarget;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { resolveBucketTarget, resolveCdnTarget, resolveCustomTarget, resolveEcsTarget } from "./targetResolution.js";
|
|
2
|
+
/**
|
|
3
|
+
* Target helper for a Fjall ECS/ALB-fronted app.
|
|
4
|
+
*
|
|
5
|
+
* Requires the app stack to publish exports `${safeApp}AlbDnsName` and
|
|
6
|
+
* `${safeApp}AlbHostedZoneId`. Phase 2 wires these emitters; until then,
|
|
7
|
+
* deploys fail at CloudFormation execution with "No export named … found".
|
|
8
|
+
*/
|
|
9
|
+
export function fjallApp(appName) {
|
|
10
|
+
const resolved = resolveEcsTarget(appName);
|
|
11
|
+
return {
|
|
12
|
+
kind: "ecs",
|
|
13
|
+
appName,
|
|
14
|
+
bind(record, zone) {
|
|
15
|
+
return resolved.bind(record, zone);
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Target helper for a Fjall CloudFront-fronted app.
|
|
21
|
+
*
|
|
22
|
+
* Requires the CDN stack to publish export `${safeApp}CdnDistributionDomainName`.
|
|
23
|
+
* Phase 2 wires the emitter.
|
|
24
|
+
*/
|
|
25
|
+
export function fjallCdn(appName) {
|
|
26
|
+
const resolved = resolveCdnTarget(appName);
|
|
27
|
+
return {
|
|
28
|
+
kind: "cdn",
|
|
29
|
+
appName,
|
|
30
|
+
bind(record, zone) {
|
|
31
|
+
return resolved.bind(record, zone);
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Target helper for a Fjall S3 static-site bucket.
|
|
37
|
+
*
|
|
38
|
+
* Requires the bucket stack to publish exports `${safeBucket}WebsiteEndpoint`
|
|
39
|
+
* and `${safeBucket}WebsiteHostedZoneId`. Phase 2 wires these emitters.
|
|
40
|
+
*/
|
|
41
|
+
export function fjallBucket(bucketName) {
|
|
42
|
+
const resolved = resolveBucketTarget(bucketName);
|
|
43
|
+
return {
|
|
44
|
+
kind: "bucket",
|
|
45
|
+
bucketName,
|
|
46
|
+
bind(record, zone) {
|
|
47
|
+
return resolved.bind(record, zone);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Target helper for an arbitrary `(dnsName, hostedZoneId)` pair. Accepts
|
|
53
|
+
* literal strings or CDK tokens (e.g. a `CfnOutput.value`). No
|
|
54
|
+
* `Fn.importValue` wrapping — the values pass through verbatim.
|
|
55
|
+
*/
|
|
56
|
+
export function aliasTo(dnsName, hostedZoneId) {
|
|
57
|
+
const resolved = resolveCustomTarget(dnsName, hostedZoneId);
|
|
58
|
+
return {
|
|
59
|
+
kind: "custom",
|
|
60
|
+
dnsName,
|
|
61
|
+
hostedZoneId,
|
|
62
|
+
bind(record, zone) {
|
|
63
|
+
return resolved.bind(record, zone);
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { type IAliasRecordTarget } from "aws-cdk-lib/aws-route53";
|
|
2
|
+
import type { FjallTarget } from "../interfaces/domain.js";
|
|
3
|
+
/**
|
|
4
|
+
* Cross-phase export-name contract.
|
|
5
|
+
*
|
|
6
|
+
* Phase 1 DEFINES these export names; Phase 2 is responsible for wiring the
|
|
7
|
+
* emitting stacks (`computeEcs.ts`, `cdn.ts`, `storage.ts`) to publish each
|
|
8
|
+
* `CfnOutput` with the matching `exportName`. Until Phase 2 lands the
|
|
9
|
+
* producers, a deploy of any `Domain` with a typed target fails at
|
|
10
|
+
* CloudFormation execution with "No export named … found" — the helpers
|
|
11
|
+
* compile and synthesise, but the cross-stack import resolves at deploy.
|
|
12
|
+
*
|
|
13
|
+
* Producer-consumer matrix (see Phase 1 plan §3, D6 / T0.5):
|
|
14
|
+
*
|
|
15
|
+
* | Producer (Phase 2) | Consumer (Phase 1) | Export name |
|
|
16
|
+
* |-----------------------------|-------------------------|------------------------------------------|
|
|
17
|
+
* | `computeEcs.ts` app stack | `resolveEcsTarget` | `${safeApp}AlbDnsName` |
|
|
18
|
+
* | `computeEcs.ts` app stack | `resolveEcsTarget` | `${safeApp}AlbHostedZoneId` |
|
|
19
|
+
* | `cdn.ts` CDN stack | `resolveCdnTarget` | `${safeApp}CdnDistributionDomainName` |
|
|
20
|
+
* | `storage.ts` bucket stack | `resolveBucketTarget` | `${safeBucket}WebsiteEndpoint` |
|
|
21
|
+
* | `storage.ts` bucket stack | `resolveBucketTarget` | `${safeBucket}WebsiteHostedZoneId` |
|
|
22
|
+
*/
|
|
23
|
+
export declare const EXPORT_NAMES: {
|
|
24
|
+
readonly ALB_DNS: (safeApp: string) => string;
|
|
25
|
+
readonly ALB_HOSTED_ZONE_ID: (safeApp: string) => string;
|
|
26
|
+
readonly CDN_DOMAIN: (safeApp: string) => string;
|
|
27
|
+
readonly BUCKET_WEBSITE_ENDPOINT: (safeBucket: string) => string;
|
|
28
|
+
readonly BUCKET_WEBSITE_HZ_ID: (safeBucket: string) => string;
|
|
29
|
+
};
|
|
30
|
+
/** Route53-reserved hosted-zone id for CloudFront distributions. */
|
|
31
|
+
export declare const CLOUDFRONT_HOSTED_ZONE_ID = "Z2FDTNDATAQYW2";
|
|
32
|
+
/**
|
|
33
|
+
* Resolve a Fjall ECS/ALB-fronted app to an `IAliasRecordTarget`.
|
|
34
|
+
*
|
|
35
|
+
* Requires the app stack to publish exports:
|
|
36
|
+
* - `${safeApp}AlbDnsName`
|
|
37
|
+
* - `${safeApp}AlbHostedZoneId`
|
|
38
|
+
*
|
|
39
|
+
* Phase 2 wires the emitters; until then, deploys of typed targets fail with
|
|
40
|
+
* "No export named … found".
|
|
41
|
+
*/
|
|
42
|
+
export declare function resolveEcsTarget(appName: string): IAliasRecordTarget;
|
|
43
|
+
/**
|
|
44
|
+
* Resolve a Fjall CloudFront-fronted app to an `IAliasRecordTarget`.
|
|
45
|
+
*
|
|
46
|
+
* Requires the CDN stack to publish export `${safeApp}CdnDistributionDomainName`.
|
|
47
|
+
* The CloudFront hosted-zone id is the globally fixed `Z2FDTNDATAQYW2`.
|
|
48
|
+
*
|
|
49
|
+
* Phase 2 wires the emitter; until then, deploys of typed targets fail with
|
|
50
|
+
* "No export named … found".
|
|
51
|
+
*/
|
|
52
|
+
export declare function resolveCdnTarget(appName: string): IAliasRecordTarget;
|
|
53
|
+
/**
|
|
54
|
+
* Resolve a Fjall S3 static-site bucket to an `IAliasRecordTarget`.
|
|
55
|
+
*
|
|
56
|
+
* Requires the bucket stack to publish exports:
|
|
57
|
+
* - `${safeBucket}WebsiteEndpoint`
|
|
58
|
+
* - `${safeBucket}WebsiteHostedZoneId`
|
|
59
|
+
*
|
|
60
|
+
* Phase 2 wires the emitters; until then, deploys of typed targets fail with
|
|
61
|
+
* "No export named … found".
|
|
62
|
+
*/
|
|
63
|
+
export declare function resolveBucketTarget(bucketName: string): IAliasRecordTarget;
|
|
64
|
+
/**
|
|
65
|
+
* Pure passthrough — accepts concrete DNS name + hosted-zone id (or CDK
|
|
66
|
+
* tokens) and forwards them unchanged. No `Fn.importValue` wrapping.
|
|
67
|
+
*/
|
|
68
|
+
export declare function resolveCustomTarget(dnsName: string, hostedZoneId: string): IAliasRecordTarget;
|
|
69
|
+
/**
|
|
70
|
+
* Resolve a `FjallTarget` to its raw DNS-name string. The return value is a
|
|
71
|
+
* CloudFormation token for the ECS/CDN/bucket variants — Phase 2 resolves the
|
|
72
|
+
* concrete host via `describeStackResources` after deploy. Used only by
|
|
73
|
+
* `externalRecordsPattern.ts` where no Route53 resource exists and manual
|
|
74
|
+
* record emission needs a string value.
|
|
75
|
+
*/
|
|
76
|
+
export declare function resolveTargetToDnsName(target: FjallTarget): string;
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { Fn } from "aws-cdk-lib";
|
|
2
|
+
import { toPascalCase } from "../../../utils/capitaliseString.js";
|
|
3
|
+
/**
|
|
4
|
+
* Cross-phase export-name contract.
|
|
5
|
+
*
|
|
6
|
+
* Phase 1 DEFINES these export names; Phase 2 is responsible for wiring the
|
|
7
|
+
* emitting stacks (`computeEcs.ts`, `cdn.ts`, `storage.ts`) to publish each
|
|
8
|
+
* `CfnOutput` with the matching `exportName`. Until Phase 2 lands the
|
|
9
|
+
* producers, a deploy of any `Domain` with a typed target fails at
|
|
10
|
+
* CloudFormation execution with "No export named … found" — the helpers
|
|
11
|
+
* compile and synthesise, but the cross-stack import resolves at deploy.
|
|
12
|
+
*
|
|
13
|
+
* Producer-consumer matrix (see Phase 1 plan §3, D6 / T0.5):
|
|
14
|
+
*
|
|
15
|
+
* | Producer (Phase 2) | Consumer (Phase 1) | Export name |
|
|
16
|
+
* |-----------------------------|-------------------------|------------------------------------------|
|
|
17
|
+
* | `computeEcs.ts` app stack | `resolveEcsTarget` | `${safeApp}AlbDnsName` |
|
|
18
|
+
* | `computeEcs.ts` app stack | `resolveEcsTarget` | `${safeApp}AlbHostedZoneId` |
|
|
19
|
+
* | `cdn.ts` CDN stack | `resolveCdnTarget` | `${safeApp}CdnDistributionDomainName` |
|
|
20
|
+
* | `storage.ts` bucket stack | `resolveBucketTarget` | `${safeBucket}WebsiteEndpoint` |
|
|
21
|
+
* | `storage.ts` bucket stack | `resolveBucketTarget` | `${safeBucket}WebsiteHostedZoneId` |
|
|
22
|
+
*/
|
|
23
|
+
export const EXPORT_NAMES = {
|
|
24
|
+
ALB_DNS: (safeApp) => `${safeApp}AlbDnsName`,
|
|
25
|
+
ALB_HOSTED_ZONE_ID: (safeApp) => `${safeApp}AlbHostedZoneId`,
|
|
26
|
+
CDN_DOMAIN: (safeApp) => `${safeApp}CdnDistributionDomainName`,
|
|
27
|
+
BUCKET_WEBSITE_ENDPOINT: (safeBucket) => `${safeBucket}WebsiteEndpoint`,
|
|
28
|
+
BUCKET_WEBSITE_HZ_ID: (safeBucket) => `${safeBucket}WebsiteHostedZoneId`
|
|
29
|
+
};
|
|
30
|
+
/** Route53-reserved hosted-zone id for CloudFront distributions. */
|
|
31
|
+
export const CLOUDFRONT_HOSTED_ZONE_ID = "Z2FDTNDATAQYW2";
|
|
32
|
+
/**
|
|
33
|
+
* Build an object satisfying CDK's `IAliasRecordTarget` shape. The
|
|
34
|
+
* `bind(record, zone?)` signature mirrors `aws-cdk-lib/aws-route53` exactly so
|
|
35
|
+
* future CDK tightenings of the interface continue to compile.
|
|
36
|
+
*/
|
|
37
|
+
function buildAliasTarget(dnsName, hostedZoneId) {
|
|
38
|
+
return {
|
|
39
|
+
bind(_record, _zone) {
|
|
40
|
+
return { dnsName, hostedZoneId };
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Resolve a Fjall ECS/ALB-fronted app to an `IAliasRecordTarget`.
|
|
46
|
+
*
|
|
47
|
+
* Requires the app stack to publish exports:
|
|
48
|
+
* - `${safeApp}AlbDnsName`
|
|
49
|
+
* - `${safeApp}AlbHostedZoneId`
|
|
50
|
+
*
|
|
51
|
+
* Phase 2 wires the emitters; until then, deploys of typed targets fail with
|
|
52
|
+
* "No export named … found".
|
|
53
|
+
*/
|
|
54
|
+
export function resolveEcsTarget(appName) {
|
|
55
|
+
const safeApp = toPascalCase(appName);
|
|
56
|
+
const dnsName = Fn.importValue(EXPORT_NAMES.ALB_DNS(safeApp));
|
|
57
|
+
const hostedZoneId = Fn.importValue(EXPORT_NAMES.ALB_HOSTED_ZONE_ID(safeApp));
|
|
58
|
+
return buildAliasTarget(dnsName, hostedZoneId);
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Resolve a Fjall CloudFront-fronted app to an `IAliasRecordTarget`.
|
|
62
|
+
*
|
|
63
|
+
* Requires the CDN stack to publish export `${safeApp}CdnDistributionDomainName`.
|
|
64
|
+
* The CloudFront hosted-zone id is the globally fixed `Z2FDTNDATAQYW2`.
|
|
65
|
+
*
|
|
66
|
+
* Phase 2 wires the emitter; until then, deploys of typed targets fail with
|
|
67
|
+
* "No export named … found".
|
|
68
|
+
*/
|
|
69
|
+
export function resolveCdnTarget(appName) {
|
|
70
|
+
const safeApp = toPascalCase(appName);
|
|
71
|
+
const dnsName = Fn.importValue(EXPORT_NAMES.CDN_DOMAIN(safeApp));
|
|
72
|
+
return buildAliasTarget(dnsName, CLOUDFRONT_HOSTED_ZONE_ID);
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Resolve a Fjall S3 static-site bucket to an `IAliasRecordTarget`.
|
|
76
|
+
*
|
|
77
|
+
* Requires the bucket stack to publish exports:
|
|
78
|
+
* - `${safeBucket}WebsiteEndpoint`
|
|
79
|
+
* - `${safeBucket}WebsiteHostedZoneId`
|
|
80
|
+
*
|
|
81
|
+
* Phase 2 wires the emitters; until then, deploys of typed targets fail with
|
|
82
|
+
* "No export named … found".
|
|
83
|
+
*/
|
|
84
|
+
export function resolveBucketTarget(bucketName) {
|
|
85
|
+
const safeBucket = toPascalCase(bucketName);
|
|
86
|
+
const dnsName = Fn.importValue(EXPORT_NAMES.BUCKET_WEBSITE_ENDPOINT(safeBucket));
|
|
87
|
+
const hostedZoneId = Fn.importValue(EXPORT_NAMES.BUCKET_WEBSITE_HZ_ID(safeBucket));
|
|
88
|
+
return buildAliasTarget(dnsName, hostedZoneId);
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Pure passthrough — accepts concrete DNS name + hosted-zone id (or CDK
|
|
92
|
+
* tokens) and forwards them unchanged. No `Fn.importValue` wrapping.
|
|
93
|
+
*/
|
|
94
|
+
export function resolveCustomTarget(dnsName, hostedZoneId) {
|
|
95
|
+
return buildAliasTarget(dnsName, hostedZoneId);
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Resolve a `FjallTarget` to its raw DNS-name string. The return value is a
|
|
99
|
+
* CloudFormation token for the ECS/CDN/bucket variants — Phase 2 resolves the
|
|
100
|
+
* concrete host via `describeStackResources` after deploy. Used only by
|
|
101
|
+
* `externalRecordsPattern.ts` where no Route53 resource exists and manual
|
|
102
|
+
* record emission needs a string value.
|
|
103
|
+
*/
|
|
104
|
+
export function resolveTargetToDnsName(target) {
|
|
105
|
+
switch (target.kind) {
|
|
106
|
+
case "ecs":
|
|
107
|
+
return Fn.importValue(EXPORT_NAMES.ALB_DNS(toPascalCase(target.appName)));
|
|
108
|
+
case "cdn":
|
|
109
|
+
return Fn.importValue(EXPORT_NAMES.CDN_DOMAIN(toPascalCase(target.appName)));
|
|
110
|
+
case "bucket":
|
|
111
|
+
return Fn.importValue(EXPORT_NAMES.BUCKET_WEBSITE_ENDPOINT(toPascalCase(target.bucketName)));
|
|
112
|
+
case "custom":
|
|
113
|
+
return target.dnsName;
|
|
114
|
+
default: {
|
|
115
|
+
const _exhaustive = target;
|
|
116
|
+
throw new Error(`Unsupported FjallTarget kind: ${String(_exhaustive.kind)}`);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./aws/index.js";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./aws/index.js";
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Connections, type IConnectable } from "aws-cdk-lib/aws-ec2";
|
|
2
|
+
import { Construct } from "constructs";
|
|
3
|
+
import type { ClickHouseProps, ClickHouseOutputs } from "./clickhouseTypes.js";
|
|
4
|
+
/**
|
|
5
|
+
* ClickHouse analytics infrastructure.
|
|
6
|
+
*
|
|
7
|
+
* Creates a single-node ClickHouse instance on ECS EC2 with a dedicated
|
|
8
|
+
* gp3 EBS volume for data persistence. Designed for analytical workloads
|
|
9
|
+
* (cost aggregation, deployment metrics, audit logs) rather than OLTP.
|
|
10
|
+
*/
|
|
11
|
+
export default class ClickHouse extends Construct implements IConnectable {
|
|
12
|
+
readonly connections: Connections;
|
|
13
|
+
readonly outputs: ClickHouseOutputs;
|
|
14
|
+
constructor(scope: Construct, id: string, props: ClickHouseProps);
|
|
15
|
+
}
|