From 62f09cbc9a48599231ea63672fbe164b68de3f48 Mon Sep 17 00:00:00 2001 From: Stevan Freeborn <65925598+StevanFreeborn@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:27:33 -0600 Subject: [PATCH 1/3] fix: remove mocha arrow functions from tests in test directory --- .../test/internal/routerClient.mocked.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/communication/communication-job-router/test/internal/routerClient.mocked.spec.ts b/sdk/communication/communication-job-router/test/internal/routerClient.mocked.spec.ts index 5ab2046be45c..4e907a28a445 100644 --- a/sdk/communication/communication-job-router/test/internal/routerClient.mocked.spec.ts +++ b/sdk/communication/communication-job-router/test/internal/routerClient.mocked.spec.ts @@ -6,12 +6,12 @@ import { AzureCommunicationTokenCredential } from "@azure/communication-common"; import { RouterClient } from "../../src"; import { baseUri, generateToken } from "../public/utils/connectionUtils"; -describe("[Mocked] RouterClient", async () => { - afterEach(() => { +describe("[Mocked] RouterClient", async function() { + afterEach(function() { sinon.restore(); }); - it("can instantiate", async () => { + it("can instantiate", async function() { new RouterClient(baseUri, new AzureCommunicationTokenCredential(generateToken())); }); }); From 3144cda8fa8fa17490d7c0107bce6f1c24412326 Mon Sep 17 00:00:00 2001 From: Stevan Freeborn <65925598+StevanFreeborn@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:28:30 -0600 Subject: [PATCH 2/3] fix: formatting changes from running 'npm run format' --- .../communication-job-router/karma.conf.js | 26 +++++------ .../src/models/models.ts | 2 +- .../src/models/options.ts | 2 +- .../src/models/responses.ts | 4 +- .../src/routerAdministrationClient.ts | 12 ++--- .../src/routerClient.ts | 16 +++---- .../test/internal/utils/mockClient.ts | 2 +- .../test/public/exceptionPolicies.spec.ts | 38 ++++++++------- .../test/public/utils/recordedClient.ts | 10 ++-- .../test/public/utils/testData.ts | 46 +++++++++---------- 10 files changed, 78 insertions(+), 80 deletions(-) diff --git a/sdk/communication/communication-job-router/karma.conf.js b/sdk/communication/communication-job-router/karma.conf.js index a7a33b4ea39a..ff9f1c10e064 100644 --- a/sdk/communication/communication-job-router/karma.conf.js +++ b/sdk/communication/communication-job-router/karma.conf.js @@ -8,7 +8,7 @@ process.env.RECORDINGS_RELATIVE_PATH = relativeRecordingsPath(); const { jsonRecordingFilterFunction, isRecordMode } = require("@azure-tools/test-recorder"); -module.exports = function (config) { +module.exports = function(config) { config.set({ // base path that will be used to resolve all patterns (eg. files, exclude) basePath: "./", @@ -29,7 +29,7 @@ module.exports = function (config) { "karma-sourcemap-loader", "karma-junit-reporter", "karma-json-to-file-reporter", - "karma-json-preprocessor", + "karma-json-preprocessor" ], // list of files / patterns to load in the browser @@ -42,7 +42,7 @@ module.exports = function (config) { // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor preprocessors: { "**/*.js": ["sourcemap", "env"], - "recordings/browsers/**/*.json": ["json"], + "recordings/browsers/**/*.json": ["json"] // IMPORTANT: COMMENT following line if you want to debug in your browsers!! // Preprocess source file to calculate code coverage, however this will make source file unreadable //"dist-test/index.browser.js": ["coverage"] @@ -65,8 +65,8 @@ module.exports = function (config) { { type: "json", subdir: ".", file: "coverage.json" }, { type: "lcovonly", subdir: ".", file: "lcov.info" }, { type: "html", subdir: "html" }, - { type: "cobertura", subdir: ".", file: "cobertura-coverage.xml" }, - ], + { type: "cobertura", subdir: ".", file: "cobertura-coverage.xml" } + ] }, junitReporter: { @@ -76,12 +76,12 @@ module.exports = function (config) { useBrowserName: false, // add browser name to report and classes names nameFormatter: undefined, // function (browser, result) to customize the name attribute in xml testcase element classNameFormatter: undefined, // function (browser, result) to customize the classname attribute in xml testcase element - properties: {}, // key value pair of properties to add to the section of the report + properties: {} // key value pair of properties to add to the section of the report }, jsonToFileReporter: { filter: jsonRecordingFilterFunction, - outputPath: ".", + outputPath: "." }, // web server port @@ -105,8 +105,8 @@ module.exports = function (config) { customLaunchers: { HeadlessChrome: { base: "ChromeHeadless", - flags: ["--no-sandbox"], - }, + flags: ["--no-sandbox"] + } }, // Continuous Integration mode @@ -121,15 +121,15 @@ module.exports = function (config) { browserDisconnectTimeout: 10000, browserDisconnectTolerance: 3, browserConsoleLogOptions: { - terminal: !isRecordMode(), + terminal: !isRecordMode() }, client: { mocha: { // change Karma's debug.html to the mocha web reporter reporter: "html", - timeout: "600000", - }, - }, + timeout: "600000" + } + } }); }; diff --git a/sdk/communication/communication-job-router/src/models/models.ts b/sdk/communication/communication-job-router/src/models/models.ts index 5c4ee7e218c7..1c10f53554f3 100644 --- a/sdk/communication/communication-job-router/src/models/models.ts +++ b/sdk/communication/communication-job-router/src/models/models.ts @@ -86,5 +86,5 @@ export { StaticWorkerSelectorAttachment, WeightedAllocationWorkerSelectorAttachment, FunctionRuleCredential, - QueueStatistics, + QueueStatistics } from "../generated/src/models"; diff --git a/sdk/communication/communication-job-router/src/models/options.ts b/sdk/communication/communication-job-router/src/models/options.ts index 4880fff52dc0..450a76b25d3b 100644 --- a/sdk/communication/communication-job-router/src/models/options.ts +++ b/sdk/communication/communication-job-router/src/models/options.ts @@ -19,7 +19,7 @@ import { QueueSelectorAttachmentUnion, RouterJob, WorkerSelector, - WorkerStateSelector, + WorkerStateSelector } from "../generated/src"; import { CommonClientOptions, OperationOptions } from "@azure/core-client"; diff --git a/sdk/communication/communication-job-router/src/models/responses.ts b/sdk/communication/communication-job-router/src/models/responses.ts index e91cd588d473..9ddacad03656 100644 --- a/sdk/communication/communication-job-router/src/models/responses.ts +++ b/sdk/communication/communication-job-router/src/models/responses.ts @@ -7,14 +7,14 @@ import { ExceptionPolicy, JobQueue, RouterJob, - RouterWorker, + RouterWorker } from "../generated/src"; export { JobRouterCancelJobActionResponse, JobRouterCloseJobActionResponse, JobRouterCompleteJobActionResponse, - JobRouterDeclineJobActionResponse, + JobRouterDeclineJobActionResponse } from "../generated/src/models"; export interface UnAssignJobResponse { diff --git a/sdk/communication/communication-job-router/src/routerAdministrationClient.ts b/sdk/communication/communication-job-router/src/routerAdministrationClient.ts index 50359c3d8d46..03d47510bbd3 100644 --- a/sdk/communication/communication-job-router/src/routerAdministrationClient.ts +++ b/sdk/communication/communication-job-router/src/routerAdministrationClient.ts @@ -12,7 +12,7 @@ import { JobRouterAdministrationListDistributionPoliciesOptionalParams, JobRouterAdministrationListExceptionPoliciesOptionalParams, JobRouterAdministrationListQueuesOptionalParams, - JobRouterApiClient, + JobRouterApiClient } from "./generated/src"; import { CreateClassificationPolicyOptions, @@ -27,7 +27,7 @@ import { UpdateClassificationPolicyOptions, UpdateDistributionPolicyOptions, UpdateExceptionPolicyOptions, - UpdateQueueOptions, + UpdateQueueOptions } from "./models/options"; import { InternalPipelineOptions } from "@azure/core-rest-pipeline"; @@ -36,7 +36,7 @@ import { CommunicationTokenCredential, createCommunicationAuthPolicy, isKeyCredential, - parseClientArguments, + parseClientArguments } from "@azure/communication-common"; import { PagedAsyncIterableIterator } from "@azure/core-paging"; @@ -46,7 +46,7 @@ import { ClassificationPolicyResponse, DistributionPolicyResponse, ExceptionPolicyResponse, - JobQueueResponse, + JobQueueResponse } from "./models/responses"; /** @@ -138,8 +138,8 @@ export class RouterAdministrationClient { ...options, userAgentOptions, loggingOptions: { - logger: logger.info, - }, + logger: logger.info + } }; const authPolicy = createCommunicationAuthPolicy(credential); diff --git a/sdk/communication/communication-job-router/src/routerClient.ts b/sdk/communication/communication-job-router/src/routerClient.ts index 7fed55a14d2f..e8c315ccd087 100644 --- a/sdk/communication/communication-job-router/src/routerClient.ts +++ b/sdk/communication/communication-job-router/src/routerClient.ts @@ -6,7 +6,7 @@ import { CommunicationTokenCredential, createCommunicationAuthPolicy, isKeyCredential, - parseClientArguments, + parseClientArguments } from "@azure/communication-common"; import { KeyCredential, TokenCredential } from "@azure/core-auth"; @@ -27,7 +27,7 @@ import { JobRouterReclassifyJobActionResponse, QueueStatistics, RouterJobItem, - RouterWorkerItem, + RouterWorkerItem } from "./generated/src"; import { logger } from "./models/logger"; import { @@ -41,7 +41,7 @@ import { ReclassifyJobOptions, RouterClientOptions, UpdateJobOptions, - UpdateWorkerOptions, + UpdateWorkerOptions } from "./models/options"; import { RouterJobResponse, RouterWorkerResponse, UnAssignJobResponse } from "./models/responses"; @@ -128,8 +128,8 @@ export class RouterClient { ...options, userAgentOptions, loggingOptions: { - logger: logger.info, - }, + logger: logger.info + } }; const authPolicy = createCommunicationAuthPolicy(credential); @@ -270,7 +270,7 @@ export class RouterClient { const result = await this.client.jobRouter.unassignJobAction(jobId, assignmentId, options); return { jobId: result.jobId, - unAssignmentCount: result.unassignmentCount, + unAssignmentCount: result.unassignmentCount }; } @@ -353,7 +353,7 @@ export class RouterClient { options: OperationOptions = {} ): Promise { const worker = { - availableForOffers: true, + availableForOffers: true }; const workerResult = await this.client.jobRouter.upsertWorker(workerId, worker, options); return workerResult; @@ -370,7 +370,7 @@ export class RouterClient { options: OperationOptions = {} ): Promise { const worker = { - availableForOffers: false, + availableForOffers: false }; const workerResult = await this.client.jobRouter.upsertWorker(workerId, worker, options); return workerResult; diff --git a/sdk/communication/communication-job-router/test/internal/utils/mockClient.ts b/sdk/communication/communication-job-router/test/internal/utils/mockClient.ts index 3845f9a66a11..a87dde4dc143 100644 --- a/sdk/communication/communication-job-router/test/internal/utils/mockClient.ts +++ b/sdk/communication/communication-job-router/test/internal/utils/mockClient.ts @@ -33,6 +33,6 @@ export async function createRecordedRouterClientWithConnectionString( env.COMMUNICATION_CONNECTION_STRING as string, recorder.configureClientOptions({}) as RouterAdministrationClientOptions ), - recorder, + recorder }; } diff --git a/sdk/communication/communication-job-router/test/public/exceptionPolicies.spec.ts b/sdk/communication/communication-job-router/test/public/exceptionPolicies.spec.ts index 4b464f76b3a5..ca5eb85a52e1 100644 --- a/sdk/communication/communication-job-router/test/public/exceptionPolicies.spec.ts +++ b/sdk/communication/communication-job-router/test/public/exceptionPolicies.spec.ts @@ -9,26 +9,26 @@ import { Context } from "mocha"; import { exceptionPolicyRequest } from "./utils/testData"; // TODO . Complete unit and integration tests https://github.com/Azure/azure-sdk-for-js/issues/23007 -describe("RouterClient", function () { +describe("RouterClient", function() { let recorder: Recorder; // let client: RouterClient; let administrationClient: RouterAdministrationClient; - describe("Exception Policy Operations", function () { - beforeEach(async function (this: Context) { + describe("Exception Policy Operations", function() { + beforeEach(async function(this: Context) { ({ administrationClient, recorder } = await createRecordedRouterClientWithConnectionString( this )); }); - afterEach(async function (this: Context) { + afterEach(async function(this: Context) { if (!this.currentTest?.isPending() && recorder) { await recorder.stop(); } }); // exception policy actions - it("should successfully create a exception policy", async function () { + it("should successfully create a exception policy", async function() { const request = exceptionPolicyRequest; const result = await administrationClient.createExceptionPolicy(request.id!, request); @@ -38,12 +38,11 @@ describe("RouterClient", function () { assert.equal(result.name, request.name); }).timeout(8000); - it("should successfully update a exception policy", async function () { - const exceptionPolicy: ExceptionPolicyResponse = - await administrationClient.createExceptionPolicy( - exceptionPolicyRequest.id!, - exceptionPolicyRequest - ); + it("should successfully update a exception policy", async function() { + const exceptionPolicy: ExceptionPolicyResponse = await administrationClient.createExceptionPolicy( + exceptionPolicyRequest.id!, + exceptionPolicyRequest + ); exceptionPolicy.name = "some new name"; const result = await administrationClient.updateExceptionPolicy( exceptionPolicyRequest.id!, @@ -55,12 +54,11 @@ describe("RouterClient", function () { assert.equal(result.name, exceptionPolicy.name); }).timeout(8000); - it("should successfully get a exception policy", async function () { - const exceptionPolicy: ExceptionPolicyResponse = - await administrationClient.createExceptionPolicy( - exceptionPolicyRequest.id!, - exceptionPolicyRequest - ); + it("should successfully get a exception policy", async function() { + const exceptionPolicy: ExceptionPolicyResponse = await administrationClient.createExceptionPolicy( + exceptionPolicyRequest.id!, + exceptionPolicyRequest + ); const result = await administrationClient.getExceptionPolicy(exceptionPolicy.id!, {}); @@ -69,13 +67,13 @@ describe("RouterClient", function () { assert.deepEqual(result.exceptionRules, exceptionPolicyRequest.exceptionRules); }).timeout(8000); - it("should successfully list exception policies", async function () { + it("should successfully list exception policies", async function() { await administrationClient.createExceptionPolicy("id-1", exceptionPolicyRequest); await administrationClient.createExceptionPolicy("id-2", exceptionPolicyRequest); const receivedItems: ExceptionPolicy[] = []; for await (const policy of administrationClient.listExceptionPolicies({ - maxPageSize: 20, + maxPageSize: 20 })) { receivedItems.push(policy.exceptionPolicy!); } @@ -83,7 +81,7 @@ describe("RouterClient", function () { assert.isNotNull(receivedItems); }).timeout(8000); - it("should successfully delete a exception policy", async function () { + it("should successfully delete a exception policy", async function() { await administrationClient.createExceptionPolicy( exceptionPolicyRequest.id!, exceptionPolicyRequest diff --git a/sdk/communication/communication-job-router/test/public/utils/recordedClient.ts b/sdk/communication/communication-job-router/test/public/utils/recordedClient.ts index 5e374aa902fe..1b41b5fd73e2 100644 --- a/sdk/communication/communication-job-router/test/public/utils/recordedClient.ts +++ b/sdk/communication/communication-job-router/test/public/utils/recordedClient.ts @@ -12,7 +12,7 @@ if (isNode) { } const envSetupForPlayback: { [k: string]: string } = { - COMMUNICATION_CONNECTION_STRING: "endpoint=https://endpoint/;accesskey=banana", + COMMUNICATION_CONNECTION_STRING: "endpoint=https://endpoint/;accesskey=banana" }; const fakeToken = generateToken(); @@ -22,11 +22,11 @@ export const recorderOptions: RecorderStartOptions = { connectionStringSanitizers: [ { fakeConnString: envSetupForPlayback["COMMUNICATION_CONNECTION_STRING"], - actualConnString: env["COMMUNICATION_CONNECTION_STRING"] || undefined, - }, + actualConnString: env["COMMUNICATION_CONNECTION_STRING"] || undefined + } ], - bodyKeySanitizers: [{ jsonPath: "$.accessToken.token", value: fakeToken }], - }, + bodyKeySanitizers: [{ jsonPath: "$.accessToken.token", value: fakeToken }] + } }; export async function createRecorder(context: Test | undefined): Promise { diff --git a/sdk/communication/communication-job-router/test/public/utils/testData.ts b/sdk/communication/communication-job-router/test/public/utils/testData.ts index 8c5d6cb3d54f..075fd4543fb0 100644 --- a/sdk/communication/communication-job-router/test/public/utils/testData.ts +++ b/sdk/communication/communication-job-router/test/public/utils/testData.ts @@ -7,7 +7,7 @@ import { ExceptionPolicy, JobQueue, RouterJob, - RouterWorker, + RouterWorker } from "../../../src"; export const exceptionPolicyRequest: ExceptionPolicy = { @@ -20,16 +20,16 @@ export const exceptionPolicyRequest: ExceptionPolicy = { kind: "reclassify", classificationPolicyId: "Main", labelsToUpsert: { - escalated: true, - }, - }, + escalated: true + } + } }, trigger: { kind: "wait-time", - thresholdSeconds: 5, - }, - }, - }, + thresholdSeconds: 5 + } + } + } }; export const classificationPolicyRequest: ClassificationPolicy = { @@ -43,15 +43,15 @@ export const classificationPolicyRequest: ClassificationPolicy = { { key: "foo", labelOperator: "equal", - value: { default: 10 }, - }, - ], - }, + value: { default: 10 } + } + ] + } ], prioritizationRule: { kind: "static-rule", - value: { default: 2 }, - }, + value: { default: 2 } + } }; export const distributionPolicyRequest: DistributionPolicy = { @@ -60,9 +60,9 @@ export const distributionPolicyRequest: DistributionPolicy = { kind: "longest-idle", minConcurrentOffers: 1, maxConcurrentOffers: 5, - bypassSelectors: false, + bypassSelectors: false }, - offerTtlInSeconds: 120, + offerTtlInSeconds: 120 }; export const queueRequest: JobQueue = { @@ -70,7 +70,7 @@ export const queueRequest: JobQueue = { distributionPolicyId: "MainDistributionPolicy", name: "Main", labels: {}, - exceptionPolicyId: "MainExceptionPolicy", + exceptionPolicyId: "MainExceptionPolicy" }; export const workerRequest: RouterWorker = { @@ -80,20 +80,20 @@ export const workerRequest: RouterWorker = { totalCapacity: 100, queueAssignments: { MainQueue: {}, - SecondaryQueue: {}, + SecondaryQueue: {} }, labels: {}, channelConfigurations: { CustomChatChannel: { - capacityCostPerJob: 10, + capacityCostPerJob: 10 }, CustomVoiceChannel: { - capacityCostPerJob: 100, - }, - }, + capacityCostPerJob: 100 + } + } }; export const jobRequest: RouterJob = { channelId: "ChatChannel", - labels: {}, + labels: {} }; From 4f79e7562d556bd453144d9a83967b0499a186c6 Mon Sep 17 00:00:00 2001 From: Stevan Freeborn <65925598+StevanFreeborn@users.noreply.github.com> Date: Wed, 15 Feb 2023 01:14:07 +0000 Subject: [PATCH 3/3] fix: re-run 'npm run format' after running 'rush update' --- .../communication-job-router/karma.conf.js | 26 +++++------ .../src/models/models.ts | 2 +- .../src/models/options.ts | 2 +- .../src/models/responses.ts | 4 +- .../src/routerAdministrationClient.ts | 12 ++--- .../src/routerClient.ts | 16 +++---- .../test/internal/routerClient.mocked.spec.ts | 6 +-- .../test/internal/utils/mockClient.ts | 2 +- .../test/public/exceptionPolicies.spec.ts | 38 +++++++-------- .../test/public/utils/recordedClient.ts | 10 ++-- .../test/public/utils/testData.ts | 46 +++++++++---------- 11 files changed, 83 insertions(+), 81 deletions(-) diff --git a/sdk/communication/communication-job-router/karma.conf.js b/sdk/communication/communication-job-router/karma.conf.js index ff9f1c10e064..a7a33b4ea39a 100644 --- a/sdk/communication/communication-job-router/karma.conf.js +++ b/sdk/communication/communication-job-router/karma.conf.js @@ -8,7 +8,7 @@ process.env.RECORDINGS_RELATIVE_PATH = relativeRecordingsPath(); const { jsonRecordingFilterFunction, isRecordMode } = require("@azure-tools/test-recorder"); -module.exports = function(config) { +module.exports = function (config) { config.set({ // base path that will be used to resolve all patterns (eg. files, exclude) basePath: "./", @@ -29,7 +29,7 @@ module.exports = function(config) { "karma-sourcemap-loader", "karma-junit-reporter", "karma-json-to-file-reporter", - "karma-json-preprocessor" + "karma-json-preprocessor", ], // list of files / patterns to load in the browser @@ -42,7 +42,7 @@ module.exports = function(config) { // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor preprocessors: { "**/*.js": ["sourcemap", "env"], - "recordings/browsers/**/*.json": ["json"] + "recordings/browsers/**/*.json": ["json"], // IMPORTANT: COMMENT following line if you want to debug in your browsers!! // Preprocess source file to calculate code coverage, however this will make source file unreadable //"dist-test/index.browser.js": ["coverage"] @@ -65,8 +65,8 @@ module.exports = function(config) { { type: "json", subdir: ".", file: "coverage.json" }, { type: "lcovonly", subdir: ".", file: "lcov.info" }, { type: "html", subdir: "html" }, - { type: "cobertura", subdir: ".", file: "cobertura-coverage.xml" } - ] + { type: "cobertura", subdir: ".", file: "cobertura-coverage.xml" }, + ], }, junitReporter: { @@ -76,12 +76,12 @@ module.exports = function(config) { useBrowserName: false, // add browser name to report and classes names nameFormatter: undefined, // function (browser, result) to customize the name attribute in xml testcase element classNameFormatter: undefined, // function (browser, result) to customize the classname attribute in xml testcase element - properties: {} // key value pair of properties to add to the section of the report + properties: {}, // key value pair of properties to add to the section of the report }, jsonToFileReporter: { filter: jsonRecordingFilterFunction, - outputPath: "." + outputPath: ".", }, // web server port @@ -105,8 +105,8 @@ module.exports = function(config) { customLaunchers: { HeadlessChrome: { base: "ChromeHeadless", - flags: ["--no-sandbox"] - } + flags: ["--no-sandbox"], + }, }, // Continuous Integration mode @@ -121,15 +121,15 @@ module.exports = function(config) { browserDisconnectTimeout: 10000, browserDisconnectTolerance: 3, browserConsoleLogOptions: { - terminal: !isRecordMode() + terminal: !isRecordMode(), }, client: { mocha: { // change Karma's debug.html to the mocha web reporter reporter: "html", - timeout: "600000" - } - } + timeout: "600000", + }, + }, }); }; diff --git a/sdk/communication/communication-job-router/src/models/models.ts b/sdk/communication/communication-job-router/src/models/models.ts index 1c10f53554f3..5c4ee7e218c7 100644 --- a/sdk/communication/communication-job-router/src/models/models.ts +++ b/sdk/communication/communication-job-router/src/models/models.ts @@ -86,5 +86,5 @@ export { StaticWorkerSelectorAttachment, WeightedAllocationWorkerSelectorAttachment, FunctionRuleCredential, - QueueStatistics + QueueStatistics, } from "../generated/src/models"; diff --git a/sdk/communication/communication-job-router/src/models/options.ts b/sdk/communication/communication-job-router/src/models/options.ts index 450a76b25d3b..4880fff52dc0 100644 --- a/sdk/communication/communication-job-router/src/models/options.ts +++ b/sdk/communication/communication-job-router/src/models/options.ts @@ -19,7 +19,7 @@ import { QueueSelectorAttachmentUnion, RouterJob, WorkerSelector, - WorkerStateSelector + WorkerStateSelector, } from "../generated/src"; import { CommonClientOptions, OperationOptions } from "@azure/core-client"; diff --git a/sdk/communication/communication-job-router/src/models/responses.ts b/sdk/communication/communication-job-router/src/models/responses.ts index 9ddacad03656..e91cd588d473 100644 --- a/sdk/communication/communication-job-router/src/models/responses.ts +++ b/sdk/communication/communication-job-router/src/models/responses.ts @@ -7,14 +7,14 @@ import { ExceptionPolicy, JobQueue, RouterJob, - RouterWorker + RouterWorker, } from "../generated/src"; export { JobRouterCancelJobActionResponse, JobRouterCloseJobActionResponse, JobRouterCompleteJobActionResponse, - JobRouterDeclineJobActionResponse + JobRouterDeclineJobActionResponse, } from "../generated/src/models"; export interface UnAssignJobResponse { diff --git a/sdk/communication/communication-job-router/src/routerAdministrationClient.ts b/sdk/communication/communication-job-router/src/routerAdministrationClient.ts index 03d47510bbd3..50359c3d8d46 100644 --- a/sdk/communication/communication-job-router/src/routerAdministrationClient.ts +++ b/sdk/communication/communication-job-router/src/routerAdministrationClient.ts @@ -12,7 +12,7 @@ import { JobRouterAdministrationListDistributionPoliciesOptionalParams, JobRouterAdministrationListExceptionPoliciesOptionalParams, JobRouterAdministrationListQueuesOptionalParams, - JobRouterApiClient + JobRouterApiClient, } from "./generated/src"; import { CreateClassificationPolicyOptions, @@ -27,7 +27,7 @@ import { UpdateClassificationPolicyOptions, UpdateDistributionPolicyOptions, UpdateExceptionPolicyOptions, - UpdateQueueOptions + UpdateQueueOptions, } from "./models/options"; import { InternalPipelineOptions } from "@azure/core-rest-pipeline"; @@ -36,7 +36,7 @@ import { CommunicationTokenCredential, createCommunicationAuthPolicy, isKeyCredential, - parseClientArguments + parseClientArguments, } from "@azure/communication-common"; import { PagedAsyncIterableIterator } from "@azure/core-paging"; @@ -46,7 +46,7 @@ import { ClassificationPolicyResponse, DistributionPolicyResponse, ExceptionPolicyResponse, - JobQueueResponse + JobQueueResponse, } from "./models/responses"; /** @@ -138,8 +138,8 @@ export class RouterAdministrationClient { ...options, userAgentOptions, loggingOptions: { - logger: logger.info - } + logger: logger.info, + }, }; const authPolicy = createCommunicationAuthPolicy(credential); diff --git a/sdk/communication/communication-job-router/src/routerClient.ts b/sdk/communication/communication-job-router/src/routerClient.ts index e8c315ccd087..7fed55a14d2f 100644 --- a/sdk/communication/communication-job-router/src/routerClient.ts +++ b/sdk/communication/communication-job-router/src/routerClient.ts @@ -6,7 +6,7 @@ import { CommunicationTokenCredential, createCommunicationAuthPolicy, isKeyCredential, - parseClientArguments + parseClientArguments, } from "@azure/communication-common"; import { KeyCredential, TokenCredential } from "@azure/core-auth"; @@ -27,7 +27,7 @@ import { JobRouterReclassifyJobActionResponse, QueueStatistics, RouterJobItem, - RouterWorkerItem + RouterWorkerItem, } from "./generated/src"; import { logger } from "./models/logger"; import { @@ -41,7 +41,7 @@ import { ReclassifyJobOptions, RouterClientOptions, UpdateJobOptions, - UpdateWorkerOptions + UpdateWorkerOptions, } from "./models/options"; import { RouterJobResponse, RouterWorkerResponse, UnAssignJobResponse } from "./models/responses"; @@ -128,8 +128,8 @@ export class RouterClient { ...options, userAgentOptions, loggingOptions: { - logger: logger.info - } + logger: logger.info, + }, }; const authPolicy = createCommunicationAuthPolicy(credential); @@ -270,7 +270,7 @@ export class RouterClient { const result = await this.client.jobRouter.unassignJobAction(jobId, assignmentId, options); return { jobId: result.jobId, - unAssignmentCount: result.unassignmentCount + unAssignmentCount: result.unassignmentCount, }; } @@ -353,7 +353,7 @@ export class RouterClient { options: OperationOptions = {} ): Promise { const worker = { - availableForOffers: true + availableForOffers: true, }; const workerResult = await this.client.jobRouter.upsertWorker(workerId, worker, options); return workerResult; @@ -370,7 +370,7 @@ export class RouterClient { options: OperationOptions = {} ): Promise { const worker = { - availableForOffers: false + availableForOffers: false, }; const workerResult = await this.client.jobRouter.upsertWorker(workerId, worker, options); return workerResult; diff --git a/sdk/communication/communication-job-router/test/internal/routerClient.mocked.spec.ts b/sdk/communication/communication-job-router/test/internal/routerClient.mocked.spec.ts index 4e907a28a445..d97a602252e1 100644 --- a/sdk/communication/communication-job-router/test/internal/routerClient.mocked.spec.ts +++ b/sdk/communication/communication-job-router/test/internal/routerClient.mocked.spec.ts @@ -6,12 +6,12 @@ import { AzureCommunicationTokenCredential } from "@azure/communication-common"; import { RouterClient } from "../../src"; import { baseUri, generateToken } from "../public/utils/connectionUtils"; -describe("[Mocked] RouterClient", async function() { - afterEach(function() { +describe("[Mocked] RouterClient", async function () { + afterEach(function () { sinon.restore(); }); - it("can instantiate", async function() { + it("can instantiate", async function () { new RouterClient(baseUri, new AzureCommunicationTokenCredential(generateToken())); }); }); diff --git a/sdk/communication/communication-job-router/test/internal/utils/mockClient.ts b/sdk/communication/communication-job-router/test/internal/utils/mockClient.ts index a87dde4dc143..3845f9a66a11 100644 --- a/sdk/communication/communication-job-router/test/internal/utils/mockClient.ts +++ b/sdk/communication/communication-job-router/test/internal/utils/mockClient.ts @@ -33,6 +33,6 @@ export async function createRecordedRouterClientWithConnectionString( env.COMMUNICATION_CONNECTION_STRING as string, recorder.configureClientOptions({}) as RouterAdministrationClientOptions ), - recorder + recorder, }; } diff --git a/sdk/communication/communication-job-router/test/public/exceptionPolicies.spec.ts b/sdk/communication/communication-job-router/test/public/exceptionPolicies.spec.ts index ca5eb85a52e1..4b464f76b3a5 100644 --- a/sdk/communication/communication-job-router/test/public/exceptionPolicies.spec.ts +++ b/sdk/communication/communication-job-router/test/public/exceptionPolicies.spec.ts @@ -9,26 +9,26 @@ import { Context } from "mocha"; import { exceptionPolicyRequest } from "./utils/testData"; // TODO . Complete unit and integration tests https://github.com/Azure/azure-sdk-for-js/issues/23007 -describe("RouterClient", function() { +describe("RouterClient", function () { let recorder: Recorder; // let client: RouterClient; let administrationClient: RouterAdministrationClient; - describe("Exception Policy Operations", function() { - beforeEach(async function(this: Context) { + describe("Exception Policy Operations", function () { + beforeEach(async function (this: Context) { ({ administrationClient, recorder } = await createRecordedRouterClientWithConnectionString( this )); }); - afterEach(async function(this: Context) { + afterEach(async function (this: Context) { if (!this.currentTest?.isPending() && recorder) { await recorder.stop(); } }); // exception policy actions - it("should successfully create a exception policy", async function() { + it("should successfully create a exception policy", async function () { const request = exceptionPolicyRequest; const result = await administrationClient.createExceptionPolicy(request.id!, request); @@ -38,11 +38,12 @@ describe("RouterClient", function() { assert.equal(result.name, request.name); }).timeout(8000); - it("should successfully update a exception policy", async function() { - const exceptionPolicy: ExceptionPolicyResponse = await administrationClient.createExceptionPolicy( - exceptionPolicyRequest.id!, - exceptionPolicyRequest - ); + it("should successfully update a exception policy", async function () { + const exceptionPolicy: ExceptionPolicyResponse = + await administrationClient.createExceptionPolicy( + exceptionPolicyRequest.id!, + exceptionPolicyRequest + ); exceptionPolicy.name = "some new name"; const result = await administrationClient.updateExceptionPolicy( exceptionPolicyRequest.id!, @@ -54,11 +55,12 @@ describe("RouterClient", function() { assert.equal(result.name, exceptionPolicy.name); }).timeout(8000); - it("should successfully get a exception policy", async function() { - const exceptionPolicy: ExceptionPolicyResponse = await administrationClient.createExceptionPolicy( - exceptionPolicyRequest.id!, - exceptionPolicyRequest - ); + it("should successfully get a exception policy", async function () { + const exceptionPolicy: ExceptionPolicyResponse = + await administrationClient.createExceptionPolicy( + exceptionPolicyRequest.id!, + exceptionPolicyRequest + ); const result = await administrationClient.getExceptionPolicy(exceptionPolicy.id!, {}); @@ -67,13 +69,13 @@ describe("RouterClient", function() { assert.deepEqual(result.exceptionRules, exceptionPolicyRequest.exceptionRules); }).timeout(8000); - it("should successfully list exception policies", async function() { + it("should successfully list exception policies", async function () { await administrationClient.createExceptionPolicy("id-1", exceptionPolicyRequest); await administrationClient.createExceptionPolicy("id-2", exceptionPolicyRequest); const receivedItems: ExceptionPolicy[] = []; for await (const policy of administrationClient.listExceptionPolicies({ - maxPageSize: 20 + maxPageSize: 20, })) { receivedItems.push(policy.exceptionPolicy!); } @@ -81,7 +83,7 @@ describe("RouterClient", function() { assert.isNotNull(receivedItems); }).timeout(8000); - it("should successfully delete a exception policy", async function() { + it("should successfully delete a exception policy", async function () { await administrationClient.createExceptionPolicy( exceptionPolicyRequest.id!, exceptionPolicyRequest diff --git a/sdk/communication/communication-job-router/test/public/utils/recordedClient.ts b/sdk/communication/communication-job-router/test/public/utils/recordedClient.ts index 1b41b5fd73e2..5e374aa902fe 100644 --- a/sdk/communication/communication-job-router/test/public/utils/recordedClient.ts +++ b/sdk/communication/communication-job-router/test/public/utils/recordedClient.ts @@ -12,7 +12,7 @@ if (isNode) { } const envSetupForPlayback: { [k: string]: string } = { - COMMUNICATION_CONNECTION_STRING: "endpoint=https://endpoint/;accesskey=banana" + COMMUNICATION_CONNECTION_STRING: "endpoint=https://endpoint/;accesskey=banana", }; const fakeToken = generateToken(); @@ -22,11 +22,11 @@ export const recorderOptions: RecorderStartOptions = { connectionStringSanitizers: [ { fakeConnString: envSetupForPlayback["COMMUNICATION_CONNECTION_STRING"], - actualConnString: env["COMMUNICATION_CONNECTION_STRING"] || undefined - } + actualConnString: env["COMMUNICATION_CONNECTION_STRING"] || undefined, + }, ], - bodyKeySanitizers: [{ jsonPath: "$.accessToken.token", value: fakeToken }] - } + bodyKeySanitizers: [{ jsonPath: "$.accessToken.token", value: fakeToken }], + }, }; export async function createRecorder(context: Test | undefined): Promise { diff --git a/sdk/communication/communication-job-router/test/public/utils/testData.ts b/sdk/communication/communication-job-router/test/public/utils/testData.ts index 075fd4543fb0..8c5d6cb3d54f 100644 --- a/sdk/communication/communication-job-router/test/public/utils/testData.ts +++ b/sdk/communication/communication-job-router/test/public/utils/testData.ts @@ -7,7 +7,7 @@ import { ExceptionPolicy, JobQueue, RouterJob, - RouterWorker + RouterWorker, } from "../../../src"; export const exceptionPolicyRequest: ExceptionPolicy = { @@ -20,16 +20,16 @@ export const exceptionPolicyRequest: ExceptionPolicy = { kind: "reclassify", classificationPolicyId: "Main", labelsToUpsert: { - escalated: true - } - } + escalated: true, + }, + }, }, trigger: { kind: "wait-time", - thresholdSeconds: 5 - } - } - } + thresholdSeconds: 5, + }, + }, + }, }; export const classificationPolicyRequest: ClassificationPolicy = { @@ -43,15 +43,15 @@ export const classificationPolicyRequest: ClassificationPolicy = { { key: "foo", labelOperator: "equal", - value: { default: 10 } - } - ] - } + value: { default: 10 }, + }, + ], + }, ], prioritizationRule: { kind: "static-rule", - value: { default: 2 } - } + value: { default: 2 }, + }, }; export const distributionPolicyRequest: DistributionPolicy = { @@ -60,9 +60,9 @@ export const distributionPolicyRequest: DistributionPolicy = { kind: "longest-idle", minConcurrentOffers: 1, maxConcurrentOffers: 5, - bypassSelectors: false + bypassSelectors: false, }, - offerTtlInSeconds: 120 + offerTtlInSeconds: 120, }; export const queueRequest: JobQueue = { @@ -70,7 +70,7 @@ export const queueRequest: JobQueue = { distributionPolicyId: "MainDistributionPolicy", name: "Main", labels: {}, - exceptionPolicyId: "MainExceptionPolicy" + exceptionPolicyId: "MainExceptionPolicy", }; export const workerRequest: RouterWorker = { @@ -80,20 +80,20 @@ export const workerRequest: RouterWorker = { totalCapacity: 100, queueAssignments: { MainQueue: {}, - SecondaryQueue: {} + SecondaryQueue: {}, }, labels: {}, channelConfigurations: { CustomChatChannel: { - capacityCostPerJob: 10 + capacityCostPerJob: 10, }, CustomVoiceChannel: { - capacityCostPerJob: 100 - } - } + capacityCostPerJob: 100, + }, + }, }; export const jobRequest: RouterJob = { channelId: "ChatChannel", - labels: {} + labels: {}, };