@fjall/components-infrastructure 0.89.5 → 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 +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,56 +1,35 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
function getConfig(accountName) {
|
|
7
|
-
const app = app_1.default.getInstance();
|
|
1
|
+
import App from "../app.js";
|
|
2
|
+
import { parseOrgConfig } from "./orgConfigParser.js";
|
|
3
|
+
import { FjallLogger } from "./validationLogger.js";
|
|
4
|
+
export function getConfig(accountName) {
|
|
5
|
+
const app = App.getInstance();
|
|
8
6
|
const config = {
|
|
9
7
|
region: process.env.AWS_REGION || "us-east-1",
|
|
10
8
|
environment: "unknown",
|
|
11
|
-
existingAccounts: [],
|
|
12
9
|
secondaryRegions: [],
|
|
13
10
|
allRegions: []
|
|
14
11
|
};
|
|
15
12
|
if (!process.env.AWS_REGION)
|
|
16
|
-
|
|
17
|
-
let providerAccounts = [];
|
|
13
|
+
FjallLogger.warn("AWS_REGION is not set, defaulting to us-east-1");
|
|
18
14
|
// Primary: read org config from CDK context (injected by CLI/worker)
|
|
19
15
|
const orgConfigRaw = app.node.tryGetContext("orgConfig");
|
|
20
|
-
if (typeof orgConfigRaw
|
|
21
|
-
|
|
22
|
-
const orgConfig = JSON.parse(orgConfigRaw);
|
|
23
|
-
providerAccounts = Array.isArray(orgConfig.providerAccounts)
|
|
24
|
-
? orgConfig.providerAccounts
|
|
25
|
-
: [];
|
|
26
|
-
config.primaryRegion =
|
|
27
|
-
typeof orgConfig.primaryRegion === "string"
|
|
28
|
-
? orgConfig.primaryRegion
|
|
29
|
-
: undefined;
|
|
30
|
-
config.secondaryRegions = Array.isArray(orgConfig.secondaryRegions)
|
|
31
|
-
? orgConfig.secondaryRegions
|
|
32
|
-
: [];
|
|
33
|
-
config.disasterRecoveryRegion =
|
|
34
|
-
typeof orgConfig.disasterRecoveryRegion === "string"
|
|
35
|
-
? orgConfig.disasterRecoveryRegion
|
|
36
|
-
: undefined;
|
|
37
|
-
// Compute allRegions from org config fields
|
|
38
|
-
const regions = new Set();
|
|
39
|
-
if (config.primaryRegion)
|
|
40
|
-
regions.add(config.primaryRegion);
|
|
41
|
-
for (const r of config.secondaryRegions)
|
|
42
|
-
regions.add(r);
|
|
43
|
-
if (config.disasterRecoveryRegion)
|
|
44
|
-
regions.add(config.disasterRecoveryRegion);
|
|
45
|
-
config.allRegions = [...regions];
|
|
46
|
-
}
|
|
47
|
-
catch (error) {
|
|
48
|
-
validationLogger_1.FjallLogger.warn(`Failed to parse orgConfig from CDK context: ${error instanceof Error ? error.message : String(error)}`);
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
else {
|
|
52
|
-
validationLogger_1.FjallLogger.warn("No orgConfig context provided — org-level config (accounts, regions) will be empty");
|
|
16
|
+
if (typeof orgConfigRaw !== "string") {
|
|
17
|
+
FjallLogger.warn("No orgConfig context provided — org-level config (accounts, regions) will be empty");
|
|
53
18
|
}
|
|
19
|
+
const orgConfig = parseOrgConfig(typeof orgConfigRaw === "string" ? orgConfigRaw : undefined);
|
|
20
|
+
const providerAccounts = orgConfig.providerAccounts;
|
|
21
|
+
config.primaryRegion = orgConfig.primaryRegion;
|
|
22
|
+
config.secondaryRegions = orgConfig.secondaryRegions;
|
|
23
|
+
config.disasterRecoveryRegion = orgConfig.disasterRecoveryRegion;
|
|
24
|
+
// Compute allRegions from org config fields
|
|
25
|
+
const regions = new Set();
|
|
26
|
+
if (config.primaryRegion)
|
|
27
|
+
regions.add(config.primaryRegion);
|
|
28
|
+
for (const r of config.secondaryRegions)
|
|
29
|
+
regions.add(r);
|
|
30
|
+
if (config.disasterRecoveryRegion)
|
|
31
|
+
regions.add(config.disasterRecoveryRegion);
|
|
32
|
+
config.allRegions = [...regions];
|
|
54
33
|
// Build account IDs map from provider accounts (name → id)
|
|
55
34
|
if (providerAccounts.length > 0) {
|
|
56
35
|
config.accountIds = {};
|
|
@@ -59,8 +38,12 @@ function getConfig(accountName) {
|
|
|
59
38
|
}
|
|
60
39
|
}
|
|
61
40
|
// If unspecified account name - try to retrieve from context
|
|
62
|
-
if (!accountName)
|
|
63
|
-
|
|
41
|
+
if (!accountName) {
|
|
42
|
+
const contextAccountName = app.node.tryGetContext("accountName");
|
|
43
|
+
if (typeof contextAccountName === "string") {
|
|
44
|
+
accountName = contextAccountName;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
64
47
|
// If we have an account name - look for associated provider account
|
|
65
48
|
if (accountName) {
|
|
66
49
|
const providerAccount = providerAccounts.find((pa) => pa.name === accountName);
|
|
@@ -94,5 +77,4 @@ function getConfig(accountName) {
|
|
|
94
77
|
}
|
|
95
78
|
return config;
|
|
96
79
|
}
|
|
97
|
-
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../../lib/utils/getConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Account } from \"@aws-sdk/client-organizations\";\n\nimport App from \"../app\";\nimport { type ProviderAccount } from \"@fjall/util\";\nimport { FjallLogger } from \"./validationLogger\";\n\nexport interface Config {\n  region: string;\n  environment: string;\n  existingAccounts: Account[];\n  accountId?: string;\n  accountName?: string;\n  accountIds?: Record<string, string>;\n  primaryRegion?: string;\n  secondaryRegions: string[];\n  allRegions: string[];\n  disasterRecoveryRegion?: string;\n}\n\nexport function getConfig(accountName?: string): Config {\n  const app = App.getInstance();\n\n  const config: Config = {\n    region: process.env.AWS_REGION || \"us-east-1\",\n    environment: \"unknown\",\n    existingAccounts: [],\n    secondaryRegions: [],\n    allRegions: []\n  };\n\n  if (!process.env.AWS_REGION)\n    FjallLogger.warn(\"AWS_REGION is not set, defaulting to us-east-1\");\n\n  let providerAccounts: ProviderAccount[] = [];\n\n  // Primary: read org config from CDK context (injected by CLI/worker)\n  const orgConfigRaw = app.node.tryGetContext(\"orgConfig\");\n\n  if (typeof orgConfigRaw === \"string\") {\n    try {\n      const orgConfig = JSON.parse(orgConfigRaw) as Record<string, unknown>;\n      providerAccounts = Array.isArray(orgConfig.providerAccounts)\n        ? (orgConfig.providerAccounts as ProviderAccount[])\n        : [];\n      config.primaryRegion =\n        typeof orgConfig.primaryRegion === \"string\"\n          ? orgConfig.primaryRegion\n          : undefined;\n      config.secondaryRegions = Array.isArray(orgConfig.secondaryRegions)\n        ? (orgConfig.secondaryRegions as string[])\n        : [];\n      config.disasterRecoveryRegion =\n        typeof orgConfig.disasterRecoveryRegion === \"string\"\n          ? orgConfig.disasterRecoveryRegion\n          : undefined;\n\n      // Compute allRegions from org config fields\n      const regions = new Set<string>();\n      if (config.primaryRegion) regions.add(config.primaryRegion);\n      for (const r of config.secondaryRegions) regions.add(r);\n      if (config.disasterRecoveryRegion)\n        regions.add(config.disasterRecoveryRegion);\n      config.allRegions = [...regions];\n    } catch (error) {\n      FjallLogger.warn(\n        `Failed to parse orgConfig from CDK context: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  } else {\n    FjallLogger.warn(\n      \"No orgConfig context provided — org-level config (accounts, regions) will be empty\"\n    );\n  }\n\n  // Build account IDs map from provider accounts (name → id)\n  if (providerAccounts.length > 0) {\n    config.accountIds = {};\n    for (const pa of providerAccounts) {\n      config.accountIds[pa.name] = pa.id;\n    }\n  }\n\n  // If unspecified account name - try to retrieve from context\n  if (!accountName) accountName = app.node.tryGetContext(\"accountName\");\n  // If we have an account name - look for associated provider account\n  if (accountName) {\n    const providerAccount = providerAccounts.find(\n      (pa) => pa.name === accountName\n    );\n    if (providerAccount) {\n      config.accountId = providerAccount.id;\n      config.accountName = providerAccount.name;\n      config.environment = providerAccount.environment;\n    }\n  }\n\n  // If we still don't have an account name - try to retrieve accountId from context\n  if (!config.accountName) {\n    const accountId = app.node.tryGetContext(\"accountId\");\n    // If we find an accountId - retrieve the associated account from config\n    if (typeof accountId === \"string\") {\n      config.accountId = accountId;\n\n      const providerAccount = providerAccounts.find(\n        (pa) => pa.id === accountId\n      );\n      if (providerAccount) {\n        config.accountName = providerAccount.name;\n        config.environment = providerAccount.environment;\n      }\n    }\n  }\n\n  // Check for environment from context (highest priority)\n  const contextEnvironment = app.node.tryGetContext(\"environment\");\n  if (typeof contextEnvironment === \"string\") {\n    config.environment = contextEnvironment;\n  } else if (process.env.ENVIRONMENT && config.environment === \"unknown\") {\n    // Fall back to ENVIRONMENT variable if no other source found\n    config.environment = process.env.ENVIRONMENT;\n  }\n\n  return config;\n}\n\nexport default getConfig;\n"]}
|
|
80
|
+
export default getConfig;
|
|
@@ -1,20 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.default = getStackOutput;
|
|
4
|
-
const fs_1 = require("fs");
|
|
5
|
-
function getStackOutput(stackname, key) {
|
|
1
|
+
import { accessSync, readFileSync, constants } from "fs";
|
|
2
|
+
export default function getStackOutput(stackname, key) {
|
|
6
3
|
const path = `./output/${stackname}.json`;
|
|
7
4
|
try {
|
|
8
|
-
|
|
5
|
+
accessSync(path, constants.R_OK);
|
|
9
6
|
}
|
|
10
7
|
catch (_error) {
|
|
11
8
|
// File does not exist or we do not have permissions to read it
|
|
12
9
|
return undefined;
|
|
13
10
|
}
|
|
14
|
-
const stackOutputFile =
|
|
11
|
+
const stackOutputFile = readFileSync(path, "utf8");
|
|
15
12
|
const stackOuput = JSON.parse(stackOutputFile);
|
|
16
13
|
for (const [, value] of Object.entries(stackOuput)) {
|
|
17
14
|
return value[`${key}`];
|
|
18
15
|
}
|
|
19
16
|
}
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0U3RhY2tPdXRwdXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvdXRpbHMvZ2V0U3RhY2tPdXRwdXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFRQSxpQ0FlQztBQXZCRCwyQkFBeUQ7QUFRekQsU0FBd0IsY0FBYyxDQUFDLFNBQWlCLEVBQUUsR0FBVztJQUNuRSxNQUFNLElBQUksR0FBRyxZQUFZLFNBQVMsT0FBTyxDQUFDO0lBRTFDLElBQUksQ0FBQztRQUNILElBQUEsZUFBVSxFQUFDLElBQUksRUFBRSxjQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbkMsQ0FBQztJQUFDLE9BQU8sTUFBTSxFQUFFLENBQUM7UUFDaEIsK0RBQStEO1FBQy9ELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxNQUFNLGVBQWUsR0FBRyxJQUFBLGlCQUFZLEVBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ25ELE1BQU0sVUFBVSxHQUFjLElBQUksQ0FBQyxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDMUQsS0FBSyxNQUFNLENBQUMsRUFBRSxLQUFLLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7UUFDbkQsT0FBTyxLQUFLLENBQUMsR0FBRyxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQ3pCLENBQUM7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgYWNjZXNzU3luYywgcmVhZEZpbGVTeW5jLCBjb25zdGFudHMgfSBmcm9tIFwiZnNcIjtcblxuaW50ZXJmYWNlIFN0YWNrSlNPTiB7XG4gIFN0YWNrTmFtZToge1xuICAgIE91dHB1dHM6IHN0cmluZztcbiAgfTtcbn1cblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gZ2V0U3RhY2tPdXRwdXQoc3RhY2tuYW1lOiBzdHJpbmcsIGtleTogc3RyaW5nKSB7XG4gIGNvbnN0IHBhdGggPSBgLi9vdXRwdXQvJHtzdGFja25hbWV9Lmpzb25gO1xuXG4gIHRyeSB7XG4gICAgYWNjZXNzU3luYyhwYXRoLCBjb25zdGFudHMuUl9PSyk7XG4gIH0gY2F0Y2ggKF9lcnJvcikge1xuICAgIC8vIEZpbGUgZG9lcyBub3QgZXhpc3Qgb3Igd2UgZG8gbm90IGhhdmUgcGVybWlzc2lvbnMgdG8gcmVhZCBpdFxuICAgIHJldHVybiB1bmRlZmluZWQ7XG4gIH1cblxuICBjb25zdCBzdGFja091dHB1dEZpbGUgPSByZWFkRmlsZVN5bmMocGF0aCwgXCJ1dGY4XCIpO1xuICBjb25zdCBzdGFja091cHV0OiBTdGFja0pTT04gPSBKU09OLnBhcnNlKHN0YWNrT3V0cHV0RmlsZSk7XG4gIGZvciAoY29uc3QgWywgdmFsdWVdIG9mIE9iamVjdC5lbnRyaWVzKHN0YWNrT3VwdXQpKSB7XG4gICAgcmV0dXJuIHZhbHVlW2Ake2tleX1gXTtcbiAgfVxufVxuIl19
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
export * from "./backupTierMapping";
|
|
2
|
-
export * from "./capitaliseString";
|
|
3
|
-
export * from "./connections";
|
|
4
|
-
export * from "./databaseTypes";
|
|
5
|
-
export * from "./getConfig";
|
|
6
|
-
export * from "./removalPolicy";
|
|
7
|
-
export * from "./resourceNaming";
|
|
8
|
-
export * from "./standardTagsAspect";
|
|
9
|
-
export * from "./validationLogger";
|
|
10
|
-
export * from "./env";
|
|
11
|
-
export * from "./vpcUtils";
|
|
12
|
-
export * from "./domainTypes";
|
|
1
|
+
export * from "./backupTierMapping.js";
|
|
2
|
+
export * from "./capitaliseString.js";
|
|
3
|
+
export * from "./connections.js";
|
|
4
|
+
export * from "./databaseTypes.js";
|
|
5
|
+
export * from "./getConfig.js";
|
|
6
|
+
export * from "./removalPolicy.js";
|
|
7
|
+
export * from "./resourceNaming.js";
|
|
8
|
+
export * from "./standardTagsAspect.js";
|
|
9
|
+
export * from "./validationLogger.js";
|
|
10
|
+
export * from "./env.js";
|
|
11
|
+
export * from "./vpcUtils.js";
|
|
12
|
+
export * from "./domainTypes.js";
|
package/dist/lib/utils/index.js
CHANGED
|
@@ -1,29 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./backupTierMapping"), exports);
|
|
18
|
-
__exportStar(require("./capitaliseString"), exports);
|
|
19
|
-
__exportStar(require("./connections"), exports);
|
|
20
|
-
__exportStar(require("./databaseTypes"), exports);
|
|
21
|
-
__exportStar(require("./getConfig"), exports);
|
|
22
|
-
__exportStar(require("./removalPolicy"), exports);
|
|
23
|
-
__exportStar(require("./resourceNaming"), exports);
|
|
24
|
-
__exportStar(require("./standardTagsAspect"), exports);
|
|
25
|
-
__exportStar(require("./validationLogger"), exports);
|
|
26
|
-
__exportStar(require("./env"), exports);
|
|
27
|
-
__exportStar(require("./vpcUtils"), exports);
|
|
28
|
-
__exportStar(require("./domainTypes"), exports);
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUFvQztBQUNwQyxxREFBbUM7QUFDbkMsZ0RBQThCO0FBQzlCLGtEQUFnQztBQUNoQyw4Q0FBNEI7QUFDNUIsa0RBQWdDO0FBQ2hDLG1EQUFpQztBQUNqQyx1REFBcUM7QUFDckMscURBQW1DO0FBQ25DLHdDQUFzQjtBQUN0Qiw2Q0FBMkI7QUFDM0IsZ0RBQThCIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSBcIi4vYmFja3VwVGllck1hcHBpbmdcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2NhcGl0YWxpc2VTdHJpbmdcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2Nvbm5lY3Rpb25zXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9kYXRhYmFzZVR5cGVzXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9nZXRDb25maWdcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3JlbW92YWxQb2xpY3lcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3Jlc291cmNlTmFtaW5nXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9zdGFuZGFyZFRhZ3NBc3BlY3RcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3ZhbGlkYXRpb25Mb2dnZXJcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2VudlwiO1xuZXhwb3J0ICogZnJvbSBcIi4vdnBjVXRpbHNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2RvbWFpblR5cGVzXCI7XG4iXX0=
|
|
1
|
+
export * from "./backupTierMapping.js";
|
|
2
|
+
export * from "./capitaliseString.js";
|
|
3
|
+
export * from "./connections.js";
|
|
4
|
+
export * from "./databaseTypes.js";
|
|
5
|
+
export * from "./getConfig.js";
|
|
6
|
+
export * from "./removalPolicy.js";
|
|
7
|
+
export * from "./resourceNaming.js";
|
|
8
|
+
export * from "./standardTagsAspect.js";
|
|
9
|
+
export * from "./validationLogger.js";
|
|
10
|
+
export * from "./env.js";
|
|
11
|
+
export * from "./vpcUtils.js";
|
|
12
|
+
export * from "./domainTypes.js";
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
* the Zod schemas to match. Future work: extract to shared @fjall/types package.
|
|
18
18
|
*/
|
|
19
19
|
import type { CloudAssembly } from "aws-cdk-lib/cx-api";
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
import { type ResourceMapEntry, MANIFEST_SCHEMA_VERSION } from "@fjall/util/constructMap";
|
|
21
|
+
import { type ResourceCategory } from "@fjall/util/resourceCategorisation";
|
|
22
22
|
/**
|
|
23
23
|
* Service configuration extracted from ECS services.
|
|
24
24
|
*/
|
|
@@ -97,6 +97,8 @@ export interface FjallManifest {
|
|
|
97
97
|
ecr?: ManifestEcr;
|
|
98
98
|
/** Template hashes by stack name */
|
|
99
99
|
stacks: Record<string, ManifestStackHash>;
|
|
100
|
+
/** Resource map: logicalId → construct context for topology grouping */
|
|
101
|
+
resourceMap?: Record<string, ResourceMapEntry>;
|
|
100
102
|
}
|
|
101
103
|
/**
|
|
102
104
|
* Collected manifest data during synthesis.
|
|
@@ -108,7 +110,17 @@ export declare class ManifestCollector {
|
|
|
108
110
|
private pattern?;
|
|
109
111
|
private ecr?;
|
|
110
112
|
private appName;
|
|
113
|
+
private constructGroups;
|
|
111
114
|
constructor(appName: string);
|
|
115
|
+
/**
|
|
116
|
+
* Set the construct group mapping based on stack type.
|
|
117
|
+
* Defaults to Account groups if not set.
|
|
118
|
+
*/
|
|
119
|
+
setConstructGroups(groups: Readonly<Record<string, ResourceCategory>>): void;
|
|
120
|
+
/**
|
|
121
|
+
* Get the current construct group mapping.
|
|
122
|
+
*/
|
|
123
|
+
getConstructGroups(): Readonly<Record<string, ResourceCategory>>;
|
|
112
124
|
/**
|
|
113
125
|
* Add a service configuration.
|
|
114
126
|
*/
|
|
@@ -171,4 +183,3 @@ export declare function getCurrentCollector(): ManifestCollector | null;
|
|
|
171
183
|
* Reset the global collector (for testing).
|
|
172
184
|
*/
|
|
173
185
|
export declare function resetManifestCollector(): void;
|
|
174
|
-
export {};
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/**
|
|
3
2
|
* Fjall Manifest Writer.
|
|
4
3
|
*
|
|
@@ -17,31 +16,38 @@
|
|
|
17
16
|
* the authoritative source for validation. If you modify these interfaces, update
|
|
18
17
|
* the Zod schemas to match. Future work: extract to shared @fjall/types package.
|
|
19
18
|
*/
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
exports.getCurrentCollector = getCurrentCollector;
|
|
26
|
-
exports.resetManifestCollector = resetManifestCollector;
|
|
27
|
-
const fs_1 = require("fs");
|
|
28
|
-
const path_1 = require("path");
|
|
29
|
-
const crypto_1 = require("crypto");
|
|
30
|
-
const validationLogger_js_1 = require("./validationLogger.js");
|
|
31
|
-
/** Current manifest schema version. Must match MANIFEST_SCHEMA_VERSION in CLI's FjallManifest.ts */
|
|
32
|
-
const MANIFEST_SCHEMA_VERSION = 1;
|
|
33
|
-
/** Manifest file name */
|
|
34
|
-
const MANIFEST_FILE_NAME = "fjall-manifest.json";
|
|
19
|
+
import { writeFileSync, readFileSync, existsSync, readdirSync } from "fs";
|
|
20
|
+
import { join, basename } from "path";
|
|
21
|
+
import { createHash } from "crypto";
|
|
22
|
+
import { buildConstructMap, constructMapToRecord, ACCOUNT_CONSTRUCT_GROUPS, FJALL_MANIFEST_FILENAME, MANIFEST_SCHEMA_VERSION } from "@fjall/util/constructMap";
|
|
23
|
+
import { FjallLogger } from "./validationLogger.js";
|
|
35
24
|
/**
|
|
36
25
|
* Collected manifest data during synthesis.
|
|
37
26
|
* Stores all data that will be written to the manifest file.
|
|
38
27
|
*/
|
|
39
|
-
class ManifestCollector {
|
|
28
|
+
export class ManifestCollector {
|
|
29
|
+
services = [];
|
|
30
|
+
lambdas = [];
|
|
31
|
+
pattern;
|
|
32
|
+
ecr;
|
|
33
|
+
appName;
|
|
34
|
+
constructGroups = ACCOUNT_CONSTRUCT_GROUPS;
|
|
40
35
|
constructor(appName) {
|
|
41
|
-
this.services = [];
|
|
42
|
-
this.lambdas = [];
|
|
43
36
|
this.appName = appName;
|
|
44
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* Set the construct group mapping based on stack type.
|
|
40
|
+
* Defaults to Account groups if not set.
|
|
41
|
+
*/
|
|
42
|
+
setConstructGroups(groups) {
|
|
43
|
+
this.constructGroups = groups;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Get the current construct group mapping.
|
|
47
|
+
*/
|
|
48
|
+
getConstructGroups() {
|
|
49
|
+
return this.constructGroups;
|
|
50
|
+
}
|
|
45
51
|
/**
|
|
46
52
|
* Add a service configuration.
|
|
47
53
|
*/
|
|
@@ -101,20 +107,19 @@ class ManifestCollector {
|
|
|
101
107
|
return this.appName;
|
|
102
108
|
}
|
|
103
109
|
}
|
|
104
|
-
exports.ManifestCollector = ManifestCollector;
|
|
105
110
|
/**
|
|
106
111
|
* Compute SHA-256 hash of a CloudFormation template file.
|
|
107
112
|
* Normalises JSON to ensure consistent hashes.
|
|
108
113
|
*/
|
|
109
114
|
function computeTemplateHash(templatePath) {
|
|
110
115
|
try {
|
|
111
|
-
const content =
|
|
116
|
+
const content = readFileSync(templatePath, "utf-8");
|
|
112
117
|
const normalised = JSON.stringify(JSON.parse(content));
|
|
113
|
-
return
|
|
118
|
+
return createHash("sha256").update(normalised).digest("hex");
|
|
114
119
|
}
|
|
115
120
|
catch (error) {
|
|
116
121
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
117
|
-
|
|
122
|
+
FjallLogger.warn(`Failed to compute hash for ${templatePath}: ${errorMessage}`);
|
|
118
123
|
return null;
|
|
119
124
|
}
|
|
120
125
|
}
|
|
@@ -125,11 +130,11 @@ function computeStackHashes(cdkOutPath) {
|
|
|
125
130
|
const stacks = {};
|
|
126
131
|
const synthTimestamp = new Date().toISOString();
|
|
127
132
|
try {
|
|
128
|
-
const files =
|
|
133
|
+
const files = readdirSync(cdkOutPath);
|
|
129
134
|
const templateFiles = files.filter((f) => f.endsWith(".template.json"));
|
|
130
135
|
for (const templateFile of templateFiles) {
|
|
131
|
-
const templatePath =
|
|
132
|
-
const stackName =
|
|
136
|
+
const templatePath = join(cdkOutPath, templateFile);
|
|
137
|
+
const stackName = basename(templateFile, ".template.json");
|
|
133
138
|
const hash = computeTemplateHash(templatePath);
|
|
134
139
|
if (hash) {
|
|
135
140
|
stacks[stackName] = {
|
|
@@ -141,7 +146,7 @@ function computeStackHashes(cdkOutPath) {
|
|
|
141
146
|
}
|
|
142
147
|
catch (error) {
|
|
143
148
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
144
|
-
|
|
149
|
+
FjallLogger.warn(`Failed to read cdk.out for hash computation: ${errorMessage}`);
|
|
145
150
|
}
|
|
146
151
|
return stacks;
|
|
147
152
|
}
|
|
@@ -151,17 +156,22 @@ function computeStackHashes(cdkOutPath) {
|
|
|
151
156
|
* @param assembly - The CloudAssembly from synth
|
|
152
157
|
* @param collector - The manifest collector with service data
|
|
153
158
|
*/
|
|
154
|
-
function writeManifest(assembly, collector) {
|
|
159
|
+
export function writeManifest(assembly, collector) {
|
|
155
160
|
const cdkOutPath = assembly.directory;
|
|
156
|
-
const manifestPath =
|
|
161
|
+
const manifestPath = join(cdkOutPath, FJALL_MANIFEST_FILENAME);
|
|
157
162
|
const stacks = computeStackHashes(cdkOutPath);
|
|
163
|
+
// Build resource map from CDK manifest metadata
|
|
164
|
+
const constructMap = buildConstructMap(cdkOutPath, collector.getConstructGroups());
|
|
158
165
|
const manifest = {
|
|
159
166
|
version: MANIFEST_SCHEMA_VERSION,
|
|
160
167
|
generatedAt: new Date().toISOString(),
|
|
161
168
|
appName: collector.getAppName(),
|
|
162
169
|
services: collector.getServices(),
|
|
163
170
|
lambdas: collector.getLambdas(),
|
|
164
|
-
stacks
|
|
171
|
+
stacks,
|
|
172
|
+
...(constructMap.size > 0
|
|
173
|
+
? { resourceMap: constructMapToRecord(constructMap) }
|
|
174
|
+
: {})
|
|
165
175
|
};
|
|
166
176
|
const pattern = collector.getPattern();
|
|
167
177
|
if (pattern) {
|
|
@@ -172,29 +182,37 @@ function writeManifest(assembly, collector) {
|
|
|
172
182
|
manifest.ecr = ecr;
|
|
173
183
|
}
|
|
174
184
|
try {
|
|
175
|
-
|
|
176
|
-
|
|
185
|
+
writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), "utf-8");
|
|
186
|
+
FjallLogger.info(`Fjall manifest written to ${manifestPath}`);
|
|
177
187
|
}
|
|
178
188
|
catch (error) {
|
|
179
189
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
180
|
-
|
|
190
|
+
FjallLogger.warn(`Failed to write Fjall manifest: ${errorMessage}`);
|
|
181
191
|
}
|
|
182
192
|
}
|
|
183
193
|
/**
|
|
184
194
|
* Read an existing manifest file (for preserving deployment history).
|
|
185
195
|
*/
|
|
186
|
-
function readExistingManifest(cdkOutPath) {
|
|
187
|
-
const manifestPath =
|
|
188
|
-
if (!
|
|
196
|
+
export function readExistingManifest(cdkOutPath) {
|
|
197
|
+
const manifestPath = join(cdkOutPath, FJALL_MANIFEST_FILENAME);
|
|
198
|
+
if (!existsSync(manifestPath)) {
|
|
189
199
|
return null;
|
|
190
200
|
}
|
|
191
201
|
try {
|
|
192
|
-
const content =
|
|
193
|
-
|
|
202
|
+
const content = readFileSync(manifestPath, "utf-8");
|
|
203
|
+
const parsed = JSON.parse(content);
|
|
204
|
+
if (typeof parsed !== "object" ||
|
|
205
|
+
parsed === null ||
|
|
206
|
+
!("version" in parsed) ||
|
|
207
|
+
!("appName" in parsed)) {
|
|
208
|
+
FjallLogger.warn("Existing manifest has unexpected shape");
|
|
209
|
+
return null;
|
|
210
|
+
}
|
|
211
|
+
return parsed;
|
|
194
212
|
}
|
|
195
213
|
catch (error) {
|
|
196
214
|
const message = error instanceof Error ? error.message : String(error);
|
|
197
|
-
|
|
215
|
+
FjallLogger.warn(`Failed to parse existing manifest: ${message}`);
|
|
198
216
|
return null;
|
|
199
217
|
}
|
|
200
218
|
}
|
|
@@ -211,7 +229,7 @@ let globalCollector = null;
|
|
|
211
229
|
* Get or create the global manifest collector.
|
|
212
230
|
* Called by App during construction to initialise the collector.
|
|
213
231
|
*/
|
|
214
|
-
function getManifestCollector(appName) {
|
|
232
|
+
export function getManifestCollector(appName) {
|
|
215
233
|
if (!globalCollector || globalCollector.getAppName() !== appName) {
|
|
216
234
|
globalCollector = new ManifestCollector(appName);
|
|
217
235
|
}
|
|
@@ -221,13 +239,12 @@ function getManifestCollector(appName) {
|
|
|
221
239
|
* Get the current global manifest collector.
|
|
222
240
|
* Returns null if not initialised.
|
|
223
241
|
*/
|
|
224
|
-
function getCurrentCollector() {
|
|
242
|
+
export function getCurrentCollector() {
|
|
225
243
|
return globalCollector;
|
|
226
244
|
}
|
|
227
245
|
/**
|
|
228
246
|
* Reset the global collector (for testing).
|
|
229
247
|
*/
|
|
230
|
-
function resetManifestCollector() {
|
|
248
|
+
export function resetManifestCollector() {
|
|
231
249
|
globalCollector = null;
|
|
232
250
|
}
|
|
233
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"manifestWriter.js","sourceRoot":"","sources":["../../../lib/utils/manifestWriter.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Fjall Manifest Writer.\n *\n * Writes a manifest file during CDK synthesis that contains resolved service\n * configuration, pattern details, and template hashes. This replaces fragile\n * AST parsing of infrastructure.ts in the CLI.\n *\n * The manifest is written to cdk.out/fjall-manifest.json after synthesis.\n *\n * NOTE: This file uses synchronous file operations (writeFileSync, readFileSync, etc.)\n * because CDK synthesis is inherently synchronous. The synth() method blocks until\n * complete, so async operations would provide no benefit and add complexity.\n *\n * TYPE DUPLICATION NOTE: The interfaces below (ManifestService, ManifestPattern, etc.)\n * are mirrored by Zod schemas in cli/src/types/FjallManifest.ts. The CLI schemas are\n * the authoritative source for validation. If you modify these interfaces, update\n * the Zod schemas to match. Future work: extract to shared @fjall/types package.\n */\n\nimport { writeFileSync, readFileSync, existsSync, readdirSync } from \"fs\";\nimport { join, basename } from \"path\";\nimport { createHash } from \"crypto\";\nimport type { CloudAssembly } from \"aws-cdk-lib/cx-api\";\n\nimport { FjallLogger } from \"./validationLogger.js\";\n\n/** Current manifest schema version. Must match MANIFEST_SCHEMA_VERSION in CLI's FjallManifest.ts */\nconst MANIFEST_SCHEMA_VERSION = 1 as const;\n\n/**\n * Service configuration extracted from ECS services.\n */\nexport interface ManifestService {\n  /** Service name (must match ECS service name) */\n  name: string;\n  /** Cluster name this service belongs to */\n  clusterName?: string;\n  /** Path to Dockerfile relative to app root */\n  dockerfilePath?: string;\n  /** Docker build target for multi-stage builds */\n  dockerTarget?: string;\n  /** Container port */\n  containerPort?: number;\n  /** SSM secrets configured for this service (aggregated from all containers) */\n  secrets?: string[];\n  /** SSM secrets path (derived or explicit) */\n  ssmSecretsPath?: string;\n}\n\n/**\n * Pattern configuration extracted from PatternFactory.\n */\nexport interface ManifestPattern {\n  /** Pattern type */\n  type: \"payload\";\n  /** Pattern name (CMS name) */\n  name: string;\n  /** Source directory containing build output */\n  source: string;\n}\n\n/**\n * ECR configuration.\n */\nexport interface ManifestEcr {\n  /** ECR repository name */\n  repositoryName: string;\n}\n\n/**\n * Lambda function configuration extracted from Lambda compute.\n * Enables CLI discovery of Lambda functions for secrets management.\n */\nexport interface ManifestLambda {\n  /** Lambda function name (construct ID) */\n  name: string;\n  /** SSM secrets configured for this Lambda */\n  secrets?: string[];\n  /** SSM secrets path (derived or explicit) */\n  ssmSecretsPath?: string;\n}\n\n/**\n * Stack hash entry computed from synthesised template.\n */\nexport interface ManifestStackHash {\n  /** SHA-256 hash of the synthesised template */\n  templateHash: string;\n  /** ISO timestamp when synth completed */\n  synthTimestamp: string;\n}\n\n/**\n * Fjall manifest - generated during CDK synth.\n */\nexport interface FjallManifest {\n  /** Schema version for future compatibility */\n  version: typeof MANIFEST_SCHEMA_VERSION;\n  /** ISO timestamp when manifest was generated */\n  generatedAt: string;\n  /** Application name */\n  appName: string;\n  /** Resolved service configurations */\n  services: ManifestService[];\n  /** Lambda function configurations */\n  lambdas: ManifestLambda[];\n  /** Pattern configuration (if using PatternFactory) */\n  pattern?: ManifestPattern;\n  /** ECR configuration */\n  ecr?: ManifestEcr;\n  /** Template hashes by stack name */\n  stacks: Record<string, ManifestStackHash>;\n}\n\n/** Manifest file name */\nconst MANIFEST_FILE_NAME = \"fjall-manifest.json\";\n\n/**\n * Collected manifest data during synthesis.\n * Stores all data that will be written to the manifest file.\n */\nexport class ManifestCollector {\n  private services: ManifestService[] = [];\n  private lambdas: ManifestLambda[] = [];\n  private pattern?: ManifestPattern;\n  private ecr?: ManifestEcr;\n  private appName: string;\n\n  constructor(appName: string) {\n    this.appName = appName;\n  }\n\n  /**\n   * Add a service configuration.\n   */\n  addService(service: ManifestService): void {\n    if (!this.services.some((s) => s.name === service.name)) {\n      this.services.push(service);\n    }\n  }\n\n  /**\n   * Add a Lambda function configuration.\n   */\n  addLambda(lambda: ManifestLambda): void {\n    if (!this.lambdas.some((l) => l.name === lambda.name)) {\n      this.lambdas.push(lambda);\n    }\n  }\n\n  /**\n   * Set the pattern configuration.\n   */\n  setPattern(pattern: ManifestPattern): void {\n    this.pattern = pattern;\n  }\n\n  /**\n   * Set the ECR repository configuration.\n   */\n  setEcr(ecr: ManifestEcr): void {\n    this.ecr = ecr;\n  }\n\n  /**\n   * Get collected services.\n   */\n  getServices(): ManifestService[] {\n    return this.services;\n  }\n\n  /**\n   * Get collected Lambda functions.\n   */\n  getLambdas(): ManifestLambda[] {\n    return this.lambdas;\n  }\n\n  /**\n   * Get pattern configuration.\n   */\n  getPattern(): ManifestPattern | undefined {\n    return this.pattern;\n  }\n\n  /**\n   * Get ECR configuration.\n   */\n  getEcr(): ManifestEcr | undefined {\n    return this.ecr;\n  }\n\n  /**\n   * Get the application name.\n   */\n  getAppName(): string {\n    return this.appName;\n  }\n}\n\n/**\n * Compute SHA-256 hash of a CloudFormation template file.\n * Normalises JSON to ensure consistent hashes.\n */\nfunction computeTemplateHash(templatePath: string): string | null {\n  try {\n    const content = readFileSync(templatePath, \"utf-8\");\n    const normalised = JSON.stringify(JSON.parse(content));\n    return createHash(\"sha256\").update(normalised).digest(\"hex\");\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : String(error);\n    FjallLogger.warn(\n      `Failed to compute hash for ${templatePath}: ${errorMessage}`\n    );\n    return null;\n  }\n}\n\n/**\n * Find all template files in cdk.out and compute their hashes.\n */\nfunction computeStackHashes(\n  cdkOutPath: string\n): Record<string, ManifestStackHash> {\n  const stacks: Record<string, ManifestStackHash> = {};\n  const synthTimestamp = new Date().toISOString();\n\n  try {\n    const files = readdirSync(cdkOutPath);\n    const templateFiles = files.filter((f) => f.endsWith(\".template.json\"));\n\n    for (const templateFile of templateFiles) {\n      const templatePath = join(cdkOutPath, templateFile);\n      const stackName = basename(templateFile, \".template.json\");\n      const hash = computeTemplateHash(templatePath);\n\n      if (hash) {\n        stacks[stackName] = {\n          templateHash: hash,\n          synthTimestamp\n        };\n      }\n    }\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : String(error);\n    FjallLogger.warn(\n      `Failed to read cdk.out for hash computation: ${errorMessage}`\n    );\n  }\n\n  return stacks;\n}\n\n/**\n * Write the manifest file to cdk.out.\n *\n * @param assembly - The CloudAssembly from synth\n * @param collector - The manifest collector with service data\n */\nexport function writeManifest(\n  assembly: CloudAssembly,\n  collector: ManifestCollector\n): void {\n  const cdkOutPath = assembly.directory;\n  const manifestPath = join(cdkOutPath, MANIFEST_FILE_NAME);\n\n  const stacks = computeStackHashes(cdkOutPath);\n\n  const manifest: FjallManifest = {\n    version: MANIFEST_SCHEMA_VERSION,\n    generatedAt: new Date().toISOString(),\n    appName: collector.getAppName(),\n    services: collector.getServices(),\n    lambdas: collector.getLambdas(),\n    stacks\n  };\n\n  const pattern = collector.getPattern();\n  if (pattern) {\n    manifest.pattern = pattern;\n  }\n\n  const ecr = collector.getEcr();\n  if (ecr) {\n    manifest.ecr = ecr;\n  }\n\n  try {\n    writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), \"utf-8\");\n    FjallLogger.info(`Fjall manifest written to ${manifestPath}`);\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : String(error);\n    FjallLogger.warn(`Failed to write Fjall manifest: ${errorMessage}`);\n  }\n}\n\n/**\n * Read an existing manifest file (for preserving deployment history).\n */\nexport function readExistingManifest(cdkOutPath: string): FjallManifest | null {\n  const manifestPath = join(cdkOutPath, MANIFEST_FILE_NAME);\n\n  if (!existsSync(manifestPath)) {\n    return null;\n  }\n\n  try {\n    const content = readFileSync(manifestPath, \"utf-8\");\n    return JSON.parse(content) as FjallManifest;\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    FjallLogger.warn(`Failed to parse existing manifest: ${message}`);\n    return null;\n  }\n}\n\n/**\n * Global manifest collector instance.\n *\n * CDK's architecture guarantees one App per process, so a global singleton is safe here.\n * The collector is created when App is constructed and used throughout synthesis.\n * resetManifestCollector() is provided for testing scenarios where multiple Apps\n * may be created in the same process.\n */\nlet globalCollector: ManifestCollector | null = null;\n\n/**\n * Get or create the global manifest collector.\n * Called by App during construction to initialise the collector.\n */\nexport function getManifestCollector(appName: string): ManifestCollector {\n  if (!globalCollector || globalCollector.getAppName() !== appName) {\n    globalCollector = new ManifestCollector(appName);\n  }\n  return globalCollector;\n}\n\n/**\n * Get the current global manifest collector.\n * Returns null if not initialised.\n */\nexport function getCurrentCollector(): ManifestCollector | null {\n  return globalCollector;\n}\n\n/**\n * Reset the global collector (for testing).\n */\nexport function resetManifestCollector(): void {\n  globalCollector = null;\n}\n"]}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { type ProviderAccount } from "@fjall/util/config";
|
|
2
|
+
export interface ParsedOrgConfig {
|
|
3
|
+
providerAccounts: ProviderAccount[];
|
|
4
|
+
primaryRegion?: string;
|
|
5
|
+
secondaryRegions: string[];
|
|
6
|
+
disasterRecoveryRegion?: string;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Parse orgConfig JSON from CDK context into a validated structure.
|
|
10
|
+
*
|
|
11
|
+
* Shared across env.ts, getConfig.ts, and disasterRecovery.ts to avoid
|
|
12
|
+
* duplicating the same JSON.parse + field extraction + type guard pattern.
|
|
13
|
+
*/
|
|
14
|
+
export declare function parseOrgConfig(raw: string | undefined): ParsedOrgConfig;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { FjallLogger } from "./validationLogger.js";
|
|
2
|
+
/**
|
|
3
|
+
* Parse orgConfig JSON from CDK context into a validated structure.
|
|
4
|
+
*
|
|
5
|
+
* Shared across env.ts, getConfig.ts, and disasterRecovery.ts to avoid
|
|
6
|
+
* duplicating the same JSON.parse + field extraction + type guard pattern.
|
|
7
|
+
*/
|
|
8
|
+
export function parseOrgConfig(raw) {
|
|
9
|
+
const empty = {
|
|
10
|
+
providerAccounts: [],
|
|
11
|
+
secondaryRegions: []
|
|
12
|
+
};
|
|
13
|
+
if (!raw)
|
|
14
|
+
return empty;
|
|
15
|
+
try {
|
|
16
|
+
const parsed = JSON.parse(raw);
|
|
17
|
+
if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed))
|
|
18
|
+
return empty;
|
|
19
|
+
const obj = parsed;
|
|
20
|
+
const providerAccounts = Array.isArray(obj.providerAccounts)
|
|
21
|
+
? obj.providerAccounts.filter((item) => typeof item === "object" &&
|
|
22
|
+
item !== null &&
|
|
23
|
+
typeof item.id === "string" &&
|
|
24
|
+
typeof item.name === "string" &&
|
|
25
|
+
typeof item.environment === "string" &&
|
|
26
|
+
(item.managed === undefined ||
|
|
27
|
+
typeof item.managed === "boolean") &&
|
|
28
|
+
(item.oidcRoleArn === undefined ||
|
|
29
|
+
typeof item.oidcRoleArn === "string"))
|
|
30
|
+
: [];
|
|
31
|
+
const primaryRegion = typeof obj.primaryRegion === "string" ? obj.primaryRegion : undefined;
|
|
32
|
+
const secondaryRegions = Array.isArray(obj.secondaryRegions)
|
|
33
|
+
? obj.secondaryRegions.filter((item) => typeof item === "string")
|
|
34
|
+
: [];
|
|
35
|
+
const disasterRecoveryRegion = typeof obj.disasterRecoveryRegion === "string"
|
|
36
|
+
? obj.disasterRecoveryRegion
|
|
37
|
+
: undefined;
|
|
38
|
+
return {
|
|
39
|
+
providerAccounts,
|
|
40
|
+
primaryRegion,
|
|
41
|
+
secondaryRegions,
|
|
42
|
+
disasterRecoveryRegion
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
FjallLogger.warn(`[fjall] Failed to parse orgConfig from CDK context: ${error instanceof Error ? error.message : String(error)}`);
|
|
47
|
+
return empty;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
@@ -1,16 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.toRemovalPolicy = toRemovalPolicy;
|
|
4
|
-
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
-
function toRemovalPolicy(value) {
|
|
1
|
+
import { RemovalPolicy } from "aws-cdk-lib";
|
|
2
|
+
export function toRemovalPolicy(value) {
|
|
6
3
|
switch (value) {
|
|
7
4
|
case "DESTROY":
|
|
8
|
-
return
|
|
5
|
+
return RemovalPolicy.DESTROY;
|
|
9
6
|
case "SNAPSHOT":
|
|
10
|
-
return
|
|
7
|
+
return RemovalPolicy.SNAPSHOT;
|
|
11
8
|
case "RETAIN":
|
|
12
9
|
default:
|
|
13
|
-
return
|
|
10
|
+
return RemovalPolicy.RETAIN;
|
|
14
11
|
}
|
|
15
12
|
}
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3ZhbFBvbGljeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi91dGlscy9yZW1vdmFsUG9saWN5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsMENBWUM7QUFkRCw2Q0FBNEM7QUFFNUMsU0FBZ0IsZUFBZSxDQUM3QixLQUF5QztJQUV6QyxRQUFRLEtBQUssRUFBRSxDQUFDO1FBQ2QsS0FBSyxTQUFTO1lBQ1osT0FBTywyQkFBYSxDQUFDLE9BQU8sQ0FBQztRQUMvQixLQUFLLFVBQVU7WUFDYixPQUFPLDJCQUFhLENBQUMsUUFBUSxDQUFDO1FBQ2hDLEtBQUssUUFBUSxDQUFDO1FBQ2Q7WUFDRSxPQUFPLDJCQUFhLENBQUMsTUFBTSxDQUFDO0lBQ2hDLENBQUM7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUmVtb3ZhbFBvbGljeSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuXG5leHBvcnQgZnVuY3Rpb24gdG9SZW1vdmFsUG9saWN5KFxuICB2YWx1ZT86IFwiREVTVFJPWVwiIHwgXCJSRVRBSU5cIiB8IFwiU05BUFNIT1RcIlxuKTogUmVtb3ZhbFBvbGljeSB7XG4gIHN3aXRjaCAodmFsdWUpIHtcbiAgICBjYXNlIFwiREVTVFJPWVwiOlxuICAgICAgcmV0dXJuIFJlbW92YWxQb2xpY3kuREVTVFJPWTtcbiAgICBjYXNlIFwiU05BUFNIT1RcIjpcbiAgICAgIHJldHVybiBSZW1vdmFsUG9saWN5LlNOQVBTSE9UO1xuICAgIGNhc2UgXCJSRVRBSU5cIjpcbiAgICBkZWZhdWx0OlxuICAgICAgcmV0dXJuIFJlbW92YWxQb2xpY3kuUkVUQUlOO1xuICB9XG59XG4iXX0=
|