Merge pull request #107 from dxw/fix-dalmatian-rds-scripts

Fix RDS scripts
dxw · Apr 29, 2022 · c77985e · c77985e
2 parents 60f7d3d + b0e0f6e
commit c77985e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/bin/rds/create-database b/bin/rds/create-database
@@ -104,7 +104,7 @@ then
 
   ECS_INSTANCES=$(
     aws ec2 describe-instances \
-      --filters "Name=vpc-id,Values=$RDS_VPC" "Name=instance-state-code,Values=16"
+      --filters "Name=vpc-id,Values=$RDS_VPC" "Name=instance-state-code,Values=16" Name=tag:Name,Values="$INFRASTRUCTURE_NAME-$ENVIRONMENT*"
   )
   ECS_INSTANCE_ID=$(
     echo "$ECS_INSTANCES" \

diff --git a/bin/rds/export-dump b/bin/rds/export-dump
@@ -105,7 +105,7 @@ then
 
   ECS_INSTANCES=$(
     aws ec2 describe-instances \
-      --filters "Name=vpc-id,Values=$RDS_VPC" "Name=instance-state-code,Values=16"
+      --filters "Name=vpc-id,Values=$RDS_VPC" "Name=instance-state-code,Values=16" Name=tag:Name,Values="$INFRASTRUCTURE_NAME-$ENVIRONMENT*"
   )
   ECS_INSTANCE_ID=$(
     echo "$ECS_INSTANCES" \

diff --git a/bin/rds/list-databases b/bin/rds/list-databases
@@ -77,8 +77,8 @@ echo "==> Finding ECS instance..."
 
 ECS_INSTANCES=$(
   aws ec2 describe-instances \
-    --filters "Name=vpc-id,Values=$RDS_VPC" "Name=instance-state-code,Values=16"
-)
+    --filters "Name=vpc-id,Values=$RDS_VPC" "Name=instance-state-code,Values=16" Name=tag:Name,Values="$INFRASTRUCTURE_NAME-$ENVIRONMENT*")
+
 ECS_INSTANCE_ID=$(
   echo "$ECS_INSTANCES" \
     | jq -r .Reservations[0].Instances[0].InstanceId

diff --git a/bin/rds/shell b/bin/rds/shell
@@ -88,7 +88,7 @@ then
 
   ECS_INSTANCES=$(
     aws ec2 describe-instances \
-      --filters "Name=vpc-id,Values=$RDS_VPC" "Name=instance-state-code,Values=16"
+      --filters "Name=vpc-id,Values=$RDS_VPC" "Name=instance-state-code,Values=16" Name=tag:Name,Values="$INFRASTRUCTURE_NAME-$ENVIRONMENT*"
   )
   ECS_INSTANCE_ID=$(
     echo "$ECS_INSTANCES" \