Fix stage name handling

package.json

@@ -76,7 +76,8 @@
     "@aws-sdk/config-resolver": "^3.329.0",
     "@aws-sdk/credential-providers": "^3.329.0",
     "@aws-sdk/node-config-provider": "^3.329.0",
-    "@aws-sdk/smithy-client": "^3.329.0"
+    "@aws-sdk/smithy-client": "^3.329.0",
+    "@aws-sdk/util-retry": "^3.329.0"
   },
   "peerDependencies": {
     "serverless": "^2.60 || ^3.0.0"

src/aws/api-gateway-v1-wrapper.ts

@@ -26,7 +26,8 @@ class APIGatewayV1Wrapper extends APIGatewayBase {
         super();
         this.apiGateway = new APIGatewayClient({
             credentials,
-            region: Globals.getRegion()
+            region: Globals.getRegion(),
+            retryStrategy: APIGatewayBase.getRetryStrategy()
         });
     }
 

src/aws/api-gateway-v2-wrapper.ts

@@ -27,7 +27,8 @@ class APIGatewayV2Wrapper extends APIGatewayBase {
         super();
         this.apiGateway = new ApiGatewayV2Client({
             credentials,
-            region: Globals.getRegion()
+            region: Globals.getRegion(),
+            retryStrategy: APIGatewayBase.getRetryStrategy()
         });
     }
 

src/index.ts

@@ -365,6 +365,12 @@ class ServerlessCustomDomain {
             domain.domainInfo = await apiGateway.getCustomDomain(domain);
 
             if (!domain.apiMapping) {
+                if (domain.apiType === Globals.apiTypes.http) {
+                    Logging.logWarning(
+                        "Make sure that the API Mapping with the `$default` stage already exists. " +
+                        "More info here https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-stages.html"
+                    )
+                }
                 await apiGateway.createBasePathMapping(domain);
             } else {
                 await apiGateway.updateBasePathMapping(domain);

src/models/apigateway-base.ts

@@ -2,10 +2,20 @@ import DomainInfo = require("./domain-info");
 import ApiGatewayMap = require("./api-gateway-map");
 import DomainConfig = require("./domain-config");
 import {Client} from "@aws-sdk/smithy-client";
+import {ConfiguredRetryStrategy} from "@aws-sdk/util-retry";
 
 abstract class APIGatewayBase {
     public apiGateway: Client<any, any, any, any>;
 
+    public static getRetryStrategy() {
+        return new ConfiguredRetryStrategy(
+            5, // max attempts.
+            // This example sets the backoff at 100ms plus 5s per attempt.
+            // https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_util_retry.html#aws-sdkutil-retry
+            (attempt: number) => 100 + attempt * 5000 // backoff function.
+        )
+    }
+
     abstract createCustomDomain(domain: DomainConfig): Promise<DomainInfo>;
 
     abstract getCustomDomain(domain: DomainConfig): Promise<DomainInfo>;

test/integration-tests/apigateway.ts

@@ -8,12 +8,16 @@ import {
     GetResourcesCommand,
     GetResourcesCommandOutput
 } from "@aws-sdk/client-api-gateway";
+import APIGatewayBase = require("../../src/models/apigateway-base");
 
 export default class APIGatewayWrap {
     private client: APIGatewayClient;
 
     constructor(region: string) {
-        this.client = new APIGatewayClient({region});
+        this.client = new APIGatewayClient({
+            region,
+            retryStrategy: APIGatewayBase.getRetryStrategy()
+        });
     }
 
     /**

test/integration-tests/basic/http-api-multiple/serverless.yml

@@ -27,11 +27,13 @@ custom:
         basePath: ''
         endpointType: REGIONAL
         autoDomain: true
+        stage: '$default'
     - http:
         domainName: ${env:PLUGIN_IDENTIFIER}-http-api-milti2-${env:RANDOM_STRING}.${env:TEST_DOMAIN}
         basePath: ''
         endpointType: REGIONAL
         autoDomain: true
+        stage: '$default'
 
 package:
   patterns: