Dashboard tag fix (#1351)

* add fix for incorrect version

* refactor initial version for readability

Author: yprikhodko

cid/helpers/quicksight/dashboard.py

@@ -11,13 +11,16 @@
 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 @@ def health(self) -> bool:
 
     @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/helpers/quicksight/definition.py

@@ -2,7 +2,7 @@
 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 @@ def cid_version(self) -> CidVersion:
         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 @@ def resolve_version(self, raw: dict):
         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/helpers/quicksight/version.py

@@ -6,6 +6,9 @@
 
 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
     """

dashboards/resilience-vue/resilience-vue-definition.yaml

@@ -4176,7 +4176,7 @@ Sheets:
   - Content: "<text-box>\n  <block align=\"center\">\n    <inline color=\"#23dae6\"\
       \ font-size=\"48px\">\n      <b>ResilienceVue\_</b>\n    </inline>\n  </block>\n\
       \  <br/>\n  <block align=\"center\">\n    <inline color=\"PrimaryForeground\"\
-      \ font-size=\"48px\">\n      <b>V 0.1.0</b>\n    </inline>\n  </block>\n  <br/>\n\
+      \ font-size=\"48px\">\n      <b>v0.1.0</b>\n    </inline>\n  </block>\n  <br/>\n\
       \  <block align=\"center\"/>\n  <br/>\n  <block align=\"center\">\n    <inline\
       \ color=\"PrimaryForeground\" font-size=\"24px\">\n      <b>Centralized AWS\
       \ Resilience Assessment Solution</b>\n    </inline>\n  </block>\n  <br/>\n \

dashboards/tao/tao-definition.yaml

@@ -17188,7 +17188,7 @@ Sheets:
       \      </a>\n    </inline>\n  </block>\n  <br/>\n  <block align=\"center\">\n\
       \    <inline font-size=\"60px\">Trusted Advisor Organizational View\_</inline>\n\
       \  </block>\n  <br/>\n  <block align=\"center\">\n    <inline font-size=\"54.88px\"\
-      >\n      <b>V4.0.0</b>\n    </inline>\n  </block>\n  <br/>\n  <br/>\n  <block\
+      >\n      <b>v4.0.0</b>\n    </inline>\n  </block>\n  <br/>\n  <br/>\n  <block\
       \ align=\"right\"/>\n  <br/>\n  <block align=\"right\"/>\n  <br/>\n  <block\
       \ align=\"right\">Built by: Yuriy Prykhodko, Timur Tulyaganov, Sumit Dhuwalia\_\
       </block>\n  <br/>\n  <block align=\"right\"/>\n  <br/>\n  <block align=\"right\"\