Skip to content

Commit 7e1b197

Browse files
iakov-awsPrykhodko
andauthored
fix deployedTemplate none issue (#466)
* Update common.py * check if source template is not none + version bump * return none instead of exception Co-authored-by: Prykhodko <[email protected]>
1 parent 1e9b9f1 commit 7e1b197

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

cfn-templates/cid-cfn.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Parameters:
128128
CidVersion:
129129
Type: String
130130
MinLength: 5
131-
Default: 0.2.11
131+
Default: 0.2.12
132132
Description: A version of CID package
133133
Suffix:
134134
Type: String

cid/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
__version__ = '0.2.11'
2+
__version__ = '0.2.12'

cid/common.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -783,15 +783,20 @@ def check_dashboard_version_compatibility(self, dashboard_id):
783783
if not dashboard:
784784
print(f'Dashboard "{dashboard_id}" is not deployed')
785785
return None
786-
786+
if not isinstance(dashboard.deployedTemplate, CidQsTemplate):
787+
print(f'Dashboard "{dashboard_id}" does not have a versioned template')
788+
return None
789+
if not isinstance(dashboard.sourceTemplate, CidQsTemplate):
790+
print(f"Cannot access QuickSight source template for {dashboard_id}")
791+
return None
787792
try:
788-
cid_version = dashboard.deployedTemplate.cid_version if isinstance(dashboard.deployedTemplate, CidQsTemplate) else "N/A"
793+
cid_version = dashboard.deployedTemplate.cid_version
789794
except ValueError:
790795
logger.debug("The cid version of the deployed dashboard could not be retrieved")
791796
cid_version = "N/A"
792797

793798
try:
794-
cid_version_latest = dashboard.sourceTemplate.cid_version if isinstance(dashboard.sourceTemplate, CidQsTemplate) else "N/A"
799+
cid_version_latest = dashboard.sourceTemplate.cid_version
795800
except ValueError:
796801
logger.debug("The latest version of the dashboard could not be retrieved")
797802
cid_version_latest = "N/A"

0 commit comments

Comments
 (0)