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

Jump to bottom

Prevents negative values for Snapshot retention policies #51295

Merged
merged 8 commits into from
Nov 26, 2019
Merged

Prevents negative values for Snapshot retention policies #51295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f8cdccf
Sets min prop of EuiFieldNumber to 0 and prevents '-' character in order
ffknob Nov 21, 2019
acb59ea
Merge branch 'master' into fix-avoid-negative-values-in-snapshot-rete…
elasticmachine Nov 25, 2019
71aa18e
Merge branch 'master' into fix-avoid-negative-values-in-snapshot-rete…
ffknob Nov 25, 2019
a389c7e
Changes negative number prevention to a form input validation and
ffknob Nov 25, 2019
52e60bc
Corrects policy add test negative number to string
ffknob Nov 25, 2019
1bfdc8b
Corrects test description
ffknob Nov 25, 2019
8f9d84f
Corrects test for negative values in the delete after field
ffknob Nov 25, 2019
f37b2d2
fix policy_add test
alisonelizabeth Nov 26, 2019
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
21 changes: 21 additions & 0 deletions x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jest.mock('ui/i18n', () => {
return { I18nContext };
});

jest.mock('ui/new_platform');

const POLICY_NAME = 'my_policy';
const SNAPSHOT_NAME = 'my_snapshot';
const MIN_COUNT = '5';
Expand Down Expand Up @@ -141,6 +143,25 @@ describe.skip('<PolicyAdd />', () => {
'Minimum count cannot be greater than maximum count.',
]);
});

test('should not allow negative values for the delete after, minimum and maximum counts', () => {
const { find, form } = testBed;

form.setInputValue('expireAfterValueInput', '-1');
find('expireAfterValueInput').simulate('blur');

form.setInputValue('minCountInput', '-1');
find('minCountInput').simulate('blur');

form.setInputValue('maxCountInput', '-1');
find('maxCountInput').simulate('blur');

expect(form.getErrorsMessages()).toEqual([
'Delete after cannot be negative.',
'Minimum count cannot be negative.',
'Maximum count cannot be negative.',
]);
});
});
});

Expand Down
6 changes: 5 additions & 1 deletion ...egacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_retention.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
}
describedByIds={['expirationDescription']}
isInvalid={touched.expireAfterValue && Boolean(errors.expireAfterValue)}
error={errors.expireAfter}
error={errors.expireAfterValue}
fullWidth
>
<EuiFlexGroup>
Expand All @@ -100,6 +100,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
});
}}
data-test-subj="expireAfterValueInput"
min={0}
/>
</EuiFlexItem>
<EuiFlexItem>
Expand Down Expand Up @@ -167,6 +168,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
});
}}
data-test-subj="minCountInput"
min={0}
/>
</EuiFormRow>
</EuiFlexItem>
Expand All @@ -179,6 +181,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
/>
}
describedByIds={['countDescription']}
isInvalid={touched.maxCount && Boolean(errors.maxCount)}
error={errors.maxCount}
fullWidth
>
Expand All @@ -193,6 +196,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
});
}}
data-test-subj="maxCountInput"
min={0}
/>
</EuiFormRow>
</EuiFlexItem>
Expand Down
30 changes: 30 additions & 0 deletions x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/validate_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ export const validatePolicy = (policy: SlmPolicyPayload): PolicyValidation => {
schedule: [],
repository: [],
indices: [],
expireAfterValue: [],
minCount: [],
maxCount: [],
},
};

Expand Down Expand Up @@ -92,6 +94,34 @@ export const validatePolicy = (policy: SlmPolicyPayload): PolicyValidation => {
})
);
}

if (retention && retention.expireAfterValue && retention.expireAfterValue < 0) {
validation.errors.expireAfterValue.push(
i18n.translate(
'xpack.snapshotRestore.policyValidation.invalidNegativeDeleteAfterErrorMessage',
{
defaultMessage: 'Delete after cannot be negative.',
}
)
);
}

if (retention && retention.minCount && retention.minCount < 0) {
validation.errors.minCount.push(
i18n.translate('xpack.snapshotRestore.policyValidation.invalidNegativeMinCountErrorMessage', {
defaultMessage: 'Minimum count cannot be negative.',
})
);
}

if (retention && retention.maxCount && retention.maxCount < 0) {
validation.errors.maxCount.push(
i18n.translate('xpack.snapshotRestore.policyValidation.invalidNegativeMaxCountErrorMessage', {
defaultMessage: 'Maximum count cannot be negative.',
})
);
}

// Remove fields with no errors
validation.errors = Object.entries(validation.errors)
.filter(([key, value]) => value.length > 0)
Expand Down