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

Enable loose coercing and add warning if the version is invalid

This commit is contained in:
david 2024-02-17 09:00:28 +01:00
parent 79f16a0cf6
commit 46d483c15f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
const apiVersion = httpClient.getApiVersion(); const apiVersion = httpClient.getApiVersion();
const zb = await this.getZetabyte(); const zb = await this.getZetabyte();
const truenasVersion = semver.coerce( const truenasVersion = semver.coerce(
await httpApiClient.getSystemVersionMajorMinor() await httpApiClient.getSystemVersionMajorMinor(), { loose: true }
); );
const isScale = await httpApiClient.getIsScale(); const isScale = await httpApiClient.getIsScale();
@ -265,6 +265,10 @@ class FreeNASApiDriver extends CsiBaseDriver {
break; break;
} }
if (!semver.valid(truenasVersion)) {
this.ctx.logger.warn("invalid truenas version, api compatibility might be broken");
}
if (isScale && semver.satisfies(truenasVersion, ">=23.10")) { if (isScale && semver.satisfies(truenasVersion, ">=23.10")) {
delete share.quiet; delete share.quiet;
delete share.nfs_quiet; delete share.nfs_quiet;

6
src/driver/freenas/ssh.js
View File

@ -231,7 +231,7 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
const apiVersion = httpClient.getApiVersion(); const apiVersion = httpClient.getApiVersion();
const zb = await this.getZetabyte(); const zb = await this.getZetabyte();
const truenasVersion = semver.coerce( const truenasVersion = semver.coerce(
await httpApiClient.getSystemVersionMajorMinor() await httpApiClient.getSystemVersionMajorMinor(), { loose: true }
); );
const isScale = await httpApiClient.getIsScale(); const isScale = await httpApiClient.getIsScale();
@ -314,6 +314,10 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
break; break;
} }
if (!semver.valid(truenasVersion)) {
this.ctx.logger.warn("invalid truenas version, api compatibility might be broken");
}
if (isScale && semver.satisfies(truenasVersion, ">=23.10")) { if (isScale && semver.satisfies(truenasVersion, ">=23.10")) {
delete share.quiet; delete share.quiet;
delete share.nfs_quiet; delete share.nfs_quiet;