fix missing imports in UI code

whummer · whummer · commit 1657c6a98b99 · 2016-11-09T11:43:39.000+11:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 *.class
+*.log
 /infra/
 /node_modules/
 /nosetests.xml
diff --git a/localstack/dashboard/infra.py b/localstack/dashboard/infra.py
@@ -3,6 +3,7 @@
 import re
 import sh
 import json
+import logging
 import base64
 
 AWS_CACHE_TIMEOUT = 60 * 60  # TODO fix
@@ -12,6 +13,9 @@
 TMP_DOWNLOAD_CACHE_MAX_AGE = 30 * 60
 last_cache_cleanup_time = {'time': 0}
 
+# logger
+LOG = logging.getLogger(__name__)
+
 
 def get_kinesis_streams(filter='.*', pool={}):
     if MOCK_OBJ:
@@ -50,7 +54,7 @@ def get_kinesis_shards(stream_name=None, stream_details=None):
 def resolve_string_or_variable(string, code_map):
     if re.match(r'^["\'].*["\']$', string):
         return string.replace('"', '').replace("'", '')
-    log("WARNING: Variable resolution not implemented")
+    LOG.warning("Variable resolution not implemented")
     return None
 
 
@@ -120,7 +124,7 @@ def handle(func):
                     code_map = get_lambda_code(func_name)
                     f.targets = extract_endpoints(code_map, pool)
                 except Exception, e:
-                    log("WARN: Unable to get code for lambda '%s'" % func_name)
+                    LOG.warning("Unable to get code for lambda '%s'" % func_name)
     parallelize(handle, out['Functions'])
     # print result
     return result
@@ -363,10 +367,10 @@ def get_graph(name_filter='.*'):
                 lookup_id = s.id
                 if isinstance(s, DynamoDBStream):
                     lookup_id = s.table.id
-                result['edges'].append({'source': node_ids[lookup_id], 'target': uid})
+                result['edges'].append({'source': node_ids.get(lookup_id), 'target': uid})
             for t in l.targets:
                 lookup_id = t.id
-                result['edges'].append({'source': uid, 'target': node_ids[lookup_id]})
+                result['edges'].append({'source': uid, 'target': node_ids.get(lookup_id)})
         for b in buckets:
             for n in b.notifications:
                 src_uid = node_ids[b.id]
diff --git a/localstack/dashboard/web/package.json b/localstack/dashboard/web/package.json
@@ -13,7 +13,7 @@
     "angular-resource": "1.3.12",
     "angular-sanitize": "1.3.12",
     "showdown": "0.3.1",
-    "@atlassian/aui": "5.9.19",
+    "@atlassian/aui": "6.0.1",
     "angular-aui": "whummer/angular-aui#feat/aui-toggle",
     "jsplumb": "2.1.4",
     "dagre": "0.7.4",
diff --git a/localstack/utils/common.py b/localstack/utils/common.py
@@ -6,6 +6,7 @@
 import time
 import glob
 import requests
+import sh
 from datetime import datetime
 from multiprocessing.dummy import Pool
 from localstack.constants import *
@@ -224,6 +225,14 @@ def do_run(cmd):
     return result
 
 
+def remove_non_ascii(text):
+    # text = unicode(text, "utf-8")
+    text = text.decode('utf-8', CODEC_HANDLER_UNDERSCORE)
+    # text = unicodedata.normalize('NFKD', text)
+    text = text.encode('ascii', CODEC_HANDLER_UNDERSCORE)
+    return text
+
+
 def make_http_request(url, data=None, headers=None, method='GET'):
     if is_string(method):
         method = requests.__dict__[method.lower()]

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 *.pyc
 *.class
 +*.log
 /infra/
 /node_modules/
 /nosetests.xml