cid-cmd 4.3.1__tar.gz → 4.3.2__tar.gz

{cid_cmd-4.3.1/cid_cmd.egg-info → cid_cmd-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cid-cmd
-Version: 4.3.1
+Version: 4.3.2
 Summary: Cloud Intelligence Dashboards deployment helper tool
 Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
 Author: AWS CUDOS Team
@@ -54,7 +54,7 @@ Cloud Intelligence Dashboards Framework provides AWS customers with [more then 2
 * Advanced Dashboards - Require CID Data Collection and CUR
 * Additional Dashboards - Require various custom datasources or created for very specific use cases.
 
-We recommend starting with deployment of [Foundational Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboard-foundational.html). Then deploy [Data Collection](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/data-collection.html) and [Advanced Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#advanced-dashboards). Check for [Additional](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#additional-dashboards) Dashboards.
+We recommend starting with deployment of [Foundational Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboard-foundational.html). Then deploy [Data Collection](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/data-collection.html) and [Advanced Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#advanced-dashboards). Check for [Additional](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#additional) Dashboards.
 
 
 [![Documentation >](assets/images/documentation.svg)](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/deployment-in-global-regions.html)

{cid_cmd-4.3.1 → cid_cmd-4.3.2}/README.md

@@ -26,7 +26,7 @@ Cloud Intelligence Dashboards Framework provides AWS customers with [more then 2
 * Advanced Dashboards - Require CID Data Collection and CUR
 * Additional Dashboards - Require various custom datasources or created for very specific use cases.
 
-We recommend starting with deployment of [Foundational Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboard-foundational.html). Then deploy [Data Collection](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/data-collection.html) and [Advanced Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#advanced-dashboards). Check for [Additional](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#additional-dashboards) Dashboards.
+We recommend starting with deployment of [Foundational Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboard-foundational.html). Then deploy [Data Collection](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/data-collection.html) and [Advanced Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#advanced-dashboards). Check for [Additional](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#additional) Dashboards.
 
 
 [![Documentation >](assets/images/documentation.svg)](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/deployment-in-global-regions.html)
@@ -156,4 +156,4 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform
 This library is licensed under the MIT-0 License. See the [LICENSE](LICENSE) file.
 
 ## Notices
-Dashboards and their content: (a) are for informational purposes only, (b) represents current AWS product offerings and practices, which are subject to change without notice, and (c) does not create any commitments or assurances from AWS and its affiliates, suppliers or licensors. AWS content, products or services are provided “as is” without warranties, representations, or conditions of any kind, whether express or implied. The responsibilities and liabilities of AWS to its customers are controlled by AWS agreements, and this document is not part of, nor does it modify, any agreement between AWS and its customers.
+Dashboards and their content: (a) are for informational purposes only, (b) represents current AWS product offerings and practices, which are subject to change without notice, and (c) does not create any commitments or assurances from AWS and its affiliates, suppliers or licensors. AWS content, products or services are provided “as is” without warranties, representations, or conditions of any kind, whether express or implied. The responsibilities and liabilities of AWS to its customers are controlled by AWS agreements, and this document is not part of, nor does it modify, any agreement between AWS and its customers.

cid_cmd-4.3.2/cid/_version.py

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

{cid_cmd-4.3.1 → cid_cmd-4.3.2}/cid/export.py

@@ -270,6 +270,8 @@ def export_analysis(qs, athena, glue):
                 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.')
                 non_cur_dep_views.append(dep_view_name)
         if deps.get('views'):
             deps['views'] = non_cur_dep_views

{cid_cmd-4.3.1 → cid_cmd-4.3.2}/cid/helpers/cur.py

@@ -299,7 +299,10 @@ class CUR(AbstractCUR):
         )
         if answer == '<CREATE CUR TABLE AND CRAWLER>':
             raise CidCritical('CUR creation was requested') # to be captured in common.py
-        database, table = answer
+        if isinstance(answer, str) and '.' in answer and len(answer.split('.')) == 2:
+            database, table = answer.split('.')
+        else:
+            database, table = answer
         set_parameters({'cur-table-name': table,'cur-database': database, })
         return database, self.athena.get_table_metadata(table, database_name=database)
 

{cid_cmd-4.3.1 → cid_cmd-4.3.2}/cid/helpers/cur_proxy.py

@@ -400,8 +400,8 @@ class ProxyView():
                 MAP(ARRAY['key1', 'key2'], ARRAY[value1, value2])
             '''
             arrays = re.findall(r'ARRAY\[(.*?)\]', mapping_string) # Extract arrays from the string
-            keys = arrays[0].strip('\'').split(',') # Split arrays into elements
-            values = arrays[1].strip('\'').split(',')
+            keys = arrays[0].replace("'", '').split(',') # Split arrays into elements
+            values = arrays[1].split(',') # FIXME: the values can be more complex then just columns and ma potentially include comma in some rare cases.
             return {key.strip(): value.strip() for key, value in zip(keys, values)}
 
         _current_sql = '\n'.join([line[0] for line in self.athena.query(f'SHOW CREATE VIEW {self.name}')])
@@ -417,9 +417,9 @@ class ProxyView():
                     logger.warning(f'Cannot find map {field} definition in the view {self.name}. It must be defined as MAP.')
                     continue
                 current_map = _parse_mapping_string(maps[0])
-                logger.debug(f'current definition of {field} of {current_map}')
-                self.exposed_maps[field].update([key[0] for key in current_map])
-        logger.debug(f'{self.exposed_maps}')
+                logger.debug(f'current definition of {field} = {current_map}')
+                self.exposed_maps[field].update([key for key in current_map])
+        logger.debug(f'exposed_maps = {self.exposed_maps}')
 
     def source_column_equivalents(self, field):
         """ Given a field of cur return an equivalent field in the target cur system. This one does not care if field actually exists
@@ -505,7 +505,7 @@ class ProxyView():
             if field_type.lower().startswith('map'):
                 map_field = field.split('[')[0]
                 map_mapping = {}
-                keys_set = set(self.exposed_maps.get(field, set()))
+                keys_set = set(self.exposed_maps.get(map_field, set()))
                 keys_set.update(self.fields_to_expose_in_maps.get(map_field, set()))
                 for key in keys_set:
                     map_field_key = f'{map_field}_{key}'
@@ -514,7 +514,7 @@ class ProxyView():
                             map_field_key = f'"{map_field_key}"'
                         map_mapping[key] = map_field_key
                     else:
-                        map_mapping[key] = empty['string'] # all known maps have string vaules for now
+                        map_mapping[key] = empty['string'] # all known maps have string values for now
                 if not map_mapping:
                     return 'cast(NULL AS MAP<VARCHAR, VARCHAR>)'
                 map_mapping = dict(sorted(map_mapping.items())) # ordered dict
@@ -566,8 +566,6 @@ class ProxyView():
         lines = {}
         for field in all_target_fields:
             target_field = self.get_fields_from_sql(field)[0]
-            if target_field not in self.exposed_fields:
-                something_changed = True
             target_field_type = self.cur.get_type_of_column(target_field, self.target_cur_version)
             logger.trace(f'get_sql_expression {field} {target_field_type}')
             mapped_expression = self.get_sql_expression(field, target_field_type) #

{cid_cmd-4.3.1 → cid_cmd-4.3.2/cid_cmd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cid-cmd
-Version: 4.3.1
+Version: 4.3.2
 Summary: Cloud Intelligence Dashboards deployment helper tool
 Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
 Author: AWS CUDOS Team
@@ -54,7 +54,7 @@ Cloud Intelligence Dashboards Framework provides AWS customers with [more then 2
 * Advanced Dashboards - Require CID Data Collection and CUR
 * Additional Dashboards - Require various custom datasources or created for very specific use cases.
 
-We recommend starting with deployment of [Foundational Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboard-foundational.html). Then deploy [Data Collection](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/data-collection.html) and [Advanced Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#advanced-dashboards). Check for [Additional](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#additional-dashboards) Dashboards.
+We recommend starting with deployment of [Foundational Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboard-foundational.html). Then deploy [Data Collection](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/data-collection.html) and [Advanced Dashboards](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#advanced-dashboards). Check for [Additional](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/dashboards.html#additional) Dashboards.
 
 
 [![Documentation >](assets/images/documentation.svg)](https://docs.aws.amazon.com/guidance/latest/cloud-intelligence-dashboards/deployment-in-global-regions.html)

cid_cmd-4.3.1/cid/_version.py

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