From 33d9bfd87ff99fc6d0f599b94c0f3a0e624f6268 Mon Sep 17 00:00:00 2001 From: Benjin Dubishar Date: Thu, 7 Oct 2021 23:22:21 -0700 Subject: [PATCH] Adding JSON and YML as valid extensions for OpenAPI/Swagger spec files (#17297) * adding more openAPI spec types * Correcting extension stripping * PR feedback --- extensions/sql-database-projects/src/common/constants.ts | 2 +- .../src/controllers/projectController.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/sql-database-projects/src/common/constants.ts b/extensions/sql-database-projects/src/common/constants.ts index 2e55c4c69f..8fb71ff3d4 100644 --- a/extensions/sql-database-projects/src/common/constants.ts +++ b/extensions/sql-database-projects/src/common/constants.ts @@ -13,7 +13,7 @@ const localize = nls.loadMessageBundle(); export const dataSourcesFileName = 'datasources.json'; export const sqlprojExtension = '.sqlproj'; export const sqlFileExtension = '.sql'; -export const yamlFileExtension = '.yaml'; +export const openApiSpecFileExtensions = ['yaml', 'yml', 'json']; export const schemaCompareExtensionId = 'microsoft.schema-compare'; export const master = 'master'; export const masterDacpac = 'master.dacpac'; diff --git a/extensions/sql-database-projects/src/controllers/projectController.ts b/extensions/sql-database-projects/src/controllers/projectController.ts index cfc4803585..a8ba8eac5b 100644 --- a/extensions/sql-database-projects/src/controllers/projectController.ts +++ b/extensions/sql-database-projects/src/controllers/projectController.ts @@ -841,7 +841,7 @@ export class ProjectsController { } const filters: { [name: string]: string[] } = {}; - filters[constants.specSelectionText] = ['yaml']; + filters[constants.specSelectionText] = constants.openApiSpecFileExtensions; let uris = await vscode.window.showOpenDialog({ canSelectFiles: true, @@ -892,7 +892,8 @@ export class ProjectsController { } outputFolder = folders[0].fsPath; - projectName = path.basename(specPath, constants.yamlFileExtension); + + projectName = path.basename(specPath, path.extname(specPath)); newProjectFolder = path.join(outputFolder, projectName); if (await utils.exists(newProjectFolder)) {