AT-9828: More stage updates

https://amplify-education.atlassian.net/browse/AT-9828
amplify-education · Jun 20, 2023 · 6d36152 · 6d36152
1 parent 5fa3b8a
commit 6d36152
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/src/aws/api-gateway-v2-wrapper.ts b/src/aws/api-gateway-v2-wrapper.ts
@@ -121,19 +121,13 @@ class APIGatewayV2Wrapper extends APIGatewayBase {
      * @param domain: DomainConfig
      */
     public async createBasePathMapping(domain: DomainConfig): Promise<void> {
-        let stage = domain.stage;
-        if (domain.apiType === Globals.apiTypes.http) {
-            // find a better way how to implement custom stage for the HTTP API type
-            stage = Globals.defaultStage;
-        }
-
         try {
             await this.apiGateway.send(
                 new CreateApiMappingCommand({
                     ApiId: domain.apiId,
                     ApiMappingKey: domain.basePath,
                     DomainName: domain.givenDomainName,
-                    Stage: stage,
+                    Stage: domain.stage,
                 })
             );
             Logging.logInfo(`V2 - Created API mapping '${domain.basePath}' for '${domain.givenDomainName}'`);
@@ -171,20 +165,14 @@ class APIGatewayV2Wrapper extends APIGatewayBase {
      * @param domain: DomainConfig
      */
     public async updateBasePathMapping(domain: DomainConfig): Promise<void> {
-        let stage = domain.stage;
-        if (domain.apiType === Globals.apiTypes.http) {
-            // find a better way how to implement custom stage for the HTTP API type
-            stage = Globals.defaultStage;
-        }
-
         try {
             await this.apiGateway.send(
                 new UpdateApiMappingCommand({
                     ApiId: domain.apiId,
                     ApiMappingId: domain.apiMapping.apiMappingId,
                     ApiMappingKey: domain.basePath,
                     DomainName: domain.givenDomainName,
-                    Stage: stage,
+                    Stage: domain.stage,
                 })
             );
             Logging.logInfo(`V2 - Updated API mapping to '${domain.basePath}' for '${domain.givenDomainName}'`);

diff --git a/src/globals.ts b/src/globals.ts
@@ -14,7 +14,6 @@ export default class Globals {
 
     public static defaultRegion = "us-east-1";
     public static defaultBasePath = "(none)";
-    public static defaultStage = "$default";
 
     // https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-known-issues.html
     public static reservedBasePaths = ["ping", "sping"];

diff --git a/src/index.ts b/src/index.ts
@@ -449,7 +449,7 @@ class ServerlessCustomDomain {
         }
 
         // Remove all special characters
-        const safeStage = domain.stage.replace(/[^a-zA-Z0-9]/g, "");
+        const safeStage = domain.stage.replace(/[^a-zA-Z\d]/g, "");
         service.provider.compiledCloudFormationTemplate.Outputs[domainNameOutputKey] = {
             Value: domain.givenDomainName,
             Export: {

diff --git a/test/unit-tests/aws/api-gateway-v1-wrapper.test.ts b/test/unit-tests/aws/api-gateway-v1-wrapper.test.ts
@@ -303,7 +303,7 @@ describe("API Gateway V1 wrapper checks", () => {
                 basePath: dc.basePath,
                 domainName: dc.givenDomainName,
                 restApiId: dc.apiId,
-                stage: dc.baseStage,
+                stage: dc.stage,
             }
             const commandCalls = APIGatewayMock.commandCalls(CreateBasePathMappingCommand, expectedParams, true);
 

diff --git a/test/unit-tests/aws/api-gateway-v2-wrapper.test.ts b/test/unit-tests/aws/api-gateway-v2-wrapper.test.ts
@@ -310,7 +310,7 @@ describe("API Gateway V2 wrapper checks", () => {
                 ApiMappingKey: dc.basePath,
                 DomainName: dc.givenDomainName,
                 ApiId: dc.apiId,
-                Stage: dc.baseStage,
+                Stage: dc.stage,
             }
             const commandCalls = APIGatewayMock.commandCalls(CreateApiMappingCommand, expectedParams, true);
 
@@ -336,7 +336,7 @@ describe("API Gateway V2 wrapper checks", () => {
                 ApiMappingKey: dc.basePath,
                 DomainName: dc.givenDomainName,
                 ApiId: dc.apiId,
-                Stage: Globals.defaultStage,
+                Stage: dc.stage,
             }
             const commandCalls = APIGatewayMock.commandCalls(CreateApiMappingCommand, expectedParams, true);
 
@@ -472,7 +472,7 @@ describe("API Gateway V2 wrapper checks", () => {
                 ApiMappingId: dc.apiMapping.apiMappingId,
                 ApiMappingKey: dc.basePath,
                 DomainName: dc.givenDomainName,
-                Stage: Globals.defaultStage
+                Stage: dc.stage
             }
             const commandCalls = APIGatewayMock.commandCalls(UpdateApiMappingCommand, expectedParams, true);