@bitblit/ratchet-epsilon-deployment 5.0.539-alpha → 5.0.541-alpha
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.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Bucket, BucketEncryption } from 'aws-cdk-lib/aws-s3';
|
|
2
|
-
import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
|
|
2
|
+
import { CfnOutput, Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
|
|
3
3
|
import path from 'path';
|
|
4
|
-
import { AllowedMethods, CachePolicy, Distribution,
|
|
4
|
+
import { AllowedMethods, CachePolicy, Distribution, PriceClass, ResponseHeadersPolicy, SSLMethod, ViewerProtocolPolicy, } from 'aws-cdk-lib/aws-cloudfront';
|
|
5
5
|
import { HostedZone, RecordSet, RecordType } from 'aws-cdk-lib/aws-route53';
|
|
6
6
|
import { CloudFrontTarget } from 'aws-cdk-lib/aws-route53-targets';
|
|
7
7
|
import { BucketDeployment, Source } from 'aws-cdk-lib/aws-s3-deployment';
|
|
@@ -13,7 +13,6 @@ import { Logger } from '@bitblit/ratchet-common/logger/logger';
|
|
|
13
13
|
export class EpsilonWebsiteStack extends Stack {
|
|
14
14
|
constructor(scope, id, props) {
|
|
15
15
|
super(scope, id, props);
|
|
16
|
-
const originAccessId = new OriginAccessIdentity(this, id + 'OriginAccessId');
|
|
17
16
|
const websiteBucket = new Bucket(this, id + 'DeployBucket', {
|
|
18
17
|
bucketName: props.targetBucketName,
|
|
19
18
|
removalPolicy: props.retainWebsiteBucketOnDestroy ? undefined : RemovalPolicy.DESTROY,
|
|
@@ -28,7 +27,7 @@ export class EpsilonWebsiteStack extends Stack {
|
|
|
28
27
|
minTtl: Duration.seconds(1),
|
|
29
28
|
});
|
|
30
29
|
const defaultBehavior = {
|
|
31
|
-
origin: S3BucketOrigin.
|
|
30
|
+
origin: S3BucketOrigin.withOriginAccessControl(websiteBucket),
|
|
32
31
|
compress: true,
|
|
33
32
|
viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
|
|
34
33
|
cachePolicy: cachePolicy,
|
|
@@ -76,7 +75,7 @@ export class EpsilonWebsiteStack extends Stack {
|
|
|
76
75
|
bucketName: eb.bucketName,
|
|
77
76
|
});
|
|
78
77
|
const behaviorOptions = {
|
|
79
|
-
origin: S3BucketOrigin.
|
|
78
|
+
origin: S3BucketOrigin.withOriginAccessControl(nextBucket),
|
|
80
79
|
compress: true,
|
|
81
80
|
viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
|
|
82
81
|
cachePolicy: cachePolicy,
|
|
@@ -85,18 +84,19 @@ export class EpsilonWebsiteStack extends Stack {
|
|
|
85
84
|
distributionProps.additionalBehaviors[eb.pathPattern] = behaviorOptions;
|
|
86
85
|
});
|
|
87
86
|
const cloudfrontDistro = new Distribution(this, id + 'CloudfrontDistro', distributionProps);
|
|
87
|
+
new CfnOutput(this, 'DistributionUrl', { value: 'https://' + cloudfrontDistro.domainName });
|
|
88
88
|
if (props?.route53Handling === EpsilonRoute53Handling.Update) {
|
|
89
89
|
if (props?.cloudFrontDomainNames?.length) {
|
|
90
|
-
|
|
91
|
-
const _domain = new RecordSet(this, id + 'DomainName-' +
|
|
90
|
+
props.cloudFrontDomainNames.forEach((dn, _idx) => {
|
|
91
|
+
const _domain = new RecordSet(this, id + 'DomainName-' + dn, {
|
|
92
92
|
recordType: RecordType.A,
|
|
93
|
-
recordName:
|
|
93
|
+
recordName: dn,
|
|
94
94
|
target: {
|
|
95
95
|
aliasTarget: new CloudFrontTarget(cloudfrontDistro),
|
|
96
96
|
},
|
|
97
|
-
zone: HostedZone.fromLookup(this, id, { domainName: EpsilonStackUtil.extractApexDomain(
|
|
97
|
+
zone: HostedZone.fromLookup(this, id, { domainName: EpsilonStackUtil.extractApexDomain(dn) }),
|
|
98
98
|
});
|
|
99
|
-
}
|
|
99
|
+
});
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
102
|
const assetSources = props.pathsToAssets.map((inPath) => Source.asset(path.resolve(inPath)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epsilon-website-stack.js","sourceRoot":"","sources":["../../../src/deployment/cdk/epsilon-website-stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"epsilon-website-stack.js","sourceRoot":"","sources":["../../../src/deployment/cdk/epsilon-website-stack.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bitblit/ratchet-epsilon-deployment",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.541-alpha",
|
|
4
4
|
"description": "Epsilon CDK extensions to simplify deployment",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -50,15 +50,15 @@
|
|
|
50
50
|
},
|
|
51
51
|
"license": "Apache-2.0",
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@bitblit/ratchet-aws": "5.0.
|
|
54
|
-
"@bitblit/ratchet-common": "5.0.
|
|
55
|
-
"@bitblit/ratchet-epsilon-common": "5.0.
|
|
56
|
-
"aws-cdk-lib": "2.
|
|
53
|
+
"@bitblit/ratchet-aws": "5.0.541-alpha",
|
|
54
|
+
"@bitblit/ratchet-common": "5.0.541-alpha",
|
|
55
|
+
"@bitblit/ratchet-epsilon-common": "5.0.541-alpha",
|
|
56
|
+
"aws-cdk-lib": "2.165.0",
|
|
57
57
|
"constructs": "10.4.2"
|
|
58
58
|
},
|
|
59
59
|
"peerDependencies": {
|
|
60
|
-
"@bitblit/ratchet-common": "5.0.
|
|
61
|
-
"aws-cdk-lib": "^2.
|
|
60
|
+
"@bitblit/ratchet-common": "5.0.541-alpha",
|
|
61
|
+
"aws-cdk-lib": "^2.165.0",
|
|
62
62
|
"constructs": "^10.4.2"
|
|
63
63
|
}
|
|
64
64
|
}
|