Fallback to uname

Handle bad versions
feat(netbox): platform: append major version to OS name
2023-09-28 09:56:24 +02:00 · 2023-09-27 16:47:52 +02:00 · 2023-09-27 09:15:07 +02:00
1 changed files with 14 additions and 2 deletions
--- a/packages/xo-server-netbox/src/index.js
+++ b/packages/xo-server-netbox/src/index.js
@@ -336,8 +336,20 @@ class Netbox {
        tags: [],
      }

-      const distro = xoVm.os_version?.distro
-      if (distro != null) {
+      let distro = xoVm.os_version?.distro
+      if (distro !== undefined) {
+        // In some cases, the version isn't properly parsed by XAPI and
+        // os_version.major returns X.Y.Z instead of X
+        const majorVersionMatch = xoVm.os_version.major?.match(/^(\d+)(?:\.\d+){0,2}$/)
+        if (majorVersionMatch != null) {
+          distro += ` ${majorVersionMatch[1]}`
+        } else {
+          const unameMatch = xoVm.os_version.uname?.match(/^(\d)+/)
+          if (unameMatch != null) {
+            distro += ` ${unameMatch[1]}`
+          }
+        }
+
        const slug = slugify(distro)
        let nbPlatform = find(nbPlatforms, { slug })
        if (nbPlatform === undefined) {
Author	SHA1	Message	Date
Pierre Donias	87dc362f10	Fallback to uname	2023-09-28 09:56:24 +02:00
Pierre Donias	918a577bb0	Handle bad versions	2023-09-27 16:47:52 +02:00
Pierre Donias	8ab7f033e0	feat(netbox): platform: append major version to OS name	2023-09-27 09:15:07 +02:00