fix quicklook for s3 buckets

twang817 · Dec 3, 2016 · dca865a · dca865a
1 parent fab146c
commit dca865a
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/aws_workflow/aws.py b/aws_workflow/aws.py
@@ -47,7 +47,8 @@ def get_s3_buckets():
                     continue
                 log.error(e)
             else:
-                for tag in tags.get('TagSet', []):
+                bucket['TagSet'] = tags.get('TagSet', [])
+                for tag in bucket['TagSet']:
                     bucket['facets'][tag['Key'].lower()] = tag['Value']
             finally:
                 buckets.append(bucket)

diff --git a/aws_workflow/base.py b/aws_workflow/base.py
@@ -145,4 +145,5 @@ def find_s3_bucket(wf, profile, region_name, terms, facets, quicklook_baseurl):
             uid=uid,
             icon='icons/s3_bucket.png',
             type='default',
+            quicklookurl=quicklookurl
         )
diff --git a/quicklook_server.py b/quicklook_server.py
@@ -18,10 +18,22 @@ def get(self):
         self.write(template.render(**context))
 
 
+class S3QuicklookHandler(tornado.web.RequestHandler):
+    def enrich(self, context):
+        pass
+
+    def get(self):
+        template = templates.get_template('s3.html.j2')
+        context = json.loads(self.get_argument('context', '{}'))
+        self.enrich(context)
+        self.write(template.render(**context))
+
+
 def make_app():
     return tornado.web.Application([
         (r'/static/(.*)', tornado.web.StaticFileHandler, {'path': os.path.join(os.getcwd(), 'static')}),
         (r'/quicklook/ec2', Ec2QuicklookHandler),
+        (r'/quicklook/s3', S3QuicklookHandler),
     ])
 
 

diff --git a/templates/s3.html.j2 b/templates/s3.html.j2
@@ -0,0 +1,27 @@
+<html>
+<head>
+    <title>{{ title }}</title>
+    <link rel="stylesheet" type="text/css" href="/static/css/main.css">
+</head>
+<body>
+    <h1>{{ title }}</h1>
+    <table>
+        <tr>
+            <td>Creation Date:</td>
+            <td>{{ bucket.CreationDate }}</td>
+        </tr>
+        <tr>
+            <td>Tags:</td>
+            <td>
+                <dl>
+                    {% for tag in bucket.TagSet %}
+                    <dt>{{ tag.Key }}</dt>
+                    <dd>{{ tag.Value }}</dd>
+                    {% endfor %}
+                </dl>
+            </td>
+        </tr>
+    </table>
+    {{ foo }}
+</body>
+</html>