CloudTrail and Athena buckets use configured S3 logging destination (a…

…irbnb#775)
alielzei · Jun 29, 2018 · fabd10f · fabd10f
1 parent 58a74be
commit fabd10f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/stream_alert_cli/terraform/athena.py b/stream_alert_cli/terraform/athena.py
@@ -46,7 +46,7 @@ def generate_athena(config):
     ).strip()
 
     athena_dict['module']['stream_alert_athena'] = {
-        's3_logging_bucket': '{}.streamalert.s3-logging'.format(prefix),
+        's3_logging_bucket': config['global']['s3_access_logging']['logging_bucket'],
         'source': 'modules/tf_stream_alert_athena',
         'database_name': database,
         'queue_name': queue_name,

diff --git a/stream_alert_cli/terraform/cloudtrail.py b/stream_alert_cli/terraform/cloudtrail.py
@@ -75,8 +75,7 @@ def generate_cloudtrail(cluster_name, cluster_dict, config):
         'prefix': config['global']['account']['prefix'],
         'enable_logging': cloudtrail_enabled,
         'enable_kinesis': kinesis_enabled,
-        's3_logging_bucket':
-        '{}.streamalert.s3-logging'.format(config['global']['account']['prefix']),
+        's3_logging_bucket': config['global']['s3_access_logging']['logging_bucket'],
         'existing_trail': existing_trail,
         'send_to_cloudwatch': send_to_cloudwatch,
         'exclude_home_region_events': exclude_home_region,