release 4.4.0 (#1347)

* release 4.4.0

* fix parameters

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.3.7 - AWS Solution SO9011
+Description: Deployment of Cloud Intelligence Dashboards v4.4.0 - 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.3.7.zip' #replace version here if needed
+        - 'cid-resource-lambda-layer/cid-4.4.0.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.3.7.zip' #replace version here if needed
+        S3Key: 'cid-resource-lambda-layer/cid-4.4.0.zip' #replace version here if needed
       CompatibleRuntimes:
         - python3.10
         - python3.11

cid/_version.py

@@ -1,2 +1,2 @@
-__version__ = '4.3.7'
+__version__ = '4.4.0'
 

cid/helpers/parameter_store.py

@@ -35,12 +35,20 @@ def load(self):
     def _to_sql_str(self, val):
         if val is None:
             return "''"
-        return "'" + str(json.dumps(val)).replace("'", "''") + "'"
+
+        # If it's already a JSON string, don't re-encode
+        if isinstance(val, str):
+            try:
+                json.loads(val)
+                # It's already JSON, just escape for SQL
+                return "'" + val.replace("'", "''") + "'"
+            except json.JSONDecodeError:
+                pass
+        return "'" + json.dumps(val).replace("'", "''") + "'"
 
     def _from_sql_str(self, string):
-        if string.endswith(']') and string.startswith('[') and string.count("'") >=2:
-            # this is an old style parameters so transform it to json readable form from __repr__
-            string = string.replace("'",'"')
+        if string.endswith(']') and string.startswith('[') and string.count("'") >= 2:
+            string = string.replace("'", '"')
         try:
             return json.loads(string)
         except json.JSONDecodeError:
@@ -67,13 +75,18 @@ def load_parameters(self, context):
         # get any context and then override with specific context
         for line in sorted(data, key=lambda x: x.get('date', '')): # latest should override
             val = self._from_sql_str(line.get('value'))
-            any_parameters[line.get('parameter')] = val
+            key = self._from_sql_str(line.get('parameter'))
+            any_parameters[key] = val
             if line.get('context') == str(context):
-                context_parameters[line.get('parameter')] = val
+                context_parameters[key] = val
         return any_parameters | context_parameters
 
     def dump_parameters(self, params, context=None):
         data = self.load()
+        data = [ line # avoid buggy records
+            for line in data
+            if '\\' not in str(line)
+        ]
         logger.trace(f'loaded parameters {data}')
         params = dict(params)
         date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -96,4 +109,10 @@ def dump_parameters(self, params, context=None):
             })
 
         logger.trace(f'dumping parameters {data}')
-        self.dump(data)
+        self.dump(data)
+
+if __name__ == '__main__':
+    from cid.helpers import Athena
+    import boto3
+    pc = ParametersController(Athena(boto3.session.Session()))
+    pc.load_parameters('aaa')