Merge pull request #116 from aws-samples/4.0.0

4.0.0

CHANGELOG.MD

@@ -1,7 +1,19 @@
 
 # Change Log
+
 All notable changes to this project will be documented in this file.
 
+## [4.0.0] - 2021-11-11
+
+### Fixed
+- #112: switch parameters and variables to dynamic variables which should enable multi deployments at the same AWS Account. 
+
+### Changed
+- Removed unused Parameters 
+- Randomized Database Naming 
+- upgraded cfn-ses-provider to v0.8.2
+- remove of any CW alarms as this should be customized per environment 
+
 ## [3.0.7] - 2022-05-28
 
 ### Fixed

README.md

@@ -107,8 +107,7 @@ The deployment parameters are placed into the bbb-on-aws-param.json or to be set
 | BBBApplicationDesiredInstances| 1| The desired amount of Big Blue Button Application servers | As EC2 Autoscaling is currently not aware of ongoing video conferences, i recommend set min=max=desired and not use dynamic here (planned scale out/in) | 
 | BBBTurnMaxInstances| 1| The maximum amount of Turn Servers to be deployed | at the current state leave it to 1. Multiple Turn servers will need additional configuration on the turnserver
 | BBBTurnMinInstances| 1| The minimum amount of Turn Servers to be deployed | at the current state leave it to 1. Multiple Turn servers will need additional configuration on the turnserver
-| BBBTurnDesiredInstances| 1| The desired amount of Turn Servers to be deployed | at the current state leave it to 1. Multiple Turn servers will need additional configuration on the turnserver
-| BBBDBName| frontendapp| Set a Database Name for Greenlight / Scalelite | 
+| BBBTurnDesiredInstances| 1| The desired amount of Turn Servers to be deployed | at the current state leave it to 1. Multiple Turn servers will need additional configuration on the turnserver 
 | BBBDBEngineVersion| 10.7| Set the Postgres version to be used at the Amazon Aurora setup | please refer to the Amazon Aurora [documentation](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraPostgreSQL.Updates.20180305.html) for supported versions
 | BBBEnvironmentStage| dev | can be set to "dev","stage" or "prod" | currently stage or prod does change the Amazon Aurora Setup to a Multi-AZ Setup and adds a 2nd Nat-Gateway to the deployment. 
 | BBBServerlessAuroraMinCapacity | The minimum capacity for the Amazon Aurora Serverless Cluster. | Value has to be >= 2

bbb-on-aws-param.json

@@ -26,7 +26,6 @@
     "BBBTurnMaxInstances": 1,
     "BBBTurnMinInstances": 1,
     "BBBTurnDesiredInstances": 1,
-    "BBBDBName": "frontendapp",
     "BBBDBEngineVersion": "10.14",
     "BBBEnvironmentStage": "dev",
     "BBBEnvironmentName": "bbbonaws",

bbb-on-aws-root.template.yaml

@@ -5,7 +5,7 @@ Description: >
 
   Disclaimber: Not for Production Use. Demo and Testing purposes only. 
 
-  Last Modified: 2nd April 2020
+  Last Modified: 27th May 2022
   Authors: David Surey <[email protected]>, Bastian Klein <[email protected]>
 
 Parameters:
@@ -93,13 +93,6 @@ Parameters:
     AllowedPattern: "([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)"
     ConstraintDescription: must be a valid email address.
     Default: [email protected]
-  BBBDBName:
-    Description: Database Name
-    Type: String
-    MinLength: '1'
-    MaxLength: '64'
-    AllowedPattern: "^[a-zA-Z]+[0-9a-zA-Z_]*$"
-    Default: frontendapp
   BBBDBEngineVersion:
     Description: Database engine version for Aurora PostgreSQL
     Type: String
@@ -571,9 +564,6 @@ Resources:
           - - "https://s3.amazonaws.com/"
             - Fn::ImportValue: !Sub "${BBBStackBucketStack}-BBBStackBucket"
             - "/bbb-on-aws-amifinder.template.yaml"
-      Parameters:
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
       Tags:
         - Key: Name
           Value:
@@ -594,8 +584,6 @@ Resources:
             - "/bbb-on-aws-ses.template.yaml"
       Parameters:
         BBBHostedZone: !Ref BBBHostedZone
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
       Tags:
         - Key: Name
           Value:
@@ -632,8 +620,6 @@ Resources:
           Fn::Join:
             - ","
             - Ref: BBBPublicApplicationSubnets
-        BBBEnvironmentName:
-          Ref: BBBEnvironmentName
         BBBEnvironmentStage:
           Ref: BBBEnvironmentStage
         BBBEnvironmentType:
@@ -664,8 +650,6 @@ Resources:
               - BBBNetworkStack
               - Outputs.BBBVPCs
             - Ref: BBBVPCs
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
         BBBEnvironmentType:
           Ref: BBBEnvironmentType
         BBBECSInstanceType:
@@ -705,8 +689,6 @@ Resources:
           Fn::GetAtt:
             - BBBSecurityGroupStack
             - Outputs.BBBSharedStorageSecurityGroup
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
       Tags:
         - Key: Name
           Value:
@@ -735,8 +717,6 @@ Resources:
           Ref: BBBServerlessAuroraMinCapacity
         BBBServerlessAuroraMaxCapacity:
           Ref: BBBServerlessAuroraMaxCapacity
-        BBBDBName:
-          Ref: BBBDBName
         BBBPrivateDBSubnets:
           Fn::If:
             - BBBNewVPC 
@@ -791,8 +771,6 @@ Resources:
           Fn::GetAtt:
             - BBBSecurityGroupStack
             - Outputs.BBBCACHEDBSecurityGroup
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
       Tags:
         - Key: Name
           Value:
@@ -824,8 +802,6 @@ Resources:
             - Fn::Join:
               - ","
               - Ref: BBBPrivateApplicationSubnets
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
         BBBECSInstanceType:
           Ref: BBBECSInstanceType
         BBBECSTaskSecurityGroup:
@@ -892,10 +868,6 @@ Resources:
           Fn::GetAtt:
             - "BBBAMIFinderStack"
             - Outputs.BBBTurnAMIParameter
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
-        BBBEnvironmentType:
-          Ref: BBBEnvironmentType
         BBBTurnInstanceType:
           Ref: BBBTurnInstanceType
         BBBTurnMaxInstances:
@@ -986,8 +958,6 @@ Resources:
           Fn::GetAtt:
             - "BBBAMIFinderStack"
             - Outputs.BBBApplicationAMIParameter
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
         BBBApplicationInstanceType:
           Ref: BBBApplicationInstanceType
         BBBApplicationDataVolumeSize:
@@ -1087,8 +1057,6 @@ Resources:
           Fn::GetAtt:
             - "BBBAMIFinderStack"
             - Outputs.BBBApplicationAMIParameter
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
         BBBApplicationInstanceType:
           Ref: BBBApplicationInstanceType
         BBBApplicationDataVolumeSize:
@@ -1133,7 +1101,9 @@ Resources:
               - Outputs.BBBVPCs
             - Ref: BBBVPCs
         BBBDBName:
-          Ref: BBBDBName
+          Fn::GetAtt:
+            - BBBDatabaseStack
+            - Outputs.BBBDBName
         BBBRDSDBSecret:
           Fn::GetAtt:
             - BBBDatabaseStack
@@ -1142,8 +1112,6 @@ Resources:
           Fn::GetAtt:
             - BBBDatabaseStack
             - Outputs.BBBRDSDBConnectionSecret
-        BBBEnvironmentStage:
-          Ref: BBBEnvironmentStage
         BBBSESValidated: 
           Ref: BBBSESValidated
         BBBECSCluster:

scripts/route53-handler.service

@@ -10,4 +10,4 @@ ExecStart=/usr/local/bin/route53-handler.sh -h INSTANCE_PLACEHOLDER -m create -z
 ExecStop=/usr/local/bin/route53-handler.sh -h INSTANCE_PLACEHOLDER -m delete -z ZONE_PLACEHOLDER
 
 [Install]
-WantedBy=multi-user.target  
+WantedBy=network.target network-online.target  

scripts/scalelite-handler.service

@@ -10,4 +10,4 @@ ExecStart=/usr/local/bin/scalelite-handler.sh -p 'SECRET_PLACEHOLDER' -s 'SERVER
 ExecStop=/usr/local/bin/scalelite-handler.sh -p 'SECRET_PLACEHOLDER' -s 'SERVER_PLACEHOLDER' -m delete -r AWSREGION_PLACEHOLDER -c ECSCLUSTER_PLACEHOLDER -n ECSMODE_PLACEHOLDER -u TASKSUBNETS_PLACEHOLDER -g TASKSGS_PLACEHOLDER
 
 [Install]
-WantedBy=multi-user.target  
+WantedBy=multi-user.target network.target network-online.target 

templates/bbb-on-aws-amifinder.template.yaml

@@ -23,13 +23,6 @@ Parameters:
     AllowedValues:
       - xenial-16.04
       - bionic-18.04
-  BBBEnvironmentStage:
-    Type: String
-    Description: Select the appropriate environment
-    AllowedValues:
-      - stage
-      - prod
-      - dev
 
 Resources:
   BBBGetLatestAMILambdaRole:

templates/bbb-on-aws-bbbappscalable.template.yaml

@@ -112,14 +112,6 @@ Parameters:
     Type: Number
     Description: Desired number of appserver instances
     Default: 1
-  BBBEnvironmentStage:
-    Type: String
-    Description: Select the appropriate environment
-    Default: stage
-    AllowedValues:
-      - stage
-      - prod
-      - dev
   BBBTurnSecret:
     Description: Secret string for the Turn server
     Type: String
@@ -201,7 +193,6 @@ Resources:
   BBBApplicationEC2Role:
     Type: AWS::IAM::Role
     Properties:
-      RoleName: BBBApplicationEC2Role
       AssumeRolePolicyDocument:
         Statement:
           - Effect: Allow

templates/bbb-on-aws-bbbappsingle.template.yaml

@@ -106,18 +106,6 @@ Parameters:
     Type: Number
     Description: Desired number of appserver instances
     Default: 1
-  BBBEnvironmentName:
-    Description: An environment name that is prefixed to resource names
-    Type: String
-    Default: bbbonaws
-  BBBEnvironmentStage:
-    Type: String
-    Description: Select the appropriate environment
-    Default: stage
-    AllowedValues:
-      - stage
-      - prod
-      - dev
   BBBTurnSecret:
     Description: Secret string for the Turn server
     Type: String
@@ -184,7 +172,6 @@ Resources:
   BBBApplicationEC2Role:
     Type: AWS::IAM::Role
     Properties:
-      RoleName: BBBApplicationEC2Role
       AssumeRolePolicyDocument:
         Statement:
           - Effect: Allow

templates/bbb-on-aws-bbbturn.template.yaml

@@ -98,19 +98,6 @@ Parameters:
     Type: Number
     Description: Desired number of turn server instance
     Default: 1
-  BBBEnvironmentStage:
-    Type: String
-    Description: Select the appropriate environment
-    AllowedValues:
-      - stage
-      - prod
-      - dev
-  BBBEnvironmentType:
-    Description: 'Defines the environment type. Allowed values: scalable, single'
-    Type: String
-    AllowedValues:
-      - scalable
-      - single
   BBBTurnSecurityGroup:
     Description: Security Group that should be assigned for the turn server
     Type: String

templates/bbb-on-aws-cachedb.template.yaml

@@ -44,20 +44,12 @@ Parameters:
     AllowedValues:
       - single-az
       - cross-az
-  BBBEnvironmentStage:
-    Type: String
-    Description: Select the appropriate environment
-    AllowedValues:
-      - stage
-      - prod
-      - dev
 
 Resources:
-
   BBBCacheSubnetGroup:
     Type: AWS::ElastiCache::SubnetGroup
     Properties:
-      Description: !Sub CacheSubnetGroup-${BBBEnvironmentStage}
+      Description: !Sub CacheSubnetGroup-${AWS::StackName}
       SubnetIds: !Ref BBBPrivateDBSubnets
 
   BBBParametersGroup: