From 81235e053999b6e32bd9048d4de907e85f20500e Mon Sep 17 00:00:00 2001
From: KokiTakemori <takemori@3-shake.com>
Date: Wed, 18 Dec 2019 11:46:04 +0900
Subject: [PATCH] Fix fail to describe-instances if get-inventory result
 includes 'mi-xxxx' InstanceID.

---
 bin/aws-ssh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/aws-ssh b/bin/aws-ssh
index 6531c4a..977f978 100755
--- a/bin/aws-ssh
+++ b/bin/aws-ssh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-INVENTORY=$(aws ssm get-inventory --filters "Key=AWS:InstanceInformation.InstanceStatus,Values=Terminated,Type=NotEqual" --query "Entities[].Id[]" --output text)
+INVENTORY=$(aws ssm get-inventory \
+            --filters \
+                "Key=AWS:InstanceInformation.InstanceStatus,Values=Terminated,Type=NotEqual" \
+                "Key=AWS:InstanceInformation.InstanceId,Values=i-,Type=BeginWith" \
+            --query "Entities[].Id[]" \
+            --output text)
 
 EC2=$(aws ec2 describe-instances --instance-ids ${INVENTORY} --query 'Reservations[].Instances[*].{Id:InstanceId,Name:Tags[?Key==`Name`].Value,DNS:PrivateDnsName}|[].{Id:Id, Name:Name[0], DNS:DNS} | [][]' --output text |peco)