From 7e78977c836a48661be9c05de8fe7eda05cd12cf Mon Sep 17 00:00:00 2001 From: Danil Uzlov <36223296+d-uzlov@users.noreply.github.com> Date: Wed, 26 Mar 2025 11:33:37 +0000 Subject: [PATCH] add callContext to assertCapabilities method --- src/driver/controller-client-common/index.js | 8 ++++---- src/driver/controller-objectivefs/index.js | 6 +++--- src/driver/controller-synology/index.js | 8 ++++---- src/driver/controller-zfs/index.js | 8 ++++---- src/driver/freenas/api.js | 8 ++++---- src/driver/index.js | 4 ++-- src/driver/node-manual/index.js | 2 +- src/driver/zfs-local-ephemeral-inline/index.js | 8 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/driver/controller-client-common/index.js b/src/driver/controller-client-common/index.js index 50f0595..8621447 100644 --- a/src/driver/controller-client-common/index.js +++ b/src/driver/controller-client-common/index.js @@ -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 }; diff --git a/src/driver/controller-objectivefs/index.js b/src/driver/controller-objectivefs/index.js index 6b64d50..d30e4e7 100644 --- a/src/driver/controller-objectivefs/index.js +++ b/src/driver/controller-objectivefs/index.js @@ -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 }; diff --git a/src/driver/controller-synology/index.js b/src/driver/controller-synology/index.js index 7645aa4..deb3091 100644 --- a/src/driver/controller-synology/index.js +++ b/src/driver/controller-synology/index.js @@ -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 }; } diff --git a/src/driver/controller-zfs/index.js b/src/driver/controller-zfs/index.js index 959a9f6..b147732 100644 --- a/src/driver/controller-zfs/index.js +++ b/src/driver/controller-zfs/index.js @@ -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 }; diff --git a/src/driver/freenas/api.js b/src/driver/freenas/api.js index fc37fac..1d53bee 100644 --- a/src/driver/freenas/api.js +++ b/src/driver/freenas/api.js @@ -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 }; diff --git a/src/driver/index.js b/src/driver/index.js index 992a401..c308a8e 100644 --- a/src/driver/index.js +++ b/src/driver/index.js @@ -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, diff --git a/src/driver/node-manual/index.js b/src/driver/node-manual/index.js index f30d63c..61cccd1 100644 --- a/src/driver/node-manual/index.js +++ b/src/driver/node-manual/index.js @@ -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; diff --git a/src/driver/zfs-local-ephemeral-inline/index.js b/src/driver/zfs-local-ephemeral-inline/index.js index 57be40b..05c6683 100644 --- a/src/driver/zfs-local-ephemeral-inline/index.js +++ b/src/driver/zfs-local-ephemeral-inline/index.js @@ -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 };