respect parameter context (#1242)

Author: iakov-gan

cfn-templates/cid-cfn.yml

@@ -1,6 +1,6 @@
 # https://github.com/aws-samples/aws-cudos-framework-deployment/blob/main/cfn-templates/cid-cfn.yml
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deployment of Cloud Intelligence Dashboards v4.2.6 - AWS Solution SO9011
+Description: Deployment of Cloud Intelligence Dashboards v4.2.7 - AWS Solution SO9011
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -2075,7 +2075,7 @@ Resources:
       SourceBucket: !Ref ReferenceAssetsBucket
       DestinationBucket: !Ref LocalAssetsBucket
       Keys:
-        - 'cid-resource-lambda-layer/cid-4.2.6.zip' #replace version here if needed
+        - 'cid-resource-lambda-layer/cid-4.2.7.zip' #replace version here if needed
 
   CidResourceLambdaLayer:
     Type: AWS::Lambda::LayerVersion
@@ -2090,7 +2090,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.2.6.zip' #replace version here if needed
+        S3Key: 'cid-resource-lambda-layer/cid-4.2.7.zip' #replace version here if needed
       CompatibleRuntimes:
         - python3.10
         - python3.11

cid/_version.py

@@ -1,2 +1,2 @@
-__version__ = '4.2.6'
+__version__ = '4.2.7'
 

cid/common.py

@@ -287,7 +287,7 @@ def track(self, action, dashboard_id):
         if not method:
             logger.debug(f"This will not fail the deployment. Logging action {action} is not supported. This issue will be ignored")
             return
-        endpoint = 'https://cid.workshops.aws.dev/adoption-tracking' # AWS Managed
+        endpoint = 'https://okakvoavfg.execute-api.eu-west-1.amazonaws.com/' # AWS Managed
         if os.environ.get('AWS_DEPLOYMENT_TYPE'):
             deployment_type = os.environ.get('AWS_DEPLOYMENT_TYPE')
         elif os.environ.get('AWS_EXECUTION_ENV', '').startswith('AWS_Lambda'):
@@ -476,17 +476,16 @@ def load_default_parameters(self):
             set_defaults(defaults)
 
     def dump_default_parameters(self):
-
         stop_list = ['profile-name', 'region', 'aws-access-key-id', 'aws-secret-access-key', 'aws-session-token', 'athena-database', 'athena-workgroup']
-        current_defaults = self.parameters_controller.load_parameters(
-            context=get_parameters().get('dashboard-id')
-        )
-        current_defaults = current_defaults | get_parameters()
+        current_defaults = get_parameters()
         for key in list(current_defaults.keys()):
             if key in stop_list:
                 del current_defaults[key]
         logger.trace(f'dumping parameters {current_defaults}')
-        self.parameters_controller.dump_parameters(current_defaults, context=get_parameters().get('dashboard-id'))
+        self.parameters_controller.dump_parameters(
+            current_defaults,
+            context=get_parameters().get('dashboard-id')
+        )
 
 
     def ensure_subscription(self):

cid/helpers/parameter_store.py

@@ -1,15 +1,23 @@
+import logging
+from datetime import datetime
+
 from cid.exceptions import CidCritical
 
+logger = logging.getLogger(__name__)
+
 class AthenaStore():
     def __init__(self, athena, view_name='cid_parameters'):
         self.athena = athena
         self.view_name = view_name
 
     def dump(self, data):
-        ''' load from athena
+        ''' dump data to athena
         '''
-        # FIXME: make it multi view
-        self.athena.query(self._generate_view_query(data, self.view_name))
+        try:
+            # FIXME: make it multi view
+            self.athena.query(self._generate_view_query(data, self.view_name))
+        except (CidCritical, Exception) as exc:
+            logger.debug(f'failed to save parameters store: {exc}')
 
     def load(self):
         ''' load from athena
@@ -44,8 +52,37 @@ def _generate_view_query(self, data, name):
 class ParametersController(AthenaStore):
     def load_parameters(self, context):
         data = self.load()
-        return { line.get('parameter'):line.get('value') for line in data}
+        context_parameters = {}
+        any_parameters = {}
+        # get any context and then override with specific context
+        for line in sorted(data, key=lambda x: x.get('date', '')): # latest should override
+            any_parameters[line.get('parameter')] = line.get('value')
+            if line.get('context') == str(context):
+                context_parameters[line.get('parameter')] = line.get('value')
+        return any_parameters | context_parameters
 
     def dump_parameters(self, params, context=None):
-        data = [{'parameter': key, 'value': ','.join(val) if isinstance(val, list) else val, 'context': str(context) } for key, val in params.items()]
+        data = self.load()
+        logger.trace(f'loaded parameters {data}')
+        params = dict(params)
+        date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+        #Update parameters if they are present already
+        for line in data:
+            for key, val in list(params.items()):
+                if line.get('context') == str(context) and line.get('parameter') == key:
+                    line['value'] = val
+                    line['date'] = date
+                    del params[key]
+
+        #add parameters that are new
+        for key, val in list(params.items()):
+            data.append({
+                'parameter': key,
+                'value': ','.join([str(v) for v in val]) if isinstance(val, list) else str(val),
+                'context': str(context),
+                'date': date
+            })
+
+        logger.trace(f'dumping parameters {data}')
         self.dump(data)

cid/helpers/quicksight/__init__.py

@@ -735,6 +735,7 @@ def describe_dashboard_definition(self, dashboard_id: str, refresh: bool = False
                     'AwsAccountId': self.account_id,
                     'DashboardId': dashboard_id
                 }
+                logger.debug(f'describe_dashboard_definition({dashboard_id})')
                 result = self.client.describe_dashboard_definition(**parameters)
                 self._definitions.update({f'{self.account_id}:{self.identityRegion}:{dashboard_id}': CidQsDefinition(result.get('Definition'))})
                 logger.debug(result)
@@ -1289,6 +1290,7 @@ def create_dashboard(self, definition: dict) -> Dashboard:
             'DashboardId': definition.get('dashboardId'),
             'VersionNumber': created_version
         }
+        logger.debug(f"describe_dashboard { definition.get('dashboardId')}")
         dashboard = self.describe_dashboard(poll=True, **describe_parameters)
         logger.debug('dashboard={dashboard}')
         self.set_tags(dashboard.arn, cid_version_tag=dashboard.cid_version) # try to update version tag
@@ -1306,7 +1308,7 @@ def _build_params_for_create_update_dash(self, definition: dict) -> Dict:
         definition: cid dashboard definition. NOT QS DEFINITION.
         returns: what we need tof create or update API
         """
-
+        cid_print('Preparing dashboard definition')
         create_parameters = {
             'AwsAccountId': self.account_id,
             'DashboardId': definition.get('dashboardId'),

cid/utils.py

@@ -276,7 +276,7 @@ def get_parameter(param_name, message, choices=None, default=None, none_as_disab
         if multi:
             default = default or []
             default = default if isinstance(default, list) else [default]
-            default = [c for c in defaults if c in choices]
+            default = [c for c in default if c in choices]
             if not isatty():
                 result = default
             else: