Merge pull request #2833 from joe4dev/fix/api-gateway-custom-endpoint

Fix hardcoded AWS endpoint using CloudFormation pseudo parameter

Author: julianwood

APIGateway-SQS-ReceiveMessages/template.yaml

@@ -115,7 +115,7 @@ Outputs:
   # API Gateway Invoke URL
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod
+    Value: !Sub https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod
 
   QueueName:
     Description: SQS Name

activemq-lambda-sam-java/template.yaml

@@ -147,7 +147,7 @@ Resources:
 Outputs:
   ActiveMQWebConsole:
     Description: The ActiveMQ web-console host
-    Value: !Sub 'https://${MyMQBroker}-1.mq.${AWS::Region}.amazonaws.com:8162/admin/index.jsp'
+    Value: !Sub 'https://${MyMQBroker}-1.mq.${AWS::Region}.${AWS::URLSuffix}:8162/admin/index.jsp'
   MyMQMessageHandlerFunction:
     Description: The name of the ActiveMQ message handler function
     Value: !Ref MyMQMessageHandlerFunction

amplify_cognito_apigateway_lambda_envvariables/template.yaml

@@ -185,7 +185,7 @@ Resources:
         - Name: user_pools_web_client_id
           Value: !Ref rAmplifyCognitoClient
         - Name: APIURL
-          Value: !Sub "https://${myAPI}.execute-api.${AWS::Region}.amazonaws.com/dev"
+          Value: !Sub "https://${myAPI}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev"
       Repository: !Ref AmplifyFrontendRepository
       OauthToken: !Ref OauthToken
 
@@ -222,6 +222,6 @@ Outputs:
 
   APIurl:
     Description: API url
-    Value: !Sub "https://${myAPI}.execute-api.${AWS::Region}.amazonaws.com/dev"
+    Value: !Sub "https://${myAPI}.execute-api.${AWS::Region}.${AWS::URLSuffix}/dev"
     Export:
       Name: APIurl

apigw-api-key/template.yaml

@@ -83,4 +83,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"

apigw-appsync-dynamodb-sam/template.yaml

@@ -209,7 +209,7 @@ Resources:
 Outputs:
   ApiGatewayEndpoint:
     Description: "HTTP API Gateway endpoint for /restaurant path"
-    Value: !Sub "https://${HttpApiProxy}.execute-api.${AWS::Region}.amazonaws.com/restaurant"
+    Value: !Sub "https://${HttpApiProxy}.execute-api.${AWS::Region}.${AWS::URLSuffix}/restaurant"
 
   AppSyncApiKey:
     Description: "AppSync API Key"

apigw-cache-invalidation-eventbridge/template.yaml

@@ -298,7 +298,7 @@ Resources:
 Outputs:
   ApiUrl:
     Description: "API Gateway endpoint URL for Prod stage"
-    Value: !Sub "https://${Api}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${Api}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"
 
   CloudWatchDashboard:
     Condition: deployMetricsDashboard

apigw-caching-sam/template.yaml

@@ -42,4 +42,4 @@ Resources:
 Outputs:
   CachedApiUrl:
     Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-    Value: !Sub "https://${CachedApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/"
+    Value: !Sub "https://${CachedApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod/"

apigw-client-certificate/template.yaml

@@ -69,4 +69,4 @@ Outputs:
   # API Gateway endpoint to be used during tests
   AppApiEndpoint:
     Description: API Endpoint
-    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.amazonaws.com/Prod"
+    Value: !Sub "https://${AppApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod"

apigw-cloudwatch/template.yaml

@@ -55,7 +55,7 @@ Outputs:
   # API endpoint for testing
   ApiEndpoint:
     Description: API endpoint URL
-    Value: !Sub https://${MyApi}.execute-api.${AWS::Region}.amazonaws.com/Prod
+    Value: !Sub https://${MyApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/Prod
   LogGroupName:
     Description: Name of the log group
     Value: !Ref MyLogGroup

apigw-comprehend/template.yaml

@@ -71,4 +71,4 @@ Outputs:
   ComprehendApiEndpoint:
     Description: API endpoint URL
     Value: !Sub >-
-      https://${ComprehendApi}.execute-api.${AWS::Region}.amazonaws.com/prod/detectSentiment
+      https://${ComprehendApi}.execute-api.${AWS::Region}.${AWS::URLSuffix}/prod/detectSentiment