[SR] Prevents negative values for Snapshot retention policies (#51295) (

#51717)
elastic · Nov 26, 2019 · aecea19 · aecea19
1 parent fa6c98e
commit aecea19
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 1 deletion.
diff --git a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
@@ -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';
@@ -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.',
+          ]);
+        });
       });
     });
 

diff --git a/...egacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_retention.tsx b/...egacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_retention.tsx
@@ -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>
@@ -100,6 +100,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
                 });
               }}
               data-test-subj="expireAfterValueInput"
+              min={0}
             />
           </EuiFlexItem>
           <EuiFlexItem>
@@ -167,6 +168,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
                 });
               }}
               data-test-subj="minCountInput"
+              min={0}
             />
           </EuiFormRow>
         </EuiFlexItem>
@@ -179,6 +181,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
               />
             }
             describedByIds={['countDescription']}
+            isInvalid={touched.maxCount && Boolean(errors.maxCount)}
             error={errors.maxCount}
             fullWidth
           >
@@ -193,6 +196,7 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
                 });
               }}
               data-test-subj="maxCountInput"
+              min={0}
             />
           </EuiFormRow>
         </EuiFlexItem>

diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/validate_policy.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/validate_policy.ts
@@ -28,7 +28,9 @@ export const validatePolicy = (policy: SlmPolicyPayload): PolicyValidation => {
       schedule: [],
       repository: [],
       indices: [],
+      expireAfterValue: [],
       minCount: [],
+      maxCount: [],
     },
   };
 
@@ -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)