From c429e24b8dad99b3d2af69bb1a9548a34b52e14c Mon Sep 17 00:00:00 2001
From: Luis <lmineiro@gmail.com>
Date: Fri, 26 Oct 2018 11:15:48 +0200
Subject: [PATCH] change in the strategy to report instances (#547)

Use `Name` tag instead of `aws:cloudformation:stack-name` to filter instances.
---
 senza/cli.py      | 55 ++++++++++++++++++++++++++---------------------
 tests/test_cli.py |  2 +-
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/senza/cli.py b/senza/cli.py
index a011f1ab..93fd46f4 100755
--- a/senza/cli.py
+++ b/senza/cli.py
@@ -1271,8 +1271,13 @@ def instances(
     if all:
         filters = []
     else:
-        # filter out instances not part of any stack
-        filters = [{"Name": "tag-key", "Values": ["aws:cloudformation:stack-name"]}]
+        # filter out instances without a Name tag
+        filters = [{"Name": "tag-key", "Values": ["Name"]}]
+
+    # Semantically equivalent to the less efficient client side filtering on != TERMINATED
+    if not terminated:
+        filters.append(
+            {"Name": "instance-state-name", "Values": ["pending", "running", "shutting-down", "stopping", "stopped"]})
 
     opt_docker_column = " docker_source" if docker_image else ""
 
@@ -1280,34 +1285,34 @@ def instances(
         rows = []
 
         for instance in ec2.instances.filter(Filters=filters):
-            cf_stack_name = get_tag(instance.tags, "aws:cloudformation:stack-name")
+            cf_stack_name = get_tag(instance.tags, "Name")
             stack_name = get_tag(instance.tags, "StackName")
             stack_version = get_tag(instance.tags, "StackVersion")
             if not stack_refs or matches_any(cf_stack_name, stack_refs):
                 instance_health = get_instance_health(cf_stack_name, region)
-                if instance.state["Name"].upper() != "TERMINATED" or terminated:
-                    docker_source = (
-                        get_instance_docker_image_source(instance)
-                        if docker_image
-                        else ""
-                    )
 
-                    rows.append(
-                        {
-                            "stack_name": stack_name or "",
-                            "version": stack_version or "",
-                            "resource_id": get_tag(
-                                instance.tags, "aws:cloudformation:logical-id"
-                            ),
-                            "instance_id": instance.id,
-                            "public_ip": instance.public_ip_address,
-                            "private_ip": instance.private_ip_address,
-                            "state": instance.state["Name"].upper().replace("-", "_"),
-                            "lb_status": instance_health.get(instance.id),
-                            "docker_source": docker_source,
-                            "launch_time": instance.launch_time.timestamp(),
-                        }
-                    )
+                docker_source = (
+                    get_instance_docker_image_source(instance)
+                    if docker_image
+                    else ""
+                )
+
+                rows.append(
+                    {
+                        "stack_name": stack_name or "",
+                        "version": stack_version or "",
+                        "resource_id": get_tag(
+                            instance.tags, "aws:cloudformation:logical-id"
+                        ),
+                        "instance_id": instance.id,
+                        "public_ip": instance.public_ip_address,
+                        "private_ip": instance.private_ip_address,
+                        "state": instance.state["Name"].upper().replace("-", "_"),
+                        "lb_status": instance_health.get(instance.id),
+                        "docker_source": docker_source,
+                        "launch_time": instance.launch_time.timestamp()
+                    }
+                )
 
         rows.sort(key=lambda r: (r["stack_name"], r["version"], r["instance_id"]))
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 8a2b22ab..68a2d2de 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -619,7 +619,7 @@ def my_resource(rtype, *args):
             instance.public_ip_address = '8.8.8.8'
             instance.private_ip_address = '10.0.0.1'
             instance.state = {'Name': 'Test-instance'}
-            instance.tags = [{'Key': 'aws:cloudformation:stack-name', 'Value': 'test-1'},
+            instance.tags = [{'Key': 'Name', 'Value': 'test-1'},
                              {'Key': 'aws:cloudformation:logical-id', 'Value': 'local-id-123'},
                              {'Key': 'StackName', 'Value': 'test'},
                              {'Key': 'StackVersion', 'Value': '1'}]