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

drop support for very old versions of TN, force version 2 of the api 

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen 2025-01-21 00:20:55 -07:00
parent 0ac7e33152
commit 2605e5e0f4
3 changed files with 13 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/driver/freenas/http/api.js
View File

@ -110,54 +110,15 @@ class Api {
} }
async getApiVersion() { async getApiVersion() {
const systemVersion = await this.getSystemVersion();
if (systemVersion.v2) {
if ((await this.getSystemVersionMajorMinor()) == 11.2) {
return 1;
}
return 2;
}
if (systemVersion.v1) {
return 1;
}
return 2; return 2;
} }
async getIsFreeNAS() { async getIsFreeNAS() {
const systemVersion = await this.getSystemVersion();
let version;
if (systemVersion.v2) {
version = systemVersion.v2;
} else {
version = systemVersion.v1.fullversion;
}
if (version.toLowerCase().includes("freenas")) {
return true;
}
return false; return false;
} }
async getIsTrueNAS() { async getIsTrueNAS() {
const systemVersion = await this.getSystemVersion(); return true;
let version;
if (systemVersion.v2) {
version = systemVersion.v2;
} else {
version = systemVersion.v1.fullversion;
}
if (version.toLowerCase().includes("truenas")) {
return true;
}
return false;
} }
async getIsScale() { async getIsScale() {
@ -261,28 +222,6 @@ class Api {
versionErrors.v2 = e.toString(); versionErrors.v2 = e.toString();
} }
httpClient.setApiVersion(1);
/**
* {"fullversion": "FreeNAS-9.3-STABLE-201503200528", "name": "FreeNAS", "version": "9.3"}
* {"fullversion": "FreeNAS-11.2-U5 (c129415c52)", "name": "FreeNAS", "version": ""}
*/
try {
response = await httpClient.get(endpoint, null, { timeout: 5 * 1000 });
versionResponses.v1 = response;
if (response.statusCode == 200 && IsJsonString(response.body)) {
versionInfo.v1 = response.body;
await this.setVersionInfoCache(versionInfo);
// reset apiVersion
httpClient.setApiVersion(startApiVersion);
return versionInfo;
}
} catch (e) {
// if more info is needed use e.stack
versionErrors.v1 = e.toString();
}
// throw error if cannot get v1 or v2 data // throw error if cannot get v1 or v2 data
// likely bad creds/url // likely bad creds/url
throw new Error( throw new Error(

6
src/driver/freenas/http/index.js
View File

@ -9,11 +9,7 @@ class Client {
constructor(options = {}) { constructor(options = {}) {
this.options = JSON.parse(JSON.stringify(options)); this.options = JSON.parse(JSON.stringify(options));
this.logger = console; this.logger = console;
this.options.apiVersion = 2;
// default to v1.0 for now
if (!this.options.apiVersion) {
this.options.apiVersion = 2;
}
} }
getHttpAgent() { getHttpAgent() {

12
src/utils/mount.js
View File

@ -10,7 +10,17 @@ const FINDMNT_COMMON_OPTIONS = [
"--nofsroot", // prevents unwanted behavior with cifs volumes "--nofsroot", // prevents unwanted behavior with cifs volumes
]; ];
const DEFAULT_TIMEOUT = process.env.MOUNT_DEFAULT_TIMEOUT || 30000; let DEFAULT_TIMEOUT = 30 * 1000;
if (process.env.MOUNT_DEFAULT_TIMEOUT) {
if (/^\d+$/.test(process.env.MOUNT_DEFAULT_TIMEOUT)) {
DEFAULT_TIMEOUT = parseInt(process.env.MOUNT_DEFAULT_TIMEOUT);
} else {
console.log(
"invalid MOUNT_DEFAULT_TIMEOUT set: " + process.env.MOUNT_DEFAULT_TIMEOUT
);
}
}
class Mount { class Mount {
constructor(options = {}) { constructor(options = {}) {