Skip to content

Commit 21bb00d

Browse files
committed
Merge remote-tracking branch 'origin/development/9.4' into w/9.4/feature/CLDSRV-860/monitor-async-await-migration
2 parents 4682684 + 313d7ea commit 21bb00d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+6866
-959
lines changed

.claude/skills/review-pr/SKILL.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ Parse `$ARGUMENTS` to extract the repo and PR number:
7979
- **Test quality** — no `.only()` tests (eslint enforces this),
8080
assertions match the behavior being tested, `require()`/`import`
8181
at top of file (never inside `describe` or functions).
82+
- **Test prefix** — Name of tests using the `it()` Mocha test function
83+
should start with `should`. Only raise this criteria once per file.
8284
8385
4. **Deliver your review:**
8486

.github/docker/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ services:
129129
depends_on:
130130
- redis
131131
metadata-standalone:
132-
image: ghcr.io/scality/metadata:8.11.0-standalone
132+
image: ghcr.io/scality/metadata:8.25.0-standalone
133133
profiles: ['metadata-standalone']
134134
network_mode: 'host'
135135
volumes:

.github/workflows/tests.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,20 @@ jobs:
261261
cache-from: type=gha,scope=mongodb
262262
cache-to: type=gha,mode=max,scope=mongodb
263263

264+
- name: Install Oras
265+
run: |
266+
curl -L https://github.com/oras-project/oras/releases/download/v${ORAS_VERSION}/oras_${ORAS_VERSION}_linux_amd64.tar.gz | \
267+
tar -xz -C /usr/local/bin oras
268+
env:
269+
ORAS_VERSION: 1.2.2
270+
271+
- name: Push dashboards
272+
run: |
273+
oras push ghcr.io/${{ github.repository }}/${{ github.event.repository.name }}-dashboards:${{ github.sha }} \
274+
dashboard.json:application/grafana-dashboard+json \
275+
alerts.yaml:application/prometheus-alerts+yaml
276+
working-directory: monitoring
277+
264278
multiple-backend:
265279
runs-on: ubuntu-24.04
266280
needs: build

lib/Config.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -545,23 +545,7 @@ function bucketNotifAssert(bucketNotifConfig) {
545545
}
546546

547547
function parseIntegrityChecks(config) {
548-
const integrityChecks = {
549-
'bucketPutACL': true,
550-
'bucketPutCors': true,
551-
'bucketPutEncryption': true,
552-
'bucketPutLifecycle': true,
553-
'bucketPutNotification': true,
554-
'bucketPutObjectLock': true,
555-
'bucketPutPolicy': true,
556-
'bucketPutReplication': true,
557-
'bucketPutVersioning': true,
558-
'bucketPutWebsite': true,
559-
'multiObjectDelete': true,
560-
'objectPutACL': true,
561-
'objectPutLegalHold': true,
562-
'objectPutTagging': true,
563-
'objectPutRetention': true,
564-
};
548+
const integrityChecks = {};
565549

566550
if (config && config.integrityChecks) {
567551
for (const method in integrityChecks) {

lib/api/api.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,20 @@ const api = {
301301
}
302302

303303
const buff = Buffer.concat(post, bodyLength);
304+
return validateMethodChecksumNoChunking(request, buff, log)
305+
.then(error => {
306+
if (error) {
307+
return next(error);
308+
}
304309

305-
const err = validateMethodChecksumNoChunking(request, buff, log);
306-
if (err) {
307-
return next(err);
308-
}
309-
310-
// Convert array of post buffers into one string
311-
request.post = buff.toString();
312-
return next(null, userInfo, authorizationResults, streamingV4Params, infos);
310+
// Convert array of post buffers into one string
311+
request.post = buff.toString();
312+
return next(null, userInfo, authorizationResults, streamingV4Params, infos);
313+
})
314+
.catch(error => {
315+
log.error('error validating checksums', { error });
316+
next(error);
317+
});
313318
});
314319
return undefined;
315320
},

0 commit comments

Comments
 (0)