Merge pull request #5 from lamhaison/develop

[update] - add feature to split uploaded logs

Author: lamhaison

.gitignore

@@ -1,2 +1,3 @@
 aws_cli_results
+services/tmp.sh
 .DS_Store

common/common.sh

@@ -18,6 +18,10 @@ aws_assume_role_disable_fast_mode() {
 	export aws_assume_role_print_account_info=true
 }
 
+aws_assume_role_disable_show_detail_commandline() {
+	export aws_show_commandline=false
+}
+
 aws_run_commandline_with_retry() {
 	local aws_commandline=$1
 	local silent_mode=$2
@@ -60,16 +64,26 @@ aws_run_commandline_with_logging() {
 	aws_commandline_logging=$(echo ${aws_commandline:?'aws_commandline is unset or empty'} | tr -d '\t' | tr -d '\n')
 	# aws_commandline_logging=$(echo ${aws_commandline})
 	local log_file_path=${aws_cli_logs}/${ASSUME_ROLE}.log
+
+	if [ "$aws_show_log_uploaded" = "true" ]; then
+
+		local log_uploaded_file_path=${aws_cli_logs}/${ASSUME_ROLE}-uploaded.log
+		local tee_command="tee -a ${log_file_path} ${log_uploaded_file_path}"
+
+	else
+		local tee_command="tee -a ${log_file_path}"
+	fi
+
 	if [ "$aws_show_commandline" = "true" ]; then
-		local output="tee -a ${log_file_path}"
+		local detail_commandline_tee_command="${tee_command}"
 	else
-		local output=">> ${log_file_path}"
+		local detail_commandline_tee_command="${tee_command} > /dev/null"
 	fi
 
 	aws_commandline_result=$(aws_run_commandline_with_retry "${aws_commandline}" "${ignored_error_when_retry}")
 
-	echo "-------------------------------------START--$(date '+%Y-%m-%d-%H-%M-%S')------------------------------------------------" >>${log_file_path}
-	echo "Running commandline [ ${aws_commandline_logging} ]" | eval $output
-	echo $aws_commandline_result | tee -a ${log_file_path}
-	echo "-------------------------------------FINISH-$(date '+%Y-%m-%d-%H-%M-%S')------------------------------------------------" >>${log_file_path}
+	echo "------------------------------STARTED--$(date '+%Y-%m-%d-%H-%M-%S')-----------------------------------------" | eval $tee_command >/dev/null
+	echo "Running commandline [ ${aws_commandline_logging} ]" | eval $detail_commandline_tee_command
+	echo $aws_commandline_result | eval $tee_command
+	echo "------------------------------FINISHED-$(date '+%Y-%m-%d-%H-%M-%S')-----------------------------------------" | eval $tee_command >/dev/null
 }

common/logging.sh

@@ -2,5 +2,20 @@
 
 aws_assume_role_check_log() {
 	local log_file_path=${aws_cli_logs}/${ASSUME_ROLE}.log
+	echo "Read the log ${log_file_path}"
 	view +$ -c 'set number' ${log_file_path}
 }
+
+aws_assume_role_check_log_uploaded() {
+	local log_file_path=${aws_cli_logs}/${ASSUME_ROLE}-uploaded.log
+	echo "Read the log ${log_file_path}"
+	view +$ -c 'set number' ${log_file_path}
+}
+
+# TODO LATER
+aws_assume_role_enable_log_uploaded() {
+	export aws_show_log_uploaded=true
+	local log_uploaded_file_path=${aws_cli_logs}/${ASSUME_ROLE}-uploaded.log
+	touch ${log_uploaded_file_path}
+	cat /dev/null >${log_uploaded_file_path}
+}

main.sh

@@ -17,6 +17,8 @@ export peco_input_expired_time=10
 export aws_assume_role_expired_time=60
 # To allow log detail of the aws cli [true|false]
 export aws_show_commandline=true
+# To allow log information to make as evident and upload to the ticket. [true|false]
+export aws_show_log_uploaded=false
 export aws_log_tail_since=120m
 
 mkdir -p ${tmp_credentials}

services/ec2.sh

@@ -141,3 +141,12 @@ aws_sg_add_rule() {
 		--cidr $(lamhaison_get_public_ip)/32
 	"
 }
+
+aws_region_list() {
+	aws_run_commandline "\
+		aws ec2 describe-regions \
+    		--all-regions \
+    		--query 'Regions[].{Name:RegionName,Endpoint:Endpoint}' \
+    		--output table
+	"
+}