From 03cd0577556d1f4cf249b167adca1c5b2573a3ca Mon Sep 17 00:00:00 2001
From: matt garber <Matthew.Garber@childrens.harvard.edu>
Date: Tue, 29 Aug 2023 09:12:05 -0400
Subject: [PATCH] Added DB prefix to example template (#270)

* Added DB prefix to example template

* description clarification
---
 docs/setup/cumulus-aws-template.yaml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/setup/cumulus-aws-template.yaml b/docs/setup/cumulus-aws-template.yaml
index 40dface8..77178304 100644
--- a/docs/setup/cumulus-aws-template.yaml
+++ b/docs/setup/cumulus-aws-template.yaml
@@ -5,6 +5,10 @@ Parameters:
   BucketPrefix:
     Type: 'String'
     Description: 'Prefix for Cumulus bucket names (they will look like {BucketPrefix}-{purpose}-{AWS::AccountId}-{AWS::Region})'
+  DatabasePrefix:
+    Type: 'String'
+    Description: 'Prefix for Athena-related AWS resources (they will look like {DatabasePrefix}-{service related suffix}. It can be left as default unless you need to run multiple instances of this stack.'
+    Default: 'cumulus-deid'
   EtlSubdir:
     Type: 'String'
     Description: 'Subdirectory on the Cumulus ETL output bucket where files will be placed. This should match the path you give when running Cumulus ETL. Using a subdirectory is recommended to allow for test runs of Cumulus ETL in different subdirectories and general future-proofing.'
@@ -116,7 +120,7 @@ Resources:
         S3Encryptions:
           - KmsKeyArn: !Ref KMSMasterKeyID
             S3EncryptionMode: SSE-KMS
-      Name: cumulus-deid-kms
+      Name: !Sub "${DatabasePrefix}-kms"
 
   CrawlerRole:
     Type: AWS::IAM::Role
@@ -148,12 +152,17 @@ Resources:
     Properties:
       CatalogId: !Ref AWS::AccountId
       DatabaseInput:
-        Name: cumulus_deid_db # use underscores for ease of SQL (hyphens are reserved)
+        Name: 
+          Fn::Join: # replace hyphens with underscores for ease of SQL (hyphens are reserved)
+          - '_'
+          - Fn::Split:
+            - '-'
+            - !Sub "${DatabasePrefix}_db"
 
   GlueCrawler:
     Type: AWS::Glue::Crawler
     Properties:
-      Name: cumulus-deid-crawler
+      Name: !Sub "${DatabasePrefix}-crawler"
       DatabaseName: !Ref GlueDB
       Role: !GetAtt CrawlerRole.Arn
       CrawlerSecurityConfiguration: !Ref GlueSecurity
@@ -222,7 +231,7 @@ Resources:
   AthenaWorkGroup:
     Type: AWS::Athena::WorkGroup
     Properties:
-      Name: cumulus-deid
+      Name: !Sub "${DatabasePrefix}"
       State: ENABLED
       WorkGroupConfiguration:
         EnforceWorkGroupConfiguration: True