@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.
- 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 +60 -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 +81 -71
- package/dist/lib/resources/aws/database/dynamodb.js +24 -27
- 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,18 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
exports.addMultiUserSecretRotation = addMultiUserSecretRotation;
|
|
8
|
-
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
9
|
-
const aws_secretsmanager_1 = require("aws-cdk-lib/aws-secretsmanager");
|
|
10
|
-
const secrets_1 = require("../secrets");
|
|
11
|
-
const resourceNaming_1 = require("../../../utils/resourceNaming");
|
|
12
|
-
const rdsDefaults_1 = require("./rdsDefaults");
|
|
13
|
-
const databaseTypes_1 = require("../../../utils/databaseTypes");
|
|
1
|
+
import { Duration } from "aws-cdk-lib";
|
|
2
|
+
import { SecretRotation, SecretRotationApplication } from "aws-cdk-lib/aws-secretsmanager";
|
|
3
|
+
import { CustomerManagedKey, Secret } from "../secrets/index.js";
|
|
4
|
+
import { ResourceNaming } from "../../../utils/resourceNaming.js";
|
|
5
|
+
import { RDS_DEFAULTS } from "./rdsDefaults.js";
|
|
6
|
+
import { isAwsManagedKey, isCMKRequested } from "../../../utils/databaseTypes.js";
|
|
14
7
|
/** Default PostgreSQL engine configuration used by both Aurora and Instance constructs. */
|
|
15
|
-
|
|
8
|
+
export const DEFAULT_POSTGRES_ENGINE_CONFIG = {
|
|
16
9
|
defaultUsername: "postgres",
|
|
17
10
|
sslParameters: { "rds.force_ssl": "1" },
|
|
18
11
|
rotationAppName: "SecretsManagerRDSPostgreSQLRotationMultiUser"
|
|
@@ -23,11 +16,11 @@ exports.DEFAULT_POSTGRES_ENGINE_CONFIG = {
|
|
|
23
16
|
* - AWS managed / undefined → returns undefined (CDK default)
|
|
24
17
|
* - IKey → returns the key as-is
|
|
25
18
|
*/
|
|
26
|
-
function resolveStorageEncryptionKey(scope, databaseName, storageKey) {
|
|
27
|
-
if (
|
|
28
|
-
return new
|
|
19
|
+
export function resolveStorageEncryptionKey(scope, databaseName, storageKey) {
|
|
20
|
+
if (isCMKRequested(storageKey)) {
|
|
21
|
+
return new CustomerManagedKey(scope, `${databaseName}ClusterEncryptionKey`, { aliasName: `cmk/rds/${databaseName}/encryptionKey` }).key;
|
|
29
22
|
}
|
|
30
|
-
if (
|
|
23
|
+
if (isAwsManagedKey(storageKey) || storageKey === undefined) {
|
|
31
24
|
return undefined;
|
|
32
25
|
}
|
|
33
26
|
return storageKey;
|
|
@@ -36,14 +29,14 @@ function resolveStorageEncryptionKey(scope, databaseName, storageKey) {
|
|
|
36
29
|
* Resolve a Performance Insights encryption key spec into an IKey or undefined.
|
|
37
30
|
* Only creates a CMK when PI is enabled and CMK is requested.
|
|
38
31
|
*/
|
|
39
|
-
function resolvePerformanceInsightsKey(scope, databaseName, piEnabled, encryptionKey) {
|
|
40
|
-
if (piEnabled &&
|
|
41
|
-
return new
|
|
32
|
+
export function resolvePerformanceInsightsKey(scope, databaseName, piEnabled, encryptionKey) {
|
|
33
|
+
if (piEnabled && isCMKRequested(encryptionKey)) {
|
|
34
|
+
return new CustomerManagedKey(scope, `${databaseName}PerformanceInsightsKey`, { aliasName: `cmk/rds/${databaseName}/InsightsKey` }).key;
|
|
42
35
|
}
|
|
43
36
|
return undefined;
|
|
44
37
|
}
|
|
45
38
|
/** Resolve the databaseInsights prop into an enabled flag and optional config object. */
|
|
46
|
-
function resolveDatabaseInsights(databaseInsights) {
|
|
39
|
+
export function resolveDatabaseInsights(databaseInsights) {
|
|
47
40
|
const piEnabled = databaseInsights !== false;
|
|
48
41
|
const piConfig = piEnabled && typeof databaseInsights === "object"
|
|
49
42
|
? databaseInsights
|
|
@@ -54,16 +47,16 @@ function resolveDatabaseInsights(databaseInsights) {
|
|
|
54
47
|
* Add multi-user secret rotation to a database construct.
|
|
55
48
|
* Shared between RdsAurora and RdsInstance.
|
|
56
49
|
*/
|
|
57
|
-
function addMultiUserSecretRotation(params) {
|
|
50
|
+
export function addMultiUserSecretRotation(params) {
|
|
58
51
|
const rotationConfig = params.credentialsConfig?.secretRotation;
|
|
59
52
|
const rotationPeriod = (typeof rotationConfig === "object" &&
|
|
60
53
|
rotationConfig?.automaticallyAfter) ||
|
|
61
|
-
|
|
62
|
-
const masterSecret = new
|
|
63
|
-
secretName:
|
|
54
|
+
Duration.days(30);
|
|
55
|
+
const masterSecret = new Secret(params.scope, `${params.databaseName}MasterSecret`, {
|
|
56
|
+
secretName: ResourceNaming.masterSecretName(params.constructId)
|
|
64
57
|
});
|
|
65
|
-
new
|
|
66
|
-
application: new
|
|
58
|
+
new SecretRotation(params.scope, `${params.databaseName}SecretRotation`, {
|
|
59
|
+
application: new SecretRotationApplication(params.engineConfig.rotationAppName, RDS_DEFAULTS.ROTATION_APP_VERSION, { isMultiUser: true }),
|
|
67
60
|
secret: params.databaseSecret,
|
|
68
61
|
masterSecret: masterSecret.secret,
|
|
69
62
|
target: params.target,
|
|
@@ -72,4 +65,3 @@ function addMultiUserSecretRotation(params) {
|
|
|
72
65
|
});
|
|
73
66
|
return masterSecret;
|
|
74
67
|
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsHelpers.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsHelpers.ts"],"names":[],"mappings":";;;AAkCA,kEAgBC;AAMD,sEAcC;AAGD,0DAYC;AAMD,gEAsCC;AAjID,6CAAuC;AAIvC,uEAGwC;AAExC,wCAAwD;AACxD,kEAA+D;AAC/D,+CAA6C;AAC7C,gEAOsC;AAEtC,2FAA2F;AAC9E,QAAA,8BAA8B,GAAiB;IAC1D,eAAe,EAAE,UAAU;IAC3B,aAAa,EAAE,EAAE,eAAe,EAAE,GAAG,EAAE;IACvC,eAAe,EAAE,8CAA8C;CAChE,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,2BAA2B,CACzC,KAAgB,EAChB,YAAgC,EAChC,UAAyC;IAEzC,IAAI,IAAA,8BAAc,EAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,4BAAkB,CAC3B,KAAK,EACL,GAAG,YAAY,sBAAsB,EACrC,EAAE,SAAS,EAAE,WAAW,YAAY,gBAAgB,EAAE,CACvD,CAAC,GAAG,CAAC;IACR,CAAC;IACD,IAAI,IAAA,+BAAe,EAAC,UAAU,CAAC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC5D,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,SAAgB,6BAA6B,CAC3C,KAAgB,EAChB,YAAgC,EAChC,SAAkB,EAClB,aAA4C;IAE5C,IAAI,SAAS,IAAI,IAAA,8BAAc,EAAC,aAAa,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,4BAAkB,CAC3B,KAAK,EACL,GAAG,YAAY,wBAAwB,EACvC,EAAE,SAAS,EAAE,WAAW,YAAY,cAAc,EAAE,CACrD,CAAC,GAAG,CAAC;IACR,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,yFAAyF;AACzF,SAAgB,uBAAuB,CACrC,gBAA4D;IAK5D,MAAM,SAAS,GAAG,gBAAgB,KAAK,KAAK,CAAC;IAC7C,MAAM,QAAQ,GACZ,SAAS,IAAI,OAAO,gBAAgB,KAAK,QAAQ;QAC/C,CAAC,CAAC,gBAAgB;QAClB,CAAC,CAAC,SAAS,CAAC;IAChB,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,MAS1C;IACC,MAAM,cAAc,GAAG,MAAM,CAAC,iBAAiB,EAAE,cAAc,CAAC;IAChE,MAAM,cAAc,GAClB,CAAC,OAAO,cAAc,KAAK,QAAQ;QACjC,cAAc,EAAE,kBAAkB,CAAC;QACrC,sBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEpB,MAAM,YAAY,GAAG,IAAI,gBAAM,CAC7B,MAAM,CAAC,KAAK,EACZ,GAAG,MAAM,CAAC,YAAY,cAAc,EACpC;QACE,UAAU,EAAE,+BAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC;KAChE,CACF,CAAC;IAEF,IAAI,mCAAc,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,YAAY,gBAAgB,EAAE;QACvE,WAAW,EAAE,IAAI,8CAAyB,CACxC,MAAM,CAAC,YAAY,CAAC,eAAe,EACnC,0BAAY,CAAC,oBAAoB,EACjC,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB;QACD,MAAM,EAAE,MAAM,CAAC,cAAc;QAC7B,YAAY,EAAE,YAAY,CAAC,MAAM;QACjC,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,kBAAkB,EAAE,cAAc;KACnC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import { Duration } from \"aws-cdk-lib\";\nimport { type IKey } from \"aws-cdk-lib/aws-kms\";\nimport { type IVpc, type IConnectable } from \"aws-cdk-lib/aws-ec2\";\nimport { type ISecret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport {\n  SecretRotation,\n  SecretRotationApplication\n} from \"aws-cdk-lib/aws-secretsmanager\";\nimport type { Construct } from \"constructs\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { ResourceNaming } from \"../../../utils/resourceNaming\";\nimport { RDS_DEFAULTS } from \"./rdsDefaults\";\nimport {\n  type DatabaseInsightsConfig,\n  type EngineConfig,\n  type EncryptionKeySpec,\n  type CredentialsConfig,\n  isAwsManagedKey,\n  isCMKRequested\n} from \"../../../utils/databaseTypes\";\n\n/** Default PostgreSQL engine configuration used by both Aurora and Instance constructs. */\nexport const DEFAULT_POSTGRES_ENGINE_CONFIG: EngineConfig = {\n  defaultUsername: \"postgres\",\n  sslParameters: { \"rds.force_ssl\": \"1\" },\n  rotationAppName: \"SecretsManagerRDSPostgreSQLRotationMultiUser\"\n};\n\n/**\n * Resolve a storage encryption key spec into an IKey or undefined.\n * - CMK marker → creates a new CustomerManagedKey\n * - AWS managed / undefined → returns undefined (CDK default)\n * - IKey → returns the key as-is\n */\nexport function resolveStorageEncryptionKey(\n  scope: Construct,\n  databaseName: string | undefined,\n  storageKey: EncryptionKeySpec | undefined\n): IKey | undefined {\n  if (isCMKRequested(storageKey)) {\n    return new CustomerManagedKey(\n      scope,\n      `${databaseName}ClusterEncryptionKey`,\n      { aliasName: `cmk/rds/${databaseName}/encryptionKey` }\n    ).key;\n  }\n  if (isAwsManagedKey(storageKey) || storageKey === undefined) {\n    return undefined;\n  }\n  return storageKey;\n}\n\n/**\n * Resolve a Performance Insights encryption key spec into an IKey or undefined.\n * Only creates a CMK when PI is enabled and CMK is requested.\n */\nexport function resolvePerformanceInsightsKey(\n  scope: Construct,\n  databaseName: string | undefined,\n  piEnabled: boolean,\n  encryptionKey: EncryptionKeySpec | undefined\n): IKey | undefined {\n  if (piEnabled && isCMKRequested(encryptionKey)) {\n    return new CustomerManagedKey(\n      scope,\n      `${databaseName}PerformanceInsightsKey`,\n      { aliasName: `cmk/rds/${databaseName}/InsightsKey` }\n    ).key;\n  }\n  return undefined;\n}\n\n/** Resolve the databaseInsights prop into an enabled flag and optional config object. */\nexport function resolveDatabaseInsights(\n  databaseInsights: DatabaseInsightsConfig | false | undefined\n): {\n  piEnabled: boolean;\n  piConfig: DatabaseInsightsConfig | undefined;\n} {\n  const piEnabled = databaseInsights !== false;\n  const piConfig =\n    piEnabled && typeof databaseInsights === \"object\"\n      ? databaseInsights\n      : undefined;\n  return { piEnabled, piConfig };\n}\n\n/**\n * Add multi-user secret rotation to a database construct.\n * Shared between RdsAurora and RdsInstance.\n */\nexport function addMultiUserSecretRotation(params: {\n  scope: Construct;\n  databaseName: string | undefined;\n  constructId: string;\n  engineConfig: EngineConfig;\n  credentialsConfig: CredentialsConfig | undefined;\n  databaseSecret: ISecret;\n  target: IConnectable;\n  vpc: IVpc;\n}): Secret {\n  const rotationConfig = params.credentialsConfig?.secretRotation;\n  const rotationPeriod =\n    (typeof rotationConfig === \"object\" &&\n      rotationConfig?.automaticallyAfter) ||\n    Duration.days(30);\n\n  const masterSecret = new Secret(\n    params.scope,\n    `${params.databaseName}MasterSecret`,\n    {\n      secretName: ResourceNaming.masterSecretName(params.constructId)\n    }\n  );\n\n  new SecretRotation(params.scope, `${params.databaseName}SecretRotation`, {\n    application: new SecretRotationApplication(\n      params.engineConfig.rotationAppName,\n      RDS_DEFAULTS.ROTATION_APP_VERSION,\n      { isMultiUser: true }\n    ),\n    secret: params.databaseSecret,\n    masterSecret: masterSecret.secret,\n    target: params.target,\n    vpc: params.vpc,\n    automaticallyAfter: rotationPeriod\n  });\n\n  return masterSecret;\n}\n"]}
|
|
@@ -3,9 +3,11 @@ import { Connections, type IConnectable, type IVpc } from "aws-cdk-lib/aws-ec2";
|
|
|
3
3
|
import { type IInstanceEngine } from "aws-cdk-lib/aws-rds";
|
|
4
4
|
import { Construct } from "constructs";
|
|
5
5
|
import { SecurityGroup } from "../networking/securityGroup.js";
|
|
6
|
-
import { Secret } from "../secrets";
|
|
7
|
-
import { type StackBuilder } from "../base/awsStack";
|
|
8
|
-
import { type EngineConfig, type ProxyConfig, type ReadReplicaConfig, type CredentialsConfig, type EncryptionConfig, type DatabaseInsightsConfig } from "../../../utils/databaseTypes";
|
|
6
|
+
import { Secret } from "../secrets/index.js";
|
|
7
|
+
import { type StackBuilder } from "../base/awsStack.js";
|
|
8
|
+
import { type EngineConfig, type ProxyConfig, type ReadReplicaConfig, type CredentialsConfig, type EncryptionConfig, type DatabaseInsightsConfig } from "../../../utils/databaseTypes.js";
|
|
9
|
+
import type { ITopic } from "aws-cdk-lib/aws-sns";
|
|
10
|
+
import { type RdsAlarmThresholds } from "../monitoring/index.js";
|
|
9
11
|
interface RdsProps {
|
|
10
12
|
vpc: IVpc;
|
|
11
13
|
databaseName?: string;
|
|
@@ -33,6 +35,12 @@ interface RdsProps {
|
|
|
33
35
|
snapshotIdentifier?: string;
|
|
34
36
|
/** Username from the snapshot (required when restoring from snapshot to reset password) */
|
|
35
37
|
snapshotUsername?: string;
|
|
38
|
+
/** SNS topic for alarm notifications. Required for alarm creation. */
|
|
39
|
+
alertsTopic?: ITopic;
|
|
40
|
+
/** Alarm thresholds. false to disable, undefined for defaults, object to override. */
|
|
41
|
+
alarms?: RdsAlarmThresholds | false;
|
|
42
|
+
/** Application ID for alarm tagging. */
|
|
43
|
+
applicationId?: string;
|
|
36
44
|
}
|
|
37
45
|
export declare class RdsInstance extends Construct implements IConnectable {
|
|
38
46
|
connections: Connections;
|
|
@@ -1,29 +1,39 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
1
|
+
import { Duration, RemovalPolicy } from "aws-cdk-lib";
|
|
2
|
+
import { Connections, InstanceType, Port, SubnetType } from "aws-cdk-lib/aws-ec2";
|
|
3
|
+
import { CaCertificate, Credentials, DatabaseInstance, DatabaseInstanceFromSnapshot, DatabaseInstanceEngine, DatabaseInstanceReadReplica, DatabaseProxy, ParameterGroup, PostgresEngineVersion, ProxyTarget, SnapshotCredentials, StorageType } from "aws-cdk-lib/aws-rds";
|
|
4
|
+
import { Runtime } from "aws-cdk-lib/aws-lambda";
|
|
5
|
+
import { PolicyStatement, Effect } from "aws-cdk-lib/aws-iam";
|
|
6
|
+
import { Construct } from "constructs";
|
|
7
|
+
import { SecurityGroup } from "../networking/securityGroup.js";
|
|
8
|
+
import { CustomerManagedKey, Secret } from "../secrets/index.js";
|
|
9
|
+
import { CustomResource } from "../utilities/customResource.js";
|
|
10
|
+
import { getDatabaseInsightsRetention } from "./index.js";
|
|
11
|
+
import { RDS_DEFAULTS } from "./rdsDefaults.js";
|
|
12
|
+
import { DEFAULT_POSTGRES_ENGINE_CONFIG, resolveDatabaseInsights, resolveStorageEncryptionKey, resolvePerformanceInsightsKey, addMultiUserSecretRotation } from "./rdsHelpers.js";
|
|
13
|
+
import { isCMKRequested } from "../../../utils/databaseTypes.js";
|
|
14
|
+
import { ResourceNaming } from "../../../utils/resourceNaming.js";
|
|
15
|
+
import { addProxyCfnOutput } from "./rdsProxyOutput.js";
|
|
16
|
+
import { createRdsAlarms } from "../monitoring/index.js";
|
|
17
|
+
export class RdsInstance extends Construct {
|
|
18
|
+
connections;
|
|
19
|
+
databaseSecurityGroup;
|
|
20
|
+
vpc;
|
|
21
|
+
port;
|
|
22
|
+
engineConfig;
|
|
23
|
+
databaseCredentials;
|
|
24
|
+
database;
|
|
25
|
+
masterSecret;
|
|
26
|
+
databaseProxy;
|
|
27
|
+
databaseProxySecurityGroup;
|
|
28
|
+
readReplicaSecurityGroup;
|
|
29
|
+
constructId;
|
|
20
30
|
constructor(scope, id, props) {
|
|
21
31
|
super(scope, id);
|
|
22
32
|
this.constructId = id;
|
|
23
|
-
this.port = props.port ||
|
|
33
|
+
this.port = props.port || RDS_DEFAULTS.DEFAULT_PORT;
|
|
24
34
|
this.vpc = props.vpc;
|
|
25
35
|
// PostgreSQL fallback for direct usage - ensure engine and engineConfig match
|
|
26
|
-
this.engineConfig = props.engineConfig ??
|
|
36
|
+
this.engineConfig = props.engineConfig ?? DEFAULT_POSTGRES_ENGINE_CONFIG;
|
|
27
37
|
this.addDatabase(props);
|
|
28
38
|
// Secret rotation enabled by default (opt-out with secretRotation: false)
|
|
29
39
|
const secretRotationDisabled = props.credentials?.secretRotation === false;
|
|
@@ -36,14 +46,24 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
36
46
|
if (props.readReplica !== undefined && props.readReplica !== false) {
|
|
37
47
|
this.addReadReplica(props);
|
|
38
48
|
}
|
|
49
|
+
if (props.alertsTopic && props.alarms !== false) {
|
|
50
|
+
createRdsAlarms({
|
|
51
|
+
scope: this,
|
|
52
|
+
databaseName: this.constructId,
|
|
53
|
+
database: this.database,
|
|
54
|
+
config: typeof props.alarms === "object" ? props.alarms : {},
|
|
55
|
+
alarmTopic: props.alertsTopic,
|
|
56
|
+
applicationId: props.applicationId
|
|
57
|
+
});
|
|
58
|
+
}
|
|
39
59
|
}
|
|
40
60
|
addDatabase(props) {
|
|
41
61
|
// Username priority: snapshotUsername > credentials.username > engine default
|
|
42
62
|
const username = props.snapshotIdentifier && props.snapshotUsername
|
|
43
63
|
? props.snapshotUsername
|
|
44
64
|
: (props.credentials?.username ?? this.engineConfig.defaultUsername);
|
|
45
|
-
this.databaseCredentials = new
|
|
46
|
-
secretName:
|
|
65
|
+
this.databaseCredentials = new Secret(this, `${props.databaseName}Credentials`, {
|
|
66
|
+
secretName: ResourceNaming.credentialsSecretName(this.constructId),
|
|
47
67
|
generateSecretString: {
|
|
48
68
|
secretStringTemplate: JSON.stringify({
|
|
49
69
|
username
|
|
@@ -53,36 +73,36 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
53
73
|
generateStringKey: "password"
|
|
54
74
|
}
|
|
55
75
|
});
|
|
56
|
-
this.databaseSecurityGroup = new
|
|
76
|
+
this.databaseSecurityGroup = new SecurityGroup(this, `${props.databaseName}SecurityGroup`, {
|
|
57
77
|
vpc: this.vpc,
|
|
58
78
|
description: `Security group for RDS database instance ${props.databaseName}`
|
|
59
79
|
});
|
|
60
80
|
// Self-referencing rule for multi-AZ communication
|
|
61
|
-
this.databaseSecurityGroup.addIngressRule(this.databaseSecurityGroup,
|
|
62
|
-
this.connections = new
|
|
81
|
+
this.databaseSecurityGroup.addIngressRule(this.databaseSecurityGroup, Port.tcp(this.port));
|
|
82
|
+
this.connections = new Connections({
|
|
63
83
|
securityGroups: [this.databaseSecurityGroup],
|
|
64
|
-
defaultPort:
|
|
84
|
+
defaultPort: Port.tcp(this.port)
|
|
65
85
|
});
|
|
66
|
-
const storageEncryptionKey =
|
|
67
|
-
const { piEnabled, piConfig } =
|
|
68
|
-
const performanceInsightsEncryptionKey =
|
|
86
|
+
const storageEncryptionKey = resolveStorageEncryptionKey(this, props.databaseName, props.encryption?.storageKey);
|
|
87
|
+
const { piEnabled, piConfig } = resolveDatabaseInsights(props.databaseInsights);
|
|
88
|
+
const performanceInsightsEncryptionKey = resolvePerformanceInsightsKey(this, props.databaseName, piEnabled, piConfig?.encryptionKey);
|
|
69
89
|
const diMode = piConfig?.mode ?? "standard";
|
|
70
90
|
const performanceInsightsRetention = piEnabled
|
|
71
|
-
?
|
|
91
|
+
? getDatabaseInsightsRetention(diMode)
|
|
72
92
|
: undefined;
|
|
73
93
|
const engine = props.engine ||
|
|
74
|
-
|
|
75
|
-
version:
|
|
94
|
+
DatabaseInstanceEngine.postgres({
|
|
95
|
+
version: PostgresEngineVersion.VER_17_5
|
|
76
96
|
});
|
|
77
|
-
const parameterGroup = new
|
|
97
|
+
const parameterGroup = new ParameterGroup(this, `${props.databaseName}ParameterGroup`, {
|
|
78
98
|
engine,
|
|
79
99
|
description: `Parameter group for ${props.databaseName} with security defaults`,
|
|
80
100
|
parameters: this.engineConfig.sslParameters
|
|
81
101
|
});
|
|
82
102
|
// Use PUBLIC subnet for publiclyAccessible databases (e.g., tinkerer tier without NAT)
|
|
83
103
|
const subnetType = props.publiclyAccessible
|
|
84
|
-
?
|
|
85
|
-
:
|
|
104
|
+
? SubnetType.PUBLIC
|
|
105
|
+
: SubnetType.PRIVATE_WITH_EGRESS;
|
|
86
106
|
const commonInstanceProps = {
|
|
87
107
|
vpc: this.vpc,
|
|
88
108
|
vpcSubnets: {
|
|
@@ -92,50 +112,50 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
92
112
|
engine,
|
|
93
113
|
parameterGroup,
|
|
94
114
|
allocatedStorage: props.allocatedStorage,
|
|
95
|
-
backupRetention: props.backupRetention ||
|
|
115
|
+
backupRetention: props.backupRetention || Duration.days(14),
|
|
96
116
|
preferredBackupWindow: props.preferredBackupWindow || "02:00-03:00",
|
|
97
117
|
storageEncrypted: true,
|
|
98
118
|
storageEncryptionKey,
|
|
99
|
-
storageType:
|
|
100
|
-
caCertificate:
|
|
101
|
-
removalPolicy:
|
|
119
|
+
storageType: StorageType.GP3,
|
|
120
|
+
caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
|
|
121
|
+
removalPolicy: RemovalPolicy.SNAPSHOT,
|
|
102
122
|
deleteAutomatedBackups: false,
|
|
103
123
|
enablePerformanceInsights: piEnabled,
|
|
104
124
|
performanceInsightEncryptionKey: performanceInsightsEncryptionKey,
|
|
105
125
|
performanceInsightRetention: performanceInsightsRetention,
|
|
106
|
-
instanceIdentifier:
|
|
126
|
+
instanceIdentifier: ResourceNaming.dbInstanceId(this.constructId),
|
|
107
127
|
instanceType: props.instanceType
|
|
108
|
-
? new
|
|
109
|
-
: new
|
|
128
|
+
? new InstanceType(props.instanceType)
|
|
129
|
+
: new InstanceType("t4g.large"),
|
|
110
130
|
maxAllocatedStorage: props.maxAllocatedStorage || 500,
|
|
111
|
-
monitoringInterval: props.monitoringInterval ||
|
|
131
|
+
monitoringInterval: props.monitoringInterval || RDS_DEFAULTS.MONITORING_INTERVAL,
|
|
112
132
|
multiAz: props.multiAz !== false,
|
|
113
133
|
port: this.port,
|
|
114
134
|
deletionProtection: props.deletionProtection ?? true,
|
|
115
135
|
preferredMaintenanceWindow: props.preferredMaintenanceWindow ||
|
|
116
|
-
|
|
136
|
+
RDS_DEFAULTS.PREFERRED_MAINTENANCE_WINDOW,
|
|
117
137
|
publiclyAccessible: props.publiclyAccessible ?? false
|
|
118
138
|
};
|
|
119
139
|
if (props.snapshotIdentifier) {
|
|
120
140
|
// Create from snapshot
|
|
121
|
-
this.database = new
|
|
141
|
+
this.database = new DatabaseInstanceFromSnapshot(this, `${props.databaseName}Database`, {
|
|
122
142
|
...commonInstanceProps,
|
|
123
143
|
snapshotIdentifier: props.snapshotIdentifier,
|
|
124
144
|
// For snapshots, credentials are used to reset the password
|
|
125
|
-
credentials:
|
|
145
|
+
credentials: SnapshotCredentials.fromSecret(this.databaseCredentials.secret)
|
|
126
146
|
});
|
|
127
147
|
}
|
|
128
148
|
else {
|
|
129
149
|
// Create new instance
|
|
130
|
-
this.database = new
|
|
150
|
+
this.database = new DatabaseInstance(this, `${props.databaseName}Database`, {
|
|
131
151
|
...commonInstanceProps,
|
|
132
152
|
databaseName: props.databaseName,
|
|
133
|
-
credentials:
|
|
153
|
+
credentials: Credentials.fromSecret(this.databaseCredentials.secret)
|
|
134
154
|
});
|
|
135
155
|
}
|
|
136
156
|
}
|
|
137
157
|
rotateSecret(props) {
|
|
138
|
-
this.masterSecret =
|
|
158
|
+
this.masterSecret = addMultiUserSecretRotation({
|
|
139
159
|
scope: this,
|
|
140
160
|
databaseName: props.databaseName,
|
|
141
161
|
constructId: this.constructId,
|
|
@@ -151,55 +171,55 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
151
171
|
return;
|
|
152
172
|
const proxyConfig = props.proxy;
|
|
153
173
|
const vpcSubnets = proxyConfig.vpcSubnets ?? {
|
|
154
|
-
subnetType:
|
|
174
|
+
subnetType: SubnetType.PRIVATE_WITH_EGRESS
|
|
155
175
|
};
|
|
156
|
-
this.databaseProxySecurityGroup = new
|
|
176
|
+
this.databaseProxySecurityGroup = new SecurityGroup(this, `${props.databaseName}ProxySecurityGroup`, {
|
|
157
177
|
vpc: this.vpc,
|
|
158
178
|
description: `Security group for RDS Proxy for ${props.databaseName}`
|
|
159
179
|
});
|
|
160
180
|
// Allow proxy to connect to database
|
|
161
|
-
this.databaseSecurityGroup.addIngressRule(this.databaseProxySecurityGroup,
|
|
162
|
-
this.databaseProxy = new
|
|
163
|
-
dbProxyName:
|
|
164
|
-
proxyTarget:
|
|
181
|
+
this.databaseSecurityGroup.addIngressRule(this.databaseProxySecurityGroup, Port.tcp(this.port), "Allow RDS Proxy to connect to database");
|
|
182
|
+
this.databaseProxy = new DatabaseProxy(this, `${props.databaseName}DatabaseProxy`, {
|
|
183
|
+
dbProxyName: ResourceNaming.proxyName(this.constructId),
|
|
184
|
+
proxyTarget: ProxyTarget.fromInstance(this.database),
|
|
165
185
|
secrets: [this.databaseCredentials.secret],
|
|
166
186
|
securityGroups: [this.databaseProxySecurityGroup],
|
|
167
187
|
vpc: this.vpc,
|
|
168
188
|
vpcSubnets,
|
|
169
189
|
requireTLS: proxyConfig.requireTLS ?? true,
|
|
170
190
|
borrowTimeout: proxyConfig.connectionBorrowTimeout
|
|
171
|
-
?
|
|
172
|
-
:
|
|
191
|
+
? Duration.seconds(proxyConfig.connectionBorrowTimeout)
|
|
192
|
+
: Duration.seconds(120),
|
|
173
193
|
maxConnectionsPercent: proxyConfig.maxConnections,
|
|
174
194
|
maxIdleConnectionsPercent: proxyConfig.maxIdleConnections
|
|
175
195
|
});
|
|
176
|
-
|
|
196
|
+
addProxyCfnOutput(this, this.constructId, props.databaseName, this.databaseProxy);
|
|
177
197
|
}
|
|
178
198
|
addReadReplica(props) {
|
|
179
199
|
if (!props.readReplica)
|
|
180
200
|
return;
|
|
181
201
|
const replicaConfig = props.readReplica;
|
|
182
202
|
const replicaInstanceType = replicaConfig.instanceType ?? props.instanceType ?? "t4g.large";
|
|
183
|
-
const { piEnabled, piConfig } =
|
|
184
|
-
const readReplicaPerformanceInsightsKey = piEnabled &&
|
|
185
|
-
? new
|
|
203
|
+
const { piEnabled, piConfig } = resolveDatabaseInsights(props.databaseInsights);
|
|
204
|
+
const readReplicaPerformanceInsightsKey = piEnabled && isCMKRequested(piConfig?.encryptionKey)
|
|
205
|
+
? new CustomerManagedKey(this, `${props.databaseName}ReadReplicaReaderInsightsKey`, {
|
|
186
206
|
aliasName: `cmk/rds/${props.databaseName}/ReadReplicaInsightsKey`
|
|
187
207
|
}).key
|
|
188
208
|
: undefined;
|
|
189
|
-
this.readReplicaSecurityGroup = new
|
|
209
|
+
this.readReplicaSecurityGroup = new SecurityGroup(this, `${props.databaseName}ReadReplicaSecurityGroup`, {
|
|
190
210
|
vpc: this.vpc,
|
|
191
211
|
description: `Security group for RDS read replica of ${props.databaseName}`
|
|
192
212
|
});
|
|
193
213
|
// Allow primary database to replicate to read replica
|
|
194
|
-
this.readReplicaSecurityGroup.addIngressRule(this.databaseSecurityGroup,
|
|
214
|
+
this.readReplicaSecurityGroup.addIngressRule(this.databaseSecurityGroup, Port.tcp(this.port), "Allow primary database to replicate to read replica");
|
|
195
215
|
// Deletion waiter ensures primary is "available" before CloudFormation deletes it.
|
|
196
216
|
// When the read replica is deleted, the primary enters "modifying" state.
|
|
197
217
|
// Without this waiter, the final snapshot creation fails.
|
|
198
|
-
const instanceId =
|
|
199
|
-
const waiterTimeout =
|
|
200
|
-
const deletionWaiter = new
|
|
201
|
-
runtime:
|
|
202
|
-
timeout: waiterTimeout.plus(
|
|
218
|
+
const instanceId = ResourceNaming.dbInstanceId(this.constructId);
|
|
219
|
+
const waiterTimeout = Duration.minutes(10);
|
|
220
|
+
const deletionWaiter = new CustomResource(this, `${props.databaseName}DeletionWaiter`, {
|
|
221
|
+
runtime: Runtime.NODEJS_22_X,
|
|
222
|
+
timeout: waiterTimeout.plus(Duration.seconds(30)),
|
|
203
223
|
lambdaDescription: `${props.databaseName} deletion waiter`,
|
|
204
224
|
inlineCode: `
|
|
205
225
|
const { RDSClient } = require('@aws-sdk/client-rds');
|
|
@@ -234,8 +254,8 @@ exports.handler = async (event) => {
|
|
|
234
254
|
};
|
|
235
255
|
`,
|
|
236
256
|
inlinePolicy: [
|
|
237
|
-
new
|
|
238
|
-
effect:
|
|
257
|
+
new PolicyStatement({
|
|
258
|
+
effect: Effect.ALLOW,
|
|
239
259
|
actions: ["rds:DescribeDBInstances"],
|
|
240
260
|
resources: ["*"]
|
|
241
261
|
})
|
|
@@ -246,34 +266,34 @@ exports.handler = async (event) => {
|
|
|
246
266
|
}
|
|
247
267
|
});
|
|
248
268
|
deletionWaiter.resource.node.addDependency(this.database);
|
|
249
|
-
const readReplica = new
|
|
269
|
+
const readReplica = new DatabaseInstanceReadReplica(this, `${props.databaseName}ReadReplica`, {
|
|
250
270
|
sourceDatabaseInstance: this.database,
|
|
251
271
|
vpc: this.vpc,
|
|
252
272
|
vpcSubnets: {
|
|
253
|
-
subnetType:
|
|
273
|
+
subnetType: SubnetType.PRIVATE_WITH_EGRESS
|
|
254
274
|
},
|
|
255
275
|
securityGroups: [this.readReplicaSecurityGroup],
|
|
256
276
|
allocatedStorage: props.allocatedStorage,
|
|
257
277
|
storageEncrypted: true,
|
|
258
|
-
storageType:
|
|
259
|
-
caCertificate:
|
|
260
|
-
removalPolicy:
|
|
278
|
+
storageType: StorageType.GP3,
|
|
279
|
+
caCertificate: CaCertificate.RDS_CA_RSA4096_G1,
|
|
280
|
+
removalPolicy: RemovalPolicy.DESTROY,
|
|
261
281
|
deleteAutomatedBackups: false,
|
|
262
282
|
enablePerformanceInsights: piEnabled,
|
|
263
283
|
performanceInsightEncryptionKey: readReplicaPerformanceInsightsKey,
|
|
264
284
|
performanceInsightRetention: piEnabled
|
|
265
|
-
?
|
|
285
|
+
? getDatabaseInsightsRetention(piConfig?.mode ?? "standard")
|
|
266
286
|
: undefined,
|
|
267
|
-
instanceIdentifier:
|
|
268
|
-
instanceType: new
|
|
287
|
+
instanceIdentifier: ResourceNaming.readReplicaId(this.constructId),
|
|
288
|
+
instanceType: new InstanceType(replicaInstanceType),
|
|
269
289
|
availabilityZone: replicaConfig.availabilityZone,
|
|
270
290
|
maxAllocatedStorage: props.maxAllocatedStorage || 500,
|
|
271
|
-
monitoringInterval: props.monitoringInterval ||
|
|
291
|
+
monitoringInterval: props.monitoringInterval || RDS_DEFAULTS.MONITORING_INTERVAL,
|
|
272
292
|
multiAz: props.multiAz !== false,
|
|
273
293
|
port: this.port,
|
|
274
294
|
deletionProtection: props.deletionProtection ?? true,
|
|
275
295
|
preferredMaintenanceWindow: props.preferredMaintenanceWindow ||
|
|
276
|
-
|
|
296
|
+
RDS_DEFAULTS.PREFERRED_MAINTENANCE_WINDOW
|
|
277
297
|
});
|
|
278
298
|
readReplica.node.addDependency(deletionWaiter.resource);
|
|
279
299
|
}
|
|
@@ -305,5 +325,3 @@ exports.handler = async (event) => {
|
|
|
305
325
|
};
|
|
306
326
|
}
|
|
307
327
|
}
|
|
308
|
-
exports.RdsInstance = RdsInstance;
|
|
309
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsInstance.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsInstance.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  type IConnectable,\n  InstanceType,\n  type IVpc,\n  Port,\n  type SubnetSelection,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  CaCertificate,\n  Credentials,\n  DatabaseInstance,\n  DatabaseInstanceFromSnapshot,\n  DatabaseInstanceEngine,\n  DatabaseInstanceReadReplica,\n  DatabaseProxy,\n  type IDatabaseInstance,\n  type IInstanceEngine,\n  ParameterGroup,\n  PostgresEngineVersion,\n  ProxyTarget,\n  SnapshotCredentials,\n  StorageType\n} from \"aws-cdk-lib/aws-rds\";\nimport { Runtime } from \"aws-cdk-lib/aws-lambda\";\nimport { PolicyStatement, Effect } from \"aws-cdk-lib/aws-iam\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../networking/securityGroup.js\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { CustomResource } from \"../utilities/customResource\";\nimport { type StackBuilder } from \"../base/awsStack\";\nimport { getDatabaseInsightsRetention } from \"./\";\nimport { RDS_DEFAULTS } from \"./rdsDefaults\";\nimport {\n  DEFAULT_POSTGRES_ENGINE_CONFIG,\n  resolveDatabaseInsights,\n  resolveStorageEncryptionKey,\n  resolvePerformanceInsightsKey,\n  addMultiUserSecretRotation\n} from \"./rdsHelpers\";\nimport {\n  type EngineConfig,\n  type ProxyConfig,\n  type ReadReplicaConfig,\n  type CredentialsConfig,\n  type EncryptionConfig,\n  type DatabaseInsightsConfig,\n  isCMKRequested\n} from \"../../../utils/databaseTypes\";\nimport { ResourceNaming } from \"../../../utils/resourceNaming\";\nimport { addProxyCfnOutput } from \"./rdsProxyOutput\";\n\ninterface RdsProps {\n  vpc: IVpc;\n  databaseName?: string;\n  engine?: IInstanceEngine;\n  engineConfig?: EngineConfig;\n  instanceType?: string;\n  maxAllocatedStorage?: number;\n  allocatedStorage?: number;\n  backupRetention?: Duration;\n  preferredBackupWindow?: string;\n  clusterIdentifier?: string;\n  monitoringInterval?: Duration;\n  preferredMaintenanceWindow?: string;\n  port?: number;\n  databaseInsights?: DatabaseInsightsConfig | false;\n  securityGroupIds?: string[];\n  multiAz?: boolean;\n  proxy?: ProxyConfig | false;\n  readReplica?: ReadReplicaConfig | false;\n  credentials?: CredentialsConfig;\n  encryption?: EncryptionConfig;\n  publiclyAccessible?: boolean;\n  deletionProtection?: boolean;\n  /** ARN or identifier of DB instance snapshot to restore from */\n  snapshotIdentifier?: string;\n  /** Username from the snapshot (required when restoring from snapshot to reset password) */\n  snapshotUsername?: string;\n}\n\nexport class RdsInstance extends Construct implements IConnectable {\n  public connections!: Connections;\n  public databaseSecurityGroup!: SecurityGroup;\n  public vpc!: IVpc;\n\n  private port!: number;\n  private engineConfig!: EngineConfig;\n  private databaseCredentials!: Secret;\n  private database!: IDatabaseInstance;\n  private masterSecret?: Secret;\n  private databaseProxy?: DatabaseProxy;\n  private databaseProxySecurityGroup?: SecurityGroup;\n  private readReplicaSecurityGroup?: SecurityGroup;\n\n  private readonly constructId: string;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n\n    this.constructId = id;\n    this.port = props.port || RDS_DEFAULTS.DEFAULT_PORT;\n    this.vpc = props.vpc;\n\n    // PostgreSQL fallback for direct usage - ensure engine and engineConfig match\n    this.engineConfig = props.engineConfig ?? DEFAULT_POSTGRES_ENGINE_CONFIG;\n\n    this.addDatabase(props);\n\n    // Secret rotation enabled by default (opt-out with secretRotation: false)\n    const secretRotationDisabled = props.credentials?.secretRotation === false;\n    if (!secretRotationDisabled) {\n      this.rotateSecret(props);\n    }\n\n    if (props.proxy !== undefined && props.proxy !== false) {\n      this.addProxy(props);\n    }\n\n    if (props.readReplica !== undefined && props.readReplica !== false) {\n      this.addReadReplica(props);\n    }\n  }\n\n  private addDatabase(props: RdsProps) {\n    // Username priority: snapshotUsername > credentials.username > engine default\n    const username =\n      props.snapshotIdentifier && props.snapshotUsername\n        ? props.snapshotUsername\n        : (props.credentials?.username ?? this.engineConfig.defaultUsername);\n    this.databaseCredentials = new Secret(\n      this,\n      `${props.databaseName}Credentials`,\n      {\n        secretName: ResourceNaming.credentialsSecretName(this.constructId),\n        generateSecretString: {\n          secretStringTemplate: JSON.stringify({\n            username\n          }),\n          excludePunctuation: true,\n          includeSpace: false,\n          generateStringKey: \"password\"\n        }\n      }\n    );\n\n    this.databaseSecurityGroup = new SecurityGroup(\n      this,\n      `${props.databaseName}SecurityGroup`,\n      {\n        vpc: this.vpc,\n        description: `Security group for RDS database instance ${props.databaseName}`\n      }\n    );\n\n    // Self-referencing rule for multi-AZ communication\n    this.databaseSecurityGroup.addIngressRule(\n      this.databaseSecurityGroup,\n      Port.tcp(this.port)\n    );\n\n    this.connections = new Connections({\n      securityGroups: [this.databaseSecurityGroup],\n      defaultPort: Port.tcp(this.port)\n    });\n\n    const storageEncryptionKey = resolveStorageEncryptionKey(\n      this,\n      props.databaseName,\n      props.encryption?.storageKey\n    );\n\n    const { piEnabled, piConfig } = resolveDatabaseInsights(\n      props.databaseInsights\n    );\n\n    const performanceInsightsEncryptionKey = resolvePerformanceInsightsKey(\n      this,\n      props.databaseName,\n      piEnabled,\n      piConfig?.encryptionKey\n    );\n\n    const diMode = piConfig?.mode ?? \"standard\";\n    const performanceInsightsRetention = piEnabled\n      ? getDatabaseInsightsRetention(diMode)\n      : undefined;\n\n    const engine =\n      props.engine ||\n      DatabaseInstanceEngine.postgres({\n        version: PostgresEngineVersion.VER_17_5\n      });\n\n    const parameterGroup = new ParameterGroup(\n      this,\n      `${props.databaseName}ParameterGroup`,\n      {\n        engine,\n        description: `Parameter group for ${props.databaseName} with security defaults`,\n        parameters: this.engineConfig.sslParameters\n      }\n    );\n\n    // Use PUBLIC subnet for publiclyAccessible databases (e.g., tinkerer tier without NAT)\n    const subnetType = props.publiclyAccessible\n      ? SubnetType.PUBLIC\n      : SubnetType.PRIVATE_WITH_EGRESS;\n\n    const commonInstanceProps = {\n      vpc: this.vpc,\n      vpcSubnets: {\n        subnetType\n      },\n      securityGroups: [this.databaseSecurityGroup],\n      engine,\n      parameterGroup,\n      allocatedStorage: props.allocatedStorage,\n      backupRetention: props.backupRetention || Duration.days(14),\n      preferredBackupWindow: props.preferredBackupWindow || \"02:00-03:00\",\n      storageEncrypted: true,\n      storageEncryptionKey,\n      storageType: StorageType.GP3,\n      caCertificate: CaCertificate.RDS_CA_RSA4096_G1,\n      removalPolicy: RemovalPolicy.SNAPSHOT,\n      deleteAutomatedBackups: false,\n      enablePerformanceInsights: piEnabled,\n      performanceInsightEncryptionKey: performanceInsightsEncryptionKey,\n      performanceInsightRetention: performanceInsightsRetention,\n      instanceIdentifier: ResourceNaming.dbInstanceId(this.constructId),\n      instanceType: props.instanceType\n        ? new InstanceType(props.instanceType)\n        : new InstanceType(\"t4g.large\"),\n      maxAllocatedStorage: props.maxAllocatedStorage || 500,\n      monitoringInterval:\n        props.monitoringInterval || RDS_DEFAULTS.MONITORING_INTERVAL,\n      multiAz: props.multiAz !== false,\n      port: this.port,\n      deletionProtection: props.deletionProtection ?? true,\n      preferredMaintenanceWindow:\n        props.preferredMaintenanceWindow ||\n        RDS_DEFAULTS.PREFERRED_MAINTENANCE_WINDOW,\n      publiclyAccessible: props.publiclyAccessible ?? false\n    };\n\n    if (props.snapshotIdentifier) {\n      // Create from snapshot\n      this.database = new DatabaseInstanceFromSnapshot(\n        this,\n        `${props.databaseName}Database`,\n        {\n          ...commonInstanceProps,\n          snapshotIdentifier: props.snapshotIdentifier,\n          // For snapshots, credentials are used to reset the password\n          credentials: SnapshotCredentials.fromSecret(\n            this.databaseCredentials.secret\n          )\n        }\n      );\n    } else {\n      // Create new instance\n      this.database = new DatabaseInstance(\n        this,\n        `${props.databaseName}Database`,\n        {\n          ...commonInstanceProps,\n          databaseName: props.databaseName,\n          credentials: Credentials.fromSecret(this.databaseCredentials.secret)\n        }\n      );\n    }\n  }\n\n  private rotateSecret(props: RdsProps) {\n    this.masterSecret = addMultiUserSecretRotation({\n      scope: this,\n      databaseName: props.databaseName,\n      constructId: this.constructId,\n      engineConfig: this.engineConfig,\n      credentialsConfig: props.credentials,\n      databaseSecret: this.databaseCredentials.secret,\n      target: this.database,\n      vpc: this.vpc\n    });\n  }\n\n  private addProxy(props: RdsProps) {\n    if (!props.proxy) return;\n    const proxyConfig = props.proxy;\n    const vpcSubnets: SubnetSelection = proxyConfig.vpcSubnets ?? {\n      subnetType: SubnetType.PRIVATE_WITH_EGRESS\n    };\n\n    this.databaseProxySecurityGroup = new SecurityGroup(\n      this,\n      `${props.databaseName}ProxySecurityGroup`,\n      {\n        vpc: this.vpc,\n        description: `Security group for RDS Proxy for ${props.databaseName}`\n      }\n    );\n\n    // Allow proxy to connect to database\n    this.databaseSecurityGroup.addIngressRule(\n      this.databaseProxySecurityGroup,\n      Port.tcp(this.port),\n      \"Allow RDS Proxy to connect to database\"\n    );\n\n    this.databaseProxy = new DatabaseProxy(\n      this,\n      `${props.databaseName}DatabaseProxy`,\n      {\n        dbProxyName: ResourceNaming.proxyName(this.constructId),\n        proxyTarget: ProxyTarget.fromInstance(this.database),\n        secrets: [this.databaseCredentials.secret],\n        securityGroups: [this.databaseProxySecurityGroup],\n        vpc: this.vpc,\n        vpcSubnets,\n        requireTLS: proxyConfig.requireTLS ?? true,\n        borrowTimeout: proxyConfig.connectionBorrowTimeout\n          ? Duration.seconds(proxyConfig.connectionBorrowTimeout)\n          : Duration.seconds(120),\n        maxConnectionsPercent: proxyConfig.maxConnections,\n        maxIdleConnectionsPercent: proxyConfig.maxIdleConnections\n      }\n    );\n\n    addProxyCfnOutput(\n      this,\n      this.constructId,\n      props.databaseName,\n      this.databaseProxy\n    );\n  }\n\n  private addReadReplica(props: RdsProps) {\n    if (!props.readReplica) return;\n    const replicaConfig = props.readReplica;\n    const replicaInstanceType =\n      replicaConfig.instanceType ?? props.instanceType ?? \"t4g.large\";\n\n    const { piEnabled, piConfig } = resolveDatabaseInsights(\n      props.databaseInsights\n    );\n\n    const readReplicaPerformanceInsightsKey =\n      piEnabled && isCMKRequested(piConfig?.encryptionKey)\n        ? new CustomerManagedKey(\n            this,\n            `${props.databaseName}ReadReplicaReaderInsightsKey`,\n            {\n              aliasName: `cmk/rds/${props.databaseName}/ReadReplicaInsightsKey`\n            }\n          ).key\n        : undefined;\n\n    this.readReplicaSecurityGroup = new SecurityGroup(\n      this,\n      `${props.databaseName}ReadReplicaSecurityGroup`,\n      {\n        vpc: this.vpc,\n        description: `Security group for RDS read replica of ${props.databaseName}`\n      }\n    );\n\n    // Allow primary database to replicate to read replica\n    this.readReplicaSecurityGroup.addIngressRule(\n      this.databaseSecurityGroup,\n      Port.tcp(this.port),\n      \"Allow primary database to replicate to read replica\"\n    );\n\n    // Deletion waiter ensures primary is \"available\" before CloudFormation deletes it.\n    // When the read replica is deleted, the primary enters \"modifying\" state.\n    // Without this waiter, the final snapshot creation fails.\n    const instanceId = ResourceNaming.dbInstanceId(this.constructId);\n    const waiterTimeout = Duration.minutes(10);\n    const deletionWaiter = new CustomResource(\n      this,\n      `${props.databaseName}DeletionWaiter`,\n      {\n        runtime: Runtime.NODEJS_22_X,\n        timeout: waiterTimeout.plus(Duration.seconds(30)),\n        lambdaDescription: `${props.databaseName} deletion waiter`,\n        inlineCode: `\nconst { RDSClient } = require('@aws-sdk/client-rds');\nconst { waitUntilDBInstanceAvailable } = require('@aws-sdk/client-rds');\n\nexports.handler = async (event) => {\n  console.log('Event:', JSON.stringify(event, null, 2));\n  const instanceId = event.ResourceProperties.InstanceIdentifier;\n  const physicalResourceId = event.PhysicalResourceId || event.LogicalResourceId || 'rds-deletion-waiter';\n\n  if (event.RequestType === 'Delete') {\n    console.log('Waiting for instance to be available:', instanceId);\n    const client = new RDSClient({});\n    try {\n      await waitUntilDBInstanceAvailable(\n        { client, maxWaitTime: ${waiterTimeout.toSeconds()}, minDelay: 10, maxDelay: 30 },\n        { DBInstanceIdentifier: instanceId }\n      );\n      console.log('Instance is available, deletion can proceed');\n    } catch (error) {\n      if (error.name === 'ResourceNotFoundError' ||\n          error.message?.includes('DBInstanceNotFound') ||\n          error.state === 'FAILURE') {\n        console.log('Instance not found or waiter failed, proceeding with deletion');\n      } else {\n        console.error('Error waiting for instance:', error);\n        throw error;\n      }\n    }\n  }\n  return { PhysicalResourceId: physicalResourceId };\n};\n        `,\n        inlinePolicy: [\n          new PolicyStatement({\n            effect: Effect.ALLOW,\n            actions: [\"rds:DescribeDBInstances\"],\n            resources: [\"*\"]\n          })\n        ],\n        properties: {\n          InstanceIdentifier: instanceId,\n          Version: \"1.0.0\"\n        }\n      }\n    );\n\n    deletionWaiter.resource.node.addDependency(this.database);\n\n    const readReplica = new DatabaseInstanceReadReplica(\n      this,\n      `${props.databaseName}ReadReplica`,\n      {\n        sourceDatabaseInstance: this.database,\n        vpc: this.vpc,\n        vpcSubnets: {\n          subnetType: SubnetType.PRIVATE_WITH_EGRESS\n        },\n        securityGroups: [this.readReplicaSecurityGroup],\n        allocatedStorage: props.allocatedStorage,\n        storageEncrypted: true,\n        storageType: StorageType.GP3,\n        caCertificate: CaCertificate.RDS_CA_RSA4096_G1,\n        removalPolicy: RemovalPolicy.DESTROY,\n        deleteAutomatedBackups: false,\n        enablePerformanceInsights: piEnabled,\n        performanceInsightEncryptionKey: readReplicaPerformanceInsightsKey,\n        performanceInsightRetention: piEnabled\n          ? getDatabaseInsightsRetention(piConfig?.mode ?? \"standard\")\n          : undefined,\n        instanceIdentifier: ResourceNaming.readReplicaId(this.constructId),\n        instanceType: new InstanceType(replicaInstanceType),\n        availabilityZone: replicaConfig.availabilityZone,\n        maxAllocatedStorage: props.maxAllocatedStorage || 500,\n        monitoringInterval:\n          props.monitoringInterval || RDS_DEFAULTS.MONITORING_INTERVAL,\n        multiAz: props.multiAz !== false,\n        port: this.port,\n        deletionProtection: props.deletionProtection ?? true,\n        preferredMaintenanceWindow:\n          props.preferredMaintenanceWindow ||\n          RDS_DEFAULTS.PREFERRED_MAINTENANCE_WINDOW\n      }\n    );\n\n    readReplica.node.addDependency(deletionWaiter.resource);\n  }\n\n  getHostEndpoint() {\n    if (this.databaseProxy) {\n      return this.databaseProxy.endpoint;\n    } else {\n      return this.database.dbInstanceEndpointAddress;\n    }\n  }\n\n  getHostPort(): string {\n    return String(this.port);\n  }\n\n  getCredentials(): Secret {\n    return this.databaseCredentials;\n  }\n\n  static build(id: string, props: RdsProps): (sb: StackBuilder) => Construct {\n    return (sb: StackBuilder) => {\n      const newProps: RdsProps = {\n        ...props,\n        ...{\n          vpc: sb.getNetwork() || props.vpc,\n          securityGroupIds: props?.securityGroupIds ?? [],\n          databaseName: props.databaseName || `${id.replace(\"Rds\", \"\")}`\n        }\n      };\n\n      return new this(sb.getStack(), id, newProps);\n    };\n  }\n}\n"]}
|
|
@@ -1,18 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.addProxyCfnOutput = addProxyCfnOutput;
|
|
4
|
-
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
-
const capitaliseString_1 = require("../../../utils/capitaliseString");
|
|
1
|
+
import { CfnOutput } from "aws-cdk-lib";
|
|
2
|
+
import { toPascalCase } from "../../../utils/capitaliseString.js";
|
|
6
3
|
/**
|
|
7
4
|
* Add a CfnOutput for the RDS proxy endpoint.
|
|
8
5
|
* Shared by RdsAurora and RdsInstance constructs.
|
|
9
6
|
*/
|
|
10
|
-
function addProxyCfnOutput(scope, constructId, databaseName, proxy) {
|
|
11
|
-
const outputName =
|
|
12
|
-
new
|
|
7
|
+
export function addProxyCfnOutput(scope, constructId, databaseName, proxy) {
|
|
8
|
+
const outputName = toPascalCase(databaseName || constructId);
|
|
9
|
+
new CfnOutput(scope, `${outputName}ProxyEndpointOutput`, {
|
|
13
10
|
key: `${outputName}ProxyEndpoint`,
|
|
14
11
|
exportName: `${outputName}ProxyEndpoint`,
|
|
15
12
|
value: proxy.endpoint
|
|
16
13
|
});
|
|
17
14
|
}
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmRzUHJveHlPdXRwdXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9kYXRhYmFzZS9yZHNQcm94eU91dHB1dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVNBLDhDQVlDO0FBckJELDZDQUF3QztBQUd4QyxzRUFBK0Q7QUFFL0Q7OztHQUdHO0FBQ0gsU0FBZ0IsaUJBQWlCLENBQy9CLEtBQWdCLEVBQ2hCLFdBQW1CLEVBQ25CLFlBQWdDLEVBQ2hDLEtBQW9CO0lBRXBCLE1BQU0sVUFBVSxHQUFHLElBQUEsK0JBQVksRUFBQyxZQUFZLElBQUksV0FBVyxDQUFDLENBQUM7SUFDN0QsSUFBSSx1QkFBUyxDQUFDLEtBQUssRUFBRSxHQUFHLFVBQVUscUJBQXFCLEVBQUU7UUFDdkQsR0FBRyxFQUFFLEdBQUcsVUFBVSxlQUFlO1FBQ2pDLFVBQVUsRUFBRSxHQUFHLFVBQVUsZUFBZTtRQUN4QyxLQUFLLEVBQUUsS0FBSyxDQUFDLFFBQVE7S0FDdEIsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENmbk91dHB1dCB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHR5cGUgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHR5cGUgeyBEYXRhYmFzZVByb3h5IH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1yZHNcIjtcbmltcG9ydCB7IHRvUGFzY2FsQ2FzZSB9IGZyb20gXCIuLi8uLi8uLi91dGlscy9jYXBpdGFsaXNlU3RyaW5nXCI7XG5cbi8qKlxuICogQWRkIGEgQ2ZuT3V0cHV0IGZvciB0aGUgUkRTIHByb3h5IGVuZHBvaW50LlxuICogU2hhcmVkIGJ5IFJkc0F1cm9yYSBhbmQgUmRzSW5zdGFuY2UgY29uc3RydWN0cy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGFkZFByb3h5Q2ZuT3V0cHV0KFxuICBzY29wZTogQ29uc3RydWN0LFxuICBjb25zdHJ1Y3RJZDogc3RyaW5nLFxuICBkYXRhYmFzZU5hbWU6IHN0cmluZyB8IHVuZGVmaW5lZCxcbiAgcHJveHk6IERhdGFiYXNlUHJveHlcbik6IHZvaWQge1xuICBjb25zdCBvdXRwdXROYW1lID0gdG9QYXNjYWxDYXNlKGRhdGFiYXNlTmFtZSB8fCBjb25zdHJ1Y3RJZCk7XG4gIG5ldyBDZm5PdXRwdXQoc2NvcGUsIGAke291dHB1dE5hbWV9UHJveHlFbmRwb2ludE91dHB1dGAsIHtcbiAgICBrZXk6IGAke291dHB1dE5hbWV9UHJveHlFbmRwb2ludGAsXG4gICAgZXhwb3J0TmFtZTogYCR7b3V0cHV0TmFtZX1Qcm94eUVuZHBvaW50YCxcbiAgICB2YWx1ZTogcHJveHkuZW5kcG9pbnRcbiAgfSk7XG59XG4iXX0=
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Construct } from "constructs";
|
|
2
|
+
import { type IRole } from "aws-cdk-lib/aws-iam";
|
|
3
|
+
import type { IHostedZone } from "aws-cdk-lib/aws-route53";
|
|
4
|
+
export interface DelegationRoleProps {
|
|
5
|
+
readonly zoneName: string;
|
|
6
|
+
readonly hostedZone: IHostedZone;
|
|
7
|
+
readonly organisationIdExportName?: string;
|
|
8
|
+
readonly description?: string;
|
|
9
|
+
readonly costAllocationEnvironment?: string;
|
|
10
|
+
readonly costAllocationDomain?: string;
|
|
11
|
+
}
|
|
12
|
+
export declare class DelegationRole extends Construct {
|
|
13
|
+
readonly role: IRole;
|
|
14
|
+
readonly roleArn: string;
|
|
15
|
+
readonly description: string;
|
|
16
|
+
readonly exportName: string;
|
|
17
|
+
constructor(scope: Construct, id: string, props: DelegationRoleProps);
|
|
18
|
+
}
|