Merge pull request #131 from nrccua/DS-488-add-all-variations-of-env-…

…names-to-ds_utils-db-cat Add all variations of env names to ds_utils databricks catalog functions
nrccua · Apr 6, 2024 · 8c68856 · 8c68856
2 parents cfe50dd + 0b23018
commit 8c68856
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,11 @@ History
 =======
 
 
+v0.20.18 (2024-04-06)
+
+* Add all variations of env names to ds_utils databricks catalog functions.
+
+
 v0.20.17 (2024-04-05)
 
 * Improve logging spark merge query results using logger instead of show.

diff --git a/aioradio/ds_utils.py b/aioradio/ds_utils.py
@@ -59,9 +59,9 @@ def db_catalog(env):
     """Return the DataBricks catalog based on the passed in environment."""
 
     catalog = ''
-    if env == 'sandbox':
+    if env in ['sandbox', 'dev']:
         catalog = 'dsc_sbx'
-    elif env == 'prod':
+    elif env in ['prod', 'prd']:
         catalog = 'dsc_prd'
 
     return catalog
@@ -71,11 +71,11 @@ def ese_db_catalog(env):
     """Return the ESE DataBricks catalog based on the passed in environment."""
 
     catalog = ''
-    if env == 'sandbox':
+    if env in ['sandbox', 'dev']:
         catalog = 'ese_dev'
-    elif env == 'stage':
+    elif env in ['stage', 'stg']:
         catalog = 'ese_stg'
-    elif env == 'prod':
+    elif env in ['prod', 'prd']:
         catalog = 'ese_prd'
 
     return catalog

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     long_description = fileobj.read()
 
 setup(name='aioradio',
-    version='0.20.17',
+    version='0.20.18',
     description='Generic asynchronous i/o python utilities for AWS services (SQS, S3, DynamoDB, Secrets Manager), Redis, MSSQL (pyodbc), JIRA and more',
     long_description=long_description,
     long_description_content_type="text/markdown",