From 1996d53fe05f9569b31f411ee6861cd9fc5eca3c Mon Sep 17 00:00:00 2001
From: Sean <sean.mchugh@suse.com>
Date: Tue, 19 Jul 2022 19:49:35 -0400
Subject: [PATCH] Fixes #5903

Add in form validation on "name" field when creating and editing backups. Checks if name conforms to dnsLabel and noUpperCase validation.
---
 shell/assets/translations/en-us.yaml      |  1 +
 shell/edit/resources.cattle.io.backup.vue | 28 +++++++++++++++++++----
 shell/utils/validators/formRules/index.ts |  3 +++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index f3e6388f20..2b03363288 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -4853,6 +4853,7 @@ user:
   list:
     errorRefreshingGroupMemberships: Error refreshing group memberships
 validation:
+  noUpperCase: 'Alphanumeric characters in "{key}" must be lowercase'
   arrayLength:
     between: '"{key}" should contain between {min} and {max} {max, plural, =1 {item} other {items}}'
     exactly: '"{key}" should contain {count, plural, =1 {# item} other {# items}}'
diff --git a/shell/edit/resources.cattle.io.backup.vue b/shell/edit/resources.cattle.io.backup.vue
index aa8ddb8a88..d4a3690967 100644
--- a/shell/edit/resources.cattle.io.backup.vue
+++ b/shell/edit/resources.cattle.io.backup.vue
@@ -1,6 +1,7 @@
 <script>
 import CruResource from '@shell/components/CruResource';
 import createEditView from '@shell/mixins/create-edit-view';
+import formValidation from '@shell/mixins/form-validation';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import UnitInput from '@shell/components/form/UnitInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
@@ -28,7 +29,7 @@ export default {
     Loading,
     S3,
   },
-  mixins: [createEditView],
+  mixins: [createEditView, formValidation],
 
   props: {
     value: {
@@ -81,7 +82,17 @@ export default {
     }
 
     return {
-      allSecrets: [], resourceSet: null, s3, storageSource, useEncryption, apps: [], setSchedule, name: this.value?.metadata?.name,
+      allSecrets:     [],
+      resourceSet:    null,
+      s3,
+      storageSource,
+      useEncryption,
+      apps:           [],
+      setSchedule,
+      name:           this.value?.metadata?.name,
+      fvFormRuleSets: [{
+        path: 'metadata.name', rules: ['dnsLabel', 'noUpperCase'], translationKey: 'nameNsDescription.name.label'
+      }]
     };
   },
 
@@ -127,7 +138,7 @@ export default {
     },
 
     validated() {
-      return !!this.name && (!this.useEncryption || !!this.value?.spec?.encryptionConfigSecretName);
+      return !!this.name && (!this.useEncryption || !!this.value?.spec?.encryptionConfigSecretName) && this.fvFormIsValid;
     },
 
     ...mapGetters({ t: 'i18n/t' })
@@ -167,9 +178,16 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <CruResource :validation-passed="validated" :done-route="doneRoute" :resource="value" :mode="mode" @finish="save">
+    <CruResource
+      :validation-passed="validated"
+      :done-route="doneRoute"
+      :resource="value"
+      :mode="mode"
+      :errors="fvUnreportedValidationErrors"
+      @finish="save"
+    >
       <template>
-        <NameNsDescription :mode="mode" :value="value" :namespaced="false" @change="name=value.metadata.name" />
+        <NameNsDescription :mode="mode" :value="value" :namespaced="false" :rules="{name: fvGetAndReportPathRules('metadata.name')}" @change="name=value.metadata.name" />
         <template v-if="!!resourceSet">
           <div class="bordered-section">
             <RadioGroup
diff --git a/shell/utils/validators/formRules/index.ts b/shell/utils/validators/formRules/index.ts
index 7f87aa30dc..d3e20d492a 100644
--- a/shell/utils/validators/formRules/index.ts
+++ b/shell/utils/validators/formRules/index.ts
@@ -75,6 +75,8 @@ export default function(t: (key: string, options?: any) => string, opt: {display
 
   const required: Validator = (val: any) => !val && val !== false ? t('validation.required', { key: displayKey }) : undefined;
 
+  const noUpperCase: Validator = (val = '') => val.toLowerCase() !== val ? t('validation.noUpperCase', { key: displayKey }) : undefined;
+
   const cronSchedule: Validator = (val: string) => {
     try {
       cronstrue.toString(val);
@@ -371,6 +373,7 @@ export default function(t: (key: string, options?: any) => string, opt: {display
   };
 
   return {
+    noUpperCase,
     required,
     cronSchedule,
     isHttps,