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

{cid_cmd-4.4.2/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.2
+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.2 → 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.2 → 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.2 → 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.2 → 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.2 → cid_cmd-4.4.4}/cid/helpers/quicksight/dashboard.py

@@ -11,13 +11,16 @@ from cid.helpers.quicksight.template import Template as CidQsTemplate
 from cid.utils import cid_print, get_yesno_parameter
 from cid.helpers.quicksight.resource import CidQsResource
 from cid.helpers.quicksight.dataset import Dataset
-from cid.helpers.quicksight.version import CidVersion
+from cid.helpers.quicksight.version import CidVersion, DEFAULT_VERSION
 
 
 logger = logging.getLogger(__name__)
 
 
 class Dashboard(CidQsResource):
+    # Dashboards with known invalid v1.0.0 tags
+    DASHBOARDS_WITH_INVALID_V1_TAGS = {'ta-organizational-view', 'resiliencevue'}
+    
     def __init__(self, raw: dict, qs=None) -> None:
         super().__init__(raw)
         # Initialize properties
@@ -212,22 +215,57 @@ class Dashboard(CidQsResource):
 
     @property
     def deployed_cid_version(self):
+        """Get the deployed CID version from tags, template, or definition."""
         if self._cid_version:
-            return  self._cid_version
-        tag_version = (self.qs.get_tags(self.arn) or {}).get('cid_version_tag')
-        #print(f'{self.id}: {tag_version}')
-        if tag_version:
-            logger.trace(f'version of {self.arn} from tag = {tag_version}')
-            self._cid_version = CidVersion(tag_version)
-        else:
-            if self.deployed_template:
-                self._cid_version = self.deployed_template.cid_version
-            elif self.deployed_definition:
-                self._cid_version = self.deployed_definition.cid_version
-            if self._cid_version:
-                logger.trace(f'setting tag of {self.arn} to cid_version_tag = {self._cid_version}')
-                self.qs.set_tags(self.arn, cid_version_tag=self._cid_version)
+            return self._cid_version
+        
+        try:
+            tag_version = self._get_version_from_tags()
+            if self._is_valid_tag_version(tag_version):
+                logger.debug(f'Using version from tag for {self.id}: {tag_version}')
+                self._cid_version = CidVersion(tag_version)
+            else:
+                self._cid_version = self._get_version_from_sources()
+                if self._cid_version:
+                    self._update_version_tag()
+        except Exception as exc:
+            logger.warning(f'Failed to determine CID version for {self.id}: {exc}')
+            self._cid_version = None
+        
         return self._cid_version
+    
+    def _get_version_from_tags(self):
+        """Extract version from dashboard tags."""
+        tags = self.qs.get_tags(self.arn) or {}
+        return tags.get('cid_version_tag')
+    
+    def _is_valid_tag_version(self, tag_version):
+        """Check if tag version is valid and not a known invalid default."""
+        if not tag_version or tag_version == DEFAULT_VERSION:
+            return False
+        
+        # v1.0.0 is invalid only for specific dashboards with incorrect defaults
+        if tag_version == 'v1.0.0' and self.id in self.DASHBOARDS_WITH_INVALID_V1_TAGS:
+            logger.debug(f'Ignoring invalid v1.0.0 tag for dashboard {self.id}')
+            return False
+        
+        return True
+    
+    def _get_version_from_sources(self):
+        """Get version from template or definition as fallback."""
+        if self.deployed_template:
+            return self.deployed_template.cid_version
+        elif self.deployed_definition:
+            return self.deployed_definition.cid_version
+        return None
+    
+    def _update_version_tag(self):
+        """Update the version tag if we found a version from other sources."""
+        try:
+            logger.debug(f'Setting version tag for {self.arn}: {self._cid_version}')
+            self.qs.set_tags(self.arn, cid_version_tag=self._cid_version)
+        except Exception as exc:
+            logger.warning(f'Failed to update version tag for {self.id}: {exc}')
 
 
     @property

{cid_cmd-4.4.2 → cid_cmd-4.4.4}/cid/helpers/quicksight/definition.py

@@ -2,7 +2,7 @@ import logging
 import re
 from typing import Dict
 from cid.helpers.quicksight.resource import CidQsResource
-from cid.helpers.quicksight.version import CidVersion
+from cid.helpers.quicksight.version import CidVersion, DEFAULT_VERSION
 
 logger = logging.getLogger(__name__)
 
@@ -21,7 +21,7 @@ class Definition:
         except TypeError as e:
             logger.debug(f"Could not resolve CID version. Raw version value '{self._raw_version}' does not conform to CID version format vmajor.minor.build e.g. v.1.0.1")
         
-        return CidVersion("v1.0.0")
+        return CidVersion(DEFAULT_VERSION)
     
     def resolve_version(self, raw: dict):
         about_content = []
@@ -38,13 +38,13 @@ class Definition:
         if about_content:
             all_about_content = " | ".join(about_content)
             # find first string that looks like vx.y.z using a regular expression where x, y and z are numbers
-            version_matches = re.findall(r"(v\d+?\.\d+?\.\d+?)", all_about_content)
+            version_matches = re.findall(r"([vV]\d+?\.\d+?\.\d+?)", all_about_content)
             if version_matches:
-                return version_matches[0]
+                return version_matches[0].lower()  # normalize to lowercase
             else:
-                version_matches = re.findall(r"(v\d+?\.\d+?)", all_about_content)
+                version_matches = re.findall(r"([vV]\d+?\.\d+?)", all_about_content)
                 if version_matches:
-                    return f"{version_matches[0]}.0"
+                    return f"{version_matches[0].lower()}.0"  # normalize to lowercase
 
         return None
     

{cid_cmd-4.4.2 → cid_cmd-4.4.4}/cid/helpers/quicksight/version.py

@@ -6,6 +6,9 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+# Default version used when version cannot be determined
+DEFAULT_VERSION = "v0.0.0"
+
 class CidVersion:
     """ Semantic version of dashboards in CID
     """

{cid_cmd-4.4.2 → 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.2
+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.2/cid/_version.py

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