Skip to content

Commit 711417c

Browse files
committed
Fix NPE on optional HTTPS listener
1 parent 68ad1b5 commit 711417c

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,16 @@ protected void handleOnboardingBaseProvisioned(Map<String, Object> event, Contex
759759
ecsSecurityGroup = tenantResources.get("ECS_SECURITY_GROUP").get("name");
760760
loadBalancerArn = tenantResources.get("LOAD_BALANCER").get("arn");
761761
// Depending on the SSL certificate configuration, one of these 2 listeners must exist
762-
httpListenerArn = Objects.toString(tenantResources.get("HTTP_LISTENER").get("arn"), "");
763-
httpsListenerArn = Objects.toString(tenantResources.get("HTTPS_LISTENER").get("arn"), "");
762+
if (tenantResources.containsKey("HTTP_LISTENER")) {
763+
httpListenerArn = Objects.toString(tenantResources.get("HTTP_LISTENER").get("arn"), "");
764+
} else {
765+
httpListenerArn = "";
766+
}
767+
if (tenantResources.containsKey("HTTPS_LISTENER")) {
768+
httpsListenerArn = Objects.toString(tenantResources.get("HTTPS_LISTENER").get("arn"), "");
769+
} else {
770+
httpsListenerArn = "";
771+
}
764772
if (Utils.isBlank(vpc) || Utils.isBlank(privateSubnetA) || Utils.isBlank(privateSubnetB)
765773
|| Utils.isBlank(ecsCluster) || Utils.isBlank(ecsSecurityGroup)
766774
|| Utils.isBlank(loadBalancerArn)

0 commit comments

Comments
 (0)