Skip to content

Fix instance capabilities in report #6080

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 2 commits into from
Feb 12, 2026
+23 −19
Merged

Fix instance capabilities in report #6080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52e43be
Fix instance capabilities in report
francoisferrand Feb 12, 2026
4aac273
Release 9.1.13
francoisferrand Feb 12, 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
2 changes: 1 addition & 1 deletion lib/Config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1813,7 +1813,7 @@ class Config extends EventEmitter {

if (config.capabilities) {
if (config.capabilities.locationTypes) {
config.capabilities.locationTypes = new Set(config.capabilities.locationTypes);
this.supportedLocationTypes = new Set(config.capabilities.locationTypes);
}
this.capabilities = config.capabilities;
}
Expand Down
18 changes: 9 additions & 9 deletions lib/utilities/reportHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ function getCapabilities(cfg = config) {
caps.lifecycleRules &&= cfg.supportedLifecycleRules;

// Map locationTypes entries to the respective "legacy" capability flags
if (caps.locationTypes) {
caps.locationTypeAzure &&= caps.locationTypes.has('location-azure-v1');
caps.locationTypeGCP &&= caps.locationTypes.has('location-gcp-v1');
caps.locationTypeDigitalOcean &&= caps.locationTypes.has('location-do-spaces-v1');
caps.locationTypeSproxyd &&= caps.locationTypes.has('location-scality-sproxyd-v1');
caps.locationTypeNFS &&= caps.locationTypes.has('location-nfs-mount-v1');
caps.locationTypeCephRadosGW &&= caps.locationTypes.has('location-ceph-radosgw-s3-v1');
caps.locationTypeHyperdriveV2 &&= caps.locationTypes.has('location-scality-hdclient-v2');
caps.locationTypeLocal &&= caps.locationTypes.has('location-file-v1');
if (cfg.supportedLocationTypes) {
caps.locationTypeAzure &&= cfg.supportedLocationTypes.has('location-azure-v1');
caps.locationTypeGCP &&= cfg.supportedLocationTypes.has('location-gcp-v1');
caps.locationTypeDigitalOcean &&= cfg.supportedLocationTypes.has('location-do-spaces-v1');
caps.locationTypeSproxyd &&= cfg.supportedLocationTypes.has('location-scality-sproxyd-v1');
caps.locationTypeNFS &&= cfg.supportedLocationTypes.has('location-nfs-mount-v1');
caps.locationTypeCephRadosGW &&= cfg.supportedLocationTypes.has('location-ceph-radosgw-s3-v1');
caps.locationTypeHyperdriveV2 &&= cfg.supportedLocationTypes.has('location-scality-hdclient-v2');
caps.locationTypeLocal &&= cfg.supportedLocationTypes.has('location-file-v1');
}

return caps;
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
@@ -1,6 +1,6 @@
{
"name": "@zenko/cloudserver",
"version": "9.1.12",
"version": "9.1.13",
"description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
"main": "index.js",
"engines": {
Expand Down
20 changes: 12 additions & 8 deletions tests/unit/utils/reportHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,13 @@ describe('reportHandler.getCapabilities', () => {
});

it('should update locationTypes capabilities based on locationTypes map', () => {
const locationTypes = [
'location-gcp-v1',
'location-scality-sproxyd-v1',
'location-ceph-radosgw-s3-v1',
'location-file-v1',
'location-scality-artesca-s3-v1',
];
const cfg = {
capabilities: {
locationTypeAzure: true,
Expand All @@ -225,15 +232,10 @@ describe('reportHandler.getCapabilities', () => {
locationTypeCephRadosGW: true,
locationTypeHyperdriveV2: true,
locationTypeLocal: true,
locationTypes: new Set([
'location-gcp-v1',
'location-scality-sproxyd-v1',
'location-ceph-radosgw-s3-v1',
'location-file-v1',
'location-scality-artesca-s3-v1',
]),
locationTypes,
},
supportedLifecycleRules: ['Expiration'],
supportedLocationTypes: new Set(locationTypes),
};
const caps = getCapabilities(cfg);

Expand All @@ -250,6 +252,7 @@ describe('reportHandler.getCapabilities', () => {

it('should handle multiple consistency checks together', () => {
process.env.LOCAL_VOLUME_CAPABILITY = '0';
const locationTypes = ['location-azure-v1'];
const cfg = {
capabilities: {
locationTypeLocal: true,
Expand All @@ -258,9 +261,10 @@ describe('reportHandler.getCapabilities', () => {
managedLifecycleTransition: true,
locationTypeAzure: true,
locationTypeGCP: true,
locationTypes: new Set(['location-azure-v1']),
locationTypes,
},
supportedLifecycleRules: ['Expiration'], // Missing Transition
supportedLocationTypes: new Set(locationTypes),
};
const caps = getCapabilities(cfg);

Expand Down
Loading