Skip to content

CLDSRV-999: Drop unused and deprecated dependencies, refresh docs/test deps #6317

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

Merged
bert-e merged 5 commits into from
Oct 1, 2026
Merged

CLDSRV-999: Drop unused and deprecated dependencies, refresh docs/test deps #6317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e0b2e8
Remove unused dependencies
francoisferrand Sep 30, 2026
ae49161
Bump Guidelines to 8.3.3
francoisferrand Sep 30, 2026
e31f355
Refresh Python docs requirements
francoisferrand Sep 30, 2026
517b256
Bump junit in jaws functional tests
francoisferrand Sep 30, 2026
ae201f4
Apply Prettier quoteProps consistent from Guidelines 8.3.3
francoisferrand Sep 30, 2026
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
6 changes: 3 additions & 3 deletions constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ const constants = {
// declare here all existing service accounts and their properties
// (if any, otherwise an empty object)
serviceAccountProperties: {
replication: {},
lifecycle: {},
gc: {},
'replication': {},
'lifecycle': {},
'gc': {},
'md-ingestion': {
canReplicate: true,
},
Expand Down
3 changes: 1 addition & 2 deletions docs/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Sphinx >= 1.7.5
recommonmark >= 0.4.0
Sphinx >= 7.0
444 changes: 338 additions & 106 deletions docs/requirements.txt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default [
'import/extensions': 'off',
'lines-around-directive': 'off',
'no-underscore-dangle': 'off',
indent: 'off',
'indent': 'off',
'object-curly-newline': 'off',
'operator-linebreak': 'off',
'function-paren-newline': 'off',
Expand Down
2 changes: 1 addition & 1 deletion lib/api/apiUtils/bucket/parseWhere.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const exprMapper = {
'<': '$lt',
'>=': '$gte',
'<=': '$lte',
LIKE: '$regex',
'LIKE': '$regex',

@DarkIsDude DarkIsDude Oct 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why do you have some prettier sutff ?

@benzekrimaha benzekrimaha Oct 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

as the prettier PR was merged , I have the same question on this

@francoisferrand francoisferrand Oct 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

prettier PR used an outdated Guidelines PR... with the bump, some things were changed: and code needs to be changed again...

};

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/api/apiUtils/object/corsResponse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function generateCorsResHeaders(rule, origin, method, headers, isPreflight) {
const resHeaders = {
'access-control-max-age': rule.maxAgeSeconds,
'access-control-allow-methods': rule.allowedMethods.join(', '),
vary: 'Origin, Access-Control-Request-Headers, Access-Control-Request-Method',
'vary': 'Origin, Access-Control-Request-Headers, Access-Control-Request-Method',
};
// send back '*' if any origin allowed; otherwise send back
// request Origin value
Expand Down
2 changes: 1 addition & 1 deletion lib/api/apiUtils/object/objectLockHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function checkUserGovernanceBypass(request, authInfo, bucketMD, objectKey, log,
);
if (explicitDenyExists) {
log.trace('authorization check failed for user', {
method: 'checkUserPolicyGovernanceBypass',
'method': 'checkUserPolicyGovernanceBypass',
's3:BypassGovernanceRetention': false,
});
return cb(errors.AccessDenied);
Expand Down
2 changes: 1 addition & 1 deletion lib/api/objectPutPart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ function objectPutPart(authInfo, request, streamingV4Params, log, cb) {
// back to Version 3 since number-subparts is not needed
'md-model-version': 3,
partLocations,
key: partKey,
'key': partKey,
'last-modified': new Date().toJSON(),
'content-md5': hexDigest,
'content-length': size,
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/veeam/schemas/system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const { errors, errorInstances } = require('@scality/arsenal');

// Allow supporting any version of the protocol
const systemSchemasPerVersion = {
unsupported: joi.object({}),
'unsupported': joi.object({}),
'"1.0"': joi.object({
SystemInfo: joi
.object({
Expand Down
2 changes: 1 addition & 1 deletion lib/services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ const services = {
// from an object to an array
'md-model-version': 3,
partLocations,
key: partKey,
'key': partKey,
'last-modified': dateModified,
'content-md5': contentMD5,
'content-length': size,
Expand Down
2 changes: 1 addition & 1 deletion lib/utilities/aclUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const grantsByURI = [constants.publicId, constants.allAuthedUsersId, constants.l
aclUtils.handleCannedGrant = function handleCannedGrant(grantType, ownerGrant, separateBucketOwner) {
const cannedGrants = [];
const actions = {
private: () => {
'private': () => {
cannedGrants.push(ownerGrant);
},
'public-read': () => {
Expand Down
9 changes: 1 addition & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"@aws-sdk/client-sts": "^3.930.0",
"@aws-sdk/crc64-nvme-crt": "^3.989.0",
"@aws-sdk/credential-providers": "^3.864.0",
"@aws-sdk/middleware-retry": "^3.374.0",
"@aws-sdk/protocol-http": "^3.374.0",
"@aws-sdk/s3-request-presigner": "^3.901.0",
"@aws-sdk/signature-v4": "^3.374.0",
Expand All @@ -46,18 +45,15 @@
"commander": "^12.1.0",
"cron-parser": "^4.9.0",
"diskusage": "^1.2.0",
"google-auto-auth": "^0.10.1",
"http-proxy": "npm:http-proxy-3@^1.21.0",
"http-proxy-agent": "^7.0.2",
"https-proxy-agent": "^7.0.5",
"level-mem": "^5.0.1",
"moment": "^2.30.1",
"mongodb": "^6.11.0",
"node-fetch": "^2.6.0",
"node-forge": "^1.3.1",
"npm-run-all": "^4.1.5",
"prom-client": "^15.1.3",
"request": "^2.88.2",
"sql-where-parser": "^2.2.1",
"utf-8-validate": "^6.0.5",
"utf8": "^3.0.0",
Expand All @@ -70,17 +66,14 @@
"devDependencies": {
"@eslint/compat": "^1.2.2",
"@scality/cloudserverclient": "1.0.12",
"@scality/eslint-config-scality": "scality/Guidelines#8.3.1",
"@scality/eslint-config-scality": "scality/Guidelines#8.3.3",
"eslint": "^9.14.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-mocha": "^10.5.0",
"eslint-plugin-n": "^17.24.0",
"eslint-plugin-promise": "^7.2.1",
"express": "^4.21.1",
"ioredis": "^5.4.1",
"istanbul": "^0.4.5",
"istanbul-api": "^3.0.0",
"lolex": "^6.0.0",
"mocha": "^11.7.5",
"mocha-junit-reporter": "^2.2.1",
"mocha-multi-reporters": "^1.5.1",
Expand Down
18 changes: 9 additions & 9 deletions tests/functional/aws-node-sdk/test/multipleBackend/put/put.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ describeSkipIfNotMultiple('MultipleBackend put object', function testSuite() {
Key: key,
Metadata: {
'scal-location-constraint': awsLocation,
mdonly: 'true',
md5chksum: b64,
size: body.length.toString(),
'mdonly': 'true',
'md5chksum': b64,
'size': body.length.toString(),
},
};
await s3
Expand All @@ -210,9 +210,9 @@ describeSkipIfNotMultiple('MultipleBackend put object', function testSuite() {
Body: body,
Metadata: {
'scal-location-constraint': awsLocation,
mdonly: 'true',
md5chksum: b64,
size: body.length.toString(),
'mdonly': 'true',
'md5chksum': b64,
'size': body.length.toString(),
},
};
await s3
Expand All @@ -236,9 +236,9 @@ describeSkipIfNotMultiple('MultipleBackend put object', function testSuite() {
Key: key,
Metadata: {
'scal-location-constraint': awsLocation,
mdonly: 'true',
md5chksum: b64,
size: '0',
'mdonly': 'true',
'md5chksum': b64,
'size': '0',
},
};
await s3
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/aws-node-sdk/test/object/100-continue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ContinueRequestHandler {
method: 'PUT',
headers: {
'content-length': body.length,
Expect: this.expectHeader,
'Expect': this.expectHeader,
},
};
}
Expand Down Expand Up @@ -126,8 +126,8 @@ describeSkipIfE2E('PUT public object with 100-continue header', () => {
bucketUtil = new BucketUtility('default', sigCfg);
s3 = bucketUtil.s3;
const params = {
Bucket: bucket,
Key: key,
'Bucket': bucket,
'Key': key,
'Content-Length': 0,
};
const command = new PutObjectCommand(params);
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/aws-node-sdk/test/object/corsHeaders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ describe('Cross Origin Resource Sharing requests', () => {
'even if request matches CORS rule and other access-control headers are returned',
async () => {
const headers = {
Origin: allowedOrigin,
'Origin': allowedOrigin,
'Content-Type': 'testvalue',
};
const headersOmitted = ['access-control-allow-headers'];
Expand Down
Loading
Loading