From cc1481e3c4e0029b75f202bbb2cfb053aaf7b006 Mon Sep 17 00:00:00 2001 From: Iakov Gan Date: Mon, 28 Oct 2024 10:19:24 +0100 Subject: [PATCH 1/3] release 0.3.14 --- cfn-templates/cid-cfn.yml | 4 ++-- cid/_version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfn-templates/cid-cfn.yml b/cfn-templates/cid-cfn.yml index c86952fc..b2f5158e 100644 --- a/cfn-templates/cid-cfn.yml +++ b/cfn-templates/cid-cfn.yml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: Deployment of Cloud Intelligence Dashboards v0.3.13 +Description: Deployment of Cloud Intelligence Dashboards v0.3.14 Metadata: AWS::CloudFormation::Interface: ParameterGroups: @@ -1625,7 +1625,7 @@ Resources: Description: An AWS managed layer with a cid-cmd package installed Content: S3Bucket: !Sub '${LambdaLayerBucketPrefix}-${AWS::Region}' - S3Key: 'cid-resource-lambda-layer/cid-0.3.13.zip' #replace version here if needed + S3Key: 'cid-resource-lambda-layer/cid-0.3.14.zip' #replace version here if needed CompatibleRuntimes: - python3.10 - python3.11 diff --git a/cid/_version.py b/cid/_version.py index 8300a52e..1ec0501b 100644 --- a/cid/_version.py +++ b/cid/_version.py @@ -1 +1 @@ -__version__ = '0.3.13' +__version__ = '0.3.14' From 36331976ac33b0a72233c0d3b0cc0fa8829c2531 Mon Sep 17 00:00:00 2001 From: Iakov Gan Date: Mon, 28 Oct 2024 10:26:27 +0100 Subject: [PATCH 2/3] fix export (again) --- cid/export.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cid/export.py b/cid/export.py index 4c3fa0c9..cc8935da 100644 --- a/cid/export.py +++ b/cid/export.py @@ -195,9 +195,10 @@ def export_analysis(qs, athena, glue): } if dep_cur: datasets[dataset_name]['dependsOn']['cur'] = True - all_views, all_databases = list(zip(*all_views_and_databases)) + all_views = [view_and_database[0] for view_and_database in all_views_and_databases] + all_databases = [view_and_database[1] for view_and_database in all_views_and_databases] if len(all_databases) > 1: - logger.warning(f'CID only supports one database. Multiple used: {all_databases}') # fixme need to fix database + logger.warning(f'CID only supports one database. Multiple used: {all_databases}') if all_databases: athena.DatabaseName = all_databases[0] From 8abcc4c62d084ca365cf7f42f9d30cafa7263db0 Mon Sep 17 00:00:00 2001 From: Iakov Gan Date: Mon, 28 Oct 2024 10:32:38 +0100 Subject: [PATCH 3/3] fix update --- cid/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cid/common.py b/cid/common.py index d52550fc..d45d2446 100644 --- a/cid/common.py +++ b/cid/common.py @@ -1060,7 +1060,7 @@ def check_dashboard_version_compatibility(self, dashboard_id): cid_print(f" Version {str(dashboard.cid_version)}") else: cid_print(f"An update is available:") - cid_print(f" Version {str(dashboard.cid_version): <9} -> {str(cid_version_latest): <9}") + cid_print(f" Version {str(dashboard.cid_version): <9} -> {str(dashboard.cid_version_latest): <9}") try: return dashboard.cid_version.compatible_versions(dashboard.cid_version)