Release/4.1.1 (#1170)

* release 4.1.1

* fix dependency bug

* fix versioning

Author: iakov-gan

cfn-templates/cid-cfn.yml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deployment of Cloud Intelligence Dashboards v4.1.0
+Description: Deployment of Cloud Intelligence Dashboards v4.1.1
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -2052,7 +2052,7 @@ Resources:
       SourceBucket: !Ref ReferenceAssetsBucket
       DestinationBucket: !Ref LocalAssetsBucket
       Keys:
-        - 'cid-resource-lambda-layer/cid-4.1.0.zip' #replace version here if needed
+        - 'cid-resource-lambda-layer/cid-4.1.1.zip' #replace version here if needed
 
   CidResourceLambdaLayer:
     Type: AWS::Lambda::LayerVersion
@@ -2067,7 +2067,7 @@ Resources:
             - LambdaLayerBucketPrefixIsManaged
             - !FindInMap [RegionMap, !Ref 'AWS::Region', BucketName]
             - !Sub '${LambdaLayerBucketPrefix}-${AWS::Region}' # Region added for backward compatibility
-        S3Key: 'cid-resource-lambda-layer/cid-4.1.0.zip' #replace version here if needed
+        S3Key: 'cid-resource-lambda-layer/cid-4.1.1.zip' #replace version here if needed
       CompatibleRuntimes:
         - python3.10
         - python3.11

cid/_version.py

@@ -1,2 +1,2 @@
-__version__ = '4.1.0'
+__version__ = '4.1.1'
 

cid/helpers/quicksight/__init__.py

@@ -1262,7 +1262,7 @@ def create_dashboard(self, definition: dict) -> Dashboard:
             'VersionNumber': created_version
         }
         dashboard = self.describe_dashboard(poll=True, **describe_parameters)
-        self.set_tags(dashboard.arn, cid_version=dashboard.cid_version) # try to update version tag
+        self.set_tags(dashboard.arn, cid_version_tag=dashboard.cid_version) # try to update version tag
 
         self.discover_dashboard(dashboard.id)
         if not dashboard.health:
@@ -1335,7 +1335,6 @@ def update_dashboard(self, dashboard: Dashboard, definition):
         updated_version = int(update_status['VersionArn'].split('/')[-1])
 
         dashboard = self.describe_dashboard(poll=True, DashboardId=dashboard.id, VersionNumber=updated_version)
-        self.set_tags(dashboard.arn, cid_version=dashboard.cid_version) # try to update version tag
 
         if not dashboard.health:
             failure_reason = dashboard.version.get('Errors')
@@ -1350,6 +1349,7 @@ def update_dashboard(self, dashboard: Dashboard, definition):
         logger.debug(result)
         if result['Status'] != 200:
             raise Exception(result)
+        self.set_tags(dashboard.arn, cid_version_tag=dashboard.latest_available_cid_version) # update version tag to the latest
 
         return result
 

cid/helpers/quicksight/dashboard.py

@@ -215,7 +215,7 @@ def datasets(self):
                 logger.debug(f'Access denied describing DataSetId {dataset_id} for Dashboard {self.id}')
             except self.qs.client.exceptions.InvalidParameterValueException:
                 logger.debug(f'Invalid dataset {dataset_id}')
-        logger.info(f"{self.name} has {len(self.datasets)} datasets")
+        logger.info(f"{self.name} has {len(self._datasets)} datasets")
         return self._datasets
 
     @property
@@ -248,7 +248,8 @@ def health(self) -> bool:
     def deployed_cid_version(self):
         if self._cid_version:
             return  self._cid_version
-        tag_version = (self.qs.get_tags(self.arn) or {}).get('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)
@@ -258,8 +259,8 @@ def deployed_cid_version(self):
             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 = {self._cid_version}')
-                self.qs.set_tags(self.arn, cid_version=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