Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shop rollout serverless changes #2611

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Shop rollout serverless changes #2611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
262b5b0
updates to work with our deploy process
May 13, 2022
54ef2df
modified read timeout to 180 sec
aapcit May 25, 2022
cdf8fce
add new paths
Dec 14, 2022
f6291b0
add config for certifications launch
Jan 27, 2023
e3a6541
Merge pull request #1 from aapcweb/certifications
john-parker3 Jan 30, 2023
4c3ed76
add training and events
Mar 9, 2023
1cbaa02
add sitemaps path (#2)
john-parker3 Mar 16, 2023
d687256
remove cookies cache
josephpalomino Jul 20, 2023
f4af677
Revert "remove cookies cache"
josephpalomino Jul 21, 2023
1adc72a
update cookes to none
josephpalomino Jul 21, 2023
fc90dfa
fix resources
josephpalomino Jul 27, 2023
cea73f6
update cache
josephpalomino Aug 1, 2023
57fa570
add lp path (#5)
john-parker3 Oct 5, 2023
869b6a8
add search and fix prettier lint errors (#6)
john-parker3 Oct 31, 2023
62f1eab
create serverless PR changes
vikrantsinghaapc Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/serverless-components/aws-cloudfront/src/getOriginConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ export const getOriginConfig = (
Quantity: 1,
Items: ["TLSv1.2"]
},
OriginReadTimeout: 30,
OriginKeepaliveTimeout: 5
OriginReadTimeout: 180,
OriginKeepaliveTimeout: 60
};
}

Expand Down
2 changes: 2 additions & 0 deletions packages/serverless-components/nextjs-cdk-construct/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
},
"license": "MIT",
"dependencies": {
"@aws-cdk/aws-ec2": "^1.156.0",
"@aws-cdk/aws-elasticloadbalancingv2": "^1.156.0",
"@sls-next/core": "link:../../libs/core",
"@sls-next/lambda-at-edge": "link:../../libs/lambda-at-edge",
"fast-glob": "3.2.11",
Expand Down
281 changes: 258 additions & 23 deletions packages/serverless-components/nextjs-component/src/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,8 @@ class NextjsComponent extends Component {
async deploy(
inputs: ServerlessComponentInputs = {}
): Promise<DeploymentResult> {
// @ts-ignore
console.log(inputs.loadBalancer);
// Skip deployment if user explicitly set deploy input to false.
// Useful when they just want the build outputs to deploy themselves.
if (inputs.deploy === "false" || inputs.deploy === false) {
Expand Down Expand Up @@ -409,6 +411,10 @@ class NextjsComponent extends Component {
}

const cloudFrontOrigins = [
{
// @ts-ignore
url: inputs.loadBalancer
},
{
url: bucketUrl,
private: true,
Expand All @@ -417,7 +423,9 @@ class NextjsComponent extends Component {
...inputOrigins
];

cloudFrontOrigins[0].pathPatterns[
console.log(cloudFrontOrigins[0]);

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("_next/static/*", routesManifest)
] = {
minTTL: 0,
Expand All @@ -430,7 +438,7 @@ class NextjsComponent extends Component {
}
};

cloudFrontOrigins[0].pathPatterns[
cloudFrontOrigins[1].pathPatterns[
this.pathPattern("static/*", routesManifest)
] = {
minTTL: 0,
Expand Down Expand Up @@ -663,7 +671,7 @@ class NextjsComponent extends Component {

const apiEdgeLambdaPublishOutputs = await apiEdgeLambda.publishVersion();

cloudFrontOrigins[0].pathPatterns[
cloudFrontOrigins[1].pathPatterns[
this.pathPattern("api/*", routesManifest)
] = {
minTTL: 0,
Expand Down Expand Up @@ -734,7 +742,7 @@ class NextjsComponent extends Component {
const imageEdgeLambdaPublishOutputs =
await imageEdgeLambda.publishVersion();

cloudFrontOrigins[0].pathPatterns[
cloudFrontOrigins[1].pathPatterns[
this.pathPattern("_next/image*", routesManifest)
] = {
minTTL: 0,
Expand Down Expand Up @@ -799,7 +807,7 @@ class NextjsComponent extends Component {
const defaultEdgeLambdaPublishOutputs =
await defaultEdgeLambda.publishVersion();

cloudFrontOrigins[0].pathPatterns[
cloudFrontOrigins[1].pathPatterns[
this.pathPattern("_next/data/*", routesManifest)
] = {
minTTL: 0,
Expand All @@ -821,13 +829,252 @@ class NextjsComponent extends Component {
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/business*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/resources*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/promos*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/about-us*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/certifications*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};
cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/sitemaps*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/training-and-events*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/support*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/lp*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/search*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/shop/*", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

cloudFrontOrigins[1].pathPatterns[
this.pathPattern("/shop", routesManifest)
] = {
minTTL: 0,
defaultTTL: 0,
maxTTL: 86400,
forward: {
cookies: "all",
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
queryString: true
},
// lambda@edge key is last and therefore cannot be overridden
"lambda@edge": {
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
};

// If we are using consolidated API pages (within default lambda), we need to ensure api/* behavior is set correctly.
// Note that if there are no consolidated API pages then existing api/* is not deleted.
// We do so for a couple reasons:
// 1. API pages don't need origin response handler as it's not retrieving from S3 origin
// 2. Override existing api/* behavior to ensure old separate API lambda isn't there
if (hasConsolidatedApiPages) {
cloudFrontOrigins[0].pathPatterns[
cloudFrontOrigins[1].pathPatterns[
this.pathPattern("api/*", routesManifest)
] = {
minTTL: 0,
Expand Down Expand Up @@ -886,15 +1133,15 @@ class NextjsComponent extends Component {
] = `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`;
}

cloudFrontOrigins[0].pathPatterns[path] = {
cloudFrontOrigins[1].pathPatterns[path] = {
// spread the existing value if there is one
...cloudFrontOrigins[0].pathPatterns[path],
...cloudFrontOrigins[1].pathPatterns[path],
// spread custom config
...config,
"lambda@edge": {
// spread the provided value
...(cloudFrontOrigins[0].pathPatterns[path] &&
cloudFrontOrigins[0].pathPatterns[path]["lambda@edge"]),
...(cloudFrontOrigins[1].pathPatterns[path] &&
cloudFrontOrigins[1].pathPatterns[path]["lambda@edge"]),
// then overrides
...edgeConfig
}
Expand All @@ -919,9 +1166,7 @@ class NextjsComponent extends Component {
maxTTL: 31536000,
...cloudFrontDefaults,
forward: {
headers: routesManifest.i18n
? ["Accept-Language", "Authorization", "Host"]
: ["Authorization", "Host"],
headers: "all",
cookies: "all",
queryString: true,
...cloudFrontDefaults.forward
Expand All @@ -936,16 +1181,6 @@ class NextjsComponent extends Component {
"PUT",
"PATCH"
],
"lambda@edge": buildOptions.disableOriginResponseHandler
? {
...defaultLambdaAtEdgeConfig,
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
}
: {
...defaultLambdaAtEdgeConfig,
"origin-request": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`,
"origin-response": `${defaultEdgeLambdaOutputs.arn}:${defaultEdgeLambdaPublishOutputs.version}`
},
compress: true
},
origins: cloudFrontOrigins,
Expand Down
Loading
Loading