Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Aug 31, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72b35b1
Fix policy upgrade from APM 0.3.0 to 0.4.0
kpollich Aug 30, 2021
1745161
Fix type error in test
kpollich Aug 30, 2021
ce7c370
Remove translation for validation debug log
kpollich Aug 30, 2021
3333407
Merge branch 'master' into fix-apm-policy-upgrade
kibanamachine Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions x-pack/plugins/fleet/common/services/validate_package_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -138,7 +138,8 @@ export const validatePackagePolicy = (
results[name] = input.enabled
? validatePackagePolicyConfig(
configEntry,
inputVarDefsByPolicyTemplateAndType[inputKey][name]
inputVarDefsByPolicyTemplateAndType[inputKey][name],
name
)
: null;
return results;
Expand All @@ -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;
},
Expand All @@ -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;
Expand All @@ -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(
Expand Down
6 changes: 5 additions & 1 deletion ...sections/agent_policy/create_package_policy_page/services/has_invalid_but_required_var.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
)
);
Expand Down
2 changes: 1 addition & 1 deletion .../fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ const UpgradeStatusCallout: React.FunctionComponent<{
</EuiPortal>
)}

{isReadyForUpgrade ? (
{isReadyForUpgrade && currentPackagePolicy ? (
<EuiCallOut
title={i18n.translate('xpack.fleet.upgradePackagePolicy.statusCallOut.successTitle', {
defaultMessage: 'Ready to upgrade',
Expand Down