[Refactor] - refactor aws_get_command to reuse some components

Author: alexhungnguyen

main.sh

@@ -29,6 +29,7 @@ export aws_cli_input_tmp="${AWS_CLI_SOURCE_SCRIPTS}/aws_cli_results/inputs"
 export aws_cli_input_folder="${AWS_CLI_SOURCE_SCRIPTS}/aws_cli_inputs"
 export aws_cli_list_commands_folder="${aws_cli_input_folder}/aws_services_commands"
 export aws_tmp_input="/tmp/aws_tmp_input_23647494949484.txt"
+export aws_cli_document_root_url="https://awscli.amazonaws.com/v2/documentation/api/latest/reference"
 export aws_assume_role_print_account_info="false"
 export aws_cli_retry_time=10
 export aws_cli_retry_sleep_interval=1

services/help.sh

@@ -32,45 +32,47 @@ aws_main_function() {
 aws_get_command() {
   function curl_aws_document_and_cut() {
     local aws_service_name=$1
-    local curl_path=$([ -z "$aws_service_name" ] && echo "index.html" || echo "$aws_service/index.html" )
-    curl -s "https://awscli.amazonaws.com/v2/documentation/api/latest/reference/${curl_path}"  \
-        | grep '<li class="toctree-l1"><a class="reference internal"' \
-        | awk -F '.html">' '{print $2}' \
-        | awk -F '</a>' '{print $1}'
-  }
-
-  if [ ! -s ${aws_cli_input_folder}/aws_list_services.txt ]; then
-    curl_aws_document_and_cut > ${aws_cli_input_folder}/aws_list_services.txt
-  fi
-
-  local aws_service=$(cat ${aws_cli_input_folder}/aws_list_services.txt | peco --prompt "Select service >")
+    local curl_path="index.html"
+    local cache_file="${aws_cli_input_folder}/aws_list_services.txt"
 
-  if [ -z "$aws_service" ]; then
-      return
+    if [ -n "$aws_service_name" ]; then
+      curl_path="${aws_service_name}/${curl_path}"
+      local cache_file="${aws_cli_list_commands_folder}/$aws_service.txt"
     fi
 
-  if [ ! -s ${aws_cli_list_commands_folder}/aws_service.txt ]; then
-      curl_aws_document_and_cut "$aws_service" > ${aws_cli_list_commands_folder}/$aws_service.txt
+    if [ ! -s "${cache_file}" ]; then
+      curl -s "${aws_cli_document_root_url}/${curl_path}" |
+        grep '<li class="toctree-l1"><a class="reference internal"' |
+        awk -F '.html">' '{print $2}' |
+        awk -F '</a>' '{print $1}' >${cache_file}
     fi
 
-  local aws_command=$(cat ${aws_cli_list_commands_folder}/$aws_service.txt | peco --prompt "aws $aws_service" --on-cancel error)
+    cat ${cache_file}
+
+  }
+
+  local aws_service=$(curl_aws_document_and_cut | peco --prompt "Select service >")
+
+  if [ -z "$aws_service" ]; then
+    return
+  fi
+
+  local aws_command=$(curl_aws_document_and_cut "$aws_service" | peco --prompt "aws $aws_service" --on-cancel error)
 
   if [ -z "$aws_command" ]; then
-      return
-    fi
+    return
+  fi
 
   local final_action=$(echo -e "input\ndocument\nhelp" | peco)
 
   if [ "$final_action" = "input" ]; then
-      local aws_input_terminal="aws $aws_service $aws_command"
-    elif [ "$final_action" = "document" ]; then
-      local aws_input_terminal="open https://awscli.amazonaws.com/v2/documentation/api/latest/reference/$aws_service/$aws_command.html"
-    else
-      local aws_input_terminal="aws $aws_service $aws_command help"
-    fi
+    local aws_input_terminal="aws $aws_service $aws_command"
+  elif [ "$final_action" = "document" ]; then
+    local aws_input_terminal="open ${aws_cli_document_root_url}/${aws_service}/${aws_command}.html"
+  else
+    local aws_input_terminal="aws $aws_service $aws_command help"
+  fi
 
-  local BUFFER=$(
-  		echo "$aws_input_terminal" | peco --query "$LBUFFER" --select-1
-  	)
+  local BUFFER=${aws_input_terminal}
   CURSOR=$#BUFFER
 }