WIP on moving tenant service private calls to async events

Author: brtrvn

functions/onboarding-app-stack-listener/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/OnboardingAppStackListener.java

@@ -136,7 +136,7 @@ public Object handleRequest(SNSEvent event, Context context) {
                                 // The update tenant resources API call is additive, so we don't need to pull the
                                 // current tenant object ourselves.
                                 Utils.publishEvent(eventBridge, SAAS_BOOST_EVENT_BUS, EVENT_SOURCE,
-                                        "Tenant Resources Updated",
+                                        "Tenant Resources Changed",
                                         Map.of("tenantId", tenantId, "resources", Utils.toJson(tenantResource))
                                 );
                             }

functions/onboarding-stack-listener/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/OnboardingStackListener.java

@@ -67,7 +67,7 @@ public OnboardingStackListener() {
 
     @Override
     public Object handleRequest(SNSEvent event, Context context) {
-        LOGGER.info(Utils.toJson(event));
+        //LOGGER.info(Utils.toJson(event));
 
         List<SNSEvent.SNSRecord> records = event.getRecords();
         SNSEvent.SNS sns = records.get(0).getSNS();
@@ -79,6 +79,7 @@ public Object handleRequest(SNSEvent event, Context context) {
         // We want to process the resources of the tenant-onboarding.yaml CloudFormation stack only after the
         // stack has finished being created or updated so we don't trigger anything downstream prematurely.
         if (filter(cloudFormationEvent)) {
+            LOGGER.info(Utils.toJson(event));
             String stackName = cloudFormationEvent.getStackName();
             String stackStatus = cloudFormationEvent.getResourceStatus();
             String stackId = cloudFormationEvent.getStackId();
@@ -124,7 +125,7 @@ public Object handleRequest(SNSEvent event, Context context) {
                     }
                 }
                 // Fire a tenant hostname changed event
-                Utils.publishEvent(eventBridge, SAAS_BOOST_EVENT_BUS, EVENT_SOURCE, "TENANT_HOSTNAME_CHANGE",
+                Utils.publishEvent(eventBridge, SAAS_BOOST_EVENT_BUS, EVENT_SOURCE, "Tenant Hostname Changed",
                         Map.of("tenantId", tenantId, "hostname", hostname));
             } catch (SdkServiceException cfnError) {
                 LOGGER.error("cfn:DescribeStacks error", cfnError);
@@ -238,7 +239,7 @@ public Object handleRequest(SNSEvent event, Context context) {
                 // Fire a tenant resources updated event
                 LOGGER.info("Updating tenant resources AWS console links");
                 Utils.publishEvent(eventBridge, SAAS_BOOST_EVENT_BUS, EVENT_SOURCE,
-                        "Tenant Resources Updated",
+                        "Tenant Resources Changed",
                         Map.of("tenantId", tenantId, "resources", Utils.toJson(tenantResources))
                 );
 

resources/saas-boost-private-api.yaml

@@ -43,9 +43,6 @@ Parameters:
   TenantServiceGetProvisioned:
     Description: Tenant Service get provisioned tenants Lambda ARN
     Type: String
-  TenantServiceUpdateOnboarding:
-    Description: Tenant Service update tenant onboarding status Lambda ARN
-    Type: String
   OnboardingUpdateAppConfig:
     Description: Onboarding Service update application config Lambda ARN
     Type: String
@@ -184,12 +181,6 @@ Resources:
       RestApiId: !Ref PrivateApi
       ParentId: !Ref TenantServiceResource
       PathPart: '{id}'
-  TenantServiceTenantOnboardingResource:
-    Type: AWS::ApiGateway::Resource
-    Properties:
-      RestApiId: !Ref PrivateApi
-      ParentId: !Ref TenantServiceByIdResource
-      PathPart: 'onboarding'
   TenantServiceGetByIdMethod:
     Type: AWS::ApiGateway::Method
     Properties:
@@ -348,62 +339,6 @@ Resources:
             method.response.header.Access-Control-Allow-Origin: false
             method.response.header.Access-Control-Max-Age: false
             method.response.header.X-Requested-With: false
-  TenantServiceTenantOnboardingUpdateMethod:
-    Type: AWS::ApiGateway::Method
-    Properties:
-      RestApiId: !Ref PrivateApi
-      ResourceId: !Ref TenantServiceTenantOnboardingResource
-      HttpMethod: PUT
-      AuthorizationType: AWS_IAM
-      RequestParameters: {method.request.path.id: true}
-      Integration:
-        Type: AWS_PROXY
-        IntegrationHttpMethod: POST
-        Uri: !Sub arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${TenantServiceUpdateOnboarding}/invocations
-        PassthroughBehavior: WHEN_NO_MATCH
-        RequestParameters: {integration.request.path.id: 'method.request.path.id'}
-      MethodResponses:
-        - StatusCode: '200'
-          ResponseModels: {application/json: Empty}
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Origin: false
-  TenantServiceUpdateOnboardingLambdaPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      Principal: apigateway.amazonaws.com
-      Action: lambda:InvokeFunction
-      FunctionName: !Ref TenantServiceUpdateOnboarding
-      SourceArn: !Sub arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${PrivateApi}/*/PUT/tenants/{id}/onboarding
-  TenantServiceTenantOnboardingResourceCORS:
-    Type: AWS::ApiGateway::Method
-    Properties:
-      RestApiId: !Ref PrivateApi
-      ResourceId: !Ref TenantServiceTenantOnboardingResource
-      HttpMethod: OPTIONS
-      AuthorizationType: NONE
-      Integration:
-        Type: MOCK
-        PassthroughBehavior: WHEN_NO_MATCH
-        IntegrationResponses:
-          - StatusCode: '200'
-            ResponseTemplates: {application/json: ''}
-            ResponseParameters:
-              method.response.header.Access-Control-Allow-Headers: "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'"
-              method.response.header.Access-Control-Allow-Methods: "'PUT,OPTIONS'"
-              method.response.header.Access-Control-Allow-Origin: "'*'"
-              method.response.header.Access-Control-Max-Age: "'3600'"
-              method.response.header.X-Requested-With: "'*'"
-        RequestTemplates:
-          application/json: '{"statusCode": 200}'
-      MethodResponses:
-        - StatusCode: '200'
-          ResponseModels: {application/json: Empty}
-          ResponseParameters:
-            method.response.header.Access-Control-Allow-Headers: false
-            method.response.header.Access-Control-Allow-Methods: false
-            method.response.header.Access-Control-Allow-Origin: false
-            method.response.header.Access-Control-Max-Age: false
-            method.response.header.X-Requested-With: false
   OnboardingServiceResource:
     Type: AWS::ApiGateway::Resource
     Properties:
@@ -1015,8 +950,6 @@ Resources:
       - TenantServiceGetByIdMethod
       - TenantServiceInsertMethod
       - TenantServiceResourceCORS
-      - TenantServiceTenantOnboardingUpdateMethod
-      - TenantServiceTenantOnboardingResourceCORS
       - OnboardingServiceUpdateAppConfigMethod
       - OnboardingServiceUpdateAppConfigResourceCORS
       - SettingsServiceGetAllMethod

resources/saas-boost-svc-tenant.yaml

@@ -218,37 +218,6 @@ Resources:
           Value: !Ref Environment
         - Key: "BoostService"
           Value: "Tenant"
-  TenantServiceUpdateOnboardingLogs:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      LogGroupName: !Sub /aws/lambda/sb-${Environment}-tenants-update-onboarding
-      RetentionInDays: 30
-  TenantServiceUpdateOnboarding:
-    Type: AWS::Lambda::Function
-    Properties:
-      FunctionName: !Sub sb-${Environment}-tenants-update-onboarding
-      Role: !GetAtt TenantServiceExecutionRole.Arn
-      Runtime: java11
-      Timeout: 300
-      MemorySize: 512
-      Handler: com.amazon.aws.partners.saasfactory.saasboost.TenantService::updateTenantOnboarding
-      Code:
-        S3Bucket: !Ref SaaSBoostBucket
-        S3Key: !Sub ${LambdaSourceFolder}/TenantService-lambda.zip
-      Layers:
-        - !Ref SaaSBoostUtilsLayer
-      Environment:
-        Variables:
-          SAAS_BOOST_ENV: !Ref Environment
-          SAAS_BOOST_EVENT_BUS: !Ref SaaSBoostEventBus
-          TENANTS_TABLE: !Ref TenantsTable
-      Tags:
-        - Key: "Application"
-          Value: "SaaSBoost"
-        - Key: "Environment"
-          Value: !Ref Environment
-        - Key: "BoostService"
-          Value: "Tenant"
   TenantServiceInsertLogs:
     Type: AWS::Logs::LogGroup
     Properties:
@@ -373,59 +342,63 @@ Resources:
           Value: !Ref Environment
         - Key: "BoostService"
           Value: "Tenant"
-  TenantServiceUpdateResourcesLogGroup:
+  TenantServiceEventHandlerLogs:
     Type: AWS::Logs::LogGroup
     Properties:
-      LogGroupName: !Sub /aws/lambda/sb-${Environment}-tenants-update-resources
+      LogGroupName: !Sub /aws/lambda/sb-${Environment}-tenant-events
       RetentionInDays: 30
-  TenantServiceUpdateResourcesFunction:
+  TenantServiceEventHandler:
     Type: AWS::Lambda::Function
     Properties:
-      FunctionName: !Sub sb-${Environment}-tenants-update-resources
+      FunctionName: !Sub sb-${Environment}-tenant-events
+      Role: !GetAtt TenantServiceExecutionRole.Arn
       Runtime: java11
-      Timeout: 300
-      MemorySize: 384
-      Environment:
-        Variables:
-          SAAS_BOOST_ENV: !Ref Environment
-          SAAS_BOOST_EVENT_BUS: !Ref SaaSBoostEventBus
-          TENANTS_TABLE: !Ref TenantsTable
-      Handler: com.amazon.aws.partners.saasfactory.saasboost.TenantService::updateTenantResources
+      Timeout: 45
+      MemorySize: 512
+      Handler: com.amazon.aws.partners.saasfactory.saasboost.TenantService::handleTenantEvent
       Code:
         S3Bucket: !Ref SaaSBoostBucket
         S3Key: !Sub ${LambdaSourceFolder}/TenantService-lambda.zip
       Layers:
         - !Ref SaaSBoostUtilsLayer
-      Role: !GetAtt TenantServiceExecutionRole.Arn
+        - !Ref ApiGatewayHelperLayer
+      Environment:
+        Variables:
+          SAAS_BOOST_ENV: !Ref Environment
+          TENANTS_TABLE: !Ref TenantsTable
+          SAAS_BOOST_EVENT_BUS: !Ref SaaSBoostEventBus
       Tags:
         - Key: "Application"
           Value: "SaaSBoost"
         - Key: "Environment"
           Value: !Ref Environment
         - Key: "BoostService"
-          Value: "Tenant"
-  TenantServiceUpdateResourcesEventRule:
+  TenantServiceEventRule:
     Type: AWS::Events::Rule
     Properties:
-      Name: !Sub sb-${Environment}-tenant-update-resources
-      Description: Tenant's provisioned resources changed
+      Name: !Sub sb-${Environment}-tenant-events
+      Description: SaaS Boost tenant events
       EventBusName: !Ref SaaSBoostEventBus
       EventPattern:
-        detail-type:
-          - Tenant Resources Updated
-        source:
-          - saas-boost
+        {
+          "source": [
+            "saas-boost"
+          ],
+          "detail-type": [{
+            "prefix": "Tenant "
+          }]
+        }
       State: ENABLED
       Targets:
-        - Arn: !GetAtt TenantServiceUpdateResourcesFunction.Arn
-          Id: TenantServiceUpdateResourcesFunction
-  TenantServiceUpdateResourcesFunctionPermission:
+        - Arn: !GetAtt TenantServiceEventHandler.Arn
+          Id: !Sub sb-${Environment}-tenant-events
+  TenantServiceEventsPermission:
     Type: AWS::Lambda::Permission
     Properties:
       Action: lambda:InvokeFunction
-      FunctionName: !GetAtt TenantServiceUpdateResourcesFunction.Arn
+      FunctionName: !Ref TenantServiceEventHandler
       Principal: events.amazonaws.com
-      SourceArn: !GetAtt TenantServiceUpdateResourcesEventRule.Arn
+      SourceArn: !GetAtt TenantServiceEventRule.Arn
 Outputs:
   TenantServiceGetAllArn:
     Description: Tenant Service get all tenants Lambda ARN
@@ -451,7 +424,4 @@ Outputs:
   TenantServiceDisableArn:
     Description: Tenant Service disable tenant Lambda ARN
     Value: !GetAtt TenantServiceDisable.Arn
-  TenantServiceUpdateOnboardingArn:
-    Description: Tenant Service update tenant onboarding status Lambda ARN
-    Value: !GetAtt TenantServiceUpdateOnboarding.Arn
 ...

resources/saas-boost.yaml

@@ -760,7 +760,6 @@ Resources:
         TenantServiceInsert: !GetAtt tenant.Outputs.TenantServiceInsertArn
         TenantServiceGetAll: !GetAtt tenant.Outputs.TenantServiceGetAllArn
         TenantServiceGetProvisioned: !GetAtt tenant.Outputs.TenantServiceGetProvisionedArn
-        TenantServiceUpdateOnboarding: !GetAtt tenant.Outputs.TenantServiceUpdateOnboardingArn
         OnboardingUpdateAppConfig: !GetAtt onboarding.Outputs.OnboardingUpdateAppConfigArn
         SettingsServiceGetAll: !GetAtt settings.Outputs.SettingsServiceGetAllArn
         SettingsServiceGetSecret: !GetAtt settings.Outputs.SettingsServiceGetSecretArn

services/onboarding-service/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/OnboardingEvent.java

@@ -16,6 +16,9 @@
 
 package com.amazon.aws.partners.saasfactory.saasboost;
 
+import java.util.Map;
+import java.util.UUID;
+
 // TODO Make a marker interface of SaaSBoostEvent?
 public enum OnboardingEvent {
     ONBOARDING_INITIATED("Onboarding Initiated"),
@@ -50,4 +53,35 @@ public static OnboardingEvent fromDetailType(String detailType) {
         }
         return event;
     }
+
+    public static boolean validate(Map<String, Object> event) {
+        return validate(event, null);
+    }
+
+    public static boolean validate(Map<String, Object> event, String... requiredKeys) {
+        if (event == null || !event.containsKey("detail")) {
+            return false;
+        }
+        try {
+            Map<String, Object> detail = (Map<String, Object>) event.get("detail");
+            if (detail == null || !detail.containsKey("onboardingId")) {
+                return false;
+            }
+            try {
+                UUID.fromString(String.valueOf(detail.get("onboardingId")));
+            } catch (IllegalArgumentException iae) {
+                return false;
+            }
+            if (requiredKeys != null) {
+                for (String requiredKey : requiredKeys) {
+                    if (!detail.containsKey(requiredKey)) {
+                        return false;
+                    }
+                }
+            }
+        } catch (ClassCastException cce) {
+            return false;
+        }
+        return true;
+    }
 }