Skip to content

Commit 1558340

Browse files
LPD-67607 Simplify resource verification
1 parent 6d20d05 commit 1558340

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

scripts/cli/lec.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,11 @@ _verifyCommand() {
337337

338338
_listPublicCommands | grep -q "^${command}$"
339339
}
340+
_verifyListResource() {
341+
local resource="${1}"
342+
343+
_listPrefixedFunctions _list_ | grep -wq "${resource}"
344+
}
340345

341346
#
342347
# General helper functions
@@ -504,9 +509,6 @@ _cmd_gw() {
504509
_cmd_list() {
505510
local closest_resource
506511
local resource="${1}"
507-
local valid_resources
508-
509-
valid_resources=$(_listPrefixedFunctions _list_)
510512

511513
if [[ ${resource} == "" ]]; then
512514
_print_step "Listing valid resources..."
@@ -516,10 +518,10 @@ _cmd_list() {
516518
exit
517519
fi
518520

519-
if ! echo -e "${valid_resources}" | grep -wq "${resource}"; then
521+
if ! _verifyListResource "${resource}"; then
520522
closest_resource=$(_listPrefixedFunctions _list_| _fzf --filter "${resource}" | head -n 1)
521523

522-
if echo -e "${valid_resources}" | grep -wq "${closest_resource}" && _confirm "Resource \"${resource}\" is unknown; use closest resource \"${closest_resource}\" instead?"; then
524+
if _verifyListResource "${closest_resource}" && _confirm "Resource \"${resource}\" is unknown; use closest resource \"${closest_resource}\" instead?"; then
523525
resource=${closest_resource}
524526
else
525527
_print_error "Resource \"${resource}\" is invalid. Listing valid resources..."

0 commit comments

Comments
 (0)