cid-cmd 4.3.6__tar.gz → 4.3.7__tar.gz

{cid_cmd-4.3.6/cid_cmd.egg-info → cid_cmd-4.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cid-cmd
-Version: 4.3.6
+Version: 4.3.7
 Summary: Cloud Intelligence Dashboards deployment helper tool
 Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
 Author: AWS CUDOS Team

cid_cmd-4.3.7/cid/_version.py

@@ -0,0 +1,2 @@
+__version__ = '4.3.7'
+

{cid_cmd-4.3.6 → cid_cmd-4.3.7}/cid/common.py

@@ -408,6 +408,8 @@ class Cid():
                     params[key] = get_parameters().get(prefix + key)
                     if isinstance(params[key], str):
                         params[key] = params[key].split(',')
+                elif not utils.isatty():
+                    params[key] = "'{}'"
                 else:
                     if 'query' not in value:
                         raise CidCritical(f'Failed fetching parameter {prefix}{key}: parameter with type Athena must have query value.')

{cid_cmd-4.3.6 → cid_cmd-4.3.7}/cid/export.py

@@ -263,15 +263,22 @@ def export_analysis(qs, athena, glue):
                 fields = []
                 for field in cur_helper.fields:
                     if field in view_data['data']:
+                        if field == 'data':
+                            # 'data' is a partition of cur2 and a frequent word, so skip it to avoid false positives
+                            continue
                         fields.append(field)
                 view_data['dependsOn'][f'cur{cur_helper.version}'] = fields or True
                 cur_tables.append(dep_view_name)
             else:
+                dep_view_data = all_views_data.get(dep_view_name, {}).get('data', '')
+                if 'CREATE EXTERNAL TABLE' in dep_view_data and not get_parameters().get('export-tables') == 'yes':
+                    cid_print(f'{key} is a Glue table. Skipping. To export table definitions use `--export-tables yes`. Please manage this dependency by adding parameter')
+                    # TODO: add parameter with schema query
+                    continue
                 logger.debug(f'{dep_view_name} is not cur')
                 if dep_view_name not in all_views_data:
                     logger.debug(f'{dep_view_name} skipping as not in the views list')
-                if dep_view_name in ['account_map']:
-                    logger.debug(f'{dep_view_name} is a special. skip.')
+                    continue
                 non_cur_dep_views.append(dep_view_name)
         if deps.get('views'):
             deps['views'] = non_cur_dep_views

{cid_cmd-4.3.6 → cid_cmd-4.3.7}/cid/helpers/parameter_store.py

@@ -1,3 +1,4 @@
+import json
 import logging
 from datetime import datetime
 
@@ -34,7 +35,16 @@ class AthenaStore():
     def _to_sql_str(self, val):
         if val is None:
             return "''"
-        return "'" + str(val).replace("'", "''") + "'"
+        return "'" + str(json.dumps(val)).replace("'", "''") + "'"
+
+    def _from_sql_str(self, string):
+        if string.endswith(']') and string.startswith('[') and string.count("'") >=2:
+            # this is an old style parameters so transform it to json readable form from __repr__
+            string = string.replace("'",'"')
+        try:
+            return json.loads(string)
+        except json.JSONDecodeError:
+            return string
 
     def _generate_view_query(self, data, name):
         all_keys = {key for dictionary in data for key in dictionary.keys()}
@@ -56,9 +66,10 @@ class ParametersController(AthenaStore):
         any_parameters = {}
         # get any context and then override with specific context
         for line in sorted(data, key=lambda x: x.get('date', '')): # latest should override
-            any_parameters[line.get('parameter')] = line.get('value')
+            val = self._from_sql_str(line.get('value'))
+            any_parameters[line.get('parameter')] = val
             if line.get('context') == str(context):
-                context_parameters[line.get('parameter')] = line.get('value')
+                context_parameters[line.get('parameter')] = val
         return any_parameters | context_parameters
 
     def dump_parameters(self, params, context=None):

{cid_cmd-4.3.6 → cid_cmd-4.3.7/cid_cmd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cid-cmd
-Version: 4.3.6
+Version: 4.3.7
 Summary: Cloud Intelligence Dashboards deployment helper tool
 Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
 Author: AWS CUDOS Team

cid_cmd-4.3.6/cid/_version.py

@@ -1,2 +0,0 @@
-__version__ = '4.3.6'
-