Merge branch 'aws-samples:main' into feature/migrate-to-non-legacy-views

Author: cristian-popa

.gitignore

@@ -4,6 +4,7 @@
 *~
 *#
 *.swp
+*.log
 
 # Python specific
 build/

cid/__init__.py

@@ -1,5 +1,3 @@
-from cid.common import Cid
+# Declare namespace
 
 __import__('pkg_resources').declare_namespace(__name__)
-
-__all__ = ["Cid"]

cid/_version.py

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

cid/builtin/core/__init__.py

@@ -1,8 +1 @@
-# This plugin implements TAO dashboard
-
-def onInit(cxt):
-    # STS context, extract user session -> detect Bubblewand
-    cxt.defaultAthenaDataSource = 'defaultDS'
-    cxt.defaultAthenaDatabase = 'defaultDS'
-    cxt.defaultAthenaTable = 'defaultDS'
-    pass
+# This plugin implements Core dashboards

cid/builtin/core/data/queries/shared/account_map.sql

@@ -1,4 +1,4 @@
 CREATE OR REPLACE VIEW account_map AS
-SELECT account_id,
-    concat(account_name, ': ', account_id) account_name
+SELECT ${account_id} as account_id,
+    concat(${account_name}, ': ', ${account_id}) account_name
 FROM ${metadata_table_name}

cid/builtin/core/data/queries/shared/aws_accounts.sql

@@ -1,6 +1,7 @@
-CREATE OR REPLACE VIEW aws_accounts AS WITH m AS (
-        SELECT account_id,
-            account_name,
+CREATE OR REPLACE VIEW aws_accounts AS WITH
+    m AS (
+        SELECT ${account_id} as account_id,
+            ${account_name} as account_name,
             email account_email_id
         FROM ${metadata_table_name}
     ),

cid/cli.py

@@ -1,69 +1,76 @@
-import logging
 import click
-from os import environ as env
 
-from cid import Cid
+from cid.common import Cid
 
-logger = logging.getLogger(__name__)
+from cid._version import __version__
 
-version = '1.0 Beta'
+version = f'{__version__} Beta'
 prog_name="CLOUD INTELLIGENCE DASHBOARDS (CID) CLI"
 print(f'{prog_name} {version}\n')
 
-App = Cid()
 
 @click.group()
-@click.option('--profile_name', help='AWS Profile name to use', default=env.get('AWS_PROFILE'))
-@click.option('--region_name', help="AWS Region (default:'us-east-1')", default=env.get('AWS_REGION', env.get('AWS_DEFAULT_REGION', 'us-east-1')))
-@click.option('--aws_access_key_id', help='', default=env.get('AWS_ACCESS_KEY_ID'))
-@click.option('--aws_secret_access_key', help='', default=env.get('AWS_SECRET_ACCESS_KEY'))
-@click.option('--aws_session_token', help='', default=env.get('AWS_SESSION_TOKEN'))
+@click.option('--profile_name', help='AWS Profile name to use', default=None)
+@click.option('--region_name', help="AWS Region (default:'us-east-1')", default=None)
+@click.option('--aws_access_key_id', help='', default=None)
+@click.option('--aws_secret_access_key', help='', default=None)
+@click.option('--aws_session_token', help='', default=None)
 @click.option('-v', '--verbose', count=True)
 @click.pass_context
 def main(ctx, **kwargs):
-    logger.setLevel(logger.getEffectiveLevel()-10*kwargs.pop('verbose'))
+    params = {
+        'verbose': kwargs.pop('verbose'),
+    }
+    App = Cid(**params)
     App.run(**kwargs)
+    ctx.obj = App
 
 
 @main.command()
-def map():
+@click.pass_obj
+def map(App):
     """Create account mapping"""
     App.map()
 
 
 @main.command()
-def deploy():
+@click.pass_obj
+def deploy(App):
     """Deploy Dashboard"""
 
     App.deploy()
 
 
 @main.command()
 @click.option('--dashboard-id', help='QuickSight dashboard id', default=None)
-def status(**kwargs):
+@click.pass_obj
+def status(App, **kwargs):
     """Show Dashboard status"""
 
     App.status(dashboard_id=kwargs.get('dashboard_id'))
 
 @main.command()
 @click.option('--dashboard-id', help='QuickSight dashboard id', default=None)
-def delete(**kwargs):
+@click.pass_obj
+def delete(App, **kwargs):
     """Delete Dashboard"""
 
     App.delete(dashboard_id=kwargs.get('dashboard_id'))
 
 @main.command()
 @click.option('--dashboard-id', help='QuickSight dashboard id', default=None)
 @click.option('--force', help='Allow force update', is_flag=True)
-def update(**kwargs):
+@click.pass_obj
+def update(App, **kwargs):
     """Update Dashboard"""
 
     App.update(dashboard_id=kwargs.get('dashboard_id'), force=kwargs.get('force'))
 
 
 @main.command()
 @click.option('--dashboard-id', help='QuickSight dashboard id', default=None)
-def open(**kwargs):
+@click.pass_obj
+def open(App, **kwargs):
     """Open Dashboard in browser"""
 
     App.open(dashboard_id=kwargs.get('dashboard_id'))