From 39adb0880a52f36be72f0437ec71c8e4f6d6cd9c Mon Sep 17 00:00:00 2001 From: Sean-McQ <37550899+Sean-McQ@users.noreply.github.com> Date: Fri, 13 Oct 2023 13:46:18 -0600 Subject: [PATCH] was incorrectly checking for apiGroups on the missingOneResource error. (#9916) --- shell/utils/validators/formRules/index.ts | 2 +- shell/utils/validators/role-template.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/utils/validators/formRules/index.ts b/shell/utils/validators/formRules/index.ts index 5f0670e5b5..43c0d68499 100644 --- a/shell/utils/validators/formRules/index.ts +++ b/shell/utils/validators/formRules/index.ts @@ -382,7 +382,7 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): { if (val.some((rule: any) => isEmpty(rule.apiGroups))) { return t('validation.roleTemplate.roleTemplateRules.missingApiGroup'); } - } else if (val.some((rule: any) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs) && isEmpty(rule.apiGroups))) { + } else if (val.some((rule: any) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs))) { return t('validation.roleTemplate.roleTemplateRules.missingOneResource'); } diff --git a/shell/utils/validators/role-template.js b/shell/utils/validators/role-template.js index 5ec69860ed..ec081c67e9 100644 --- a/shell/utils/validators/role-template.js +++ b/shell/utils/validators/role-template.js @@ -21,7 +21,7 @@ export function roleTemplateRules(rules = [], getters, errors, validatorArgs = [ errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.noResourceAndNonResource')); } - if (rules.some((rule) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs) && isEmpty(rule.apiGroups))) { + if (rules.some((rule) => isEmpty(rule.resources) && isEmpty(rule.nonResourceURLs))) { errors.push(getters['i18n/t']('validation.roleTemplate.roleTemplateRules.missingOneResource')); } }