Fix release type swagger generation script (#265)

* Fix release type swagger generation script

* Remove typeload build from pipeline

Author: jason-dou

pipelines/ci-build.yml

@@ -37,8 +37,6 @@ jobs:
 
       - template: ./common-templates/security-pre-checks.yml
 
-      - template: ./common-templates/common-steps.yml
-        parameters:
-          Official: false
+      - template: ./common-templates/generate-types.yml
 
       - template: ./common-templates/security-post-checks.yml

pipelines/common-variables.yml

@@ -7,7 +7,7 @@ variables:
   ArtifactName: "GeneratedFiles"
   ProductBinPath: '$(Build.SourcesDirectory)/src/Microsoft.Graph.Bicep.Types/bin/$(BuildConfiguration)'
   BuildSolution: '$(Build.SourcesDirectory)/Microsoft.Graph.Bicep.Types.sln'
-  SwaggerFilePath: '$(Build.SourcesDirectory)/swagger/specification/microsoftgraph/resource-manager/microsoftgraph/preview'
+  SwaggerFilePath: '$(Build.SourcesDirectory)/swagger/specification/microsoftgraph/resource-manager/microsoftgraph'
   AutoRestWorkingDir: "$(Build.SourcesDirectory)/src/autorest.bicep"
   BicepTypesWorkingDir: "$(Build.SourcesDirectory)/bicep-types/src/bicep-types"
   GeneratorWorkingdir: "$(Build.SourcesDirectory)/src/generator"

scripts/UpdateGeneratedTypes.ps1

@@ -38,7 +38,7 @@ Write-Host "Autorest successfully built"
 Write-Host "Generating Swagger spec"
 npm ci --prefix $SwaggerGenerationPrefix
 npm audit fix
-npm run --prefix $SwaggerGenerationPrefix start "--" --output=C:\Git\msgraph-bicep-types\swagger\specification\microsoftgraph\resource-manager\microsoftgraph\preview
+npm run --prefix $SwaggerGenerationPrefix start "--" --output=C:\Git\msgraph-bicep-types\swagger\specification\microsoftgraph\resource-manager\microsoftgraph
 Write-Host "Swagger spec successfully generated"
 
 # Generate Bicep types

src/swagger-generation/src/index.ts

@@ -45,7 +45,8 @@ async function parse(config: Config): Promise<[Metadata, Swagger]> {
 
 function writeSwaggerFile(swagger: Swagger, apiVersion: string, extensionVersion: string) {
   const swaggerJson: string = JSON.stringify(swagger, null, 2);
-  const fullOutputPath = `${outputPath}/${apiVersion}`;
+  const releaseType: string = getReleaseTypeFromExtensionVersion(extensionVersion);
+  const fullOutputPath = `${outputPath}/${releaseType}/${apiVersion}`;
 
   if (outputPath !== 'output') {
     if (!fs.existsSync(fullOutputPath)) {
@@ -77,11 +78,11 @@ function writeSwaggerReadMeFile(apiExtensionVersions: { [key in ApiVersion]: str
   let betaVersionsContent = '';
   let v1VersionsContent = '';
   for (const version of apiExtensionVersions[ApiVersion.Beta]) {
-    const releaseType = version.endsWith('preview') ? 'preview' : 'official';
+    const releaseType = getReleaseTypeFromExtensionVersion(version);
     betaVersionsContent += `\n  - microsoftgraph/${releaseType}/beta/${version}.json`;
   }
   for (const version of apiExtensionVersions[ApiVersion.V1_0]) {
-    const releaseType = version.endsWith('preview') ? 'preview' : 'official';
+    const releaseType = getReleaseTypeFromExtensionVersion(version);
     v1VersionsContent += `\n  - microsoftgraph/${releaseType}/v1.0/${version}.json`;
   }
   let readMeContent = `# MicrosoftGraph
@@ -130,6 +131,10 @@ input-file: ${v1VersionsContent}
   });
 }
 
+function getReleaseTypeFromExtensionVersion(extensionVersion: string): 'preview' | 'official' {
+  return extensionVersion.endsWith('preview') ? 'preview' : 'official';
+}
+
 async function main() {
   let extensionVersionMetadata: ExtensionVersionMetadata = require('../output/metadata.json');
   let metadata: Metadata = {};