Merge pull request #36 from lamhaison/develop

Add some functions and update the documents

Author: lamhaison

main.sh

@@ -95,16 +95,22 @@ LHS_BIND_KEY=${3:-'True'}
 
 if [[ ${LHS_BIND_KEY} == "True" && "$(which zle)" != "" ]]; then
 	# Add hot-keys
-	# zle -N aws_help
+
+	# For aws helper function
+	zle -N aws_help
+	bindkey '^h' aws_help 
+	
+	# For assume role
 	zle -N aws_main_function
 	bindkey '^@' aws_main_function
 
+	# For building the aws cli commandline
 	zle -N aws_get_command
 	# Hotkey: Option + a + c
 	bindkey 'åç' aws_get_command
-
 	bindkey '∫' aws_get_command
 
+	# For get history
 	zle -N aws_history
 	# Hotkey Option + ah
 	bindkey '˙' aws_history

services/assume_role.sh

@@ -104,7 +104,9 @@ aws_assume_role_get_credential() {
 
 	assume_role_result=""
 
-	aws_assume_role_expired_time_from_config=$(aws configure get profile.${ASSUME_ROLE}.assume_role_timeout)
+	# aws_assume_role_expired_time_from_config=$(aws configure get profile.${ASSUME_ROLE}.assume_role_timeout)
+	# improve performance
+	aws_assume_role_expired_time_from_config=60
 
 	# Check input invalid
 	if [[ -n "$aws_assume_role_expired_time_from_config" ]]; then

services/aws_cost.sh

@@ -19,3 +19,31 @@ function aws_cost_list_months_later() {
         --time-period "Start=$(date -d "${months} months ago" +%Y-%m-01),End=$(date -d "$(date +%Y-%m-01) -1 day" +%Y-%m-%d)" \
         --granularity MONTHLY --metrics "UnblendedCost"
 }
+
+function aws_cost_get_current_month() {
+    aws ce get-cost-and-usage \
+        --time-period "Start=$(date +%Y-%m-01),End=$(date +%Y-%m-%d)" \
+        --granularity MONTHLY --metrics "UnblendedCost"
+}
+
+function aws_cost_get_last_month() {
+    aws ce get-cost-and-usage \
+        --time-period "Start=$(date -d "$(date +%Y-%m-01) -1 month" +%Y-%m-01),End=$(date -d "$(date +%Y-%m-01) -1 day" +%Y-%m-%d)" \
+        --granularity MONTHLY --metrics "UnblendedCost"
+}
+
+function aws_cost_get_service_cost_current_month() {
+    aws ce get-cost-and-usage \
+    --time-period Start=$(date +%Y-%m-01),End=$(date -d "+1 day" +%Y-%m-%d) \
+    --granularity MONTHLY \
+    --metrics "UnblendedCost" \
+    --group-by Type=DIMENSION,Key=SERVICE \
+    --output table
+}
+
+function aws_cost_get_last_7_days() {
+    aws ce get-cost-and-usage \
+        --time-period "Start=$(date -d "7 days ago" +%Y-%m-%d),End=$(date +%Y-%m-%d)" \
+        --granularity DAILY --metrics "UnblendedCost" \
+        --output table 
+}

services/ec2/ec2_autoscaling.sh

@@ -18,7 +18,9 @@ aws_autoscaling_list() {
 				LTID:MixedInstancesPolicy.LaunchTemplate.LaunchTemplateSpecification.LaunchTemplateId,\
 				LTVersion:MixedInstancesPolicy.LaunchTemplate.LaunchTemplateSpecification.Version,\
 				LTName:MixedInstancesPolicy.LaunchTemplate.LaunchTemplateSpecification.LaunchTemplateName,\
-				DesiredCapacity:DesiredCapacity}" \
+				MinSize:MinSize,\
+				DesiredCapacity:DesiredCapacity,\
+				MaxSize:MaxSize}" \
 			--output table		
 	'
 }

services/ecr.sh

@@ -92,3 +92,24 @@ function aws_ecr_pull_image_with_hint() { # To get the docker image and pull it
 		${aws_ecr_repo_image_tag:?'aws_ecr_repo_image_tag is uset or empty'}
 
 }
+
+
+# ECR for helmchart
+function aws_ecr_login_for_helm() {
+	if [[ -z "${AWS_ACCOUNT_ID}" ]]; then
+		aws_assume_role_get_aws_account_id
+	fi
+
+	local aws_ecr_helm_docker_login_password
+	local aws_ecr_helm_docker_login_cmd 
+
+	aws_ecr_helm_docker_login_password=$(aws ecr get-login-password --region ${AWS_REGION})
+
+	aws_ecr_helm_docker_login_cmd=$(
+		echo "echo '${aws_ecr_helm_docker_login_password}' | helm registry login \
+				--username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
+	)
+
+	aws_run_commandline "${aws_ecr_helm_docker_login_cmd}"
+
+}

services/s3.sh

@@ -158,3 +158,4 @@ function aws_s3_cp_folder_instruction() {
 	"
 
 }
+