Feat/platform 696: accept custom cloudfront distribution #33
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,21 @@ | ||
| import { ElasticBeanstalk } from '@aws-sdk/client-elastic-beanstalk' | ||
| import { S3 } from '@aws-sdk/client-s3' | ||
| import { CloudFront, GetDistributionCommandOutput } from '@aws-sdk/client-cloudfront' | ||
| import fs from 'node:fs' | ||
| import childProcess from 'node:child_process' | ||
| import path from 'node:path' | ||
| import { buildApp, OUTPUT_FOLDER } from '../build/next' | ||
| import { NextRenderServerStack, type NextRenderServerStackProps } from '../cdk/stacks/NextRenderServerStack' | ||
| import { NextCloudfrontStack, type NextCloudfrontStackProps } from '../cdk/stacks/NextCloudfrontStack' | ||
| import { | ||
| getAWSCredentials, | ||
| uploadFolderToS3, | ||
| uploadFileToS3, | ||
| AWS_EDGE_REGION, | ||
| emptyBucket, | ||
| updateDistribution, | ||
| getCloudFrontDistribution | ||
| } from '../common/aws' | ||
| import { AppStack } from '../common/cdk' | ||
| import { getProjectSettings } from '../common/project' | ||
| import loadConfig from './helpers/loadConfig' | ||
|
|
@@ -21,6 +29,8 @@ export interface DeployConfig { | |
| region?: string | ||
| profile?: string | ||
| } | ||
| cloudFrontId?: string | ||
| skipDefaultBehavior?: boolean | ||
| } | ||
|
|
||
| export interface DeployStackProps { | ||
|
|
@@ -53,9 +63,10 @@ const createOutputFolder = () => { | |
| export const deploy = async (config: DeployConfig) => { | ||
| let cleanNextApp | ||
| try { | ||
| const { siteName, stage = 'development', aws, cloudFrontId, skipDefaultBehavior } = config | ||
| const credentials = await getAWSCredentials({ region: config.aws.region, profile: config.aws.profile }) | ||
| const region = aws.region || process.env.REGION | ||
| let customCFDistribution: GetDistributionCommandOutput | undefined | ||
|
|
||
| if (!credentials.accessKeyId || !credentials.secretAccessKey) { | ||
| throw new Error('AWS Credentials are required.') | ||
|
|
@@ -97,6 +108,10 @@ export const deploy = async (config: DeployConfig) => { | |
| } | ||
| const siteNameLowerCased = siteName.toLowerCase() | ||
|
|
||
| if (cloudFrontId) { | ||
| customCFDistribution = await getCloudFrontDistribution(cloudfrontClient, cloudFrontId) | ||
| } | ||
|
|
||
| const nextRenderServerStack = new AppStack<NextRenderServerStack, NextRenderServerStackProps>( | ||
| `${siteNameLowerCased}-server`, | ||
| NextRenderServerStack, | ||
|
|
@@ -132,7 +147,8 @@ export const deploy = async (config: DeployConfig) => { | |
| cacheConfig, | ||
| env: { | ||
| region: AWS_EDGE_REGION // required since Edge can be deployed only here. | ||
| }, | ||
| customCloudFrontDistribution: customCFDistribution?.Distribution | ||
| } | ||
| ) | ||
| const nextCloudfrontStackOutput = await nextCloudfrontStack.deployStack() | ||
|
|
@@ -189,6 +205,19 @@ export const deploy = async (config: DeployConfig) => { | |
| VersionLabel: versionLabel | ||
| }) | ||
|
|
||
| // if custom cf distribution, update it | ||
| if (customCFDistribution) { | ||
| await updateDistribution(cloudfrontClient, customCFDistribution, { | ||
|
There was a problem hiding this comment. we should do that inside stack, otherwise we will keep changing cloudfront with each deployment There was a problem hiding this comment. same as the above comment. I searched and there is no way to update the distribution inside the stack. There was a problem hiding this comment. can we check at least that those origins and rules were already added, so we can skip that step? There was a problem hiding this comment. I will create a function to check this then. |
||
| longCachePolicyId: nextCloudfrontStackOutput.LongCachePolicyId!, | ||
| splitCachePolicyId: nextCloudfrontStackOutput.SplitCachePolicyId!, | ||
| routingFunctionArn: nextCloudfrontStackOutput.RoutingFunctionArn!, | ||
| checkExpirationFunctionArn: nextCloudfrontStackOutput.CheckExpirationFunctionArn!, | ||
| staticBucketName: nextCloudfrontStackOutput.StaticBucketRegionalDomainName!, | ||
| addAdditionalBehaviour: true, | ||
| skipDefaultBehavior | ||
| }) | ||
| } | ||
|
|
||
| await cloudfrontClient.createInvalidation({ | ||
| DistributionId: nextCloudfrontStackOutput.CloudfrontDistributionId!, | ||
| InvalidationBatch: { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we also need to add new rules and lambda to existing cloudfront
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can call
this.cf.addBehaviourThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, this isn't supported by the cloudformation stack. we can only add existing id to the cloud formation template (which is what I did here by setting it to the output).
aws/aws-cdk#12524