Merge branch 'main' of https://github.com/awslabs/aws-saas-boost

awslabs · May 27, 2021 · dcaed06 · dcaed06
2 parents 2a61cf3 + 8fe6082
commit dcaed06
Show file tree

Hide file tree

Showing 18 changed files with 402 additions and 402 deletions.
diff --git a/resources/saas-boost-core.yaml b/resources/saas-boost-core.yaml
@@ -147,13 +147,13 @@ Resources:
           API_TRUST_ROLE: !Sub arn:aws:iam::${AWS::AccountId}:role/sb-private-api-trust-role-${Environment}-${AWS::Region}
           API_GATEWAY_HOST: !Sub ${SaaSBoostPrivateApi}.execute-api.${AWS::Region}.amazonaws.com
           API_GATEWAY_STAGE: !Ref PrivateApiStage
-      Tags: 
+      Tags:
         - Key: "Application"
           Value: "SaaSBoost"
         - Key: "Environment"
           Value: !Ref Environment
         - Key: "BoostService"
-          Value: "ECSDeploy"             
+          Value: "ECSDeploy"
   CfnNotifyExecRole:
     Type: AWS::IAM::Role
     Properties:
@@ -225,20 +225,20 @@ Resources:
           SAAS_BOOST_ENV: !Ref Environment
           SAAS_BOOST_EVENT_BUS: !Ref SaaSBoostEventBus
           TENANT_DEPLOY_LAMBDA: !Ref WorkloadDeployLambda
-      Tags: 
+      Tags:
         - Key: "Application"
           Value: "SaaSBoost"
         - Key: "Environment"
           Value: !Ref Environment
         - Key: "BoostService"
-          Value: "Onboarding"          
+          Value: "Onboarding"
   CfnNotifyTopic:
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: Tenant Onboarding Notifications
       TopicName: !Sub sb-${Environment}-onboarding-notify
       KmsMasterKeyId: alias/aws/sns  #use AWS managed key
-      
+
   CfnNotifySubscription:
     Type: AWS::SNS::Subscription
     Properties:
@@ -380,13 +380,13 @@ Resources:
         S3Key: !Sub ${LambdaSourceFolder}/EcsServiceUpdate-lambda.zip
       Layers:
         - !Ref SaaSBoostUtilsLayer
-      Tags: 
+      Tags:
         - Key: "Application"
           Value: "SaaSBoost"
         - Key: "Environment"
           Value: !Ref Environment
         - Key: "BoostService"
-          Value: "ECSDeploy"         
+          Value: "ECSDeploy"
   CodePipelineUpdateEcsServicePermission:
     Type: AWS::Lambda::Permission
     Properties:
@@ -518,13 +518,13 @@ Resources:
           API_TRUST_ROLE: !Sub arn:aws:iam::${AWS::AccountId}:role/sb-private-api-trust-role-${Environment}-${AWS::Region}
           API_GATEWAY_HOST: !Sub ${SaaSBoostPrivateApi}.execute-api.${AWS::Region}.amazonaws.com
           API_GATEWAY_STAGE: !Ref PrivateApiStage
-      Tags: 
+      Tags:
         - Key: "Application"
           Value: "SaaSBoost"
         - Key: "Environment"
           Value: !Ref Environment
         - Key: "BoostService"
-          Value: "APIClient"           
+          Value: "APIClient"
   SaaSBoostEventRule:
     Type: AWS::Events::Rule
     Properties:
@@ -619,13 +619,13 @@ Resources:
         - !Ref SaaSBoostUtilsLayer
         - !Ref ApiGatewayHelperLayer
       Role: !GetAtt TenantEnableDisableListenerFunctionRole.Arn
-      Tags: 
+      Tags:
         - Key: "Application"
           Value: "SaaSBoost"
         - Key: "Environment"
           Value: !Ref Environment
         - Key: "BoostService"
-          Value: "Tenant"       
+          Value: "Tenant"
   TenantEnableDisableEventRule:
     Type: AWS::Events::Rule
     Properties:

diff --git a/resources/saas-boost-managed-ad.yaml b/resources/saas-boost-managed-ad.yaml
@@ -59,7 +59,7 @@ Parameters:
     MaxLength: '1024'
     MinLength: '1'
     Type: String
- 
+
 
 Resources:
   ADDirectory:
@@ -79,28 +79,28 @@ Resources:
       Name: !Sub /saas-boost/${Environment}/ACTIVE_DIRECTORY_DNS_IPS
       Type: String
       # save the ips
-      Value:   
-       !Join [",", !GetAtt ADDirectory.DnsIpAddresses]  
+      Value:
+       !Join [",", !GetAtt ADDirectory.DnsIpAddresses]
 
   SSMParamDirectoryName:
     Type: AWS::SSM::Parameter
-    DependsOn: ADDirectory    
+    DependsOn: ADDirectory
     Properties:
       Name: !Sub /saas-boost/${Environment}/ACTIVE_DIRECTORY_DNS_NAME
       Type: String
       Value: !Sub ${Environment}.${AWS::Region}.saasboost.com
 
   SSMParamUserName:
     Type: AWS::SSM::Parameter
-    DependsOn: ADDirectory    
+    DependsOn: ADDirectory
     Properties:
       Name: !Sub /saas-boost/${Environment}/ACTIVE_DIRECTORY_USER
       Type: String
       # save the ips
-      Value: !Sub ${Environment}.${AWS::Region}.saasboost.com\admin      
+      Value: !Sub ${Environment}.${AWS::Region}.saasboost.com\admin
 
   SSMParamDirectoryId:
-    Type: AWS::SSM::Parameter   
+    Type: AWS::SSM::Parameter
     Properties:
       Name: !Sub /saas-boost/${Environment}/ACTIVE_DIRECTORY_ID
       Type: String