From fdca28c2aff548fcbad59b823d9beba09168ce34 Mon Sep 17 00:00:00 2001 From: Danil Uzlov <36223296+d-uzlov@users.noreply.github.com> Date: Mon, 24 Mar 2025 21:42:06 +0000 Subject: [PATCH] logs: use context logger in objectivefs, synology, node-manual drivers --- src/driver/controller-objectivefs/index.js | 8 +++--- src/driver/controller-synology/index.js | 30 +++++++++++----------- src/driver/index.js | 2 +- src/driver/node-manual/index.js | 4 +-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/driver/controller-objectivefs/index.js b/src/driver/controller-objectivefs/index.js index 121570f..089a188 100644 --- a/src/driver/controller-objectivefs/index.js +++ b/src/driver/controller-objectivefs/index.js @@ -159,9 +159,9 @@ class ControllerObjectiveFSDriver extends CsiBaseDriver { return ["fuse.objectivefs", "objectivefs"]; } - assertCapabilities(capabilities) { + assertCapabilities(capabilities, callContext) { const driver = this; - this.ctx.logger.verbose("validating capabilities: %j", capabilities); + callContext.logger.verbose("validating capabilities: %j", capabilities); let message = null; let fs_types = driver.getFsTypes(); @@ -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(call.request.volume_capabilities, callContext); 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(call.request.volume_capabilities, callContext); 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 bbae748..25376cc 100644 --- a/src/driver/controller-synology/index.js +++ b/src/driver/controller-synology/index.js @@ -250,9 +250,9 @@ class ControllerSynologyDriver extends CsiBaseDriver { return access_modes; } - assertCapabilities(capabilities) { + assertCapabilities(capabilities, callContext) { const driverResourceType = this.getDriverResourceType(); - this.ctx.logger.verbose("validating capabilities: %j", capabilities); + callContext.logger.verbose("validating capabilities: %j", capabilities); let message = null; //[{"access_mode":{"mode":"SINGLE_NODE_WRITER"},"mount":{"mount_flags":["noatime","_netdev"],"fs_type":"nfs"},"access_type":"mount"}] @@ -319,7 +319,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async CreateVolume(call) { + async CreateVolume(call, callContext) { const driver = this; const httpClient = await driver.getHttpClient(); @@ -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(call.request.volume_capabilities, callContext); if (result.valid !== true) { throw new GrpcError(grpc.status.INVALID_ARGUMENT, result.message); } @@ -677,7 +677,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async DeleteVolume(call) { + async DeleteVolume(call, callContext) { const driver = this; const httpClient = await driver.getHttpClient(); @@ -785,7 +785,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async ControllerExpandVolume(call) { + async ControllerExpandVolume(call, callContext) { const driver = this; const httpClient = await driver.getHttpClient(); @@ -877,7 +877,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async GetCapacity(call) { + async GetCapacity(call, callContext) { const driver = this; const httpClient = await driver.getHttpClient(); const location = driver.getLocation(); @@ -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(call.request.volume_capabilities, callContext); if (result.valid !== true) { return { available_capacity: 0 }; @@ -907,7 +907,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async ListVolumes(call) { + async ListVolumes(call, callContext) { throw new GrpcError( grpc.status.UNIMPLEMENTED, `operation not supported by driver` @@ -918,7 +918,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async ListSnapshots(call) { + async ListSnapshots(call, callContext) { throw new GrpcError( grpc.status.UNIMPLEMENTED, `operation not supported by driver` @@ -929,7 +929,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async CreateSnapshot(call) { + async CreateSnapshot(call, callContext) { const driver = this; const httpClient = await driver.getHttpClient(); @@ -951,7 +951,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { ); } - driver.ctx.logger.verbose("requested snapshot name: %s", name); + callContext.logger.verbose("requested snapshot name: %s", name); let invalid_chars; invalid_chars = name.match(/[^a-z0-9_\-:.+]+/gi); @@ -1049,7 +1049,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async DeleteSnapshot(call) { + async DeleteSnapshot(call, callContext) { // throw new GrpcError( // grpc.status.UNIMPLEMENTED, // `operation not supported by driver` @@ -1100,7 +1100,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { * * @param {*} call */ - async ValidateVolumeCapabilities(call) { + async ValidateVolumeCapabilities(call, callContext) { const driver = this; const httpClient = await driver.getHttpClient(); @@ -1150,7 +1150,7 @@ class ControllerSynologyDriver extends CsiBaseDriver { break; } - const result = this.assertCapabilities(call.request.volume_capabilities); + const result = this.assertCapabilities(call.request.volume_capabilities, callContext); if (result.valid !== true) { return { message: result.message }; } diff --git a/src/driver/index.js b/src/driver/index.js index 229998b..b6a3a3e 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([capability], callContext, node_attach_driver); 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 c55915e..adbbe22 100644 --- a/src/driver/node-manual/index.js +++ b/src/driver/node-manual/index.js @@ -100,8 +100,8 @@ class NodeManualDriver extends CsiBaseDriver { } } - assertCapabilities(capabilities, node_attach_driver) { - this.ctx.logger.verbose("validating capabilities: %j", capabilities); + assertCapabilities(capabilities, callContext, node_attach_driver) { + callContext.logger.verbose("validating capabilities: %j", capabilities); let message = null; let driverResourceType;