[Fix] - merge conflict

Author: lamhaison

README.md

@@ -89,7 +89,7 @@ brew install lamhaison/formulae/aws-cli-utils
 ## Load when start an Iterm terminal
 Add these lines to ~/.bashrc or ~/.zshrc or ~/.bash_profile
 ```
-source "$(which aws-cli-utils.sh)" "/opt/homebrew/Cellar/aws-cli-utils/$(brew info aws-cli-utils | head -1 | awk -F "stable " '{print $2}')" "${HOME}" "True"
+source "$(which lhs-helpful-commandlines.sh)" "/opt/homebrew/Cellar/lhs-helpful-commandlines/$(brew info lhs-helpful-commandlines | grep -E '==> .*: stable (.*)$' | sed -E 's|==> .*: stable (.*)$|\1|g')" "True" "True"
 
 ```
 

common/peco.sh

@@ -142,6 +142,10 @@ peco_aws_list_db_clusters() {
 	peco_aws_input 'aws rds describe-db-clusters --query "*[].DBClusterIdentifier"' 'true'
 }
 
+peco_aws_list_db_endpoint() {
+	peco_aws_input 'aws rds describe-db-clusters --query "*[].[Endpoint, ReaderEndpoint]"' 'true'
+}
+
 peco_aws_list_db_instances() {
 	peco_aws_input 'aws rds describe-db-instances --query "*[].DBInstanceIdentifier"' 'true'
 }

services/aws_secretmanager.sh

@@ -33,7 +33,6 @@ function aws_secretmanager_get_with_hint() {
 }
 
 function aws_secretmanager_get_value() {
-
 	local secret_name=$1
 	local nolog=${2:-'no'}
 	# Check input invalid

services/ssm.sh

@@ -27,3 +27,21 @@ aws_ssm_connection_ec2() {
         fi
 
 }
+
+aws_ssm_port_forwarding_ec2_for_rds() {
+        aws_ec2_instance_id=$1
+        aws_rds_endpoint=$2
+        local_port=$3
+        aws_commandline_logging "\
+                aws ssm start-session --target ${aws_ec2_instance_id:?'aws_ec2_instance_id is unset or empty'}
+                        --document-name AWS-StartPortForwardingSessionToRemoteHost \
+                        --parameters host="${aws_rds_endpoint:?'aws_rds_endpoint is unset or empty'}",portNumber="3306",localPortNumber="${local_port:?'local_port is unset or empty'}"
+        "
+
+        if [[ -n "${aws_ec2_instance_id}" || -n "${aws_rds_endpoint}"|| -n "${local_port}" ]]; then
+                aws ssm start-session --target $aws_ec2_instance_id \
+                        --document-name AWS-StartPortForwardingSessionToRemoteHost \
+                        --parameters host="$aws_rds_endpoint",portNumber="3306",localPortNumber="$local_port"
+        fi
+
+}