vls-openapi-generator 1.8.1 → 1.8.3

package/dist/generate-openapi.js

@@ -138,12 +138,24 @@ const generateOpenAPI = async () => {
         const developmentURLIndex = existingOpenAPIFile.servers.findIndex((x) => x.url.includes('development'));
         const fetchedDevelopmentURL = await getStackURL(partnerName, 'development');
         if (fetchedDevelopmentURL) {
-            existingOpenAPIFile.servers[developmentURLIndex].url = fetchedDevelopmentURL;
+            existingOpenAPIFile.servers[developmentURLIndex].url =
+                fetchedDevelopmentURL[fetchedDevelopmentURL.length - 1] === '/'
+                    ? fetchedDevelopmentURL.slice(0, -1)
+                    : fetchedDevelopmentURL;
+        }
+        else {
+            existingOpenAPIFile.servers[developmentURLIndex].url = 'development url';
         }
         const productionURLIndex = existingOpenAPIFile.servers.findIndex((x) => x.url.includes('production'));
         const fetchedProductionURL = await getStackURL(partnerName, 'production');
         if (fetchedProductionURL) {
-            existingOpenAPIFile.servers[productionURLIndex].url = fetchedProductionURL;
+            existingOpenAPIFile.servers[productionURLIndex].url =
+                fetchedProductionURL[fetchedProductionURL.length - 1] === '/'
+                    ? fetchedProductionURL.slice(0, -1)
+                    : fetchedProductionURL;
+        }
+        else {
+            existingOpenAPIFile.servers[productionURLIndex].url = 'production url';
         }
     }
     await fs_1.promises.writeFile(OUTPUT_FILE, JSON.stringify(existingOpenAPIFile, undefined, 4));
@@ -151,12 +163,19 @@ const generateOpenAPI = async () => {
 };
 exports.generateOpenAPI = generateOpenAPI;
 async function getStackURL(partnerName, environment) {
+    const stackName = `${partnerName}-${environment}`;
     const cloudFormationClient = new client_cloudformation_1.CloudFormationClient();
     const describeStacksCommand = new client_cloudformation_1.DescribeStacksCommand({
-        StackName: `${partnerName}-${environment}`
+        StackName: stackName
+    });
+    const result = await cloudFormationClient.send(describeStacksCommand).catch((err) => {
+        if (err instanceof client_cloudformation_1.CloudFormationServiceException &&
+            err.message.includes(`Stack with id ${stackName} does not exist`)) {
+            return;
+        }
+        throw err;
     });
-    const result = await cloudFormationClient.send(describeStacksCommand);
-    if (!result.Stacks) {
+    if (!result || !result.Stacks) {
         console.warn(`Base URL was not found with the given environment. Environment will not be updated. Given environment: ${environment}`);
         return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vls-openapi-generator",
-    "version": "1.8.1",
+    "version": "1.8.3",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {

package/src/generate-openapi.ts

@@ -7,7 +7,11 @@ import { promisify } from 'util';
 import { z } from 'zod';
 import { LambdaConfig, OpenAPIConfig } from './lambda-type';
 import { OpenAPI } from './openapi-type';
-import { CloudFormationClient, DescribeStacksCommand } from '@aws-sdk/client-cloudformation';
+import {
+    CloudFormationClient,
+    CloudFormationServiceException,
+    DescribeStacksCommand
+} from '@aws-sdk/client-cloudformation';
 
 const OPENAPI_FILE = path.join(process.cwd(), 'openapi.json');
 const HANDLERS_DIR = path.join(process.cwd(), 'dist', 'src', 'handlers');
@@ -144,7 +148,12 @@ export const generateOpenAPI = async (): Promise<void> => {
         const fetchedDevelopmentURL = await getStackURL(partnerName, 'development');
 
         if (fetchedDevelopmentURL) {
-            existingOpenAPIFile.servers[developmentURLIndex].url = fetchedDevelopmentURL;
+            existingOpenAPIFile.servers[developmentURLIndex].url =
+                fetchedDevelopmentURL[fetchedDevelopmentURL.length - 1] === '/'
+                    ? fetchedDevelopmentURL.slice(0, -1)
+                    : fetchedDevelopmentURL;
+        } else {
+            existingOpenAPIFile.servers[developmentURLIndex].url = 'development url';
         }
 
         const productionURLIndex = existingOpenAPIFile.servers.findIndex((x) => x.url.includes('production'));
@@ -152,7 +161,12 @@ export const generateOpenAPI = async (): Promise<void> => {
         const fetchedProductionURL = await getStackURL(partnerName, 'production');
 
         if (fetchedProductionURL) {
-            existingOpenAPIFile.servers[productionURLIndex].url = fetchedProductionURL;
+            existingOpenAPIFile.servers[productionURLIndex].url =
+                fetchedProductionURL[fetchedProductionURL.length - 1] === '/'
+                    ? fetchedProductionURL.slice(0, -1)
+                    : fetchedProductionURL;
+        } else {
+            existingOpenAPIFile.servers[productionURLIndex].url = 'production url';
         }
     }
 
@@ -161,15 +175,25 @@ export const generateOpenAPI = async (): Promise<void> => {
 };
 
 async function getStackURL(partnerName: string, environment: 'development' | 'production') {
+    const stackName = `${partnerName}-${environment}`;
     const cloudFormationClient = new CloudFormationClient();
 
     const describeStacksCommand = new DescribeStacksCommand({
-        StackName: `${partnerName}-${environment}`
+        StackName: stackName
     });
 
-    const result = await cloudFormationClient.send(describeStacksCommand);
+    const result = await cloudFormationClient.send(describeStacksCommand).catch((err) => {
+        if (
+            err instanceof CloudFormationServiceException &&
+            err.message.includes(`Stack with id ${stackName} does not exist`)
+        ) {
+            return;
+        }
+
+        throw err;
+    });
 
-    if (!result.Stacks) {
+    if (!result || !result.Stacks) {
         console.warn(
             `Base URL was not found with the given environment. Environment will not be updated. Given environment: ${environment}`
         );