Merge pull request #112 from SquirrelCorporation/bug-fix-install-agen…

…t-quick-ref [FIX] Refactor extra variable handling and command reference
SquirrelCorporation · Jul 16, 2024 · 119b00d · 119b00d
2 parents 16597ae + 52b916a
commit 119b00d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/client/src/pages/Admin/Inventory/index.tsx b/client/src/pages/Admin/Inventory/index.tsx
@@ -112,7 +112,7 @@ const Inventory: React.FC = () => {
     setTerminal({
       target: [target],
       isOpen: true,
-      command: '_installAgent',
+      quickRef: 'installAgent',
     });
   };
   const onDeleteNewDevice = async () => {

diff --git a/server/src/modules/ansible/utils/ExtraVars.ts b/server/src/modules/ansible/utils/ExtraVars.ts
@@ -42,14 +42,17 @@ async function findValueOfExtraVars(
       logger.error(
         `[INTEGRATION][ANSIBLE] - findValueOfExtraVars - ExtraVar not found : ${e.extraVar}`,
       );
-      throw new Error('ExtraVars value not found !');
+      if (!e.local) {
+        throw new Error('ExtraVars value not found !');
+      }
+    } else {
+      substitutedExtraVars.push({
+        extraVar: e.extraVar,
+        value: value || undefined,
+        required: e.required,
+        canBeOverride: e.canBeOverride,
+      });
     }
-    substitutedExtraVars.push({
-      extraVar: e.extraVar,
-      value: value || undefined,
-      required: e.required,
-      canBeOverride: e.canBeOverride,
-    });
   }
   logger.debug(substitutedExtraVars);
   return substitutedExtraVars;

diff --git a/shared-lib/src/types/api.ts b/shared-lib/src/types/api.ts
@@ -547,6 +547,7 @@ export type ExtraVar = {
   value?: string;
   required?: boolean;
   canBeOverride?: boolean;
+  local?: boolean;
 };
 
 export type Image = {