Skip to content

Commit 2978314

Browse files
committed
Merge remote-tracking branch 'origin/improvement/CLDSRV-840' into w/9.3/improvement/CLDSRV-840
2 parents 2f24691 + 39ec017 commit 2978314

File tree

2 files changed

+54
-58
lines changed

2 files changed

+54
-58
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"npm-run-all": "^4.1.5",
5151
"prom-client": "^15.1.3",
5252
"request": "^2.88.2",
53-
"scubaclient": "git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9",
53+
"scubaclient": "git+https://github.com/scality/scubaclient.git#1.1.4",
5454
"sql-where-parser": "^2.2.1",
5555
"utapi": "github:scality/utapi#8.2.4",
5656
"utf-8-validate": "^6.0.5",

yarn.lock

Lines changed: 53 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3415,6 +3415,14 @@
34153415
"@smithy/types" "^4.9.0"
34163416
tslib "^2.6.2"
34173417

3418+
"@smithy/protocol-http@^5.3.8":
3419+
version "5.3.8"
3420+
resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.8.tgz#0938f69a3c3673694c2f489a640fce468ce75006"
3421+
integrity sha512-QNINVDhxpZ5QnP3aviNHQFlRogQZDfYlCkQT+7tJnErPQbDhysondEjhikuANxgMsZrkGeiAxXy4jguEGsDrWQ==
3422+
dependencies:
3423+
"@smithy/types" "^4.12.0"
3424+
tslib "^2.6.2"
3425+
34183426
"@smithy/querystring-builder@^3.0.11":
34193427
version "3.0.11"
34203428
resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.11.tgz#2ed04adbe725671824c5613d0d6f9376d791a909"
@@ -3539,19 +3547,6 @@
35393547
"@smithy/util-utf8" "^1.1.0"
35403548
tslib "^2.5.0"
35413549

3542-
"@smithy/signature-v4@^2.1.1":
3543-
version "2.3.0"
3544-
resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.3.0.tgz#c30dd4028ae50c607db99459981cce8cdab7a3fd"
3545-
integrity sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q==
3546-
dependencies:
3547-
"@smithy/is-array-buffer" "^2.2.0"
3548-
"@smithy/types" "^2.12.0"
3549-
"@smithy/util-hex-encoding" "^2.2.0"
3550-
"@smithy/util-middleware" "^2.2.0"
3551-
"@smithy/util-uri-escape" "^2.2.0"
3552-
"@smithy/util-utf8" "^2.3.0"
3553-
tslib "^2.6.2"
3554-
35553550
"@smithy/signature-v4@^4.1.0":
35563551
version "4.2.4"
35573552
resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.2.4.tgz#3501d3d09fd82768867bfc00a7be4bad62f62f4d"
@@ -3608,6 +3603,20 @@
36083603
"@smithy/util-utf8" "^4.2.0"
36093604
tslib "^2.6.2"
36103605

3606+
"@smithy/signature-v4@^5.3.7":
3607+
version "5.3.8"
3608+
resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.8.tgz#796619b10b7cc9467d0625b0ebd263ae04fdfb76"
3609+
integrity sha512-6A4vdGj7qKNRF16UIcO8HhHjKW27thsxYci+5r/uVRkdcBEkOEiY8OMPuydLX4QHSrJqGHPJzPRwwVTqbLZJhg==
3610+
dependencies:
3611+
"@smithy/is-array-buffer" "^4.2.0"
3612+
"@smithy/protocol-http" "^5.3.8"
3613+
"@smithy/types" "^4.12.0"
3614+
"@smithy/util-hex-encoding" "^4.2.0"
3615+
"@smithy/util-middleware" "^4.2.8"
3616+
"@smithy/util-uri-escape" "^4.2.0"
3617+
"@smithy/util-utf8" "^4.2.0"
3618+
tslib "^2.6.2"
3619+
36113620
"@smithy/smithy-client@^4.6.3", "@smithy/smithy-client@^4.6.4":
36123621
version "4.6.4"
36133622
resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.6.4.tgz#3a66bb71c91dadf1806adab664ba2e164a1139ab"
@@ -3667,13 +3676,6 @@
36673676
dependencies:
36683677
tslib "^2.5.0"
36693678

3670-
"@smithy/types@^2.12.0":
3671-
version "2.12.0"
3672-
resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.12.0.tgz#c44845f8ba07e5e8c88eda5aed7e6a0c462da041"
3673-
integrity sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==
3674-
dependencies:
3675-
tslib "^2.6.2"
3676-
36773679
"@smithy/types@^3.7.2":
36783680
version "3.7.2"
36793681
resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.7.2.tgz#05cb14840ada6f966de1bf9a9c7dd86027343e10"
@@ -3688,6 +3690,13 @@
36883690
dependencies:
36893691
tslib "^2.6.2"
36903692

3693+
"@smithy/types@^4.12.0":
3694+
version "4.12.0"
3695+
resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.12.0.tgz#55d2479080922bda516092dbf31916991d9c6fee"
3696+
integrity sha512-9YcuJVTOBDjg9LWo23Qp0lTQ3D7fQsQtwle0jVfpbUHy9qBwCEgKuVH4FqFB3VYu0nwdHKiEMA+oXz7oV8X1kw==
3697+
dependencies:
3698+
tslib "^2.6.2"
3699+
36913700
"@smithy/types@^4.5.0":
36923701
version "4.5.0"
36933702
resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.5.0.tgz#850e334662a1ef1286c35814940c80880400a370"
@@ -3940,13 +3949,6 @@
39403949
dependencies:
39413950
tslib "^2.5.0"
39423951

3943-
"@smithy/util-hex-encoding@^2.2.0":
3944-
version "2.2.0"
3945-
resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz#87edb7c88c2f422cfca4bb21f1394ae9602c5085"
3946-
integrity sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ==
3947-
dependencies:
3948-
tslib "^2.6.2"
3949-
39503952
"@smithy/util-hex-encoding@^3.0.0":
39513953
version "3.0.0"
39523954
resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz#32938b33d5bf2a15796cd3f178a55b4155c535e6"
@@ -3975,14 +3977,6 @@
39753977
dependencies:
39763978
tslib "^2.5.0"
39773979

3978-
"@smithy/util-middleware@^2.2.0":
3979-
version "2.2.0"
3980-
resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.2.0.tgz#80cfad40f6cca9ffe42a5899b5cb6abd53a50006"
3981-
integrity sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw==
3982-
dependencies:
3983-
"@smithy/types" "^2.12.0"
3984-
tslib "^2.6.2"
3985-
39863980
"@smithy/util-middleware@^3.0.11":
39873981
version "3.0.11"
39883982
resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.11.tgz#2ab5c17266b42c225e62befcffb048afa682b5bf"
@@ -4015,6 +4009,14 @@
40154009
"@smithy/types" "^4.9.0"
40164010
tslib "^2.6.2"
40174011

4012+
"@smithy/util-middleware@^4.2.8":
4013+
version "4.2.8"
4014+
resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.8.tgz#1da33f29a74c7ebd9e584813cb7e12881600a80a"
4015+
integrity sha512-PMqfeJxLcNPMDgvPbbLl/2Vpin+luxqTGPpW3NAQVLbRrFRzTa4rNAASYeIGjRV9Ytuhzny39SpyU04EQreF+A==
4016+
dependencies:
4017+
"@smithy/types" "^4.12.0"
4018+
tslib "^2.6.2"
4019+
40184020
"@smithy/util-retry@^1.1.0":
40194021
version "1.1.0"
40204022
resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-1.1.0.tgz#f6e62ec7d7d30f1dd9608991730ba7a86e445047"
@@ -4099,13 +4101,6 @@
40994101
dependencies:
41004102
tslib "^2.5.0"
41014103

4102-
"@smithy/util-uri-escape@^2.2.0":
4103-
version "2.2.0"
4104-
resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz#56f5764051a33b67bc93fdd2a869f971b0635406"
4105-
integrity sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==
4106-
dependencies:
4107-
tslib "^2.6.2"
4108-
41094104
"@smithy/util-uri-escape@^3.0.0":
41104105
version "3.0.0"
41114106
resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz#e43358a78bf45d50bb736770077f0f09195b6f54"
@@ -4135,7 +4130,7 @@
41354130
"@smithy/util-buffer-from" "^1.1.0"
41364131
tslib "^2.5.0"
41374132

4138-
"@smithy/util-utf8@^2.0.0", "@smithy/util-utf8@^2.3.0":
4133+
"@smithy/util-utf8@^2.0.0":
41394134
version "2.3.0"
41404135
resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5"
41414136
integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==
@@ -4785,13 +4780,13 @@ axios@^0.18.0:
47854780
follow-redirects "1.5.10"
47864781
is-buffer "^2.0.2"
47874782

4788-
axios@^1.3.4:
4789-
version "1.8.4"
4790-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447"
4791-
integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
4783+
axios@^1.13.2:
4784+
version "1.13.4"
4785+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.4.tgz#15d109a4817fb82f73aea910d41a2c85606076bc"
4786+
integrity sha512-1wVkUaAO6WyaYtCkcYCOx12ZgpGf9Zif+qXa4n+oYzK558YryKqiL6UWwd5DqiH3VRW0GYhTZQ/vlgJrCoNQlg==
47924787
dependencies:
47934788
follow-redirects "^1.15.6"
4794-
form-data "^4.0.0"
4789+
form-data "^4.0.4"
47954790
proxy-from-env "^1.1.0"
47964791

47974792
backo@^1.1.0:
@@ -6344,14 +6339,15 @@ forever-agent@~0.6.1:
63446339
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
63456340
integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
63466341

6347-
form-data@^4.0.0:
6348-
version "4.0.2"
6349-
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c"
6350-
integrity sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==
6342+
form-data@^4.0.4:
6343+
version "4.0.5"
6344+
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
6345+
integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
63516346
dependencies:
63526347
asynckit "^0.4.0"
63536348
combined-stream "^1.0.8"
63546349
es-set-tostringtag "^2.1.0"
6350+
hasown "^2.0.2"
63556351
mime-types "^2.1.12"
63566352

63576353
form-data@~2.3.2:
@@ -9305,13 +9301,13 @@ sax@>=0.6.0, sax@^1.2.4:
93059301
resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
93069302
integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
93079303

9308-
"scubaclient@git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9":
9309-
version "1.0.0"
9310-
resolved "git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9"
9304+
"scubaclient@git+https://github.com/scality/scubaclient.git#1.1.4":
9305+
version "1.1.3"
9306+
resolved "git+https://github.com/scality/scubaclient.git#950e26d10154f6351f16c8f9fef1f55a676d1c71"
93119307
dependencies:
93129308
"@aws-crypto/sha256-js" "^5.2.0"
9313-
"@smithy/signature-v4" "^2.1.1"
9314-
axios "^1.3.4"
9309+
"@smithy/signature-v4" "^5.3.7"
9310+
axios "^1.13.2"
93159311

93169312
"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
93179313
version "5.7.2"

0 commit comments

Comments
 (0)