Skip to content

Commit bc7e924

Browse files
bert-ebert-e
committed
Merge branch 'improvement/CLDSRV-651' into tmp/octopus/w/9.1/improvement/CLDSRV-651 
2 parents 82ba16a + 0d150e9 commit bc7e924

File tree

5 files changed

+39
-48
lines changed

5 files changed

+39
-48
lines changed

‎constants.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,6 @@ const constants = {
250250
// if requester is not bucket owner, bucket policy actions should be denied with
251251
// MethodNotAllowed error
252252
onlyOwnerAllowed: ['bucketDeletePolicy', 'bucketGetPolicy', 'bucketPutPolicy'],
253-
supportedLifecycleRules: [
254-
'expiration',
255-
'noncurrentVersionExpiration',
256-
'abortIncompleteMultipartUpload',
257-
'transitions',
258-
'noncurrentVersionTransition',
259-
],
260253
};
261254

262255
module.exports = constants;

‎lib/Config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const {
1818
base64Regex,
1919
allowedUtapiEventFilterFields,
2020
allowedUtapiEventFilterStates,
21-
supportedLifecycleRules,
2221
} = require('../constants');
22+
const { ValidLifecycleRules: supportedLifecycleRules } = require('arsenal').models;
2323
const { utapiVersion } = require('utapi');
2424
const { scaleMsPerDay } = s3middleware.objectUtils;
2525

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"dependencies": {
2222
"@azure/storage-blob": "^12.25.0",
2323
"@hapi/joi": "^17.1.1",
24-
"arsenal": "git+https://github.com/scality/arsenal#8.2.17",
24+
"arsenal": "git+https://github.com/scality/Arsenal#8.2.18",
2525
"async": "2.6.4",
2626
"aws-sdk": "^2.1692.0",
2727
"bucketclient": "scality/bucketclient#8.2.3",

‎tests/unit/Config.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ const {
99
ConfigObject,
1010
} = require('../../lib/Config');
1111

12-
const {
13-
supportedLifecycleRules,
14-
} = require('../../constants');
12+
const { ValidLifecycleRules: supportedLifecycleRules } = require('arsenal').models;
1513

1614
describe('Config', () => {
1715
const envToRestore = [];
@@ -673,9 +671,9 @@ describe('Config', () => {
673671

674672
it('should return the rules provided when they are valid', () => {
675673
const rules = [
676-
'expiration',
677-
'noncurrentVersionExpiration',
678-
'abortIncompleteMultipartUpload',
674+
'Expiration',
675+
'NoncurrentVersionExpiration',
676+
'AbortIncompleteMultipartUpload',
679677
];
680678
const parsedRules = parseSupportedLifecycleRules(rules);
681679
assert.deepStrictEqual(parsedRules, rules);

‎yarn.lock‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,37 +1342,32 @@ arraybuffer.prototype.slice@^1.0.4:
13421342
get-intrinsic "^1.2.6"
13431343
is-array-buffer "^3.0.4"
13441344

1345-
"arsenal@git+https://github.com/scality/Arsenal#8.2.4":
1346-
version "8.2.4"
1347-
resolved "git+https://github.com/scality/Arsenal#96ef6a3e26d7528f877300606586759f1da6d0cd"
1345+
"arsenal@git+https://github.com/scality/Arsenal#8.2.18":
1346+
version "8.2.18"
1347+
resolved "git+https://github.com/scality/Arsenal#6d0165b870575d77f265bd3dd98b1ca875ebaa06"
13481348
dependencies:
1349-
"@azure/identity" "^4.5.0"
1350-
"@azure/storage-blob" "^12.25.0"
1351-
"@eslint/plugin-kit" "^0.2.3"
1349+
"@azure/identity" "^4.9.1"
1350+
"@azure/storage-blob" "^12.27.0"
13521351
"@js-sdsl/ordered-set" "^4.4.2"
13531352
"@scality/hdclient" "^1.3.1"
1354-
"@types/async" "^3.2.24"
1355-
"@types/utf8" "^3.0.3"
13561353
JSONStream "^1.3.5"
1357-
agentkeepalive "^4.5.0"
1354+
agentkeepalive "^4.6.0"
13581355
ajv "6.12.3"
13591356
async "~2.6.4"
13601357
aws-sdk "^2.1691.0"
13611358
backo "^1.1.0"
13621359
base-x "3.0.8"
13631360
base62 "^2.0.2"
1364-
bson "^6.8.0"
13651361
debug "^4.3.7"
1366-
diskusage "^1.2.0"
13671362
fcntl "github:scality/node-fcntl#0.3.0"
13681363
httpagent scality/httpagent#1.1.0
1369-
https-proxy-agent "^7.0.5"
1370-
ioredis "^5.4.1"
1364+
https-proxy-agent "^7.0.6"
1365+
ioredis "^5.6.1"
13711366
ipaddr.js "^2.2.0"
13721367
joi "^17.13.3"
13731368
level "~5.0.1"
13741369
level-sublevel "~6.6.5"
1375-
mongodb "^6.11.0"
1370+
mongodb "^6.16.0"
13761371
node-forge "^1.3.1"
13771372
prom-client "^15.1.3"
13781373
simple-glob "^0.2.0"
@@ -1386,9 +1381,9 @@ arraybuffer.prototype.slice@^1.0.4:
13861381
optionalDependencies:
13871382
ioctl "^2.0.2"
13881383

1389-
"arsenal@git+https://github.com/scality/Arsenal#8.2.6":
1390-
version "8.2.6"
1391-
resolved "git+https://github.com/scality/Arsenal#ae9f1ec9e93da10c20c22e7197cd92dcc082ba08"
1384+
"arsenal@git+https://github.com/scality/Arsenal#8.2.4":
1385+
version "8.2.4"
1386+
resolved "git+https://github.com/scality/Arsenal#96ef6a3e26d7528f877300606586759f1da6d0cd"
13921387
dependencies:
13931388
"@azure/identity" "^4.5.0"
13941389
"@azure/storage-blob" "^12.25.0"
@@ -1430,14 +1425,15 @@ arraybuffer.prototype.slice@^1.0.4:
14301425
optionalDependencies:
14311426
ioctl "^2.0.2"
14321427

1433-
"arsenal@git+https://github.com/scality/arsenal#8.2.1":
1434-
version "8.2.1"
1435-
resolved "git+https://github.com/scality/arsenal#6285cb70b1edd87ef3ab20b73324bd4bdaa9a2a2"
1428+
"arsenal@git+https://github.com/scality/Arsenal#8.2.6":
1429+
version "8.2.6"
1430+
resolved "git+https://github.com/scality/Arsenal#ae9f1ec9e93da10c20c22e7197cd92dcc082ba08"
14361431
dependencies:
14371432
"@azure/identity" "^4.5.0"
14381433
"@azure/storage-blob" "^12.25.0"
14391434
"@eslint/plugin-kit" "^0.2.3"
14401435
"@js-sdsl/ordered-set" "^4.4.2"
1436+
"@scality/hdclient" "^1.3.1"
14411437
"@types/async" "^3.2.24"
14421438
"@types/utf8" "^3.0.3"
14431439
JSONStream "^1.3.5"
@@ -1451,8 +1447,7 @@ arraybuffer.prototype.slice@^1.0.4:
14511447
bson "^6.8.0"
14521448
debug "^4.3.7"
14531449
diskusage "^1.2.0"
1454-
fcntl "github:scality/node-fcntl#0.2.2"
1455-
hdclient scality/hdclient#1.1.7
1450+
fcntl "github:scality/node-fcntl#0.3.0"
14561451
httpagent scality/httpagent#1.1.0
14571452
https-proxy-agent "^7.0.5"
14581453
ioredis "^5.4.1"
@@ -1474,32 +1469,37 @@ arraybuffer.prototype.slice@^1.0.4:
14741469
optionalDependencies:
14751470
ioctl "^2.0.2"
14761471

1477-
"arsenal@git+https://github.com/scality/arsenal#8.2.17":
1478-
version "8.2.17"
1479-
resolved "git+https://github.com/scality/arsenal#692a82c9e2778549f24c1a1f108e663ed20108ce"
1472+
"arsenal@git+https://github.com/scality/arsenal#8.2.1":
1473+
version "8.2.1"
1474+
resolved "git+https://github.com/scality/arsenal#6285cb70b1edd87ef3ab20b73324bd4bdaa9a2a2"
14801475
dependencies:
1481-
"@azure/identity" "^4.9.1"
1482-
"@azure/storage-blob" "^12.27.0"
1476+
"@azure/identity" "^4.5.0"
1477+
"@azure/storage-blob" "^12.25.0"
1478+
"@eslint/plugin-kit" "^0.2.3"
14831479
"@js-sdsl/ordered-set" "^4.4.2"
1484-
"@scality/hdclient" "^1.3.1"
1480+
"@types/async" "^3.2.24"
1481+
"@types/utf8" "^3.0.3"
14851482
JSONStream "^1.3.5"
1486-
agentkeepalive "^4.6.0"
1483+
agentkeepalive "^4.5.0"
14871484
ajv "6.12.3"
14881485
async "~2.6.4"
14891486
aws-sdk "^2.1691.0"
14901487
backo "^1.1.0"
14911488
base-x "3.0.8"
14921489
base62 "^2.0.2"
1490+
bson "^6.8.0"
14931491
debug "^4.3.7"
1494-
fcntl "github:scality/node-fcntl#0.3.0"
1492+
diskusage "^1.2.0"
1493+
fcntl "github:scality/node-fcntl#0.2.2"
1494+
hdclient scality/hdclient#1.1.7
14951495
httpagent scality/httpagent#1.1.0
1496-
https-proxy-agent "^7.0.6"
1497-
ioredis "^5.6.1"
1496+
https-proxy-agent "^7.0.5"
1497+
ioredis "^5.4.1"
14981498
ipaddr.js "^2.2.0"
14991499
joi "^17.13.3"
15001500
level "~5.0.1"
15011501
level-sublevel "~6.6.5"
1502-
mongodb "^6.16.0"
1502+
mongodb "^6.11.0"
15031503
node-forge "^1.3.1"
15041504
prom-client "^15.1.3"
15051505
simple-glob "^0.2.0"

0 commit comments

Comments
 (0)