Merge pull request serverless-operations#216 from horike37/feature/fi…

…x_service_endpoint fix: fix incorrect ServiceEndpoint
BetSEQNZR · Jun 11, 2019 · 5e9ac6c · 5e9ac6c
2 parents 313d945 + a3c6228
commit 5e9ac6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/deploy/events/apiGateway/deployment.js b/lib/deploy/events/apiGateway/deployment.js
@@ -27,9 +27,11 @@ module.exports = {
             [
               'https://',
               this.provider.getApiGatewayRestApiId(),
-              `.execute-api.${this.options.region}.`,
+              '.execute-api.',
+              { Ref: 'AWS::Region' },
+              '.',
               { Ref: 'AWS::URLSuffix' },
-              `/${this.options.stage}`,
+              `/${this.provider.getStage()}`,
             ],
           ],
         },

diff --git a/lib/deploy/events/apiGateway/deployment.test.js b/lib/deploy/events/apiGateway/deployment.test.js
@@ -59,7 +59,9 @@ describe('#compileDeployment()', () => {
             [
               'https://',
               { Ref: serverlessStepFunctions.apiGatewayRestApiLogicalId },
-              '.execute-api.us-east-1.',
+              '.execute-api.',
+              { Ref: 'AWS::Region' },
+              '.',
               { Ref: 'AWS::URLSuffix' },
               '/dev',
             ],