@cdklabs/cdk-cicd-wrapper 0.4.0 → 0.4.1
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/.jsii +9962 -2698
- package/.jsii.tabl.json +1 -1
- package/README.md +7 -1
- package/lib/code-pipeline/AppStage.d.ts +80 -0
- package/lib/code-pipeline/AppStage.js +80 -0
- package/lib/code-pipeline/CDKPipeline.d.ts +225 -0
- package/lib/code-pipeline/CDKPipeline.js +167 -0
- package/lib/code-pipeline/CodeGuruSecurityStep.d.ts +61 -0
- package/lib/code-pipeline/CodeGuruSecurityStep.js +137 -0
- package/lib/code-pipeline/PostDeployBuildStep.d.ts +16 -0
- package/lib/code-pipeline/PostDeployBuildStep.js +67 -0
- package/lib/code-pipeline/PreDeployBuildStep.d.ts +14 -0
- package/lib/code-pipeline/PreDeployBuildStep.js +35 -0
- package/lib/code-pipeline/index.d.ts +7 -0
- package/lib/code-pipeline/index.js +26 -0
- package/lib/common/index.d.ts +16 -0
- package/lib/common/index.js +35 -0
- package/lib/common/spi/ResourceContext.d.ts +128 -0
- package/lib/common/spi/ResourceContext.js +251 -0
- package/lib/common/spi/index.d.ts +6 -0
- package/lib/common/spi/index.js +25 -0
- package/lib/common/types/BaseStackProvider.d.ts +95 -0
- package/lib/common/types/BaseStackProvider.js +152 -0
- package/lib/common/types/DefaultStackProvider.d.ts +70 -0
- package/lib/common/types/DefaultStackProvider.js +141 -0
- package/lib/common/types/Types.d.ts +402 -0
- package/lib/common/types/Types.js +110 -0
- package/lib/constructs/CodeCommitRepositoryConstruct.d.ts +56 -0
- package/lib/constructs/CodeCommitRepositoryConstruct.js +100 -0
- package/lib/constructs/CodeStarConnectionConstruct.d.ts +34 -0
- package/lib/constructs/CodeStarConnectionConstruct.js +41 -0
- package/lib/constructs/S3RepositoryConstruct.d.ts +51 -0
- package/lib/constructs/S3RepositoryConstruct.js +81 -0
- package/lib/constructs/index.d.ts +8 -0
- package/lib/constructs/index.js +27 -0
- package/lib/index.d.ts +14 -29
- package/lib/index.js +36 -114
- package/lib/plugins/index.d.ts +56 -0
- package/lib/plugins/index.js +81 -0
- package/lib/plugins/optimization/DestroyEncryptionKeysOnDeletePlugin.d.ts +12 -0
- package/lib/plugins/optimization/DestroyEncryptionKeysOnDeletePlugin.js +40 -0
- package/lib/plugins/pipeline/GitHubPipelinePlugin.d.ts +125 -0
- package/lib/plugins/pipeline/GitHubPipelinePlugin.js +44 -0
- package/lib/plugins/pipeline/resources/github/GitHubPipelineProvider.d.ts +16 -0
- package/lib/plugins/pipeline/resources/github/GitHubPipelineProvider.js +74 -0
- package/lib/plugins/pipeline/resources/github/GitHubRepositoryProvider.d.ts +82 -0
- package/lib/plugins/pipeline/resources/github/GitHubRepositoryProvider.js +70 -0
- package/lib/plugins/security/AccessLogsForBucketPlugin.d.ts +10 -0
- package/lib/plugins/security/AccessLogsForBucketPlugin.js +75 -0
- package/lib/plugins/security/DisablePublicIPAssignmentForEC2Plugin.d.ts +10 -0
- package/lib/plugins/security/DisablePublicIPAssignmentForEC2Plugin.js +36 -0
- package/lib/plugins/security/EncryptBucketOnTransitPlugin.d.ts +10 -0
- package/lib/plugins/security/EncryptBucketOnTransitPlugin.js +48 -0
- package/lib/plugins/security/EncryptCloudWatchLogGroupsPlugin.d.ts +12 -0
- package/lib/plugins/security/EncryptCloudWatchLogGroupsPlugin.js +45 -0
- package/lib/plugins/security/EncryptSNSTopicOnTransitPlugin.d.ts +10 -0
- package/lib/plugins/security/EncryptSNSTopicOnTransitPlugin.js +70 -0
- package/lib/plugins/security/LambdaDLQPlugin.d.ts +16 -0
- package/lib/plugins/security/LambdaDLQPlugin.js +61 -0
- package/lib/plugins/security/RotateEncryptionKeysPlugin.d.ts +10 -0
- package/lib/plugins/security/RotateEncryptionKeysPlugin.js +36 -0
- package/lib/plugins/utils/CodeArtifactPlugin.d.ts +27 -0
- package/lib/plugins/utils/CodeArtifactPlugin.js +66 -0
- package/lib/projen/CDKCommands.d.ts +56 -0
- package/lib/projen/CDKCommands.js +125 -0
- package/lib/projen/CICommands.d.ts +61 -0
- package/lib/projen/CICommands.js +70 -0
- package/lib/projen/CdkCICDWrapper.d.ts +56 -0
- package/lib/projen/CdkCICDWrapper.js +65 -0
- package/lib/projen/DevBoxFile.d.ts +12 -0
- package/lib/projen/DevBoxFile.js +40 -0
- package/lib/projen/DotEnvFile.d.ts +26 -0
- package/lib/projen/DotEnvFile.js +40 -0
- package/lib/projen/TaskFile.d.ts +18 -0
- package/lib/projen/TaskFile.js +26 -0
- package/lib/projen/Taskfile.yaml +158 -0
- package/lib/projen/index.d.ts +5 -0
- package/lib/projen/index.js +24 -0
- package/lib/resource-providers/CIDefinitionProvider.d.ts +39 -0
- package/lib/resource-providers/CIDefinitionProvider.js +68 -0
- package/lib/resource-providers/CodeBuildFactoryProvider.d.ts +136 -0
- package/lib/resource-providers/CodeBuildFactoryProvider.js +264 -0
- package/lib/resource-providers/ComplianceBucketProvider.d.ts +42 -0
- package/lib/resource-providers/ComplianceBucketProvider.js +50 -0
- package/lib/resource-providers/DisabledProvider.d.ts +6 -0
- package/lib/resource-providers/DisabledProvider.js +16 -0
- package/lib/resource-providers/EncryptionProvider.d.ts +25 -0
- package/lib/resource-providers/EncryptionProvider.js +33 -0
- package/lib/resource-providers/HooksProvider.d.ts +15 -0
- package/lib/resource-providers/HooksProvider.js +49 -0
- package/lib/resource-providers/LoggingProvider.d.ts +21 -0
- package/lib/resource-providers/LoggingProvider.js +63 -0
- package/lib/resource-providers/ParameterProvider.d.ts +32 -0
- package/lib/resource-providers/ParameterProvider.js +46 -0
- package/lib/resource-providers/PhaseCommandProvider.d.ts +136 -0
- package/lib/resource-providers/PhaseCommandProvider.js +220 -0
- package/lib/resource-providers/PipelineProvider.d.ts +13 -0
- package/lib/resource-providers/PipelineProvider.js +54 -0
- package/lib/resource-providers/ProxyProvider.d.ts +35 -0
- package/lib/resource-providers/ProxyProvider.js +53 -0
- package/lib/resource-providers/RepositoryProvider.d.ts +171 -0
- package/lib/resource-providers/RepositoryProvider.js +201 -0
- package/lib/resource-providers/StageProvider.d.ts +17 -0
- package/lib/resource-providers/StageProvider.js +36 -0
- package/lib/resource-providers/VPCProvider.d.ts +57 -0
- package/lib/resource-providers/VPCProvider.js +67 -0
- package/lib/resource-providers/index.d.ts +48 -0
- package/lib/resource-providers/index.js +67 -0
- package/lib/stacks/CodeCommitRepositoryStack.d.ts +39 -0
- package/lib/stacks/CodeCommitRepositoryStack.js +23 -0
- package/lib/stacks/CodeStarConnectRepositoryStack.d.ts +44 -0
- package/lib/stacks/CodeStarConnectRepositoryStack.js +33 -0
- package/lib/stacks/EncryptionStack.d.ts +27 -0
- package/lib/stacks/EncryptionStack.js +41 -0
- package/lib/stacks/PipelineBlueprint.d.ts +220 -0
- package/lib/stacks/PipelineBlueprint.js +467 -0
- package/lib/stacks/PipelineBlueprintBase.d.ts +40 -0
- package/lib/stacks/PipelineBlueprintBase.js +130 -0
- package/lib/stacks/PipelineStack.d.ts +16 -0
- package/lib/stacks/PipelineStack.js +36 -0
- package/lib/stacks/PostDeployExecutorStack.d.ts +76 -0
- package/lib/stacks/PostDeployExecutorStack.js +60 -0
- package/lib/stacks/S3RepositoryStack.d.ts +30 -0
- package/lib/stacks/S3RepositoryStack.js +38 -0
- package/lib/stacks/SSMParameterStack.d.ts +50 -0
- package/lib/stacks/SSMParameterStack.js +74 -0
- package/lib/stacks/WorkbenchStack.d.ts +19 -0
- package/lib/stacks/WorkbenchStack.js +29 -0
- package/lib/stacks/compliance-bucket/ComplianceBucketStack.d.ts +47 -0
- package/lib/stacks/compliance-bucket/ComplianceBucketStack.js +124 -0
- package/lib/stacks/compliance-bucket/lambda-functions/compliance_log_bucket_policy.py +34 -0
- package/lib/stacks/compliance-bucket/lambda-functions/make-compliance-log-bucket.py +111 -0
- package/lib/stacks/index.d.ts +36 -0
- package/lib/stacks/index.js +55 -0
- package/lib/stacks/vpc/ManagedVPCStack.d.ts +96 -0
- package/lib/stacks/vpc/ManagedVPCStack.js +115 -0
- package/lib/stacks/vpc/NoVPCStack.d.ts +27 -0
- package/lib/stacks/vpc/NoVPCStack.js +23 -0
- package/lib/stacks/vpc/VPCFromLookUpStack.d.ts +42 -0
- package/lib/stacks/vpc/VPCFromLookUpStack.js +49 -0
- package/lib/utils/ParameterResolver.d.ts +18 -0
- package/lib/utils/ParameterResolver.js +34 -0
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/index.js +20 -0
- package/node_modules/yaml/browser/dist/compose/composer.js +2 -4
- package/node_modules/yaml/browser/dist/compose/resolve-flow-scalar.js +3 -5
- package/node_modules/yaml/browser/dist/nodes/Alias.js +0 -2
- package/node_modules/yaml/browser/dist/parse/lexer.js +24 -28
- package/node_modules/yaml/browser/dist/parse/parser.js +4 -12
- package/node_modules/yaml/browser/dist/schema/yaml-1.1/merge.js +8 -11
- package/node_modules/yaml/browser/dist/stringify/stringifyNumber.js +1 -2
- package/node_modules/yaml/dist/compose/composer.js +2 -4
- package/node_modules/yaml/dist/compose/resolve-flow-scalar.js +3 -5
- package/node_modules/yaml/dist/nodes/Alias.js +0 -2
- package/node_modules/yaml/dist/nodes/Scalar.d.ts +1 -5
- package/node_modules/yaml/dist/parse/lexer.js +24 -28
- package/node_modules/yaml/dist/parse/parser.js +4 -12
- package/node_modules/yaml/dist/schema/yaml-1.1/merge.js +7 -10
- package/node_modules/yaml/dist/stringify/stringifyNumber.js +1 -2
- package/node_modules/yaml/package.json +1 -1
- package/package.json +3 -6
- package/rosetta/default.ts-fixture +1 -1
- package/.compatignore +0 -131
- package/lib/app/DeploymentPipelineApp.d.ts +0 -19
- package/lib/app/DeploymentPipelineApp.js +0 -49
- package/lib/app/PipelineApp.d.ts +0 -25
- package/lib/app/PipelineApp.js +0 -62
- package/lib/appconfig/accessor.d.ts +0 -59
- package/lib/appconfig/accessor.js +0 -79
- package/lib/appconfig/defaults.d.ts +0 -23
- package/lib/appconfig/defaults.js +0 -87
- package/lib/appconfig/error.d.ts +0 -20
- package/lib/appconfig/error.js +0 -32
- package/lib/appconfig/index.d.ts +0 -6
- package/lib/appconfig/index.js +0 -25
- package/lib/appconfig/loader.d.ts +0 -34
- package/lib/appconfig/loader.js +0 -86
- package/lib/appconfig/schema.d.ts +0 -46
- package/lib/appconfig/schema.js +0 -14
- package/lib/appconfig/validation.d.ts +0 -41
- package/lib/appconfig/validation.js +0 -72
- package/lib/config/build-image.d.ts +0 -41
- package/lib/config/build-image.js +0 -46
- package/lib/config/define.d.ts +0 -137
- package/lib/config/define.js +0 -151
- package/lib/config/naming.d.ts +0 -32
- package/lib/config/naming.js +0 -47
- package/lib/config/repository.d.ts +0 -36
- package/lib/config/repository.js +0 -53
- package/lib/config/types.d.ts +0 -375
- package/lib/config/types.js +0 -69
- package/lib/engine/cdkpipelines/CdkPipelinesEngine.d.ts +0 -46
- package/lib/engine/cdkpipelines/CdkPipelinesEngine.js +0 -260
- package/lib/engine/codepipeline/CodePipelineEngine.d.ts +0 -63
- package/lib/engine/codepipeline/CodePipelineEngine.js +0 -631
- package/lib/engine/codepipeline/DeploymentPipeline.d.ts +0 -24
- package/lib/engine/codepipeline/DeploymentPipeline.js +0 -236
- package/lib/engine/codepipeline/deploy-driver/handler.d.ts +0 -42
- package/lib/engine/codepipeline/deploy-driver/handler.js +0 -116
- package/lib/engine/codepipeline/source.d.ts +0 -5
- package/lib/engine/codepipeline/source.js +0 -56
- package/lib/engine/github/GitHubActionsEngine.d.ts +0 -29
- package/lib/engine/github/GitHubActionsEngine.js +0 -165
- package/lib/engine/types.d.ts +0 -14
- package/lib/engine/types.js +0 -11
- package/lib/runtime/attach.d.ts +0 -24
- package/lib/runtime/attach.js +0 -41
- package/lib/runtime/inject.d.ts +0 -90
- package/lib/runtime/inject.js +0 -227
- package/lib/runtime/pipeline-assembler.d.ts +0 -25
- package/lib/runtime/pipeline-assembler.js +0 -208
- package/lib/runtime/register.d.ts +0 -1
- package/lib/runtime/register.js +0 -110
- package/lib/support/AccessLogsForBucketAspect.d.ts +0 -24
- package/lib/support/AccessLogsForBucketAspect.js +0 -67
- package/lib/support/DestroyEncryptionKeysOnDeleteAspect.d.ts +0 -10
- package/lib/support/DestroyEncryptionKeysOnDeleteAspect.js +0 -33
- package/lib/support/DisablePublicIPAssignmentForEC2Aspect.d.ts +0 -9
- package/lib/support/DisablePublicIPAssignmentForEC2Aspect.js +0 -34
- package/lib/support/EncryptBucketOnTransitAspect.d.ts +0 -10
- package/lib/support/EncryptBucketOnTransitAspect.js +0 -56
- package/lib/support/EncryptCloudWatchLogGroupsAspect.d.ts +0 -23
- package/lib/support/EncryptCloudWatchLogGroupsAspect.js +0 -45
- package/lib/support/EncryptSNSTopicOnTransitAspect.d.ts +0 -9
- package/lib/support/EncryptSNSTopicOnTransitAspect.js +0 -77
- package/lib/support/LambdaDLQAspect.d.ts +0 -17
- package/lib/support/LambdaDLQAspect.js +0 -31
- package/lib/support/LogRetentionAspect.d.ts +0 -23
- package/lib/support/LogRetentionAspect.js +0 -43
- package/lib/support/RotateEncryptionKeysAspect.d.ts +0 -9
- package/lib/support/RotateEncryptionKeysAspect.js +0 -33
- package/lib/support/SupportResources.d.ts +0 -75
- package/lib/support/SupportResources.js +0 -137
- package/lib/support/Vpc.d.ts +0 -21
- package/lib/support/Vpc.js +0 -110
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var _a;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.ManagedVPCStack = void 0;
|
|
5
|
+
const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
|
|
6
|
+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
7
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
8
|
+
const cdk = require("aws-cdk-lib");
|
|
9
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
10
|
+
const ec2 = require("aws-cdk-lib/aws-ec2");
|
|
11
|
+
/**
|
|
12
|
+
* A stack that creates or looks up a VPC and configures its settings.
|
|
13
|
+
*/
|
|
14
|
+
class ManagedVPCStack extends cdk.Stack {
|
|
15
|
+
get securityGroup() {
|
|
16
|
+
return this._securityGroup;
|
|
17
|
+
}
|
|
18
|
+
constructor(scope, id, props) {
|
|
19
|
+
super(scope, id, props);
|
|
20
|
+
this.cidrBlock = props.cidrBlock;
|
|
21
|
+
this.restrictDefaultSecurityGroup = props.restrictDefaultSecurityGroup || true;
|
|
22
|
+
this.allowAllOutbound = props.allowAllOutbound || true;
|
|
23
|
+
this.subnetCidrMask = props.subnetCidrMask;
|
|
24
|
+
this.maxAzs = props.maxAzs;
|
|
25
|
+
this.codeBuildVPCInterfaces = [
|
|
26
|
+
ec2.InterfaceVpcEndpointAwsService.SSM,
|
|
27
|
+
ec2.InterfaceVpcEndpointAwsService.STS,
|
|
28
|
+
ec2.InterfaceVpcEndpointAwsService.CLOUDWATCH_LOGS,
|
|
29
|
+
ec2.InterfaceVpcEndpointAwsService.CLOUDFORMATION,
|
|
30
|
+
ec2.InterfaceVpcEndpointAwsService.SECRETS_MANAGER,
|
|
31
|
+
ec2.InterfaceVpcEndpointAwsService.KMS,
|
|
32
|
+
...(props.codeBuildVPCInterfaces || []),
|
|
33
|
+
];
|
|
34
|
+
this.subnetType =
|
|
35
|
+
props.subnetType || (props.useProxy ? ec2.SubnetType.PRIVATE_ISOLATED : ec2.SubnetType.PRIVATE_WITH_EGRESS);
|
|
36
|
+
this.vpc = props.useProxy ? this.launchVPCIsolated() : this.launchVPCWithEgress();
|
|
37
|
+
const vpcFlowLogsDestinationS3 = aws_cdk_lib_1.aws_s3.Bucket.fromBucketName(this, 'VpcFlowLogsBucket', props.flowLogsBucketName);
|
|
38
|
+
this.vpc.addFlowLog('vpcFlowLogs', {
|
|
39
|
+
destination: ec2.FlowLogDestination.toS3(vpcFlowLogsDestinationS3),
|
|
40
|
+
trafficType: ec2.FlowLogTrafficType.ALL,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Launches a VPC with an isolated subnet and configures security groups and VPC endpoints.
|
|
45
|
+
* @param props The properties for configuring the VPC.
|
|
46
|
+
* @returns The created VPC.
|
|
47
|
+
*/
|
|
48
|
+
launchVPCIsolated() {
|
|
49
|
+
const vpc = new ec2.Vpc(this, 'vpc', {
|
|
50
|
+
ipAddresses: ec2.IpAddresses.cidr(this.cidrBlock),
|
|
51
|
+
restrictDefaultSecurityGroup: this.restrictDefaultSecurityGroup,
|
|
52
|
+
subnetConfiguration: [
|
|
53
|
+
{
|
|
54
|
+
cidrMask: this.subnetCidrMask,
|
|
55
|
+
name: 'private-isolated',
|
|
56
|
+
subnetType: this.subnetType,
|
|
57
|
+
},
|
|
58
|
+
],
|
|
59
|
+
maxAzs: this.maxAzs,
|
|
60
|
+
});
|
|
61
|
+
this._securityGroup = new ec2.SecurityGroup(this, 'VpcSecurityGroup', {
|
|
62
|
+
vpc: vpc,
|
|
63
|
+
description: 'Allow traffic between CodeBuildStep and AWS Service VPC Endpoints',
|
|
64
|
+
securityGroupName: 'Security Group for AWS Service VPC Endpoints',
|
|
65
|
+
allowAllOutbound: this.allowAllOutbound,
|
|
66
|
+
});
|
|
67
|
+
this._securityGroup.addIngressRule(ec2.Peer.ipv4(vpc.vpcCidrBlock), ec2.Port.tcp(443), 'HTTPS Traffic');
|
|
68
|
+
this.codeBuildVPCInterfaces.forEach((service) => {
|
|
69
|
+
vpc.addInterfaceEndpoint(`VpcEndpoint${service.shortName}`, {
|
|
70
|
+
service,
|
|
71
|
+
open: false,
|
|
72
|
+
securityGroups: [this._securityGroup],
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
vpc.addGatewayEndpoint('VpcGatewayS3', {
|
|
76
|
+
service: ec2.GatewayVpcEndpointAwsService.S3,
|
|
77
|
+
});
|
|
78
|
+
return vpc;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Launches a VPC with a private subnet with egress.
|
|
82
|
+
* @param props The properties for configuring the VPC.
|
|
83
|
+
* @returns The created VPC.
|
|
84
|
+
*/
|
|
85
|
+
launchVPCWithEgress() {
|
|
86
|
+
const vpc = new ec2.Vpc(this, 'vpc', {
|
|
87
|
+
ipAddresses: ec2.IpAddresses.cidr(this.cidrBlock),
|
|
88
|
+
restrictDefaultSecurityGroup: this.restrictDefaultSecurityGroup,
|
|
89
|
+
subnetConfiguration: [
|
|
90
|
+
{
|
|
91
|
+
cidrMask: this.subnetCidrMask,
|
|
92
|
+
name: 'private-egress',
|
|
93
|
+
subnetType: this.subnetType,
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
cidrMask: this.subnetCidrMask,
|
|
97
|
+
name: 'public',
|
|
98
|
+
subnetType: ec2.SubnetType.PUBLIC,
|
|
99
|
+
},
|
|
100
|
+
],
|
|
101
|
+
maxAzs: this.maxAzs,
|
|
102
|
+
});
|
|
103
|
+
this._securityGroup = new ec2.SecurityGroup(this, 'VpcSecurityGroup', {
|
|
104
|
+
vpc: vpc,
|
|
105
|
+
description: 'Use this as the default VPC Security Group',
|
|
106
|
+
securityGroupName: 'Security Group for the VPC with Egress + Public Subnets',
|
|
107
|
+
allowAllOutbound: this.allowAllOutbound,
|
|
108
|
+
});
|
|
109
|
+
return vpc;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
exports.ManagedVPCStack = ManagedVPCStack;
|
|
113
|
+
_a = JSII_RTTI_SYMBOL_1;
|
|
114
|
+
ManagedVPCStack[_a] = { fqn: "@cdklabs/cdk-cicd-wrapper.ManagedVPCStack", version: "0.4.1" };
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ManagedVPCStack.js","sourceRoot":"","sources":["../../../src/stacks/vpc/ManagedVPCStack.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\n\nimport * as cdk from 'aws-cdk-lib';\nimport { aws_s3 } from 'aws-cdk-lib';\nimport * as ec2 from 'aws-cdk-lib/aws-ec2';\nimport { Construct } from 'constructs';\n\n/**\n * Properties for the VPCStack.\n */\nexport interface ManagedVPCStackProps extends cdk.StackProps {\n  /**\n   * CIDR block for the VPC.\n   */\n  readonly cidrBlock: string;\n\n  /**\n   * Subnets CIDR masks.\n   */\n  readonly subnetCidrMask: number;\n\n  /**\n   * Max AZs.\n   */\n  readonly maxAzs: number;\n\n  /**\n   * Whether to use a proxy for the VPC.\n   * Default value is false.\n   */\n  readonly useProxy: boolean;\n\n  /**\n   * The name of the S3 bucket for VPC flow logs.\n   */\n  readonly flowLogsBucketName?: string;\n\n  /**\n   * If set to true then the default inbound & outbound rules will be removed\n   * from the default security group\n   *\n   * @default true\n   */\n  readonly restrictDefaultSecurityGroup?: boolean;\n\n  /**\n   * Whether to allow all outbound traffic by default.\n   *\n   * If this is set to true, there will only be a single egress rule which allows all\n   * outbound traffic. If this is set to false, no outbound traffic will be allowed by\n   * default and all egress traffic must be explicitly authorized.\n   *\n   * @default true\n   */\n  readonly allowAllOutbound?: boolean;\n\n  /**\n   * The list of CodeBuild VPC InterfacesVpcEndpointAwsServices to extend the defaultCodeBuildVPCInterfaces\n   */\n  readonly codeBuildVPCInterfaces?: ec2.InterfaceVpcEndpointAwsService[];\n\n  /**\n   * The subnets attached to the VPC\n   *\n   * @default - Private Subnet only\n   */\n  readonly subnetType?: ec2.SubnetType;\n}\n\n/**\n * A stack that creates or looks up a VPC and configures its settings.\n */\nexport class ManagedVPCStack extends cdk.Stack {\n  /**\n   * The VPC created or looked up by this stack.\n   */\n  readonly vpc: ec2.IVpc;\n\n  /**\n   * The security group attached to the VPC\n   */\n  private _securityGroup?: ec2.ISecurityGroup;\n\n  /**\n   * The subnets attached to the VPC\n   */\n  readonly subnetType?: ec2.SubnetType;\n\n  /**\n   * The list of CodeBuild VPC InterfacesVpcEndpointAwsServices\n   */\n  readonly codeBuildVPCInterfaces: ec2.InterfaceVpcEndpointAwsService[];\n\n  readonly cidrBlock: string;\n\n  readonly restrictDefaultSecurityGroup: boolean;\n\n  readonly allowAllOutbound: boolean;\n\n  readonly subnetCidrMask: number;\n\n  readonly maxAzs: number;\n\n  get securityGroup(): ec2.ISecurityGroup | undefined {\n    return this._securityGroup;\n  }\n\n  constructor(scope: Construct, id: string, props: ManagedVPCStackProps) {\n    super(scope, id, props);\n\n    this.cidrBlock = props.cidrBlock;\n    this.restrictDefaultSecurityGroup = props.restrictDefaultSecurityGroup || true;\n    this.allowAllOutbound = props.allowAllOutbound || true;\n    this.subnetCidrMask = props.subnetCidrMask;\n    this.maxAzs = props.maxAzs;\n\n    this.codeBuildVPCInterfaces = [\n      ec2.InterfaceVpcEndpointAwsService.SSM,\n      ec2.InterfaceVpcEndpointAwsService.STS,\n      ec2.InterfaceVpcEndpointAwsService.CLOUDWATCH_LOGS,\n      ec2.InterfaceVpcEndpointAwsService.CLOUDFORMATION,\n      ec2.InterfaceVpcEndpointAwsService.SECRETS_MANAGER,\n      ec2.InterfaceVpcEndpointAwsService.KMS,\n      ...(props.codeBuildVPCInterfaces || []),\n    ];\n\n    this.subnetType =\n      props.subnetType || (props.useProxy ? ec2.SubnetType.PRIVATE_ISOLATED : ec2.SubnetType.PRIVATE_WITH_EGRESS);\n\n    this.vpc = props.useProxy ? this.launchVPCIsolated() : this.launchVPCWithEgress();\n\n    const vpcFlowLogsDestinationS3 = aws_s3.Bucket.fromBucketName(this, 'VpcFlowLogsBucket', props.flowLogsBucketName!);\n\n    this.vpc.addFlowLog('vpcFlowLogs', {\n      destination: ec2.FlowLogDestination.toS3(vpcFlowLogsDestinationS3),\n      trafficType: ec2.FlowLogTrafficType.ALL,\n    });\n  }\n\n  /**\n   * Launches a VPC with an isolated subnet and configures security groups and VPC endpoints.\n   * @param props The properties for configuring the VPC.\n   * @returns The created VPC.\n   */\n  private launchVPCIsolated() {\n    const vpc = new ec2.Vpc(this, 'vpc', {\n      ipAddresses: ec2.IpAddresses.cidr(this.cidrBlock),\n      restrictDefaultSecurityGroup: this.restrictDefaultSecurityGroup,\n      subnetConfiguration: [\n        {\n          cidrMask: this.subnetCidrMask,\n          name: 'private-isolated',\n          subnetType: this.subnetType!,\n        },\n      ],\n      maxAzs: this.maxAzs,\n    });\n\n    this._securityGroup = new ec2.SecurityGroup(this, 'VpcSecurityGroup', {\n      vpc: vpc,\n      description: 'Allow traffic between CodeBuildStep and AWS Service VPC Endpoints',\n      securityGroupName: 'Security Group for AWS Service VPC Endpoints',\n      allowAllOutbound: this.allowAllOutbound,\n    });\n\n    this._securityGroup.addIngressRule(ec2.Peer.ipv4(vpc.vpcCidrBlock), ec2.Port.tcp(443), 'HTTPS Traffic');\n\n    this.codeBuildVPCInterfaces.forEach((service: ec2.InterfaceVpcEndpointAwsService) => {\n      vpc.addInterfaceEndpoint(`VpcEndpoint${service.shortName}`, {\n        service,\n        open: false,\n        securityGroups: [this._securityGroup!],\n      });\n    });\n\n    vpc.addGatewayEndpoint('VpcGatewayS3', {\n      service: ec2.GatewayVpcEndpointAwsService.S3,\n    });\n\n    return vpc;\n  }\n\n  /**\n   * Launches a VPC with a private subnet with egress.\n   * @param props The properties for configuring the VPC.\n   * @returns The created VPC.\n   */\n  private launchVPCWithEgress() {\n    const vpc = new ec2.Vpc(this, 'vpc', {\n      ipAddresses: ec2.IpAddresses.cidr(this.cidrBlock),\n      restrictDefaultSecurityGroup: this.restrictDefaultSecurityGroup,\n      subnetConfiguration: [\n        {\n          cidrMask: this.subnetCidrMask,\n          name: 'private-egress',\n          subnetType: this.subnetType!,\n        },\n        {\n          cidrMask: this.subnetCidrMask,\n          name: 'public',\n          subnetType: ec2.SubnetType.PUBLIC,\n        },\n      ],\n      maxAzs: this.maxAzs,\n    });\n\n    this._securityGroup = new ec2.SecurityGroup(this, 'VpcSecurityGroup', {\n      vpc: vpc,\n      description: 'Use this as the default VPC Security Group',\n      securityGroupName: 'Security Group for the VPC with Egress + Public Subnets',\n      allowAllOutbound: this.allowAllOutbound,\n    });\n\n    return vpc;\n  }\n}\n"]}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import * as ec2 from 'aws-cdk-lib/aws-ec2';
|
|
2
|
+
import { IVpcConstruct } from '../../resource-providers';
|
|
3
|
+
/**
|
|
4
|
+
* A NoVPCStack that does not create a VPC.
|
|
5
|
+
*/
|
|
6
|
+
export declare class NoVPCStack implements IVpcConstruct {
|
|
7
|
+
/**
|
|
8
|
+
* The VPC created or looked up by this stack.
|
|
9
|
+
*/
|
|
10
|
+
readonly vpc?: ec2.IVpc;
|
|
11
|
+
/**
|
|
12
|
+
* The security group attached to the VPC.
|
|
13
|
+
*/
|
|
14
|
+
readonly securityGroup?: ec2.ISecurityGroup;
|
|
15
|
+
/**
|
|
16
|
+
* The subnet type attached to the VPC.
|
|
17
|
+
*/
|
|
18
|
+
readonly subnetType?: ec2.SubnetType;
|
|
19
|
+
/**
|
|
20
|
+
* The list of CodeBuild VPC Interface VPC Endpoint AWS Services.
|
|
21
|
+
*/
|
|
22
|
+
readonly codeBuildVPCInterfaces: ec2.InterfaceVpcEndpointAwsService[];
|
|
23
|
+
/**
|
|
24
|
+
* Constructs a new instance of the NoVPCStack class.
|
|
25
|
+
*/
|
|
26
|
+
constructor();
|
|
27
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var _a;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.NoVPCStack = void 0;
|
|
5
|
+
const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
|
|
6
|
+
/**
|
|
7
|
+
* A NoVPCStack that does not create a VPC.
|
|
8
|
+
*/
|
|
9
|
+
class NoVPCStack {
|
|
10
|
+
/**
|
|
11
|
+
* Constructs a new instance of the NoVPCStack class.
|
|
12
|
+
*/
|
|
13
|
+
constructor() {
|
|
14
|
+
/**
|
|
15
|
+
* The list of CodeBuild VPC Interface VPC Endpoint AWS Services.
|
|
16
|
+
*/
|
|
17
|
+
this.codeBuildVPCInterfaces = [];
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
exports.NoVPCStack = NoVPCStack;
|
|
21
|
+
_a = JSII_RTTI_SYMBOL_1;
|
|
22
|
+
NoVPCStack[_a] = { fqn: "@cdklabs/cdk-cicd-wrapper.NoVPCStack", version: "0.4.1" };
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTm9WUENTdGFjay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdGFja3MvdnBjL05vVlBDU3RhY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFNQTs7R0FFRztBQUNILE1BQWEsVUFBVTtJQXFCckI7O09BRUc7SUFDSDtRQVJBOztXQUVHO1FBQ00sMkJBQXNCLEdBQXlDLEVBQUUsQ0FBQztJQUs1RCxDQUFDOztBQXhCbEIsZ0NBeUJDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4vLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuXG5pbXBvcnQgKiBhcyBlYzIgZnJvbSAnYXdzLWNkay1saWIvYXdzLWVjMic7XG5pbXBvcnQgeyBJVnBjQ29uc3RydWN0IH0gZnJvbSAnLi4vLi4vcmVzb3VyY2UtcHJvdmlkZXJzJztcblxuLyoqXG4gKiBBIE5vVlBDU3RhY2sgdGhhdCBkb2VzIG5vdCBjcmVhdGUgYSBWUEMuXG4gKi9cbmV4cG9ydCBjbGFzcyBOb1ZQQ1N0YWNrIGltcGxlbWVudHMgSVZwY0NvbnN0cnVjdCB7XG4gIC8qKlxuICAgKiBUaGUgVlBDIGNyZWF0ZWQgb3IgbG9va2VkIHVwIGJ5IHRoaXMgc3RhY2suXG4gICAqL1xuICByZWFkb25seSB2cGM/OiBlYzIuSVZwYztcblxuICAvKipcbiAgICogVGhlIHNlY3VyaXR5IGdyb3VwIGF0dGFjaGVkIHRvIHRoZSBWUEMuXG4gICAqL1xuICByZWFkb25seSBzZWN1cml0eUdyb3VwPzogZWMyLklTZWN1cml0eUdyb3VwO1xuXG4gIC8qKlxuICAgKiBUaGUgc3VibmV0IHR5cGUgYXR0YWNoZWQgdG8gdGhlIFZQQy5cbiAgICovXG4gIHJlYWRvbmx5IHN1Ym5ldFR5cGU/OiBlYzIuU3VibmV0VHlwZTtcblxuICAvKipcbiAgICogVGhlIGxpc3Qgb2YgQ29kZUJ1aWxkIFZQQyBJbnRlcmZhY2UgVlBDIEVuZHBvaW50IEFXUyBTZXJ2aWNlcy5cbiAgICovXG4gIHJlYWRvbmx5IGNvZGVCdWlsZFZQQ0ludGVyZmFjZXM6IGVjMi5JbnRlcmZhY2VWcGNFbmRwb2ludEF3c1NlcnZpY2VbXSA9IFtdO1xuXG4gIC8qKlxuICAgKiBDb25zdHJ1Y3RzIGEgbmV3IGluc3RhbmNlIG9mIHRoZSBOb1ZQQ1N0YWNrIGNsYXNzLlxuICAgKi9cbiAgY29uc3RydWN0b3IoKSB7fVxufVxuIl19
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import * as cdk from 'aws-cdk-lib';
|
|
2
|
+
import * as ec2 from 'aws-cdk-lib/aws-ec2';
|
|
3
|
+
import { Construct } from 'constructs';
|
|
4
|
+
/**
|
|
5
|
+
* Properties for the VPCStack.
|
|
6
|
+
*/
|
|
7
|
+
export interface VPCFromLookUpStackProps extends cdk.StackProps {
|
|
8
|
+
/**
|
|
9
|
+
* The configuration for the VPC to be created or looked up.
|
|
10
|
+
*/
|
|
11
|
+
readonly vpcId: string;
|
|
12
|
+
/**
|
|
13
|
+
* The list of CodeBuild VPC InterfacesVpcEndpointAwsServices to extend the defaultCodeBuildVPCInterfaces
|
|
14
|
+
*/
|
|
15
|
+
readonly codeBuildVPCInterfaces?: ec2.InterfaceVpcEndpointAwsService[];
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* A stack that creates or looks up a VPC and configures its settings.
|
|
19
|
+
*/
|
|
20
|
+
export declare class VPCFromLookUpStack extends cdk.Stack {
|
|
21
|
+
/**
|
|
22
|
+
* The VPC created or looked up by this stack.
|
|
23
|
+
*/
|
|
24
|
+
readonly vpc: ec2.IVpc;
|
|
25
|
+
/**
|
|
26
|
+
* The security group attached to the VPC
|
|
27
|
+
*/
|
|
28
|
+
readonly securityGroup?: ec2.ISecurityGroup;
|
|
29
|
+
/**
|
|
30
|
+
* The subnets attached to the VPC
|
|
31
|
+
*/
|
|
32
|
+
readonly subnetType?: ec2.SubnetType;
|
|
33
|
+
/**
|
|
34
|
+
* The list of CodeBuild VPC InterfacesVpcEndpointAwsServices
|
|
35
|
+
*/
|
|
36
|
+
readonly codeBuildVPCInterfaces: ec2.InterfaceVpcEndpointAwsService[];
|
|
37
|
+
/**
|
|
38
|
+
* The ID of the VPC being created or looked up.
|
|
39
|
+
*/
|
|
40
|
+
readonly vpcId: string;
|
|
41
|
+
constructor(scope: Construct, id: string, props: VPCFromLookUpStackProps);
|
|
42
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var _a;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.VPCFromLookUpStack = void 0;
|
|
5
|
+
const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
|
|
6
|
+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
7
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
8
|
+
const cdk = require("aws-cdk-lib");
|
|
9
|
+
const ec2 = require("aws-cdk-lib/aws-ec2");
|
|
10
|
+
const aws_ssm_1 = require("aws-cdk-lib/aws-ssm");
|
|
11
|
+
/**
|
|
12
|
+
* A stack that creates or looks up a VPC and configures its settings.
|
|
13
|
+
*/
|
|
14
|
+
class VPCFromLookUpStack extends cdk.Stack {
|
|
15
|
+
constructor(scope, id, props) {
|
|
16
|
+
super(scope, id, props);
|
|
17
|
+
/**
|
|
18
|
+
* Default list of CodeBuild VPC InterfacesVpcEndpointAwsServices,
|
|
19
|
+
* which can be extended by the codeBuildVPCInterfaces prop.
|
|
20
|
+
*/
|
|
21
|
+
this.codeBuildVPCInterfaces = [
|
|
22
|
+
ec2.InterfaceVpcEndpointAwsService.SSM,
|
|
23
|
+
ec2.InterfaceVpcEndpointAwsService.STS,
|
|
24
|
+
ec2.InterfaceVpcEndpointAwsService.CLOUDWATCH_LOGS,
|
|
25
|
+
ec2.InterfaceVpcEndpointAwsService.CLOUDFORMATION,
|
|
26
|
+
ec2.InterfaceVpcEndpointAwsService.SECRETS_MANAGER,
|
|
27
|
+
ec2.InterfaceVpcEndpointAwsService.KMS,
|
|
28
|
+
...(props.codeBuildVPCInterfaces || []),
|
|
29
|
+
];
|
|
30
|
+
/**
|
|
31
|
+
* If the provided vpcId starts with 'resolve:ssm:', it is treated as a parameter name
|
|
32
|
+
* and the actual value is fetched from the AWS Systems Manager Parameter Store.
|
|
33
|
+
* Otherwise, the provided vpcId is used as is.
|
|
34
|
+
*/
|
|
35
|
+
this.vpcId = props.vpcId.startsWith('resolve:ssm:')
|
|
36
|
+
? aws_ssm_1.StringParameter.valueFromLookup(this, props.vpcId.replace('resolve:ssm:', ''))
|
|
37
|
+
: props.vpcId;
|
|
38
|
+
/**
|
|
39
|
+
* Creates or looks up a VPC based on the provided vpcId.
|
|
40
|
+
*/
|
|
41
|
+
this.vpc = ec2.Vpc.fromLookup(this, 'vpc', {
|
|
42
|
+
vpcId: this.vpcId,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
exports.VPCFromLookUpStack = VPCFromLookUpStack;
|
|
47
|
+
_a = JSII_RTTI_SYMBOL_1;
|
|
48
|
+
VPCFromLookUpStack[_a] = { fqn: "@cdklabs/cdk-cicd-wrapper.VPCFromLookUpStack", version: "0.4.1" };
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVlBDRnJvbUxvb2tVcFN0YWNrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YWNrcy92cGMvVlBDRnJvbUxvb2tVcFN0YWNrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEscUVBQXFFO0FBQ3JFLHNDQUFzQztBQUV0QyxtQ0FBbUM7QUFDbkMsMkNBQTJDO0FBQzNDLGlEQUFzRDtBQWtCdEQ7O0dBRUc7QUFDSCxNQUFhLGtCQUFtQixTQUFRLEdBQUcsQ0FBQyxLQUFLO0lBMEIvQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQThCO1FBQ3RFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRXhCOzs7V0FHRztRQUNILElBQUksQ0FBQyxzQkFBc0IsR0FBRztZQUM1QixHQUFHLENBQUMsOEJBQThCLENBQUMsR0FBRztZQUN0QyxHQUFHLENBQUMsOEJBQThCLENBQUMsR0FBRztZQUN0QyxHQUFHLENBQUMsOEJBQThCLENBQUMsZUFBZTtZQUNsRCxHQUFHLENBQUMsOEJBQThCLENBQUMsY0FBYztZQUNqRCxHQUFHLENBQUMsOEJBQThCLENBQUMsZUFBZTtZQUNsRCxHQUFHLENBQUMsOEJBQThCLENBQUMsR0FBRztZQUN0QyxHQUFHLENBQUMsS0FBSyxDQUFDLHNCQUFzQixJQUFJLEVBQUUsQ0FBQztTQUN4QyxDQUFDO1FBRUY7Ozs7V0FJRztRQUNILElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDO1lBQ2pELENBQUMsQ0FBQyx5QkFBZSxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ2hGLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDO1FBRWhCOztXQUVHO1FBQ0gsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFO1lBQ3pDLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztTQUNsQixDQUFDLENBQUM7SUFDTCxDQUFDOztBQTFESCxnREEyREMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBBcGFjaGUtMi4wXG5cbmltcG9ydCAqIGFzIGNkayBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgKiBhcyBlYzIgZnJvbSAnYXdzLWNkay1saWIvYXdzLWVjMic7XG5pbXBvcnQgeyBTdHJpbmdQYXJhbWV0ZXIgfSBmcm9tICdhd3MtY2RrLWxpYi9hd3Mtc3NtJztcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuXG4vKipcbiAqIFByb3BlcnRpZXMgZm9yIHRoZSBWUENTdGFjay5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBWUENGcm9tTG9va1VwU3RhY2tQcm9wcyBleHRlbmRzIGNkay5TdGFja1Byb3BzIHtcbiAgLyoqXG4gICAqIFRoZSBjb25maWd1cmF0aW9uIGZvciB0aGUgVlBDIHRvIGJlIGNyZWF0ZWQgb3IgbG9va2VkIHVwLlxuICAgKi9cbiAgcmVhZG9ubHkgdnBjSWQ6IHN0cmluZztcblxuICAvKipcbiAgICogVGhlIGxpc3Qgb2YgQ29kZUJ1aWxkIFZQQyBJbnRlcmZhY2VzVnBjRW5kcG9pbnRBd3NTZXJ2aWNlcyB0byBleHRlbmQgdGhlIGRlZmF1bHRDb2RlQnVpbGRWUENJbnRlcmZhY2VzXG4gICAqL1xuICByZWFkb25seSBjb2RlQnVpbGRWUENJbnRlcmZhY2VzPzogZWMyLkludGVyZmFjZVZwY0VuZHBvaW50QXdzU2VydmljZVtdO1xufVxuXG4vKipcbiAqIEEgc3RhY2sgdGhhdCBjcmVhdGVzIG9yIGxvb2tzIHVwIGEgVlBDIGFuZCBjb25maWd1cmVzIGl0cyBzZXR0aW5ncy5cbiAqL1xuZXhwb3J0IGNsYXNzIFZQQ0Zyb21Mb29rVXBTdGFjayBleHRlbmRzIGNkay5TdGFjayB7XG4gIC8qKlxuICAgKiBUaGUgVlBDIGNyZWF0ZWQgb3IgbG9va2VkIHVwIGJ5IHRoaXMgc3RhY2suXG4gICAqL1xuICByZWFkb25seSB2cGM6IGVjMi5JVnBjO1xuXG4gIC8qKlxuICAgKiBUaGUgc2VjdXJpdHkgZ3JvdXAgYXR0YWNoZWQgdG8gdGhlIFZQQ1xuICAgKi9cbiAgcmVhZG9ubHkgc2VjdXJpdHlHcm91cD86IGVjMi5JU2VjdXJpdHlHcm91cDtcblxuICAvKipcbiAgICogVGhlIHN1Ym5ldHMgYXR0YWNoZWQgdG8gdGhlIFZQQ1xuICAgKi9cbiAgcmVhZG9ubHkgc3VibmV0VHlwZT86IGVjMi5TdWJuZXRUeXBlO1xuXG4gIC8qKlxuICAgKiBUaGUgbGlzdCBvZiBDb2RlQnVpbGQgVlBDIEludGVyZmFjZXNWcGNFbmRwb2ludEF3c1NlcnZpY2VzXG4gICAqL1xuICByZWFkb25seSBjb2RlQnVpbGRWUENJbnRlcmZhY2VzOiBlYzIuSW50ZXJmYWNlVnBjRW5kcG9pbnRBd3NTZXJ2aWNlW107XG5cbiAgLyoqXG4gICAqIFRoZSBJRCBvZiB0aGUgVlBDIGJlaW5nIGNyZWF0ZWQgb3IgbG9va2VkIHVwLlxuICAgKi9cbiAgcmVhZG9ubHkgdnBjSWQ6IHN0cmluZztcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogVlBDRnJvbUxvb2tVcFN0YWNrUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQsIHByb3BzKTtcblxuICAgIC8qKlxuICAgICAqIERlZmF1bHQgbGlzdCBvZiBDb2RlQnVpbGQgVlBDIEludGVyZmFjZXNWcGNFbmRwb2ludEF3c1NlcnZpY2VzLFxuICAgICAqIHdoaWNoIGNhbiBiZSBleHRlbmRlZCBieSB0aGUgY29kZUJ1aWxkVlBDSW50ZXJmYWNlcyBwcm9wLlxuICAgICAqL1xuICAgIHRoaXMuY29kZUJ1aWxkVlBDSW50ZXJmYWNlcyA9IFtcbiAgICAgIGVjMi5JbnRlcmZhY2VWcGNFbmRwb2ludEF3c1NlcnZpY2UuU1NNLFxuICAgICAgZWMyLkludGVyZmFjZVZwY0VuZHBvaW50QXdzU2VydmljZS5TVFMsXG4gICAgICBlYzIuSW50ZXJmYWNlVnBjRW5kcG9pbnRBd3NTZXJ2aWNlLkNMT1VEV0FUQ0hfTE9HUyxcbiAgICAgIGVjMi5JbnRlcmZhY2VWcGNFbmRwb2ludEF3c1NlcnZpY2UuQ0xPVURGT1JNQVRJT04sXG4gICAgICBlYzIuSW50ZXJmYWNlVnBjRW5kcG9pbnRBd3NTZXJ2aWNlLlNFQ1JFVFNfTUFOQUdFUixcbiAgICAgIGVjMi5JbnRlcmZhY2VWcGNFbmRwb2ludEF3c1NlcnZpY2UuS01TLFxuICAgICAgLi4uKHByb3BzLmNvZGVCdWlsZFZQQ0ludGVyZmFjZXMgfHwgW10pLFxuICAgIF07XG5cbiAgICAvKipcbiAgICAgKiBJZiB0aGUgcHJvdmlkZWQgdnBjSWQgc3RhcnRzIHdpdGggJ3Jlc29sdmU6c3NtOicsIGl0IGlzIHRyZWF0ZWQgYXMgYSBwYXJhbWV0ZXIgbmFtZVxuICAgICAqIGFuZCB0aGUgYWN0dWFsIHZhbHVlIGlzIGZldGNoZWQgZnJvbSB0aGUgQVdTIFN5c3RlbXMgTWFuYWdlciBQYXJhbWV0ZXIgU3RvcmUuXG4gICAgICogT3RoZXJ3aXNlLCB0aGUgcHJvdmlkZWQgdnBjSWQgaXMgdXNlZCBhcyBpcy5cbiAgICAgKi9cbiAgICB0aGlzLnZwY0lkID0gcHJvcHMudnBjSWQuc3RhcnRzV2l0aCgncmVzb2x2ZTpzc206JylcbiAgICAgID8gU3RyaW5nUGFyYW1ldGVyLnZhbHVlRnJvbUxvb2t1cCh0aGlzLCBwcm9wcy52cGNJZC5yZXBsYWNlKCdyZXNvbHZlOnNzbTonLCAnJykpXG4gICAgICA6IHByb3BzLnZwY0lkO1xuXG4gICAgLyoqXG4gICAgICogQ3JlYXRlcyBvciBsb29rcyB1cCBhIFZQQyBiYXNlZCBvbiB0aGUgcHJvdmlkZWQgdnBjSWQuXG4gICAgICovXG4gICAgdGhpcy52cGMgPSBlYzIuVnBjLmZyb21Mb29rdXAodGhpcywgJ3ZwYycsIHtcbiAgICAgIHZwY0lkOiB0aGlzLnZwY0lkLFxuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Construct } from 'constructs';
|
|
2
|
+
/**
|
|
3
|
+
* This class provides functionality to resolve parameter values from AWS Systems Manager Parameter Store or from provided string values.
|
|
4
|
+
*/
|
|
5
|
+
export declare class ParameterResolver {
|
|
6
|
+
/**
|
|
7
|
+
* The prefix used to identify parameter resolution from AWS Systems Manager Parameter Store.
|
|
8
|
+
* @default 'resolve'
|
|
9
|
+
*/
|
|
10
|
+
static readonly PREFIX = "resolve";
|
|
11
|
+
/**
|
|
12
|
+
* Resolves the value of a parameter, either from an SSM parameter or using the provided string value.
|
|
13
|
+
* @param scope The scope in which the parameter is resolved.
|
|
14
|
+
* @param param The parameter value to resolve. If it starts with 'ssm:', it will be treated as an SSM parameter name.
|
|
15
|
+
* @returns The resolved parameter value.
|
|
16
|
+
*/
|
|
17
|
+
static resolveValue(scope: Construct, param: string): string;
|
|
18
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var _a;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.ParameterResolver = void 0;
|
|
5
|
+
const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
|
|
6
|
+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
7
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
8
|
+
const ssm = require("aws-cdk-lib/aws-ssm");
|
|
9
|
+
/**
|
|
10
|
+
* This class provides functionality to resolve parameter values from AWS Systems Manager Parameter Store or from provided string values.
|
|
11
|
+
*/
|
|
12
|
+
class ParameterResolver {
|
|
13
|
+
/**
|
|
14
|
+
* Resolves the value of a parameter, either from an SSM parameter or using the provided string value.
|
|
15
|
+
* @param scope The scope in which the parameter is resolved.
|
|
16
|
+
* @param param The parameter value to resolve. If it starts with 'ssm:', it will be treated as an SSM parameter name.
|
|
17
|
+
* @returns The resolved parameter value.
|
|
18
|
+
*/
|
|
19
|
+
static resolveValue(scope, param) {
|
|
20
|
+
if (param.startsWith('resolve:ssm:')) {
|
|
21
|
+
return ssm.StringParameter.valueForStringParameter(scope, param.substring(12));
|
|
22
|
+
}
|
|
23
|
+
return param;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
exports.ParameterResolver = ParameterResolver;
|
|
27
|
+
_a = JSII_RTTI_SYMBOL_1;
|
|
28
|
+
ParameterResolver[_a] = { fqn: "@cdklabs/cdk-cicd-wrapper.ParameterResolver", version: "0.4.1" };
|
|
29
|
+
/**
|
|
30
|
+
* The prefix used to identify parameter resolution from AWS Systems Manager Parameter Store.
|
|
31
|
+
* @default 'resolve'
|
|
32
|
+
*/
|
|
33
|
+
ParameterResolver.PREFIX = 'resolve';
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFyYW1ldGVyUmVzb2x2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvUGFyYW1ldGVyUmVzb2x2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxRUFBcUU7QUFDckUsc0NBQXNDO0FBQ3RDLDJDQUEyQztBQUczQzs7R0FFRztBQUNILE1BQWEsaUJBQWlCO0lBTzVCOzs7OztPQUtHO0lBQ0ksTUFBTSxDQUFDLFlBQVksQ0FBQyxLQUFnQixFQUFFLEtBQWE7UUFDeEQsSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7WUFDckMsT0FBTyxHQUFHLENBQUMsZUFBZSxDQUFDLHVCQUF1QixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDakYsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQzs7QUFsQkgsOENBbUJDOzs7QUFsQkM7OztHQUdHO0FBQ2Esd0JBQU0sR0FBRyxTQUFTLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBBcGFjaGUtMi4wXG5pbXBvcnQgKiBhcyBzc20gZnJvbSAnYXdzLWNkay1saWIvYXdzLXNzbSc7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdjb25zdHJ1Y3RzJztcblxuLyoqXG4gKiBUaGlzIGNsYXNzIHByb3ZpZGVzIGZ1bmN0aW9uYWxpdHkgdG8gcmVzb2x2ZSBwYXJhbWV0ZXIgdmFsdWVzIGZyb20gQVdTIFN5c3RlbXMgTWFuYWdlciBQYXJhbWV0ZXIgU3RvcmUgb3IgZnJvbSBwcm92aWRlZCBzdHJpbmcgdmFsdWVzLlxuICovXG5leHBvcnQgY2xhc3MgUGFyYW1ldGVyUmVzb2x2ZXIge1xuICAvKipcbiAgICogVGhlIHByZWZpeCB1c2VkIHRvIGlkZW50aWZ5IHBhcmFtZXRlciByZXNvbHV0aW9uIGZyb20gQVdTIFN5c3RlbXMgTWFuYWdlciBQYXJhbWV0ZXIgU3RvcmUuXG4gICAqIEBkZWZhdWx0ICdyZXNvbHZlJ1xuICAgKi9cbiAgc3RhdGljIHJlYWRvbmx5IFBSRUZJWCA9ICdyZXNvbHZlJztcblxuICAvKipcbiAgICogUmVzb2x2ZXMgdGhlIHZhbHVlIG9mIGEgcGFyYW1ldGVyLCBlaXRoZXIgZnJvbSBhbiBTU00gcGFyYW1ldGVyIG9yIHVzaW5nIHRoZSBwcm92aWRlZCBzdHJpbmcgdmFsdWUuXG4gICAqIEBwYXJhbSBzY29wZSBUaGUgc2NvcGUgaW4gd2hpY2ggdGhlIHBhcmFtZXRlciBpcyByZXNvbHZlZC5cbiAgICogQHBhcmFtIHBhcmFtIFRoZSBwYXJhbWV0ZXIgdmFsdWUgdG8gcmVzb2x2ZS4gSWYgaXQgc3RhcnRzIHdpdGggJ3NzbTonLCBpdCB3aWxsIGJlIHRyZWF0ZWQgYXMgYW4gU1NNIHBhcmFtZXRlciBuYW1lLlxuICAgKiBAcmV0dXJucyBUaGUgcmVzb2x2ZWQgcGFyYW1ldGVyIHZhbHVlLlxuICAgKi9cbiAgcHVibGljIHN0YXRpYyByZXNvbHZlVmFsdWUoc2NvcGU6IENvbnN0cnVjdCwgcGFyYW06IHN0cmluZykge1xuICAgIGlmIChwYXJhbS5zdGFydHNXaXRoKCdyZXNvbHZlOnNzbTonKSkge1xuICAgICAgcmV0dXJuIHNzbS5TdHJpbmdQYXJhbWV0ZXIudmFsdWVGb3JTdHJpbmdQYXJhbWV0ZXIoc2NvcGUsIHBhcmFtLnN1YnN0cmluZygxMikpO1xuICAgIH1cbiAgICByZXR1cm4gcGFyYW07XG4gIH1cbn1cbiJdfQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './ParameterResolver';
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
5
|
+
if (k2 === undefined) k2 = k;
|
|
6
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
7
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
8
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
9
|
+
}
|
|
10
|
+
Object.defineProperty(o, k2, desc);
|
|
11
|
+
}) : (function(o, m, k, k2) {
|
|
12
|
+
if (k2 === undefined) k2 = k;
|
|
13
|
+
o[k2] = m[k];
|
|
14
|
+
}));
|
|
15
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
16
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
17
|
+
};
|
|
18
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
+
__exportStar(require("./ParameterResolver"), exports);
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHFFQUFxRTtBQUNyRSxzQ0FBc0M7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFdEMsc0RBQW9DIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4vLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuXG5leHBvcnQgKiBmcm9tICcuL1BhcmFtZXRlclJlc29sdmVyJztcbiJdfQ==
|
|
@@ -94,10 +94,8 @@ class Composer {
|
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
if (afterDoc) {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
for (let i = 0; i < this.warnings.length; ++i)
|
|
100
|
-
doc.warnings.push(this.warnings[i]);
|
|
97
|
+
Array.prototype.push.apply(doc.errors, this.errors);
|
|
98
|
+
Array.prototype.push.apply(doc.warnings, this.warnings);
|
|
101
99
|
}
|
|
102
100
|
else {
|
|
103
101
|
doc.errors = this.errors;
|
|
@@ -142,7 +142,7 @@ function doubleQuotedValue(source, onError) {
|
|
|
142
142
|
next = source[++i + 1];
|
|
143
143
|
}
|
|
144
144
|
else if (next === 'x' || next === 'u' || next === 'U') {
|
|
145
|
-
const length =
|
|
145
|
+
const length = { x: 2, u: 4, U: 8 }[next];
|
|
146
146
|
res += parseCharCode(source, i + 1, length, onError);
|
|
147
147
|
i += length;
|
|
148
148
|
}
|
|
@@ -212,14 +212,12 @@ function parseCharCode(source, offset, length, onError) {
|
|
|
212
212
|
const cc = source.substr(offset, length);
|
|
213
213
|
const ok = cc.length === length && /^[0-9a-fA-F]+$/.test(cc);
|
|
214
214
|
const code = ok ? parseInt(cc, 16) : NaN;
|
|
215
|
-
|
|
216
|
-
return String.fromCodePoint(code);
|
|
217
|
-
}
|
|
218
|
-
catch {
|
|
215
|
+
if (isNaN(code)) {
|
|
219
216
|
const raw = source.substr(offset - 2, length + 2);
|
|
220
217
|
onError(offset - 2, 'BAD_DQ_ESCAPE', `Invalid escape sequence ${raw}`);
|
|
221
218
|
return raw;
|
|
222
219
|
}
|
|
220
|
+
return String.fromCodePoint(code);
|
|
223
221
|
}
|
|
224
222
|
|
|
225
223
|
export { resolveFlowScalar };
|
|
@@ -19,8 +19,6 @@ class Alias extends NodeBase {
|
|
|
19
19
|
* instance of the `source` anchor before this node.
|
|
20
20
|
*/
|
|
21
21
|
resolve(doc, ctx) {
|
|
22
|
-
if (ctx?.maxAliasCount === 0)
|
|
23
|
-
throw new ReferenceError('Alias resolution is disabled');
|
|
24
22
|
let nodes;
|
|
25
23
|
if (ctx?.aliasResolveCache) {
|
|
26
24
|
nodes = ctx.aliasResolveCache;
|
|
@@ -310,7 +310,7 @@ class Lexer {
|
|
|
310
310
|
const n = (yield* this.pushCount(1)) + (yield* this.pushSpaces(true));
|
|
311
311
|
this.indentNext = this.indentValue + 1;
|
|
312
312
|
this.indentValue += n;
|
|
313
|
-
return
|
|
313
|
+
return yield* this.parseBlockStart();
|
|
314
314
|
}
|
|
315
315
|
return 'doc';
|
|
316
316
|
}
|
|
@@ -631,36 +631,32 @@ class Lexer {
|
|
|
631
631
|
return 0;
|
|
632
632
|
}
|
|
633
633
|
*pushIndicators() {
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
n += yield* this.pushSpaces(true);
|
|
657
|
-
continue loop;
|
|
658
|
-
}
|
|
634
|
+
switch (this.charAt(0)) {
|
|
635
|
+
case '!':
|
|
636
|
+
return ((yield* this.pushTag()) +
|
|
637
|
+
(yield* this.pushSpaces(true)) +
|
|
638
|
+
(yield* this.pushIndicators()));
|
|
639
|
+
case '&':
|
|
640
|
+
return ((yield* this.pushUntil(isNotAnchorChar)) +
|
|
641
|
+
(yield* this.pushSpaces(true)) +
|
|
642
|
+
(yield* this.pushIndicators()));
|
|
643
|
+
case '-': // this is an error
|
|
644
|
+
case '?': // this is an error outside flow collections
|
|
645
|
+
case ':': {
|
|
646
|
+
const inFlow = this.flowLevel > 0;
|
|
647
|
+
const ch1 = this.charAt(1);
|
|
648
|
+
if (isEmpty(ch1) || (inFlow && flowIndicatorChars.has(ch1))) {
|
|
649
|
+
if (!inFlow)
|
|
650
|
+
this.indentNext = this.indentValue + 1;
|
|
651
|
+
else if (this.flowKey)
|
|
652
|
+
this.flowKey = false;
|
|
653
|
+
return ((yield* this.pushCount(1)) +
|
|
654
|
+
(yield* this.pushSpaces(true)) +
|
|
655
|
+
(yield* this.pushIndicators()));
|
|
659
656
|
}
|
|
660
657
|
}
|
|
661
|
-
break loop;
|
|
662
658
|
}
|
|
663
|
-
return
|
|
659
|
+
return 0;
|
|
664
660
|
}
|
|
665
661
|
*pushTag() {
|
|
666
662
|
if (this.charAt(1) === '<') {
|
|
@@ -67,14 +67,6 @@ function getFirstKeyStartProps(prev) {
|
|
|
67
67
|
}
|
|
68
68
|
return prev.splice(i, prev.length);
|
|
69
69
|
}
|
|
70
|
-
function arrayPushArray(target, source) {
|
|
71
|
-
// May exhaust call stack with large `source` array
|
|
72
|
-
if (source.length < 1e5)
|
|
73
|
-
Array.prototype.push.apply(target, source);
|
|
74
|
-
else
|
|
75
|
-
for (let i = 0; i < source.length; ++i)
|
|
76
|
-
target.push(source[i]);
|
|
77
|
-
}
|
|
78
70
|
function fixFlowSeqItems(fc) {
|
|
79
71
|
if (fc.start.type === 'flow-seq-start') {
|
|
80
72
|
for (const it of fc.items) {
|
|
@@ -87,12 +79,12 @@ function fixFlowSeqItems(fc) {
|
|
|
87
79
|
delete it.key;
|
|
88
80
|
if (isFlowToken(it.value)) {
|
|
89
81
|
if (it.value.end)
|
|
90
|
-
|
|
82
|
+
Array.prototype.push.apply(it.value.end, it.sep);
|
|
91
83
|
else
|
|
92
84
|
it.value.end = it.sep;
|
|
93
85
|
}
|
|
94
86
|
else
|
|
95
|
-
|
|
87
|
+
Array.prototype.push.apply(it.start, it.sep);
|
|
96
88
|
delete it.sep;
|
|
97
89
|
}
|
|
98
90
|
}
|
|
@@ -510,7 +502,7 @@ class Parser {
|
|
|
510
502
|
const prev = map.items[map.items.length - 2];
|
|
511
503
|
const end = prev?.value?.end;
|
|
512
504
|
if (Array.isArray(end)) {
|
|
513
|
-
|
|
505
|
+
Array.prototype.push.apply(end, it.start);
|
|
514
506
|
end.push(this.sourceToken);
|
|
515
507
|
map.items.pop();
|
|
516
508
|
return;
|
|
@@ -725,7 +717,7 @@ class Parser {
|
|
|
725
717
|
const prev = seq.items[seq.items.length - 2];
|
|
726
718
|
const end = prev?.value?.end;
|
|
727
719
|
if (Array.isArray(end)) {
|
|
728
|
-
|
|
720
|
+
Array.prototype.push.apply(end, it.start);
|
|
729
721
|
end.push(this.sourceToken);
|
|
730
722
|
seq.items.pop();
|
|
731
723
|
return;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isScalar,
|
|
1
|
+
import { isScalar, isAlias, isSeq, isMap } from '../../nodes/identity.js';
|
|
2
2
|
import { Scalar } from '../../nodes/Scalar.js';
|
|
3
3
|
|
|
4
4
|
// If the value associated with a merge key is a single mapping node, each of
|
|
@@ -26,18 +26,18 @@ const isMergeKey = (ctx, key) => (merge.identify(key) ||
|
|
|
26
26
|
merge.identify(key.value))) &&
|
|
27
27
|
ctx?.doc.schema.tags.some(tag => tag.tag === merge.tag && tag.default);
|
|
28
28
|
function addMergeToJSMap(ctx, map, value) {
|
|
29
|
-
|
|
30
|
-
if (isSeq(
|
|
31
|
-
for (const it of
|
|
29
|
+
value = ctx && isAlias(value) ? value.resolve(ctx.doc) : value;
|
|
30
|
+
if (isSeq(value))
|
|
31
|
+
for (const it of value.items)
|
|
32
32
|
mergeValue(ctx, map, it);
|
|
33
|
-
else if (Array.isArray(
|
|
34
|
-
for (const it of
|
|
33
|
+
else if (Array.isArray(value))
|
|
34
|
+
for (const it of value)
|
|
35
35
|
mergeValue(ctx, map, it);
|
|
36
36
|
else
|
|
37
|
-
mergeValue(ctx, map,
|
|
37
|
+
mergeValue(ctx, map, value);
|
|
38
38
|
}
|
|
39
39
|
function mergeValue(ctx, map, value) {
|
|
40
|
-
const source =
|
|
40
|
+
const source = ctx && isAlias(value) ? value.resolve(ctx.doc) : value;
|
|
41
41
|
if (!isMap(source))
|
|
42
42
|
throw new Error('Merge sources must be maps or map aliases');
|
|
43
43
|
const srcMap = source.toJSON(null, ctx, Map);
|
|
@@ -60,8 +60,5 @@ function mergeValue(ctx, map, value) {
|
|
|
60
60
|
}
|
|
61
61
|
return map;
|
|
62
62
|
}
|
|
63
|
-
function resolveAliasValue(ctx, value) {
|
|
64
|
-
return ctx && isAlias(value) ? value.resolve(ctx.doc, ctx) : value;
|
|
65
|
-
}
|
|
66
63
|
|
|
67
64
|
export { addMergeToJSMap, isMergeKey, merge };
|
|
@@ -8,8 +8,7 @@ function stringifyNumber({ format, minFractionDigits, tag, value }) {
|
|
|
8
8
|
if (!format &&
|
|
9
9
|
minFractionDigits &&
|
|
10
10
|
(!tag || tag === 'tag:yaml.org,2002:float') &&
|
|
11
|
-
|
|
12
|
-
!n.includes('e')) {
|
|
11
|
+
/^\d/.test(n)) {
|
|
13
12
|
let i = n.indexOf('.');
|
|
14
13
|
if (i < 0) {
|
|
15
14
|
i = n.length;
|
|
@@ -97,10 +97,8 @@ class Composer {
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
if (afterDoc) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
for (let i = 0; i < this.warnings.length; ++i)
|
|
103
|
-
doc.warnings.push(this.warnings[i]);
|
|
100
|
+
Array.prototype.push.apply(doc.errors, this.errors);
|
|
101
|
+
Array.prototype.push.apply(doc.warnings, this.warnings);
|
|
104
102
|
}
|
|
105
103
|
else {
|
|
106
104
|
doc.errors = this.errors;
|
|
@@ -144,7 +144,7 @@ function doubleQuotedValue(source, onError) {
|
|
|
144
144
|
next = source[++i + 1];
|
|
145
145
|
}
|
|
146
146
|
else if (next === 'x' || next === 'u' || next === 'U') {
|
|
147
|
-
const length =
|
|
147
|
+
const length = { x: 2, u: 4, U: 8 }[next];
|
|
148
148
|
res += parseCharCode(source, i + 1, length, onError);
|
|
149
149
|
i += length;
|
|
150
150
|
}
|
|
@@ -214,14 +214,12 @@ function parseCharCode(source, offset, length, onError) {
|
|
|
214
214
|
const cc = source.substr(offset, length);
|
|
215
215
|
const ok = cc.length === length && /^[0-9a-fA-F]+$/.test(cc);
|
|
216
216
|
const code = ok ? parseInt(cc, 16) : NaN;
|
|
217
|
-
|
|
218
|
-
return String.fromCodePoint(code);
|
|
219
|
-
}
|
|
220
|
-
catch {
|
|
217
|
+
if (isNaN(code)) {
|
|
221
218
|
const raw = source.substr(offset - 2, length + 2);
|
|
222
219
|
onError(offset - 2, 'BAD_DQ_ESCAPE', `Invalid escape sequence ${raw}`);
|
|
223
220
|
return raw;
|
|
224
221
|
}
|
|
222
|
+
return String.fromCodePoint(code);
|
|
225
223
|
}
|
|
226
224
|
|
|
227
225
|
exports.resolveFlowScalar = resolveFlowScalar;
|