Match serverless framework generation of ServiceEndpoint value

Author: dannyshisler

lib/deploy/events/apiGateway/deployment.js

@@ -27,7 +27,9 @@ module.exports = {
             [
               'https://',
               this.provider.getApiGatewayRestApiId(),
-              `.execute-api.${this.options.region}.amazonaws.com/${this.options.stage}`,
+              `.execute-api.${this.options.region}.`,
+              { Ref: 'AWS::URLSuffix' },
+              `/${this.options.stage}`,
             ],
           ],
         },

lib/deploy/events/apiGateway/deployment.test.js

@@ -27,43 +27,53 @@ describe('#compileDeployment()', () => {
   });
 
   it('should create a deployment resource', () => serverlessStepFunctions
-    .compileDeployment().then(() => {
+    .compileDeployment()
+    .then(() => {
       const apiGatewayDeploymentLogicalId = Object
         .keys(serverlessStepFunctions.serverless.service.provider
           .compiledCloudFormationTemplate.Resources)[0];
 
       expect(
         serverlessStepFunctions.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources[apiGatewayDeploymentLogicalId]
-      ).to.deep.equal({
-        Type: 'AWS::ApiGateway::Deployment',
-        DependsOn: ['method-dependency1', 'method-dependency2'],
-        Properties: {
-          RestApiId: { Ref: serverlessStepFunctions.apiGatewayRestApiLogicalId },
-          StageName: 'dev',
-        },
-      });
-    })
+          .Resources[apiGatewayDeploymentLogicalId],
+      )
+        .to
+        .deep
+        .equal({
+          Type: 'AWS::ApiGateway::Deployment',
+          DependsOn: ['method-dependency1', 'method-dependency2'],
+          Properties: {
+            RestApiId: { Ref: serverlessStepFunctions.apiGatewayRestApiLogicalId },
+            StageName: 'dev',
+          },
+        });
+    }),
   );
 
   it('should add service endpoint output', () =>
-    serverlessStepFunctions.compileDeployment().then(() => {
-      expect(
-        serverlessStepFunctions.serverless.service.provider.compiledCloudFormationTemplate
-          .Outputs.ServiceEndpoint
-      ).to.deep.equal({
-        Description: 'URL of the service endpoint',
-        Value: {
-          'Fn::Join': [
-            '',
-            [
-              'https://',
-              { Ref: serverlessStepFunctions.apiGatewayRestApiLogicalId },
-              '.execute-api.us-east-1.amazonaws.com/dev',
-            ],
-          ],
-        },
-      });
-    })
+    serverlessStepFunctions.compileDeployment()
+      .then(() => {
+        expect(
+          serverlessStepFunctions.serverless.service.provider.compiledCloudFormationTemplate
+            .Outputs.ServiceEndpoint,
+        )
+          .to
+          .deep
+          .equal({
+            Description: 'URL of the service endpoint',
+            Value: {
+              'Fn::Join': [
+                '',
+                [
+                  'https://',
+                  { Ref: serverlessStepFunctions.apiGatewayRestApiLogicalId },
+                  '.execute-api.us-east-1.',
+                  { Ref: 'AWS::URLSuffix' },
+                  '/dev',
+                ],
+              ],
+            },
+          });
+      }),
   );
 });