Merge pull request #30 from lamhaison/feature/add-more-funtions-to-support-working

Feature/add more funtions to support working

Author: lamhaison

common/common.sh

@@ -64,10 +64,11 @@ aws_run_commandline() {
 }
 
 function aws_commandline_logging() {
+	local log_file_path=${aws_cli_logs}/${ASSUME_ROLE}.log
 	local aws_commandline_logging=$(echo ${1:?'aws_commandline is unset or empty'} | tr -d '\t' | tr -d '\n' | tr -s ' ')
 
 	if [ "$aws_show_commandline" = "true" ]; then
-		echo "Running commandline [ ${aws_commandline_logging} ]"
+		echo "Running commandline [ ${aws_commandline_logging} ]" | tee -a ${log_file_path}
 	fi
 }
 
@@ -97,3 +98,45 @@ aws_run_commandline_with_logging() {
 	echo $aws_commandline_result | eval $tee_command
 	echo "------------------------------FINISHED-$(date '+%Y-%m-%d-%H-%M-%S')-----------------------------------------" | eval $tee_command >/dev/null
 }
+
+# Waiting function
+function aws_wait() { # To run commandline and wait the status
+
+	echo "Accessing the waiting status function"
+
+	local commandline=$1
+	# The status that you want to wait
+	local waiting_status=$2
+	local max_retry_times=${3:-'30'}
+	local sleep_time=${3:-'60'}
+
+	# Check input invalid
+	if [[ -z "$commandline" ]]; then return 1; fi
+	if [[ -z "$waiting_status" ]]; then return 1; fi
+
+	# Initialize the counter variable
+	local counter=0
+	local current_status
+
+	# Start the while loop
+	while [[ $counter -lt $max_retry_times ]]; do
+		current_status=$(eval "${commandline}")
+
+		echo "[ Iteration: $counter ] - The expected status ${waiting_status}, Current status is ${current_status}"
+
+		if [[ "$current_status" == "${waiting_status}" ]]; then
+			echo "${current_status}"
+			return 0
+		fi
+
+		sleep "${sleep_time}"
+		# Increment the counter inside a subshell and ignore failure
+		((counter = counter + 1))
+
+	done
+
+	# Can't successful during waiting
+	echo "The expected status ${waiting_status}, Current status is ${current_status}"
+	exit 1
+
+}

common/peco.sh

@@ -42,6 +42,10 @@ peco_commandline_input() {
 	local result_cached=$2
 	local input_expired_time="${3:-$peco_input_expired_time}"
 
+	if [ "${peco_aws_disable_input_cached}" = "0" ]; then
+		input_expired_time=0
+	fi
+
 	local md5_hash=$(echo $commandline | md5)
 	local input_folder="${aws_cli_input_tmp}/${ASSUME_ROLE:-NOTSET}"
 	mkdir -p ${input_folder}
@@ -193,8 +197,17 @@ peco_aws_iam_list_attached_policies() {
 
 # EC2 Instance
 peco_aws_ec2_list() {
+	local instance_state=${1:-'running'}
+
+	commandline="aws ec2 describe-instances \
+		--filters Name=instance-state-name,Values=${instance_state} \
+		--query 'Reservations[].Instances[].{Name: Tags[?Key==\`Name\`].Value | [0],InstanceId:InstanceId,PrivateIpAddress:PrivateIpAddress}' \
+		--output text | tr -s '\t' '_'"
+	peco_commandline_input ${commandline} 'true'
+}
 
-	commandline="aws ec2 describe-instances --filters Name=instance-state-name,Values=running --query 'Reservations[].Instances[].{Name: Tags[?Key==\`Name\`].Value | [0],InstanceId:InstanceId}' --output text | tr -s '\t' '_'"
+peco_aws_ec2_list_all() {
+	commandline="aws ec2 describe-instances --query 'Reservations[].Instances[].{Name: Tags[?Key==\`Name\`].Value | [0],InstanceId:InstanceId.PrivateIpAddress:PrivateIpAddress}' --output text | tr -s '\t' '_'"
 	peco_commandline_input ${commandline} 'true'
 }
 
@@ -208,3 +221,37 @@ peco_aws_ssm_list_parameters() {
   "
 	peco_commandline_input ${commandline} 'true'
 }
+
+peco_aws_dynamodb_list_tables() {
+	peco_aws_input "aws dynamodb list-tables --query 'TableNames[]'" 'true'
+}
+
+peco_aws_sqs_list() {
+	peco_aws_input 'aws sqs list-queues --query "*[]"' 'true'
+}
+
+peco_aws_eks_list_clusters() {
+	peco_aws_input 'aws eks list-clusters  --query "*[]"' 'true'
+}
+
+peco_aws_cloudformation_list_stacks() {
+	peco_aws_input 'aws cloudformation list-stacks --query "*[].StackName"' 'true'
+}
+
+peco_aws_imagebuilder_list() {
+	peco_aws_input 'aws imagebuilder list-image-pipelines --query "imagePipelineList[*].arn"' 'true'
+}
+
+peco_aws_imagebuilder_list_recipes() {
+	peco_aws_input 'aws imagebuilder list-image-recipes --query "*[].arn"' 'true'
+}
+
+peco_aws_budgets_list() {
+	aws_assume_role_get_aws_account_id
+	peco_aws_input 'aws budgets describe-budgets --account-id=${AWS_ACCOUNT_ID} --query "*[].BudgetName"' 'true'
+}
+
+peco_aws_secretmanager_list() {
+	peco_aws_input 'aws secretsmanager list-secrets --query "*[].Name"' 'true'
+
+}

main.sh

@@ -7,12 +7,15 @@
 # $2: Where do you want to save logs?
 # $3: Do you want to set the bind key?
 
+DEFAULT_AWS_CLI_SOURCE_SCRIPTS='/opt/lamhaison-tools/aws-cli-utils'
+DEFAULT_AWS_CLI_DATA='/opt/lamhaison-tools/aws-cli-utils'
+
 AWS_CLI_SOURCE_SCRIPTS=$1
 
 if [[ -z "${AWS_CLI_SOURCE_SCRIPTS}" ]]; then
 	LOCAL_AWS_CLI_SOURCE_SCRIPTS=$(dirname -- "$0")
-	if [[ "${LOCAL_AWS_CLI_SOURCE_SCRIPTS}" = "." ]]; then
-		DEFAULT_AWS_CLI_SOURCE_SCRIPTS='/opt/lamhaison-tools/aws-cli-utils'
+	if [[ "${LOCAL_AWS_CLI_SOURCE_SCRIPTS}" == "." ]]; then
+		LOCAL_AWS_CLI_SOURCE_SCRIPTS="${DEFAULT_AWS_CLI_SOURCE_SCRIPTS}"
 	fi
 
 	export AWS_CLI_SOURCE_SCRIPTS="${LOCAL_AWS_CLI_SOURCE_SCRIPTS:-${DEFAULT_AWS_CLI_SOURCE_SCRIPTS}}"
@@ -23,15 +26,16 @@ fi
 AWS_CLI_DATA=$2
 if [[ -z "${AWS_CLI_DATA}" ]]; then
 	LOCAL_AWS_CLI_DATA=$(dirname -- "$0")
-	if [[ "${LOCAL_AWS_CLI_DATA}" = "." ]]; then
-		DEFAULT_AWS_CLI_DATA='/opt/lamhaison-tools/aws-cli-utils'
+	if [[ "${LOCAL_AWS_CLI_DATA}" == "." ]]; then
+		LOCAL_AWS_CLI_DATA="${DEFAULT_AWS_CLI_DATA}"
 	fi
 
 	export AWS_CLI_DATA="${LOCAL_AWS_CLI_DATA:-${DEFAULT_AWS_CLI_DATA}}"
 else
 	export AWS_CLI_DATA=${AWS_CLI_DATA}
 fi
 
+# shellcheck disable=SC2155
 export assume_role_password_encrypted="$(cat ~/.password_assume_role_encrypted)"
 export tmp_credentials="/tmp/aws_temporary_credentials"
 
@@ -67,20 +71,20 @@ mkdir -p ${aws_cli_list_commands_folder}
 export AWS_DEFAULT_OUTPUT="json"
 
 # add some help aliases
-alias get-account-alias='aws iam list-account-aliases'
+alias get-account-alias='aws iam list-account-aliases --query "*[0]" --output text'
 alias get-account-id='echo AccountId $(aws sts get-caller-identity --query "Account" --output text)'
 
 # Import sub-commandlines.
 for script in $(
 	find ${AWS_CLI_SOURCE_SCRIPTS} -type f -name '*.sh' |
-		grep -v main.sh | grep -v main.sh | grep -v test.sh | grep -v temp.sh | grep -v aws-cli-utils.sh
+		grep -v -E '.*(main.sh|test.sh|temp.sh|aws-cli-utils.sh)$'
 ); do
 	source $script
 done
 
 # Reuse session in the new terminal
 export aws_cli_current_assume_role_name="/tmp/aws_cli_current_assume_role_SW7DNb48oQB57"
-export aws_cli_load_current_assume_role=false
+export aws_cli_load_current_assume_role=true
 # If the file is not empty
 # TODO Later (To check if the credential is expired, don't autoload credential)
 if [ "true" = "${aws_cli_load_current_assume_role}" ] && [ -s "${aws_cli_current_assume_role_name}" ]; then
@@ -89,7 +93,7 @@ fi
 
 LHS_BIND_KEY=${3:-'True'}
 
-if [[ "${LHS_BIND_KEY}" = "True" ]]; then
+if [[ ${LHS_BIND_KEY} == "True" && "$(which zle)" != "" ]]; then
 	# Add hot-keys
 	# zle -N aws_help
 	zle -N aws_main_function
@@ -99,6 +103,8 @@ if [[ "${LHS_BIND_KEY}" = "True" ]]; then
 	# Hotkey: Option + a + c
 	bindkey 'åç' aws_get_command
 
+	bindkey '∫' aws_get_command
+
 	zle -N aws_history
 	# Hotkey Option + ah
 	bindkey '˙' aws_history