diff --git a/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cli/pipelineCli/prepareArtifactFilesCli.ts b/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cli/pipelineCli/prepareArtifactFilesCli.ts index 980ab093072..46b4b0a00e6 100644 --- a/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cli/pipelineCli/prepareArtifactFilesCli.ts +++ b/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cli/pipelineCli/prepareArtifactFilesCli.ts @@ -12,8 +12,7 @@ import { SDK, SDKPipelineStatus, TaskResult, - TaskResultStatus, - Trigger, + Trigger } from '@azure-tools/sdk-generation-lib'; import * as fs from 'fs'; import * as path from 'path'; @@ -21,8 +20,8 @@ import * as path from 'path'; import { PrepareArtifactFilesInput, prepareArtifactFilesInput, - prepareResultArtifactInput, PrepareResultArtifactInput, + prepareResultArtifactInput } from '../../cliSchema/prepareArtifactFilesCliConfig'; import { GitOperationWrapper } from '../../utils/GitOperationWrapper'; @@ -136,34 +135,34 @@ function prepareResult(pipelineStatus: SDKPipelineStatus) { let event: PipelineRunEvent = undefined; switch (pipelineStatus) { - case 'in_progress': - event = { - status: 'in_progress', - trigger: trigger, - pipelineBuildId: config.pipelineBuildId, - } as InProgressEvent; - break; - case 'completed': - if (!config.resultsPath || !config.logPath) { - throw new Error(`Invalid completed event parameter!`); - } + case 'in_progress': + event = { + status: 'in_progress', + trigger: trigger, + pipelineBuildId: config.pipelineBuildId + } as InProgressEvent; + break; + case 'completed': + if (!config.resultsPath || !config.logPath) { + throw new Error(`Invalid completed event parameter!`); + } - const taskResults: TaskResult[] = getTaskResults(config.resultsPath); - const taskTotalResult: TaskResult = generateTotalResult(taskResults, config.pipelineBuildId); - event = { - status: 'completed', - trigger: trigger, - pipelineBuildId: config.pipelineBuildId, - logPath: config.logPath, - result: taskTotalResult, - } as CompletedEvent; - break; - default: - throw new Error(`Unsupported status: ` + (pipelineStatus as string)); + const taskResults: TaskResult[] = getTaskResults(config.resultsPath); + const taskTotalResult: TaskResult = generateTotalResult(taskResults, config.pipelineBuildId); + event = { + status: 'completed', + trigger: trigger, + pipelineBuildId: config.pipelineBuildId, + logPath: config.logPath, + result: taskTotalResult + } as CompletedEvent; + break; + default: + throw new Error(`Unsupported status: ` + (pipelineStatus as string)); } fs.writeFileSync(config.artifactDir + `/` + pipelineStatus + `/result.json`, JSON.stringify(event, null, 2), { - encoding: 'utf-8', + encoding: 'utf-8' }); } diff --git a/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cli/pipelineCli/publishResultCli.ts b/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cli/pipelineCli/publishResultCli.ts index 4d84f28f21b..b9583a15788 100644 --- a/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cli/pipelineCli/publishResultCli.ts +++ b/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cli/pipelineCli/publishResultCli.ts @@ -18,7 +18,7 @@ import { SDKPipelineStatus, StorageType, TaskResult, - Trigger, + Trigger } from '@azure-tools/sdk-generation-lib'; import * as fs from 'fs'; @@ -30,7 +30,7 @@ import { ResultPublisherDBResultInput, resultPublisherDBResultInput, ResultPublisherEventHubInput, - resultPublisherEventHubInput, + resultPublisherEventHubInput } from '../../cliSchema/publishResultConfig'; async function publishBlob() { @@ -40,7 +40,7 @@ async function publishBlob() { pipelineBuildId: config.pipelineBuildId, sdkGenerationName: config.sdkGenerationName, azureStorageBlobSasUrl: config.azureStorageBlobSasUrl, - azureBlobContainerName: config.azureBlobContainerName, + azureBlobContainerName: config.azureBlobContainerName }; const resultBlobPublisher: ResultBlobPublisher = new ResultBlobPublisher(context); await resultBlobPublisher.uploadLogsAndResult(config.logsAndResultPath, config.taskName as AzureSDKTaskName); @@ -76,7 +76,7 @@ function initMongoConnectContext(config: ResultPublisherDBCodeGenerationInput): database: config.mongodb.database, ssl: config.mongodb.ssl, synchronize: true, - logging: true, + logging: true }; return mongoConnectContext; @@ -132,37 +132,37 @@ async function publishEventhub(pipelineStatus: SDKPipelineStatus) { const publisher: ResultEventhubPublisher = new ResultEventhubPublisher(config.eventHubConnectionString); switch (pipelineStatus) { - case 'queued': - event = { - status: 'queued', - trigger: trigger, - pipelineBuildId: config.pipelineBuildId, - } as QueuedEvent; - break; - case 'in_progress': - event = { - status: 'in_progress', - trigger: trigger, - pipelineBuildId: config.pipelineBuildId, - } as InProgressEvent; - break; - case 'completed': - if (!config.resultsPath || !config.logPath) { - throw new Error(`Invalid completed event parameter!`); - } + case 'queued': + event = { + status: 'queued', + trigger: trigger, + pipelineBuildId: config.pipelineBuildId + } as QueuedEvent; + break; + case 'in_progress': + event = { + status: 'in_progress', + trigger: trigger, + pipelineBuildId: config.pipelineBuildId + } as InProgressEvent; + break; + case 'completed': + if (!config.resultsPath || !config.logPath) { + throw new Error(`Invalid completed event parameter!`); + } - const taskResults: TaskResult[] = getTaskResults(config.resultsPath); - const taskTotalResult: TaskResult = generateTotalResult(taskResults, config.pipelineBuildId); - event = { - status: 'completed', - trigger: trigger, - pipelineBuildId: config.pipelineBuildId, - logPath: config.logPath, - result: taskTotalResult, - } as CompletedEvent; - break; - default: - throw new Error(`Unsupported status: ` + (pipelineStatus as string)); + const taskResults: TaskResult[] = getTaskResults(config.resultsPath); + const taskTotalResult: TaskResult = generateTotalResult(taskResults, config.pipelineBuildId); + event = { + status: 'completed', + trigger: trigger, + pipelineBuildId: config.pipelineBuildId, + logPath: config.logPath, + result: taskTotalResult + } as CompletedEvent; + break; + default: + throw new Error(`Unsupported status: ` + (pipelineStatus as string)); } await publisher.publishEvent(event); await publisher.close(); @@ -174,17 +174,17 @@ async function main() { const pipelineStatus = args['pipelineStatus']; switch (storageType as StorageType) { - case StorageType.Blob: - await publishBlob(); - break; - case StorageType.Db: - await publishDB(pipelineStatus); - break; - case StorageType.EventHub: - await publishEventhub(pipelineStatus); - break; - default: - throw new Error(`Unknown storageType:${storageType}!`); + case StorageType.Blob: + await publishBlob(); + break; + case StorageType.Db: + await publishDB(pipelineStatus); + break; + case StorageType.EventHub: + await publishEventhub(pipelineStatus); + break; + default: + throw new Error(`Unknown storageType:${storageType}!`); } } diff --git a/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cliSchema/generateResultCliConfig.ts b/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cliSchema/generateResultCliConfig.ts index 336721672d5..6cbb3ff901c 100644 --- a/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cliSchema/generateResultCliConfig.ts +++ b/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cliSchema/generateResultCliConfig.ts @@ -17,45 +17,45 @@ export const generateResultCliInput = convict({ pipelineBuildId: { default: null, format: assertNullOrEmpty, - arg: 'buildId', + arg: 'buildId' }, logfile: { default: null, format: assertNullOrEmpty, - arg: 'logfile', + arg: 'logfile' }, logFilterStr: { default: null, nullable: true, format: String, - arg: 'logFilterStr', + arg: 'logFilterStr' }, taskName: { default: null, format: ['init', 'generateAndBuild', 'mockTest', 'liveTest'], - arg: 'taskName', + arg: 'taskName' }, exeResult: { default: null, nullable: true, format: ['succeeded', 'failed'], - arg: 'exeResult', + arg: 'exeResult' }, taskOutputPath: { default: null, nullable: true, format: String, - arg: 'taskOutputPath', + arg: 'taskOutputPath' }, resultOutputPath: { default: null, format: assertNullOrEmpty, - arg: 'resultOutputPath', + arg: 'resultOutputPath' }, dockerResultFile: { default: null, nullable: true, format: String, - arg: 'dockerResultFile', - }, + arg: 'dockerResultFile' + } }); diff --git a/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cliSchema/prepareArtifactFilesCliConfig.ts b/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cliSchema/prepareArtifactFilesCliConfig.ts index 2ad5bff4353..018fc478a0a 100644 --- a/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cliSchema/prepareArtifactFilesCliConfig.ts +++ b/tools/sdk-generation-pipeline/packages/sdk-generation-cli/src/cliSchema/prepareArtifactFilesCliConfig.ts @@ -12,19 +12,19 @@ export const prepareArtifactFilesInput = convict({ generateAndBuildOutputFile: { default: null, format: assertNullOrEmpty, - arg: 'generateAndBuildOutputFile', + arg: 'generateAndBuildOutputFile' }, artifactDir: { doc: 'The dir to publish artifact', default: null, format: assertNullOrEmpty, - arg: 'artifactDir', + arg: 'artifactDir' }, language: { default: null, format: ['js', 'python', 'go', 'net', 'java'], - arg: 'language', - }, + arg: 'language' + } }); export class PrepareResultArtifactInput { @@ -39,30 +39,30 @@ export const prepareResultArtifactInput = convict({ pipelineBuildId: { default: null, format: assertNullOrEmpty, - arg: 'buildId', + arg: 'buildId' }, trigger: { default: null, format: assertNullOrEmpty, - arg: 'trigger', + arg: 'trigger' }, artifactDir: { doc: 'The dir to publish artifact', default: null, format: assertNullOrEmpty, - arg: 'artifactDir', + arg: 'artifactDir' }, logPath: { default: null, nullable: true, format: String, - arg: 'logPath', + arg: 'logPath' }, resultsPath: { doc: 'task result files array', default: null, nullable: true, format: String, - arg: 'resultsPath', - }, + arg: 'resultsPath' + } }); diff --git a/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/lib/ResultPublisher.ts b/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/lib/ResultPublisher.ts index 99a9d0c8cff..c4403cb0f0e 100644 --- a/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/lib/ResultPublisher.ts +++ b/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/lib/ResultPublisher.ts @@ -50,7 +50,7 @@ export class ResultDBPublisher { ssl: this.context.ssl, synchronize: this.context.synchronize, logging: this.context.logging, - entities: [TaskResultEntity, CodeGeneration], + entities: [TaskResultEntity, CodeGeneration] }); } @@ -101,9 +101,9 @@ export class ResultBlobPublisher { const logsAndResultPathArray = JSON.parse(logsAndResultPath); for (const file of logsAndResultPathArray) { if (fs.existsSync(file)) { - const blobName: string = file.includes('.json') - ? `${this.pipelineBuildId}/logs/${this.sdkGenerationName}-${taskName}-result.json` - : `${this.pipelineBuildId}/logs/${this.sdkGenerationName}-${taskName}.log`; + const blobName: string = file.includes('.json') ? + `${this.pipelineBuildId}/logs/${this.sdkGenerationName}-${taskName}-result.json` : + `${this.pipelineBuildId}/logs/${this.sdkGenerationName}-${taskName}.log`; await this.azureBlobClient.publishBlob(file, blobName); logger.info(`Publish ${file} Success !!!`); } else { diff --git a/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/lib/generateResult.ts b/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/lib/generateResult.ts index 2e6312aa498..6ce10c17beb 100644 --- a/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/lib/generateResult.ts +++ b/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/lib/generateResult.ts @@ -88,7 +88,7 @@ export function parseGenerateLog( errorCount: errorNum, warningCount: warnNum, messages: messages, - result: taskExeResult, + result: taskExeResult }; return result; diff --git a/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/types/taskResult.ts b/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/types/taskResult.ts index fd5f1f28917..26ec9333e2e 100644 --- a/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/types/taskResult.ts +++ b/tools/sdk-generation-pipeline/packages/sdk-generation-lib/src/types/taskResult.ts @@ -1,23 +1,23 @@ import * as fs from 'fs'; import { Column, Entity, ObjectIdColumn } from 'typeorm'; +import { logger } from '../utils/logger'; +import { requireJsonc } from '../utils/requireJsonc'; import { getTaskBasicConfig, TaskBasicConfig } from './taskBasicConfig'; import { GenerateAndBuildOutput } from './taskInputAndOuputSchemaTypes/GenerateAndBuildOutput'; import { InitOutput } from './taskInputAndOuputSchemaTypes/InitOutput'; -import { logger } from '../utils/logger'; -import { requireJsonc } from '../utils/requireJsonc'; import { TestOutput } from './taskInputAndOuputSchemaTypes/TestOutput'; @Entity('sdkGenerationResults') export class TaskResultEntity { @ObjectIdColumn() - id: string; + id: string; @Column() - key: string; + key: string; @Column() - pipelineBuildId: string; + pipelineBuildId: string; @Column() - taskResult: TaskResult; + taskResult: TaskResult; } export enum TaskResultStatus { @@ -106,7 +106,7 @@ export function setTaskResult(config: TaskBasicConfig, taskName: string) { pipelineBuildId: '', result: TaskResultStatus.Success, errorCount: 0, - warningCount: 0, + warningCount: 0 }; } @@ -124,7 +124,7 @@ export function generateTotalResult(taskResults: TaskResult[], pipelineBuildId: pipelineBuildId: pipelineBuildId, result: TaskResultStatus.Success, errorCount: 0, - messages: [], + messages: [] }; if (taskResults.length === 0) {