fixing bug in default athena results bucket name, dry out code

airbnb · Apr 1, 2020 · c98a66b · c98a66b
1 parent bde957f
commit c98a66b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/streamalert/shared/config.py b/streamalert/shared/config.py
@@ -145,7 +145,7 @@ def athena_query_results_bucket(config):
 
     return athena_config.get(
         'results_bucket',
-        '{}.streamalert.athena-results'.format(prefix)
+        '{}-streamalert-athena-results'.format(prefix)
     ).strip()
 
 

diff --git a/streamalert_cli/terraform/athena.py b/streamalert_cli/terraform/athena.py
@@ -14,7 +14,7 @@
 limitations under the License.
 """
 from streamalert.shared import metrics
-from streamalert.shared.config import athena_partition_buckets
+from streamalert.shared.config import athena_partition_buckets, athena_query_results_bucket
 from streamalert_cli.manage_lambda.package import AthenaPackage
 from streamalert_cli.terraform.common import (
     infinitedict,
@@ -40,10 +40,7 @@ def generate_athena(config):
     prefix = config['global']['account']['prefix']
     database = athena_config.get('database_name', '{}_streamalert'.format(prefix))
 
-    results_bucket_name = athena_config.get(
-        'results_bucket',
-        '{}-streamalert-athena-results'.format(prefix)
-    ).strip()
+    results_bucket_name = athena_query_results_bucket(config)
 
     queue_name = athena_config.get(
         'queue_name',