Skip to content

Commit e5eb81f

Browse files
committed
zip at install
1 parent 89ef9f2 commit e5eb81f

File tree

10 files changed

+46
-28
lines changed

10 files changed

+46
-28
lines changed

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
!lambda/**/*.js
1212
!resources/**/*/*.*
1313

14+
!scripts/*.js
15+
1416
!package.json
1517
!package-lock.json
1618

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6767
### Changed
6868

6969
- Use one CloudFront Function template per framework
70+
- Generate the necessary dummy zip file required by the Pipeline during installation, instead of using the CLI deploy command
7071

7172
### Fixed

bin/cli/actions/deploy.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,6 @@ interface Command {
6262
cmd: any;
6363
}
6464

65-
export async function createZipArchive() {
66-
const outputFile = getBuildConfigS3Folder() + "/dummy.zip";
67-
// Check if the zip file already exists
68-
if (fs.existsSync(outputFile)) {
69-
return;
70-
}
71-
72-
const zip = new AdmZip();
73-
74-
zip.addLocalFile(getBuildConfigS3Folder() + "/dummy.txt");
75-
zip.writeZip(outputFile);
76-
77-
}
7865

7966
export default async function handleDeployCommand() {
8067
await checkAWSConnection();
@@ -95,10 +82,6 @@ export default async function handleDeployCommand() {
9582
var counter = 1;
9683
const hostingConfiguration = await loadHostingConfiguration();
9784

98-
if (isS3Config(hostingConfiguration)) {
99-
await createZipArchive();
100-
}
101-
10285
var certificateArnCmdParam = "";
10386
if (hostingConfiguration.domainName) {
10487
console.log(

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
3434
"audit": "npm audit && cdk synth | cfn_nag",
3535
"cloudfront-hosting-toolkit": "node bin/cli/index.js",
3636
"test": "jest --coverage",
37-
"postinstall": "cd lambda/layers/aws_sdk/nodejs && npm install"
37+
"zipfile": "node scripts/createDummyZip.js",
38+
"postinstall": "cd lambda/layers/aws_sdk/nodejs && npm install && cd ../../../.. && npm run zipfile"
3839
},
40+
3941
"devDependencies": {
4042
"@types/archiver": "5.3.2",
4143
"@types/aws-lambda": "^8.10.133",

resources/cff_templates/index_angularjs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ async function handler(event) {
2626
var request = event.request;
2727
var uri = request.uri;
2828

29-
//console.log("URI BEFORE: " + request.uri); -> Uncomment if needed
29+
//console.log("URI BEFORE: " + request.uri); // Uncomment if needed
3030
request.uri = await updateURI(uri);
31-
//console.log("URI AFTER: " + request.uri);-> Uncomment if needed
31+
//console.log("URI AFTER: " + request.uri); // Uncomment if needed
3232

3333
return request;
3434
}

resources/cff_templates/index_basic.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ async function handler(event) {
5252
var request = event.request;
5353
var uri = request.uri;
5454

55-
//console.log("URI BEFORE: " + request.uri); -> Uncomment if needed
55+
//console.log("URI BEFORE: " + request.uri); // Uncomment if needed
5656
request.uri = await updateURI(uri);
57-
//console.log("URI AFTER: " + request.uri);-> Uncomment if needed
57+
//console.log("URI AFTER: " + request.uri); // Uncomment if needed
58+
5859

5960

6061
return request;

resources/cff_templates/index_nextjs.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ async function handler(event) {
5252
var request = event.request;
5353
var uri = request.uri;
5454

55-
//console.log("URI BEFORE: " + request.uri); -> Uncomment if needed
55+
//console.log("URI BEFORE: " + request.uri); // Uncomment if needed
5656
request.uri = await updateURI(uri);
57-
//console.log("URI AFTER: " + request.uri);-> Uncomment if needed
57+
//console.log("URI AFTER: " + request.uri); // Uncomment if needed
58+
5859

5960

6061
return request;

resources/cff_templates/index_reactjs.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ async function handler(event) {
3333
var request = event.request;
3434
var uri = request.uri;
3535

36-
//console.log("URI BEFORE: " + request.uri); -> Uncomment if needed
36+
//console.log("URI BEFORE: " + request.uri); // Uncomment if needed
3737
request.uri = await updateURI(uri);
38-
//console.log("URI AFTER: " + request.uri);-> Uncomment if needed
38+
//console.log("URI AFTER: " + request.uri); // Uncomment if needed
39+
3940

4041

4142
return request;

resources/cff_templates/index_vuejs.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ async function handler(event) {
5252
var request = event.request;
5353
var uri = request.uri;
5454

55-
//console.log("URI BEFORE: " + request.uri); -> Uncomment if needed
55+
//console.log("URI BEFORE: " + request.uri); // Uncomment if needed
5656
request.uri = await updateURI(uri);
57-
//console.log("URI AFTER: " + request.uri);-> Uncomment if needed
57+
//console.log("URI AFTER: " + request.uri); // Uncomment if needed
58+
5859

5960

6061
return request;

scripts/createDummyZip.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// scripts/createZipArchive.js
2+
3+
const fs = require("fs");
4+
const AdmZip = require("adm-zip");
5+
6+
console.log("createZipArchive");
7+
const outputFile = "resources/s3_trigger/dummy.zip"; // Adjust the path as needed
8+
9+
// Check if the zip file already exists
10+
if (fs.existsSync(outputFile)) {
11+
console.log("Zip file already exists.");
12+
return;
13+
}
14+
15+
console.log("Creating new zip file...");
16+
17+
const zip = new AdmZip();
18+
19+
try {
20+
zip.addLocalFile("resources/s3_trigger/dummy.txt"); // Adjust the path as needed
21+
zip.writeZip(outputFile);
22+
console.log("Zip file written successfully.");
23+
} catch (error) {
24+
console.error("Error writing zip file:", error);
25+
process.exit(1);
26+
}

0 commit comments

Comments
 (0)