Fix missing package-level vars in GCP policy editor

Display package-level variables even if they aren't defined on the existing package policy during an upgrade, honoring default values for all variables if they exist. Fixes #131251
elastic · May 11, 2022 · 132f547 · 132f547
1 parent 327df57
commit 132f547
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/x-pack/plugins/fleet/common/services/validate_package_policy.ts b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
@@ -55,6 +55,7 @@ export const validatePackagePolicy = (
     description: null,
     namespace: null,
     inputs: {},
+    vars: {},
   };
   const namespaceValidation = isValidNamespace(packagePolicy.namespace);
 

diff --git a/...ons/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx b/...ons/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
@@ -208,9 +208,9 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
 
           {/* Required vars */}
           {requiredVars.map((varDef) => {
-            const { name: varName, type: varType } = varDef;
-            if (!packagePolicy.vars || !packagePolicy.vars[varName]) return null;
-            const value = packagePolicy.vars[varName].value;
+            const { name: varName, type: varType, default: defaultValue } = varDef;
+            const value = packagePolicy.vars?.[varName]?.value ?? defaultValue;
+
             return (
               <EuiFlexItem key={varName}>
                 <PackagePolicyInputVarField