public_git
/
democratic-csi
mirror of https://github.com/democratic-csi/democratic-csi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add callContext to assertCapabilities method

This commit is contained in:
Danil Uzlov 2025-03-26 11:33:37 +00:00
parent cff82dc2c3
commit 7e78977c83
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/controller-client-common/index.js
View File

@ -156,7 +156,7 @@ class ControllerClientCommonDriver extends CsiBaseDriver {
return access_modes;
}
assertCapabilities(capabilities) {
assertCapabilities(callContext, capabilities) {
const driver = this;
this.ctx.logger.verbose("validating capabilities: %j", capabilities);
@ -560,7 +560,7 @@ class ControllerClientCommonDriver extends CsiBaseDriver {
call.request.volume_capabilities &&
call.request.volume_capabilities.length > 0
) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
throw new GrpcError(grpc.status.INVALID_ARGUMENT, result.message);
}
@ -902,7 +902,7 @@ class ControllerClientCommonDriver extends CsiBaseDriver {
}
if (call.request.volume_capabilities) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { available_capacity: 0 };
@ -1414,7 +1414,7 @@ class ControllerClientCommonDriver extends CsiBaseDriver {
);
}
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { message: result.message };

6
src/driver/controller-objectivefs/index.js
View File

@ -159,7 +159,7 @@ class ControllerObjectiveFSDriver extends CsiBaseDriver {
return ["fuse.objectivefs", "objectivefs"];
}
assertCapabilities(capabilities) {
assertCapabilities(callContext, capabilities) {
const driver = this;
this.ctx.logger.verbose("validating capabilities: %j", capabilities);
@ -347,7 +347,7 @@ class ControllerObjectiveFSDriver extends CsiBaseDriver {
call.request.volume_capabilities &&
call.request.volume_capabilities.length > 0
) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
throw new GrpcError(grpc.status.INVALID_ARGUMENT, result.message);
}
@ -651,7 +651,7 @@ class ControllerObjectiveFSDriver extends CsiBaseDriver {
throw new GrpcError(grpc.status.INVALID_ARGUMENT, `missing capabilities`);
}
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { message: result.message };

8
src/driver/controller-synology/index.js
View File

@ -250,7 +250,7 @@ class ControllerSynologyDriver extends CsiBaseDriver {
return access_modes;
}
assertCapabilities(capabilities) {
assertCapabilities(callContext, capabilities) {
const driverResourceType = this.getDriverResourceType();
this.ctx.logger.verbose("validating capabilities: %j", capabilities);
@ -330,7 +330,7 @@ class ControllerSynologyDriver extends CsiBaseDriver {
call.request.volume_capabilities &&
call.request.volume_capabilities.length > 0
) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
throw new GrpcError(grpc.status.INVALID_ARGUMENT, result.message);
}
@ -890,7 +890,7 @@ class ControllerSynologyDriver extends CsiBaseDriver {
}
if (call.request.volume_capabilities) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { available_capacity: 0 };
@ -1150,7 +1150,7 @@ class ControllerSynologyDriver extends CsiBaseDriver {
break;
}
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { message: result.message };
}

8
src/driver/controller-zfs/index.js
View File

@ -250,7 +250,7 @@ class ControllerZfsBaseDriver extends CsiBaseDriver {
return access_modes;
}
assertCapabilities(capabilities) {
assertCapabilities(callContext, capabilities) {
const driverZfsResourceType = this.getDriverZfsResourceType();
this.ctx.logger.verbose("validating capabilities: %j", capabilities);
@ -658,7 +658,7 @@ class ControllerZfsBaseDriver extends CsiBaseDriver {
call.request.volume_capabilities &&
call.request.volume_capabilities.length > 0
) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
throw new GrpcError(grpc.status.INVALID_ARGUMENT, result.message);
}
@ -1534,7 +1534,7 @@ class ControllerZfsBaseDriver extends CsiBaseDriver {
}
if (call.request.volume_capabilities) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { available_capacity: 0 };
@ -2461,7 +2461,7 @@ class ControllerZfsBaseDriver extends CsiBaseDriver {
}
}
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { message: result.message };

8
src/driver/freenas/api.js
View File

@ -2082,7 +2082,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
return access_modes;
}
assertCapabilities(capabilities) {
assertCapabilities(callContext, capabilities) {
const driverZfsResourceType = this.getDriverZfsResourceType();
this.ctx.logger.verbose("validating capabilities: %j", capabilities);
@ -2254,7 +2254,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
call.request.volume_capabilities &&
call.request.volume_capabilities.length > 0
) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
throw new GrpcError(grpc.status.INVALID_ARGUMENT, result.message);
}
@ -3269,7 +3269,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
}
if (call.request.volume_capabilities) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { available_capacity: 0 };
@ -4450,7 +4450,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
}
}
const result = this.assertCapabilities(capabilities);
const result = this.assertCapabilities(callContext, capabilities);
if (result.valid !== true) {
return { message: result.message };

4
src/driver/index.js
View File

@ -767,7 +767,7 @@ class CsiBaseDriver {
}
if (call.request.volume_context.provisioner_driver == "node-manual") {
result = await this.assertCapabilities([capability], node_attach_driver);
result = await this.assertCapabilities(callContext, [capability], node_attach_driver);
if (!result.valid) {
throw new GrpcError(
grpc.status.INVALID_ARGUMENT,
@ -775,7 +775,7 @@ class CsiBaseDriver {
);
}
} else {
result = await this.assertCapabilities([capability]);
result = await this.assertCapabilities(callContext, [capability]);
if (!result.valid) {
throw new GrpcError(
grpc.status.INVALID_ARGUMENT,

2
src/driver/node-manual/index.js
View File

@ -100,7 +100,7 @@ class NodeManualDriver extends CsiBaseDriver {
}
}
assertCapabilities(capabilities, node_attach_driver) {
assertCapabilities(callContext, capabilities, node_attach_driver) {
this.ctx.logger.verbose("validating capabilities: %j", capabilities);
let message = null;

8
src/driver/zfs-local-ephemeral-inline/index.js
View File

@ -165,7 +165,7 @@ class ZfsLocalEphemeralInlineDriver extends CsiBaseDriver {
return datasetParentName;
}
assertCapabilities(capabilities) {
assertCapabilities(callContext, capabilities) {
// hard code this for now
const driverZfsResourceType = "filesystem";
this.ctx.logger.verbose("validating capabilities: %j", capabilities);
@ -309,7 +309,7 @@ class ZfsLocalEphemeralInlineDriver extends CsiBaseDriver {
}
if (capability) {
const result = this.assertCapabilities([capability]);
const result = this.assertCapabilities(callContext, [capability]);
if (result.valid !== true) {
throw new GrpcError(grpc.status.INVALID_ARGUMENT, result.message);
@ -468,7 +468,7 @@ class ZfsLocalEphemeralInlineDriver extends CsiBaseDriver {
}
if (call.request.volume_capabilities) {
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { available_capacity: 0 };
@ -490,7 +490,7 @@ class ZfsLocalEphemeralInlineDriver extends CsiBaseDriver {
*/
async ValidateVolumeCapabilities(callContext, call) {
const driver = this;
const result = this.assertCapabilities(call.request.volume_capabilities);
const result = this.assertCapabilities(callContext, call.request.volume_capabilities);
if (result.valid !== true) {
return { message: result.message };