Fix stage name handling

amplify-education · May 12, 2023 · 9e86fea · 9e86fea
1 parent 1af9b67
commit 9e86fea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/aws/api-gateway-v1-wrapper.ts b/src/aws/api-gateway-v1-wrapper.ts
@@ -110,7 +110,7 @@ class APIGatewayV1Wrapper extends APIGatewayBase {
                 basePath: domain.basePath,
                 domainName: domain.givenDomainName,
                 restApiId: domain.apiId,
-                stage: domain.baseStage,
+                stage: domain.stage,
             }));
             Logging.logInfo(`V1 - Created API mapping '${domain.basePath}' for '${domain.givenDomainName}'`);
         } catch (err) {

diff --git a/src/aws/api-gateway-v2-wrapper.ts b/src/aws/api-gateway-v2-wrapper.ts
@@ -121,7 +121,7 @@ class APIGatewayV2Wrapper extends APIGatewayBase {
      * @param domain: DomainConfig
      */
     public async createBasePathMapping(domain: DomainConfig): Promise<void> {
-        let stage = domain.baseStage;
+        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;
@@ -171,7 +171,7 @@ class APIGatewayV2Wrapper extends APIGatewayBase {
      * @param domain: DomainConfig
      */
     public async updateBasePathMapping(domain: DomainConfig): Promise<void> {
-        let stage = domain.baseStage;
+        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;

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