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

Improvement/arsn 423 bump dependencies #2266

Open
wants to merge 9 commits into
base: development/8.2
Choose a base branch
from
Open

Improvement/arsn 423 bump dependencies #2266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0529217
Bump dependencies
benzekrimaha Oct 22, 2024
eead5e1
Adapt config post bump eslint to v9
benzekrimaha Oct 22, 2024
df6f808
Update code to match scality guidelines and dependencies bumps
benzekrimaha Oct 22, 2024
aa2bb42
Tests fixups after CI failures due to bumps
benzekrimaha Oct 22, 2024
bb259f8
Md lint fixup
benzekrimaha Oct 22, 2024
79351c9
Bump node version in gha
benzekrimaha Oct 22, 2024
353a7e6
Post reviews fixups
benzekrimaha Oct 22, 2024
ba7ade2
bump mongodb and adapt code
benzekrimaha Nov 28, 2024
7e142a1
fixup
benzekrimaha Nov 28, 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 lib/s3routes/routesUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@
xml.push(
'<?xml version="1.0" encoding="UTF-8"?>',
'<Error>',
`<Code>${errCode.message}</Code>`,
`<Message>${errCode.description}</Message>`,
`<Code>${error.message}</Code>`,
`<Message>${error.description}</Message>`,
);
Comment on lines +150 to 152
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this was changed already in 8.1, you can rebase your branch

const invalidArguments = error.metadata.get('invalidArguments') || [];
invalidArguments.forEach((invalidArgument, index) => {
Expand Down Expand Up @@ -335,9 +335,9 @@
const errorHandlerFn = () => { response.socket?.destroy(); };
const current = locations.shift();

response.on('error', () => {

Check warning on line 338 in lib/s3routes/routesUtils.ts

View check run for this annotation

Codecov / codecov/patch

lib/s3routes/routesUtils.ts#L338 

Added line #L338 was not covered by tests
logger.error('error piping data from source');
errorHandlerFn();

Check warning on line 340 in lib/s3routes/routesUtils.ts

View check run for this annotation

Codecov / codecov/patch

lib/s3routes/routesUtils.ts#L340 

Added line #L340 was not covered by tests
});
const {
client,
Expand All @@ -357,7 +357,7 @@
method: 'retrieveData',
backend: 'Azure',
});
return errorHandlerFn();

Check warning on line 360 in lib/s3routes/routesUtils.ts

View check run for this annotation

Codecov / codecov/patch

lib/s3routes/routesUtils.ts#L360 

Added line #L360 was not covered by tests
}
return undefined;
});
Expand Down Expand Up @@ -493,7 +493,7 @@
return sum + parseInt(location.size, 10);
}
}
return sum;

Check warning on line 496 in lib/s3routes/routesUtils.ts

View check run for this annotation

Codecov / codecov/patch

lib/s3routes/routesUtils.ts#L496 

Added line #L496 was not covered by tests
benzekrimaha marked this conversation as resolved.
Show resolved Hide resolved
}, 0);
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"sproxydclient": "github:scality/sproxydclient#8.1.0",
"utf8": "^3.0.0",
"uuid": "^10.0.0",
"werelogs": "scality/werelogs#8.2.0",
"werelogs": "scality/werelogs#8.2.2",
"xml2js": "^0.6.2"
},
"optionalDependencies": {
Expand Down
7 changes: 7 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7635,6 +7635,13 @@ werelogs@scality/werelogs#8.2.0:
fast-safe-stringify "^2.1.1"
safe-json-stringify "^1.2.0"

werelogs@scality/werelogs#8.2.2:
version "8.2.2"
resolved "https://codeload.github.com/scality/werelogs/tar.gz/e53bef5145697bf8af940dcbe59408988d64854f"
dependencies:
fast-safe-stringify "^2.1.1"
safe-json-stringify "^1.2.0"

whatwg-url@^11.0.0:
version "11.0.0"
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
Expand Down
Loading