Adjustments for S3 bucket

prod/aws-us-gov/mdr-prod-c2/account.hcl

@@ -245,7 +245,7 @@ locals {
       hec_token = "eb79bb2d-b27d-455d-bc5c-e8cf3165b294"
       firehose_name = "portal_customer_sync_firehose"
       lambda_function_name = "portal_customer_sync_kinesis_firehose_transform"
-      s3_bucket_name = "kinesis-flowlogs-portal-customer-sync-s3"
+      s3_bucket_name = "${local.account_name}-kinesis-flowlogs-portal-customer-sync-s3"
       log_stream_name = "SplunkDelivery_portal_customer_sync"
       kinesis_firehose_lambda_role_name = "KinesisFirehoseToLambaRole-portal_customer_sync"
       kinesis_firehose_role_name = "kinesis-firehose-role-name-portal-customer-sync"
@@ -258,7 +258,7 @@ locals {
       hec_token = "bce12568-f390-4b17-8dfe-ea26b856820b"
       firehose_name = "portal_scheduler_firehose"
       lambda_function_name = "portal_scheduler_kinesis_firehose_transform"
-      s3_bucket_name = "kinesis-flowlogs-portal-scheduler-s3"
+      s3_bucket_name = "${local.account_name}-kinesis-flowlogs-portal-scheduler-s3"
       log_stream_name = "SplunkDelivery_portal_scheduler"
       kinesis_firehose_lambda_role_name = "KinesisFirehoseToLambaRole-portal_scheduler"
       kinesis_firehose_role_name = "kinesis-firehose-role-name-portal-scheduler"

test/aws-us-gov/mdr-test-c2/account.hcl

@@ -248,7 +248,7 @@ locals {
       hec_token = "eb79bb2d-b27d-455d-bc5c-e8cf3165b294"
       firehose_name = "portal_customer_sync_firehose"
       lambda_function_name = "portal_customer_sync_kinesis_firehose_transform"
-      s3_bucket_name = "kinesis-flowlogs-portal-customer-sync-s3"
+      s3_bucket_name = "${local.account_name}-kinesis-flowlogs-portal-customer-sync-s3"
       log_stream_name = "SplunkDelivery_portal_customer_sync"
       kinesis_firehose_lambda_role_name = "KinesisFirehoseToLambaRole-portal_customer_sync"
       kinesis_firehose_role_name = "kinesis-firehose-role-name-portal-customer-sync"
@@ -261,7 +261,7 @@ locals {
       hec_token = "bce12568-f390-4b17-8dfe-ea26b856820b"
       firehose_name = "portal_scheduler_firehose"
       lambda_function_name = "portal_scheduler_kinesis_firehose_transform"
-      s3_bucket_name = "kinesis-flowlogs-portal-scheduler-s3"
+      s3_bucket_name = "${local.account_name}-kinesis-flowlogs-portal-scheduler-s3"
       log_stream_name = "SplunkDelivery_portal_scheduler"
       kinesis_firehose_lambda_role_name = "KinesisFirehoseToLambaRole-portal_scheduler"
       kinesis_firehose_role_name = "kinesis-firehose-role-name-portal-scheduler"