Cleanup of onboarding and tenant to track all deployments and update

tenant status

Author: brtrvn

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

@@ -139,6 +139,16 @@ public Object handleRequest(SNSEvent event, Context context) {
                                         "Tenant Resources Changed",
                                         Map.of("tenantId", tenantId, "resources", Utils.toJson(tenantResource))
                                 );
+
+                                // Link this pipeline to the stack that created it in Onboarding so we can keep
+                                // track of when all pipeline executions for an onboarding request
+                                Utils.publishEvent(eventBridge, SAAS_BOOST_EVENT_BUS, EVENT_SOURCE,
+                                        "Onboarding Deployment Pipeline Created",
+                                        Map.of("tenantId", tenantId,
+                                                "stackId", stackId,
+                                                "stackName", stackName,
+                                                "pipeline", codePipeline)
+                                );
                             }
                             //                        } else if ("AWS::CloudFormation::Stack".equals(resourceType) && "rds".equals(logicalId)) {
                             //                            //this is the rds sub-stack so get the cluster and instance ids

layers/utils/src/main/java/com/amazon/aws/partners/saasfactory/saasboost/Utils.java

@@ -246,11 +246,62 @@ public static String toUpperSnakeCase(String str) {
         if (str == null) {
             return  null;
         }
-        if (isBlank(str)) {
+        return toSnakeCase(str).toUpperCase();
+    }
+
+    public static String toSnakeCase(String str) {
+        if (str == null) {
+            return null;
+        }
+        if (str.isBlank()) {
             return str;
         }
-        // Don't prefix or suffix with underscore
-        return str.trim().toUpperCase().replaceAll("\\s+", "_");
+        if (str.length() == 1) {
+            return str.toLowerCase();
+        }
+        StringBuilder buffer = new StringBuilder();
+        boolean skip = false;
+        char[] chars = str.toCharArray();
+        for (int ch = 0; ch < chars.length; ch++) {
+            char character = chars[ch];
+            if (ch == 0) {
+                buffer.append(Character.toLowerCase(character));
+                continue;
+            }
+            if ('_' == character || '-' == character || ' ' == character) {
+                buffer.append('_');
+                skip = true;
+                continue;
+            }
+            if (Character.isLowerCase(character) || Character.isDigit(character)) {
+                buffer.append(character);
+                continue;
+            }
+            char previous = chars[(ch - 1)];
+            if (!Character.isLetter(previous) || Character.isLowerCase(previous)) {
+                if (skip) {
+                    skip = false;
+                } else {
+                    buffer.append('_');
+                }
+                buffer.append(Character.toLowerCase(character));
+                continue;
+            }
+            if (ch < (chars.length - 1)) {
+                char last = chars[(ch + 1)];
+                if (Character.isLowerCase(last)) {
+                    if (skip) {
+                        skip = false;
+                    } else {
+                        buffer.append('_');
+                    }
+                    buffer.append(Character.toLowerCase(character));
+                    continue;
+                }
+            }
+            buffer.append(Character.toLowerCase(character));
+        }
+        return buffer.toString();
     }
 
     public static String randomString(int length) {

layers/utils/src/test/java/com/amazon/aws/partners/saasfactory/saasboost/UtilsTest.java

@@ -16,6 +16,7 @@
 
 package com.amazon.aws.partners.saasfactory.saasboost;
 
+import jdk.jshell.execution.Util;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -37,4 +38,21 @@ public void testRandomString() {
             assertTrue("Character " + character + " is legal", legalCharacters.contains(character));
         }
     }
+
+    @Test
+    public void testToSnakeCase() {
+        assertNull(Utils.toSnakeCase(null));
+        assertEquals("", Utils.toSnakeCase(""));
+        assertEquals("  ", Utils.toSnakeCase("  "));
+        assertEquals("a", Utils.toSnakeCase("a"));
+        assertEquals("a", Utils.toSnakeCase("A"));
+        assertEquals("?", Utils.toSnakeCase("?"));
+        assertEquals("snake_case", Utils.toSnakeCase("snake_case"));
+        assertEquals("camel_case", Utils.toSnakeCase("camelCase"));
+        assertEquals("pascal_case", Utils.toSnakeCase("PascalCase"));
+        assertEquals("snake_case", Utils.toSnakeCase("Snake Case"));
+        assertEquals("foo_bar", Utils.toSnakeCase("foo baR"));
+        assertEquals("foo_bar_baz", Utils.toSnakeCase("fooBarBaz"));
+        assertEquals("foo_bar_baz", Utils.toSnakeCase("fooBarBAZ"));
+    }
 }

resources/saas-boost-core.yaml

@@ -659,28 +659,6 @@ Resources:
           Value: !Ref Environment
         - Key: "BoostService"
           Value: "Tenant"
-  TenantEnableDisableEventRule:
-    Type: AWS::Events::Rule
-    Properties:
-      Name: !Sub sb-${Environment}-tenant-enable-disable
-      Description: A filter for when a tenant status is updated
-      EventBusName: !Sub '{{resolve:ssm:/saas-boost/${Environment}/EVENT_BUS}}'
-      EventPattern:
-        detail-type:
-          - Tenant Status Update
-        source:
-          - saas-boost
-      State: ENABLED
-      Targets:
-        - Arn: !GetAtt TenantEnableDisableListenerFunction.Arn
-          Id: TenantEnableDisableListenerFunction
-  TenantEnableDisableListenerPermission:
-    Type: AWS::Lambda::Permission
-    Properties:
-      Action: lambda:InvokeFunction
-      FunctionName: !GetAtt TenantEnableDisableListenerFunction.Arn
-      Principal: events.amazonaws.com
-      SourceArn: !GetAtt TenantEnableDisableEventRule.Arn
   EcsShutdownServicesExecRole:
     Type: AWS::IAM::Role
     Properties:

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

@@ -16,8 +16,6 @@
 
 package com.amazon.aws.partners.saasfactory.saasboost;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +31,7 @@ public class Onboarding {
     private UUID tenantId;
     private OnboardingRequest request;
     private List<OnboardingStack> stacks = new ArrayList<>();
-    private String zipFileUrl;
+    private String zipFile;
 
     public Onboarding() {
     }
@@ -46,14 +44,6 @@ public void setId(UUID id) {
         this.id = id;
     }
 
-    public void setZipFileUrl(String zipFileUrl) {
-        this.zipFileUrl = zipFileUrl;
-    }
-
-    public String getZipFileUrl() {
-        return zipFileUrl;
-    }
-
     public LocalDateTime getCreated() {
         return created;
     }
@@ -98,6 +88,14 @@ public List<OnboardingStack> getStacks() {
         return stacks;
     }
 
+    public void setZipFile(String zipFile) {
+        this.zipFile = zipFile;
+    }
+
+    public String getZipFile() {
+        return zipFile;
+    }
+
     public void setStacks(List<OnboardingStack> stacks) {
         this.stacks = stacks != null ? new ArrayList<>(stacks) : new ArrayList<>();
     }
@@ -124,6 +122,17 @@ public boolean baseStacksComplete() {
         return stacksComplete(true);
     }
 
+    public boolean stacksDeployed() {
+        boolean deployed = true;
+        for (OnboardingStack stack : getStacks()) {
+            if (!stack.isDeployed()) {
+                deployed = false;
+                break;
+            }
+        }
+        return deployed;
+    }
+
     protected boolean stacksComplete(boolean baseStacks) {
         boolean complete = false;
         if (!getStacks().isEmpty()) {

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

@@ -27,6 +27,7 @@ public enum OnboardingEvent {
     ONBOARDING_STACK_STATUS_CHANGED("Onboarding Stack Status Changed"),
     ONBOARDING_BASE_PROVISIONED("Onboarding Base Provisioned"),
     ONBOARDING_PROVISIONED("Onboarding Provisioned"),
+    ONBOARDING_DEPLOYMENT_PIPELINE_CREATED("Onboarding Deployment Pipeline Created"),
     ONBOARDING_DEPLOYMENT_PIPELINE_CHANGED("Onboarding Deployment Pipeline Change"),
     ONBOARDING_DEPLOYED("Onboarding Deployed"),
     ONBOARDING_COMPLETED("Onboarding Completed"),