Merge branch 'py3' into py3_merge_fix

Author: Tenebriso

hubblestack/extmods/grains/cloud_details.py

@@ -49,8 +49,8 @@ def _get_aws_details():
         # Else it will throw an Exception
         int(aws['cloud_account_id'])
         aws['cloud_instance_id'] = requests.get('http://169.254.169.254/latest/meta-data/instance-id',
-                                                headers=aws_token_header, timeout=3, proxies=proxies).text
-
+                                                headers=aws_token_header, timeout=3,
+                                                proxies=proxies).text
     except (requests.exceptions.RequestException, ValueError):
         # Not on an AWS box
         aws = None
@@ -61,13 +61,16 @@ def _get_aws_details():
             aws_extra['cloud_availability_zone'] = res.get('availabilityZone')
             aws_extra['cloud_ami_id'] = res.get('imageId')
             aws_extra['cloud_region'] = res.get('region')
-            r = requests.get('http://169.254.169.254/latest/meta-data/public-hostname', headers=aws_token_header, timeout=3, proxies=proxies)
+            r = requests.get('http://169.254.169.254/latest/meta-data/public-hostname',
+                             headers=aws_token_header, timeout=3, proxies=proxies)
             if r.status_code == requests.codes.ok:
                 aws_extra['cloud_public_hostname'] = r.text
-            r = requests.get('http://169.254.169.254/latest/meta-data/public-ipv4', headers=aws_token_header, timeout=3, proxies=proxies)
+            r = requests.get('http://169.254.169.254/latest/meta-data/public-ipv4',
+                             headers=aws_token_header, timeout=3, proxies=proxies)
             if r.status_code == requests.codes.ok:
                 aws_extra['cloud_public_ipv4'] = r.text
-            r = requests.get('http://169.254.169.254/latest/meta-data/local-hostname', headers=aws_token_header, timeout=3, proxies=proxies)
+            r = requests.get('http://169.254.169.254/latest/meta-data/local-hostname',
+                             headers=aws_token_header, timeout=3, proxies=proxies)
             if r.status_code == requests.codes.ok:
                 aws_extra['cloud_private_hostname'] = r.text
             for key in aws_extra.keys():
@@ -228,5 +231,4 @@ def _build_gpc_extra(gcp_header, proxies):
                              'externalIp' in item]
         gcp_extra[grain_name_accessconfig_external_ips] = ','.join(external_ips_list)
 
-
     return gcp_extra

hubblestack/extmods/modules/nebula_osquery.py

@@ -116,6 +116,8 @@ def queries(query_group,
 
     query_data = query_data.get(query_group, {})
 
+    if not query_group:
+        return None
     if not query_data:
         return None
 

hubblestack/status.py

@@ -479,7 +479,7 @@ def stats(cls):
         min_t = min([x['first_t'] for x in stats_short.values() if x['first_t'] > 0])
         time_stats = {'time': max_t, 'dt': min_dt, 'start': min_t}
         stats_short['HEALTH'] = health_stats = {
-            'buckets': {k: n.buckets for k, n in cls.dat.iteritems()},
+            'buckets': {k: n.buckets for k, n in cls.dat.items()},
             'last_activity': time_stats,
         }
         stats_short['__doc__'] = {

tests/unittests/test_stat_nova.py

@@ -11,14 +11,25 @@ def test_virtual(self):
 
     def test_merge_yaml(self):
         ret = {}
-        data = {'stat': {'passwd_owner_group': {'nova_profile': 'ubuntu-1604-level-1-scored-v1-0-0',
-                                                'data': {'Ubuntu-16.04': [{'/etc/passwd': {'gid': 0, 'tag': 'CIS-12.4', 'group': 'root', 'uid': 0, 'user': 'root'}}]},
-                                                'description': 'Verify User/Group Ownership on /etc/passwd'}}}
+        data = {
+            'stat': {'passwd_owner_group': {
+                'nova_profile': 'ubuntu-1604-level-1-scored-v1-0-0',
+                'data': {'Ubuntu-16.04': [{'/etc/passwd': {'gid': 0,
+                                                           'tag': 'CIS-12.4',
+                                                           'group': 'root',
+                                                           'uid': 0,
+                                                           'user': 'root'}}]},
+                'description': 'Verify User/Group Ownership on /etc/passwd'}}}
         profile = 'ubuntu-1604-level-1-scored-v1-0-0'
         val = hubblestack.files.hubblestack_nova.stat_nova._merge_yaml(ret, data, profile)
-        assert val['stat'] == [{'passwd_owner_group': {'nova_profile': 'ubuntu-1604-level-1-scored-v1-0-0',
-                                                       'data': {'Ubuntu-16.04': [{'/etc/passwd': {'group': 'root', 'gid': 0, 'tag': 'CIS-12.4', 'uid': 0, 'user': 'root'}}]},
-                                                       'description': 'Verify User/Group Ownership on /etc/passwd'}}]
+        assert val['stat'] == [{'passwd_owner_group': {
+            'nova_profile': 'ubuntu-1604-level-1-scored-v1-0-0',
+            'data': {'Ubuntu-16.04': [{'/etc/passwd': {'group': 'root',
+                                                       'gid': 0,
+                                                       'tag': 'CIS-12.4',
+                                                       'uid': 0,
+                                                       'user': 'root'}}]},
+            'description': 'Verify User/Group Ownership on /etc/passwd'}}]
 
     def test_merge_yaml_recurssive(self):
         ret = {}