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

Jump to bottom

Add new custom-resource patching mechanism for serverless>3.39.0 #254

Merged
merged 2 commits into from
Jun 21, 2024
Merged

Add new custom-resource patching mechanism for serverless>3.39.0 #254

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f6db22
Add new patching mechanism for serverless>3.39, which uses aws sdk v3…
dfangl Jun 21, 2024
2e0eb7a
Update package to version 1.2.1
dfangl Jun 21, 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
58 changes: 47 additions & 11 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,50 @@ class LocalstackPlugin {
return;
}
}

function patchPreV3() {
const utilFile = customResources.getEntry('utils.js');
if (utilFile == null) return;
const data = utilFile.getData().toString();
const legacyPatch = 'AWS.config.s3ForcePathStyle = true;';
if (data.includes(legacyPatch)) {
createPatchMarker();
return true;
}
const patchIndex = data.indexOf('AWS.config.logger = console;');
if (patchIndex === -1) {
return false;
}
const newData =
data.slice(0, patchIndex) + legacyPatch + '\n' + data.slice(patchIndex);
utilFile.setData(newData);
return true;
}

function patchV3() {
this.debug(
'serverless-localstack: Patching V3',
);
const customResourcesBucketFile = customResources.getEntry('s3/lib/bucket.js');
if (customResourcesBucketFile == null) {
// TODO debugging, remove
this.log(
'serverless-localstack: Could not find file s3/lib/bucket.js to patch.',
);
return;
}
const data = customResourcesBucketFile.getData().toString();
const oldClientCreation = 'S3Client({ maxAttempts: MAX_AWS_REQUEST_TRY });';
const newClientCreation = 'S3Client({ maxAttempts: MAX_AWS_REQUEST_TRY, forcePathStyle: true });';
if (data.includes(newClientCreation)) {
// patch already done
createPatchMarker();
return;
}
const newData = data.replace(oldClientCreation, newClientCreation);

customResourcesBucketFile.setData(newData);
}

if (fileExists(patchMarker)) {
this.debug(
Expand All @@ -1000,18 +1044,10 @@ class LocalstackPlugin {
}

const customResources = new AdmZip(zipFilePath);
const utilFile = customResources.getEntry('utils.js');
if (utilFile == null) return;
const data = utilFile.getData().toString();
const patch = 'AWS.config.s3ForcePathStyle = true;';
if (data.includes(patch)) {
createPatchMarker();
return;

if (!patchPreV3.call(this)) {
patchV3.call(this);
}
const indexPatch = data.indexOf('AWS.config.logger = console;');
const newData =
data.slice(0, indexPatch) + patch + '\n' + data.slice(indexPatch);
utilFile.setData(newData);
customResources.writeZip();
createPatchMarker();
this.debug(
Expand Down
Loading