Skip to content

[Fleet] Fix package policy validation #123153

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

Merged
nchaulet merged 2 commits into from
Jan 18, 2022
Merged

[Fleet] Fix package policy validation #123153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a4c8f3
[Fleet] Fix package policy validation
nchaulet Jan 17, 2022
72f5bfb
Merge branch 'main' into fix-package-policy-validation
kibanamachine Jan 17, 2022
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
39 changes: 16 additions & 23 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 @@ -162,23 +162,17 @@ export const validatePackagePolicy = (
const streamVarDefs =
streamVarDefsByDatasetAndInput[`${stream.data_stream.dataset}-${input.type}`];

// Validate stream-level config fields
if (stream.vars) {
streamValidationResults.vars = Object.entries(stream.vars).reduce(
(results, [name, configEntry]) => {
results[name] =
streamVarDefs && streamVarDefs[name] && input.enabled && stream.enabled
? validatePackagePolicyConfig(
configEntry,
streamVarDefs[name],
name,
safeLoadYaml
)
: null;
return results;
},
{} as ValidationEntry
);
if (streamVarDefs && Object.keys(streamVarDefs).length) {
streamValidationResults.vars = Object.keys(streamVarDefs).reduce((results, name) => {
const configEntry = stream?.vars?.[name];

results[name] =
input.enabled && stream.enabled
? validatePackagePolicyConfig(configEntry, streamVarDefs[name], name, safeLoadYaml)
: null;

return results;
}, {} as ValidationEntry);
}

inputValidationResults.streams![stream.data_stream.dataset] = streamValidationResults;
Expand All @@ -200,13 +194,15 @@ export const validatePackagePolicy = (
};

export const validatePackagePolicyConfig = (
configEntry: PackagePolicyConfigRecordEntry,
configEntry: PackagePolicyConfigRecordEntry | undefined,
varDef: RegistryVarsEntry,
varName: string,
safeLoadYaml: (yaml: string) => any
): string[] | null => {
const errors = [];
const { value } = configEntry;

const value = configEntry?.value;

let parsedValue: any = value;

if (typeof value === 'string') {
Expand Down Expand Up @@ -253,10 +249,7 @@ export const validatePackagePolicyConfig = (
})
);
}
if (
varDef.required &&
(!parsedValue || (Array.isArray(parsedValue) && parsedValue.length === 0))
) {
if (varDef.required && Array.isArray(parsedValue) && parsedValue.length === 0) {
errors.push(
i18n.translate('xpack.fleet.packagePolicyValidation.requiredErrorMessage', {
defaultMessage: '{fieldName} is required',
Expand Down
8 changes: 6 additions & 2 deletions ...ctions/agent_policy/create_package_policy_page/components/package_policy_input_stream.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@ export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
<EuiFlexGroup direction="column" gutterSize="m">
{requiredVars.map((varDef) => {
const { name: varName, type: varType } = varDef;
const { value, frozen } = packagePolicyInputStream.vars![varName];
const varConfigEntry = packagePolicyInputStream.vars?.[varName];
const value = varConfigEntry?.value;
const frozen = varConfigEntry?.frozen ?? false;

return (
<EuiFlexItem key={varName}>
<PackagePolicyInputVarField
Expand Down Expand Up @@ -164,7 +167,8 @@ export const PackagePolicyInputStreamConfig: React.FunctionComponent<{
{isShowingAdvanced
? advancedVars.map((varDef) => {
const { name: varName, type: varType } = varDef;
const value = packagePolicyInputStream.vars![varName].value;
const value = packagePolicyInputStream.vars?.[varName]?.value;

return (
<EuiFlexItem key={varName}>
<PackagePolicyInputVarField
Expand Down
2 changes: 1 addition & 1 deletion ...ons/agent_policy/create_package_policy_page/components/package_policy_input_var_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const PackagePolicyInputVarField: React.FunctionComponent<{
if (multi) {
return (
<MultiTextInput
value={value}
value={value ?? []}
onChange={onChange}
onBlur={() => setIsDirty(true)}
isDisabled={frozen}
Expand Down