Merge pull request #120 from bs-thomas/master

Fix to logic to determine if ACM_CERTIFICATE_ARN should be used, or a…
venveo · Jun 29, 2022 · 1f64468 · 1f64468
2 parents f7234fc + 0470481
commit 1f64468
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/serverless.yml b/serverless.yml
@@ -67,17 +67,20 @@ resources:
           Aliases:
             Fn::If:
             - CustomDomain
-            - - '${self:custom.settings.environment.CUSTOM_DOMAIN, self:custom.empty}'
+            - - '${self:custom.settings.environment.CUSTOM_DOMAIN, ""}'
             - Ref: AWS::NoValue
           ViewerCertificate:
             Fn::If:
+            - ArnCertificate
+            - MinimumProtocolVersion: 'TLSv1'
+              SslSupportMethod: 'sni-only'
+              AcmCertificateArn: ${self:custom.settings.environment.ACM_CERTIFICATE_ARN,''}
+            - Fn::If:
               - CreateCertificate
-              - AcmCertificateArn: !If
-                - ArnCertificate
-                - self:custom.settings.environment.ACM_CERTIFICATE_ARN
-                - Ref: Certificate
+              - MinimumProtocolVersion: 'TLSv1'
                 SslSupportMethod: 'sni-only'
-                MinimumProtocolVersion: 'TLSv1'
+                AcmCertificateArn:
+                  Ref: Certificate
               - Ref: AWS::NoValue
     Certificate:
       Type: AWS::CertificateManager::Certificate