cid-cmd 4.4.3__tar.gz → 4.4.4__tar.gz

{cid_cmd-4.4.3/cid_cmd.egg-info → cid_cmd-4.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cid-cmd
-Version: 4.4.3
+Version: 4.4.4
 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.4.4/cid/_version.py

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

{cid_cmd-4.4.3 → cid_cmd-4.4.4}/cid/common.py

@@ -1,4 +1,5 @@
 import os
+import re
 import json
 import urllib
 import logging
@@ -1937,8 +1938,10 @@ class Cid():
         if not resource_tags:
             return "'{}'"
         logger.debug(f'selected_tag_names = {resource_tags}')
+        pattern = r"\W"
         array = ',\n                        '.join(
-            [f"('{name}', {tags_and_names[name]})"
+            # replace all special characters with _ to allow QS read from this json (QS parseJson does not like special characters)
+            [f"""('{re.sub(pattern, "_", name)}', {tags_and_names[name]})"""
             for name in resource_tags]
         )
         res = f'''

{cid_cmd-4.4.3 → cid_cmd-4.4.4}/cid/helpers/athena.py

@@ -82,9 +82,11 @@ class Athena(CidBase):
 
         # check if we have a default database
         logger.info(f'athena_databases = {athena_databases}')
-        default_databases = [database for database in athena_databases if database == self.defaults.get('DatabaseName')]
+        default_database = None
         if 'cid_cur' in athena_databases:
-            default_databases = ['cid_cur']
+            default_database = 'cid_cur'
+        elif self.defaults.get('DatabaseName') in athena_databases:
+            default_database = self.defaults.get('DatabaseName')
 
         # Ask user
         choices = list(athena_databases)
@@ -92,9 +94,9 @@ class Athena(CidBase):
             choices.append(self.defaults.get('DatabaseName') + ' (CREATE NEW)')
         self._DatabaseName = get_parameter(
             param_name='athena-database',
-            message="Select AWS Athena database to use as default",
+            message="Select AWS Athena database to use as default for queries and views. " + (f"Use {default_database} if not sure." if default_database else ''),
             choices=choices,
-            default=default_databases[0] if default_databases else None,
+            default=default_database,
         )
         if self._DatabaseName.endswith( ' (CREATE NEW)'):
             self._DatabaseName = self.defaults.get('DatabaseName')
@@ -118,25 +120,26 @@ class Athena(CidBase):
                 self.WorkGroup = self._ensure_workgroup(name=get_parameters().get('athena-workgroup'))
                 return self._WorkGroup
             logger.info('Selecting Athena workgroup...')
-            workgroups = self.list_work_groups()
-            logger.info(f'Found {len(workgroups)} workgroups: {", ".join([wg.get("Name") for wg in workgroups])}')
-            # if len(workgroups) == 0:
+            work_group_names = [wgr['Name'] for wgr in self.list_work_groups()]
+            logger.debug(f'Found {len(work_group_names)} work_groups: {work_group_names}')
+            # if len(work_group_names) == 0:
             #     self.WorkGroup = self._ensure_workgroup(name=self.defaults.get('WorkGroup'))
-            # elif len(workgroups) == 1:
+            # elif len(work_group_names) == 1:
             #     # Silently choose the only workgroup that is available
-            #     self.WorkGroup = self._ensure_workgroup(name=workgroups.pop().get('Name'))
+            #     self.WorkGroup = self._ensure_workgroup(name=work_group_names[0])
             # else:
             # Select default workgroup if present
-            if self.defaults.get('WorkGroup') not in {wgr['Name'] for wgr in workgroups}:
-                workgroups.append({'Name': f"{self.defaults.get('WorkGroup')} (create new)"})
-            default_workgroup = next(iter([wgr.get('Name') for wgr in workgroups if  self.defaults.get('WorkGroup') in wgr['Name']]), None)
-            if default_workgroup:
-                logger.info(f'Found "{default_workgroup}" as a default workgroup')
+            if self.defaults.get('WorkGroup') not in work_group_names:
+                work_group_names.append(f"{self.defaults.get('WorkGroup')} (create new)")
+            default_workgroup = None
+            if self.defaults.get('WorkGroup') in work_group_names:
+                default_workgroup = self.defaults.get('WorkGroup')
+                logger.debug(f'Found "{default_workgroup}" as a default workgroup')
             # Ask user
             selected_workgroup = get_parameter(
                 param_name='athena-workgroup',
-                message="Select Amazon Athena workgroup to use",
-                choices=[wgr['Name'] for wgr in workgroups],
+                message="Select Amazon Athena workgroup to use. " + (f"Use {default_workgroup} if not sure." if default_workgroup else ''),
+                choices=work_group_names,
                 default=default_workgroup,
                 fuzzy=False,
             )

{cid_cmd-4.4.3 → cid_cmd-4.4.4}/cid/helpers/iam.py

@@ -55,7 +55,7 @@ class IAM(CidBase):
             return
 
         if role_name in ['aws-quicksight-service-role-v0']:
-            logger.warning(f'{role_name} is a managed role. Please manage it in QuickSight UI. Make sure that equivalent of those polices is configured: {policies_arns}')
+            logger.info(f'{role_name} is a managed role. Please manage it in QuickSight UI. Make sure that equivalent of those polices is configured: {policies_arns}')
             return
 
         try:
@@ -73,7 +73,7 @@ class IAM(CidBase):
                     )
                     logger.info(f'Attached {policy_arn} to the role {role_name}')
                 except self.client.exceptions.ClientError as exc:
-                    logger.warning(f'Unable to attach policy {policy_arn} to {role_name}: {exc}')
+                    logger.info(f'Unable to attach policy {policy_arn} to {role_name}: {exc}')
 
 
     def ensure_role_for_crawler(self, s3bucket, database, table, role_name: str='CidCmdCrawlerRole', policy_name: str="CidCmdGlueCrawlerPolicy") -> None:

{cid_cmd-4.4.3 → cid_cmd-4.4.4}/cid/helpers/quicksight/__init__.py

@@ -341,7 +341,7 @@ class QuickSight(CidBase):
             self._principal_arn = group.get('Arn')
 
         if not self._principal_arn:
-            raise CidCritical('Cannot find principal_arn. Please provide --quicksight-username or --quicksight-groupname')
+            raise CidCritical('Cannot find principal_arn. Please provide --quicksight-user or --quicksight-group')
         return self._principal_arn
 
 

{cid_cmd-4.4.3 → cid_cmd-4.4.4/cid_cmd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cid-cmd
-Version: 4.4.3
+Version: 4.4.4
 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.4.3/cid/_version.py

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