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.

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

Update from deprecated aws-sdk bindings #678

Merged
merged 4 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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 flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
{
request = {
method = "PUT";
url = "/effect/4.0.0.tar.gz";
url = "/effect/4.0.0.tar.gz?x-id=PutObject";
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only visible change to the requests based on our integration test and I think it's harmless, but without verifying against the actual bucket I can't be completely sure.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's generated by the new sdk then it's probably the right thing 😄

};
response = {
status = 200;
Expand All @@ -492,7 +492,7 @@
{
request = {
method = "PUT";
url = "/prelude/6.0.1.tar.gz";
url = "/prelude/6.0.1.tar.gz?x-id=PutObject";
};
response = {
status = 500;
Expand Down
2 changes: 1 addition & 1 deletion foreign/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"private": true,
"license": "BSD-3-Clause",
"dependencies": {
"@aws-sdk/client-s3": "^3.461.0",
"@octokit/plugin-retry": "^3.0.9",
"@octokit/plugin-throttling": "^3.7.0",
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1050.0",
"better-sqlite3": "^8.5.2",
"fast-glob": "^3.2.11",
"fs-extra": "^10.0.0",
Expand Down
64 changes: 24 additions & 40 deletions foreign/src/Foreign/S3.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,32 @@
import aws from "aws-sdk";
import {
DeleteObjectCommand,
ListObjectsCommand,
PutObjectCommand,
S3,
} from "@aws-sdk/client-s3";

export const connectImpl = ({ key, secret }, endpoint) => {
const spacesEndpoint = new aws.Endpoint(endpoint);
return new aws.S3({
endpoint: spacesEndpoint,
accessKeyId: key,
secretAccessKey: secret,
export const connectImpl = ({ key, secret }, endpoint) =>
new S3({
forcePathStyle: false,
endpoint,
region: "us-east-1",
credentials: {
accessKeyId: key,
secretAccessKey: secret,
},
});
};

// TODO: we should switch to v3 of the SDK:
// https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3/classes/listobjectsv2command.html
export const listObjectsImpl = (s3, params) => {
return new Promise(function (resolve, reject) {
s3.listObjectsV2(params, function (err, data) {
if (err) {
reject(err);
} else {
resolve(data["Contents"]);
}
});
});
export const listObjectsImpl = async (s3, params) => {
const data = await s3.send(new ListObjectsCommand(params));
return data["Contents"];
};

export const putObjectImpl = (s3, params) => {
return new Promise(function (resolve, reject) {
s3.putObject(params, function (err, data) {
if (err) {
reject(err);
} else {
resolve(data);
}
});
});
export const putObjectImpl = async (s3, params) => {
const data = await s3.send(new PutObjectCommand(params));
return data;
};

export const deleteObjectImpl = (s3, params) => {
return new Promise(function (resolve, reject) {
s3.deleteObject(params, function (err, data) {
if (err) {
reject(err);
} else {
resolve(data);
}
});
});
export const deleteObjectImpl = async (s3, params) => {
const data = await s3.send(new DeleteObjectCommand(params));
return data;
};
Loading
Loading