Merge pull request #138 from aws-samples/bugfix/exceptions

Bugfix: exceptions

Author: megareez

cid/_version.py

@@ -1,2 +1,2 @@
 
-__version__ = '0.1.7'
+__version__ = '0.1.8'

cid/helpers/account_map.py

@@ -276,8 +276,10 @@ def create_account_mapping_sql(self, name) -> str:
             template = Template(template_str)
             accounts_sql = list()
             for account in self.accounts:
+                acc = account.copy()
+                account_name = acc.pop('account_name').replace("'", "''")
                 accounts_sql.append(
-                    "ROW ('{account_id}', '{account_name}:{account_id}', '{parent_account_id}', '{account_status}', '{account_email}')".format(**account))
+                    """ROW ('{account_id}', '{account_name}:{account_id}', '{parent_account_id}', '{account_status}', '{account_email}')""".format(account_name=account_name, **acc))
 
             # Fill in TPLs
             columns_tpl = dict()

cid/helpers/quicksight.py

@@ -389,7 +389,8 @@ def list_data_sources(self) -> list:
             else:
                 return result.get('DataSources')
         except self.client.exceptions.AccessDeniedException:
-            raise
+            logger.info('Access denied listing data sources')
+            return list()
         except:
             return list()
 
@@ -489,10 +490,8 @@ def describe_dataset(self, id) -> dict:
                 self._datasets.update({_dataset.get('DataSetId'): _dataset})
             except self.client.exceptions.ResourceNotFoundException:
                 logger.info(f'DataSetId {id} do not exist')
-                raise
             except self.client.exceptions.AccessDeniedException:
                 logger.debug(f'No quicksight:DescribeDataSet permission or missing DataSetId {id}')
-                raise
         return self._datasets.get(id)
 
     def describe_data_source(self, id):