Skip to content

[Fleet] Allow empty strings for required text fields in package policies #123610

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
hop-dev merged 2 commits into from
Jan 25, 2022
Merged

[Fleet] Allow empty strings for required text fields in package policies #123610

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
83da7d9
Allow empty strings for required text fields in package policies
hop-dev Jan 24, 2022
69ddf5c
make empty yaml check more explicit
hop-dev Jan 24, 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
53 changes: 52 additions & 1 deletion x-pack/plugins/fleet/common/services/validate_package_policy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ describe('Fleet - validatePackagePolicy()', () => {
enabled: true,
vars: {
'foo-input-var-name': { value: undefined, type: 'text' },
'foo-input2-var-name': { value: '', type: 'text' },
'foo-input2-var-name': { value: undefined, type: 'text' },
'foo-input3-var-name': { value: [], type: 'text' },
},
streams: [
Expand Down Expand Up @@ -555,6 +555,57 @@ describe('Fleet - validatePackagePolicy()', () => {
inputs: null,
});
});

it('returns no errors when required field is present but empty', () => {
expect(
validatePackagePolicy(
{
...validPackagePolicy,
inputs: [
{
type: 'foo',
policy_template: 'pkgPolicy1',
enabled: true,
vars: {
'foo-input-var-name': { value: '', type: 'text' },
'foo-input2-var-name': { value: '', type: 'text' },
'foo-input3-var-name': { value: ['test'], type: 'text' },
},
streams: [
{
data_stream: { dataset: 'foo', type: 'logs' },
enabled: true,
vars: { 'var-name': { value: 'test_yaml: value', type: 'yaml' } },
},
],
},
],
},
mockPackage,
safeLoad
)
).toEqual({
name: null,
description: null,
namespace: null,
inputs: {
foo: {
streams: {
foo: {
vars: {
'var-name': null,
},
},
},
vars: {
'foo-input-var-name': null,
'foo-input2-var-name': null,
'foo-input3-var-name': null,
},
},
},
});
});
});

describe('works for packages with multiple policy templates (aka integrations)', () => {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -217,7 +217,7 @@ export const validatePackagePolicyConfig = (
}

if (varDef.required) {
if (parsedValue === undefined || (typeof parsedValue === 'string' && !parsedValue)) {
if (parsedValue === undefined || (varDef.type === 'yaml' && parsedValue === '')) {
errors.push(
i18n.translate('xpack.fleet.packagePolicyValidation.requiredErrorMessage', {
defaultMessage: '{fieldName} is required',
Expand Down