浏览代码

HUE-5153 [aws] Turn off default AWS account when not configured

Jenny Kim 9 年之前
父节点
当前提交
46cdf8d
共有 3 个文件被更改,包括 3 次插入6 次删除
  1. 1 1
      desktop/conf.dist/hue.ini
  2. 1 1
      desktop/conf/pseudo-distributed.ini.tmpl
  3. 1 4
      desktop/libs/aws/src/aws/conf.py

+ 1 - 1
desktop/conf.dist/hue.ini

@@ -1252,7 +1252,7 @@
 [aws]
   [[aws_accounts]]
     # Default AWS account
-    [[[default]]]
+    ## [[[default]]]
       # AWS credentials
       ## access_key_id=
       ## secret_access_key=

+ 1 - 1
desktop/conf/pseudo-distributed.ini.tmpl

@@ -1259,7 +1259,7 @@
 [aws]
   [[aws_accounts]]
     # Default AWS account
-    [[[default]]]
+    ## [[[default]]]
       # AWS credentials
       ## access_key_id=
       ## secret_access_key=

+ 1 - 4
desktop/libs/aws/src/aws/conf.py

@@ -106,11 +106,8 @@ def is_default_configured():
 
 
 def has_iam_metadata():
-  iam_found = False
   metadata = boto.utils.get_instance_metadata(timeout=1, num_retries=1)
-  if 'iam' in metadata:
-    iam_found = True
-  return iam_found
+  return 'iam' in metadata
 
 
 def has_s3_access(user):