maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Fleet] Fix policy upgrade from APM 0.3.0 to 0.4.0 (#110505)

Browse source 
* Fix policy upgrade from APM 0.3.0 to 0.4.0

Add debug log + logic to skip over any package variables that have been
removed from the base policy object. Issue was initially surfaced
testing upgrade from APM integration v0.3.0 to v0.4.0.

Ref #109907

* Fix type error in test

* Remove translation for validation debug log

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Kyle Pollich 2021-08-31 08:08:00 -04:00 committed by GitHub
parent adde076d58
commit a49700f95d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
x-pack/plugins/fleet/common/services/validate_package_policy.ts
View file

@ -75,7 +75,7 @@ export const validatePackagePolicy = (
const packageVars = Object.entries(packagePolicy.vars || {});
if (packageVars.length) {
validationResults.vars = packageVars.reduce((results, [name, varEntry]) => {
results[name] = validatePackagePolicyConfig(varEntry, packageVarsByName[name]);
results[name] = validatePackagePolicyConfig(varEntry, packageVarsByName[name], name);
return results;
}, {} as ValidationEntry);
}
@ -138,7 +138,8 @@ export const validatePackagePolicy = (
results[name] = input.enabled
? validatePackagePolicyConfig(
configEntry,
inputVarDefsByPolicyTemplateAndType[inputKey][name]
inputVarDefsByPolicyTemplateAndType[inputKey][name],
name
)
: null;
return results;
@ -161,7 +162,7 @@ export const validatePackagePolicy = (
(results, [name, configEntry]) => {
results[name] =
streamVarDefs && streamVarDefs[name] && input.enabled && stream.enabled
? validatePackagePolicyConfig(configEntry, streamVarDefs[name])
? validatePackagePolicyConfig(configEntry, streamVarDefs[name], name)
: null;
return results;
},
@ -183,12 +184,14 @@ export const validatePackagePolicy = (
if (Object.entries(validationResults.inputs!).length === 0) {
validationResults.inputs = null;
}
return validationResults;
};
export const validatePackagePolicyConfig = (
configEntry: PackagePolicyConfigRecordEntry,
varDef: RegistryVarsEntry
varDef: RegistryVarsEntry,
varName: string
): string[] | null => {
const errors = [];
const { value } = configEntry;
@ -198,6 +201,13 @@ export const validatePackagePolicyConfig = (
parsedValue = value.trim();
}
if (varDef === undefined) {
// eslint-disable-next-line no-console
console.debug(`No variable definition for ${varName} found`);
return null;
}
if (varDef.required) {
if (parsedValue === undefined || (typeof parsedValue === 'string' && !parsedValue)) {
errors.push(

6
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
View file

@ -22,7 +22,11 @@ export const hasInvalidButRequiredVar = (
registryVar.required &&
(!packagePolicyVars ||
!packagePolicyVars[registryVar.name] ||
validatePackagePolicyConfig(packagePolicyVars[registryVar.name], registryVar)?.length)
validatePackagePolicyConfig(
packagePolicyVars[registryVar.name],
registryVar,
registryVar.name
)?.length)
)
)
);

2
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
View file

@ -695,7 +695,7 @@ const UpgradeStatusCallout: React.FunctionComponent<{
</EuiPortal>
)}
{isReadyForUpgrade ? (
{isReadyForUpgrade && currentPackagePolicy ? (
<EuiCallOut
title={i18n.translate('xpack.fleet.upgradePackagePolicy.statusCallOut.successTitle', {
defaultMessage: 'Ready to upgrade',