From dc3931aeb2f7d3e5aeba9b1e7d25a3347a1d0e47 Mon Sep 17 00:00:00 2001
From: Sinny Kumari <sinny@redhat.com>
Date: May 15 2018 10:16:01 +0000
Subject: get_ami.py should now listen to fedimg.image.publish fedmsg


With fedimg 2.0.0, org.fedoraproject.prod.fedimg.image.publish
fedmsg topic is used to notify that AMIs are successfully
published to AWS EC2 regions. Fedmsg topic
org.fedoraproject.prod.fedimg.image.upload is sent only when
image gets successfully uploaded to base region.

Signed-off-by: Sinny Kumari <sinny@redhat.com>

---

diff --git a/tools/get_ami.py b/tools/get_ami.py
index aecca71..3a63f3d 100644
--- a/tools/get_ami.py
+++ b/tools/get_ami.py
@@ -20,7 +20,7 @@ import requests
 log = logging.getLogger()
 
 base_url = 'https://apps.fedoraproject.org/datagrepper/raw'
-topic = "org.fedoraproject.prod.fedimg.image.upload"
+topic = "org.fedoraproject.prod.fedimg.image.publish"
 
 
 def get_page(page, pages, delta):
@@ -34,8 +34,6 @@ def get_page(page, pages, delta):
     return response.json()
 
 
-completed = lambda message: message['msg']['status'] == 'completed'
-
 
 def get_messages(days):
     """ Generator that yields messages from datagrepper """
@@ -45,8 +43,7 @@ def get_messages(days):
     # Get the first page
     data = get_page(1, 'unknown', delta)
     for message in data['raw_messages']:
-        if completed(message):
-            yield message
+         yield message
 
     more = functools.partial(get_page, pages=data['pages'], delta=delta)
 
@@ -55,8 +52,7 @@ def get_messages(days):
         data = more(page + 1)
 
         for message in data['raw_messages']:
-            if completed(message):
-                yield message
+            yield message
 
 
 def parse_args():
@@ -98,4 +94,4 @@ if __name__ == '__main__':
                 extra.get('id', '').ljust(15),
                 extra.get('virt_type', '').ljust(13),
                 extra.get('vol_type', '').ljust(15),
-            )
\ No newline at end of file
+            )