ADD: configurable deployment bucket resource name

Author: borzav

src/cli/providers/cloudFormation/context/resources.ts

@@ -9,7 +9,7 @@ import { createStack, setStackParameter, getStackName } from './stack'
 import { getBucketReference } from './s3StorageDeployment'
 
 export { s3DeploymentBucket, s3DeploymentBucketParameter, s3 } from './s3Storage'
-export { S3_DEPLOYMENT_BUCKET_RESOURCE_NAME } from './s3StorageDeployment'
+export { getDeploymentBucketResourceName } from './s3StorageDeployment'
 export { apiGateway } from './apiGateway'
 export { sns } from './sns'
 export { cloudWatchEvent } from './cloudWatchEvent'

src/cli/providers/cloudFormation/context/s3Storage.ts

@@ -4,7 +4,7 @@ import { ExecuteStep, executor } from '../../../context'
 import { collectMetadata } from '../../../utilities/collectMetadata'
 import { setResource } from '../utils'
 import { createStack, setStackParameter, getStackName } from './stack'
-import { S3_DEPLOYMENT_BUCKET_RESOURCE_NAME } from './s3StorageDeployment'
+import { getDeploymentBucketResourceName } from './s3StorageDeployment'
 
 export const S3_STORAGE_STACK = 'S3Stack'
 
@@ -17,7 +17,7 @@ export const s3DeploymentBucket = ExecuteStep.register('S3-Deployment-Bucket', a
         "Type": "AWS::S3::Bucket"
     }
 
-    const bucketResourceName = S3_DEPLOYMENT_BUCKET_RESOURCE_NAME
+    const bucketResourceName = await getDeploymentBucketResourceName()
     const resourceName = setResource(context, bucketResourceName, s3BucketResource)
 
     context.CloudFormationTemplate.Outputs[`${resourceName}Name`] = {
@@ -30,7 +30,7 @@ export const s3DeploymentBucket = ExecuteStep.register('S3-Deployment-Bucket', a
 
 
 export const s3DeploymentBucketParameter = ExecuteStep.register('S3-Deployment-Bucket-Parameter', async (context) => {
-    const resourceName = S3_DEPLOYMENT_BUCKET_RESOURCE_NAME
+    const resourceName = await getDeploymentBucketResourceName()
     await setStackParameter({
         ...context,
         resourceName

src/cli/providers/cloudFormation/context/s3StorageDeployment.ts

@@ -1,7 +1,13 @@
-export const S3_DEPLOYMENT_BUCKET_RESOURCE_NAME = 'FunctionlyDeploymentBucket'
+import { projectConfig } from '../../../project/config'
+
+const S3_DEPLOYMENT_BUCKET_RESOURCE_NAME = 'FunctionlyDeploymentBucket'
+
+export const getDeploymentBucketResourceName = async () => {
+    return projectConfig.awsBucketResourceName || S3_DEPLOYMENT_BUCKET_RESOURCE_NAME
+}
 
 export const getBucketReference = async (context) => {
     return context.__userAWSBucket ? context.awsBucket : {
-        "Ref": S3_DEPLOYMENT_BUCKET_RESOURCE_NAME
+        "Ref": await getDeploymentBucketResourceName()
     }
 }

src/cli/providers/cloudFormation/index.ts

@@ -9,7 +9,7 @@ import { executor } from '../../context'
 import { cloudFormationInit, cloudFormationMerge } from './context/cloudFormationInit'
 import {
     tableResources, lambdaResources, roleResources, s3DeploymentBucket, s3DeploymentBucketParameter,
-    apiGateway, sns, s3, cloudWatchEvent, initStacks, lambdaLogResources, S3_DEPLOYMENT_BUCKET_RESOURCE_NAME, tableSubscribers
+    apiGateway, sns, s3, cloudWatchEvent, initStacks, lambdaLogResources, getDeploymentBucketResourceName, tableSubscribers
 } from './context/resources'
 import { uploadTemplate, persistCreateTemplate } from './context/uploadTemplate'
 
@@ -38,7 +38,8 @@ export const cloudFormation = {
             }
         }
         if (!context.awsBucket) {
-            const bucketData = await executor({ ...context, LogicalResourceId: S3_DEPLOYMENT_BUCKET_RESOURCE_NAME }, describeStackResouce)
+            const logicalResourceId = await getDeploymentBucketResourceName()
+            const bucketData = await executor({ ...context, LogicalResourceId: logicalResourceId }, describeStackResouce)
             context.awsBucket = bucketData.StackResourceDetail.PhysicalResourceId
         }