diff --git a/eng/common/scripts/Verify-Links.ps1 b/eng/common/scripts/Verify-Links.ps1 index c9991a058894..60065c980890 100644 --- a/eng/common/scripts/Verify-Links.ps1 +++ b/eng/common/scripts/Verify-Links.ps1 @@ -30,6 +30,7 @@ function NormalizeUrl([string]$url){ $url = "file://" + (Resolve-Path $url).ToString(); } + Write-Verbose "The url to check against: $url." $uri = [System.Uri]$url; if ($script:baseUrl -eq "") { diff --git a/eng/common/scripts/get-markdown-files-from-changed-files.ps1 b/eng/common/scripts/get-markdown-files-from-changed-files.ps1 new file mode 100644 index 000000000000..6316fd1ce26e --- /dev/null +++ b/eng/common/scripts/get-markdown-files-from-changed-files.ps1 @@ -0,0 +1,49 @@ +param ( + # The root repo we scaned with. + [string] $RootRepo = '$PSScriptRoot/../../..', + # The target branch to compare with. + [string] $targetBranch = "origin/${env:SYSTEM_PULLREQUEST_TARGETBRANCH}" +) +$deletedFiles = (git diff $targetBranch HEAD --name-only --diff-filter=D) +$renamedFiles = (git diff $targetBranch HEAD --diff-filter=R) +$changedMarkdowns = (git diff $targetBranch HEAD --name-only -- '*.md') + +$beforeRenameFiles = @() +# Retrieve the 'renamed from' files. Git command only returns back the files after rename. +# In order to have the files path before rename, it has to do some regex checking. +# It is better to be replaced by more reliable commands if any. +foreach ($file in $renamedFiles) { + if ($file -match "^rename from (.*)$") { + $beforeRenameFiles += $file -replace "^rename from (.*)$", '$1' + } +} +# A combined list of deleted and renamed files. +$relativePathLinks = ($deletedFiles + $beforeRenameFiles) +# Removed the deleted markdowns. +$changedMarkdowns = $changedMarkdowns | Where-Object { $deletedFiles -notcontains $_ } +# Scan all markdowns and find if it contains the deleted or renamed files. +$markdownContainLinks = @() +$allMarkdownFiles = Get-ChildItem -Path $RootRepo -Recurse -Include *.md +foreach ($f in $allMarkdownFiles) { + $filePath = $f.FullName + $content = Get-Content -Path $filePath -Raw + foreach ($l in $relativePathLinks) { + if ($content -match $l) { + $markdownContainLinks += $filePath + break + } + } +} + +# Convert markdowns path of the PR to absolute path. +$adjustedReadmes = $changedMarkdowns | Foreach-Object { Resolve-Path $_ } +$markdownContainLinks += $adjustedReadmes + +# Get rid of any duplicated ones. +$allMarkdowns = [string[]]($markdownContainLinks | Sort-Object | Get-Unique) + +Write-Host "Here are all markdown files we need to check based on the changed files:" +foreach ($file in $allMarkdowns) { + Write-Host " $file" +} +return $allMarkdowns diff --git a/sdk/identity/identity/CHANGELOG.md b/sdk/identity/identity/CHANGELOG.md index 7cff752e47c5..6ff3494488ca 100644 --- a/sdk/identity/identity/CHANGELOG.md +++ b/sdk/identity/identity/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.2.1 (Unreleased) + + ## 1.2.0 (2020-11-11) ### Changes since 1.1.\* diff --git a/sdk/identity/identity/package.json b/sdk/identity/identity/package.json index 9381047c0206..00a4a689586e 100644 --- a/sdk/identity/identity/package.json +++ b/sdk/identity/identity/package.json @@ -1,7 +1,7 @@ { "name": "@azure/identity", "sdk-type": "client", - "version": "1.2.0", + "version": "1.2.1", "description": "Provides credential implementations for Azure SDK libraries that can authenticate with Azure Active Directory", "main": "dist/index.js", "module": "dist-esm/src/index.js", diff --git a/sdk/locks/arm-locks/LICENSE.txt b/sdk/locks/arm-locks/LICENSE.txt index b73b4a1293c3..ea8fb1516028 100644 --- a/sdk/locks/arm-locks/LICENSE.txt +++ b/sdk/locks/arm-locks/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2019 Microsoft +Copyright (c) 2020 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/locks/arm-locks/README.md b/sdk/locks/arm-locks/README.md index 3d40a1ffb0ee..aca3e2c9bdb6 100644 --- a/sdk/locks/arm-locks/README.md +++ b/sdk/locks/arm-locks/README.md @@ -15,21 +15,21 @@ npm install @azure/arm-locks ### How to use -#### nodejs - Authentication, client creation and list authorizationOperations as an example written in TypeScript. +#### nodejs - client creation and list authorizationOperations as an example written in TypeScript. ##### Install @azure/ms-rest-nodeauth +- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`. ```bash -npm install @azure/ms-rest-nodeauth +npm install @azure/ms-rest-nodeauth@"^3.0.0" ``` ##### Sample code +While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package ```typescript -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; -import { ManagementLockClient, ManagementLockModels, ManagementLockMappers } from "@azure/arm-locks"; +const msRestNodeAuth = require("@azure/ms-rest-nodeauth"); +const { ManagementLockClient } = require("@azure/arm-locks"); const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; msRestNodeAuth.interactiveLogin().then((creds) => { @@ -95,4 +95,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) -![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Flocks%2Farm-locks%2FREADME.png) +![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/locks/arm-locks/README.png) diff --git a/sdk/locks/arm-locks/package.json b/sdk/locks/arm-locks/package.json index ed0bb0c2316e..b9b0b6bf8ec7 100644 --- a/sdk/locks/arm-locks/package.json +++ b/sdk/locks/arm-locks/package.json @@ -4,9 +4,9 @@ "description": "ManagementLockClient Library with typescript type definitions for node.js and browser.", "version": "1.1.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.3.2", - "@azure/ms-rest-js": "^1.8.1", - "tslib": "^1.9.3" + "@azure/ms-rest-azure-js": "^2.0.1", + "@azure/ms-rest-js": "^2.0.4", + "tslib": "^1.10.0" }, "keywords": [ "node", @@ -20,11 +20,11 @@ "module": "./esm/managementLockClient.js", "types": "./esm/managementLockClient.d.ts", "devDependencies": { - "typescript": "^3.1.1", - "rollup": "^0.66.2", - "rollup-plugin-node-resolve": "^3.4.0", + "typescript": "^3.5.3", + "rollup": "^1.18.0", + "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-sourcemaps": "^0.4.2", - "uglify-js": "^3.4.9" + "uglify-js": "^3.6.0" }, "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/locks/arm-locks", "repository": { diff --git a/sdk/locks/arm-locks/rollup.config.js b/sdk/locks/arm-locks/rollup.config.js index ad258f7a3de7..634feec9bd0f 100644 --- a/sdk/locks/arm-locks/rollup.config.js +++ b/sdk/locks/arm-locks/rollup.config.js @@ -21,15 +21,15 @@ const config = { "@azure/ms-rest-azure-js": "msRestAzure" }, banner: `/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */` }, plugins: [ - nodeResolve({ module: true }), + nodeResolve({ mainFields: ['module', 'main'] }), sourcemaps() ] }; diff --git a/sdk/locks/arm-locks/src/managementLockClient.ts b/sdk/locks/arm-locks/src/managementLockClient.ts index 8f3ee196f5d8..f86a4383d845 100644 --- a/sdk/locks/arm-locks/src/managementLockClient.ts +++ b/sdk/locks/arm-locks/src/managementLockClient.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/locks/arm-locks/src/managementLockClientContext.ts b/sdk/locks/arm-locks/src/managementLockClientContext.ts index 1614234fb5b2..ed42623f65ed 100644 --- a/sdk/locks/arm-locks/src/managementLockClientContext.ts +++ b/sdk/locks/arm-locks/src/managementLockClientContext.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/locks/arm-locks/src/models/authorizationOperationsMappers.ts b/sdk/locks/arm-locks/src/models/authorizationOperationsMappers.ts index 689688180be7..938d3e665a23 100644 --- a/sdk/locks/arm-locks/src/models/authorizationOperationsMappers.ts +++ b/sdk/locks/arm-locks/src/models/authorizationOperationsMappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/locks/arm-locks/src/models/index.ts b/sdk/locks/arm-locks/src/models/index.ts index cb1a27b7a18b..416c69793916 100644 --- a/sdk/locks/arm-locks/src/models/index.ts +++ b/sdk/locks/arm-locks/src/models/index.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -129,6 +129,46 @@ export interface ManagementLocksListByScopeOptionalParams extends msRest.Request filter?: string; } +/** + * Optional Parameters. + */ +export interface ManagementLocksListAtResourceGroupLevelNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply on the operation. + */ + filter?: string; +} + +/** + * Optional Parameters. + */ +export interface ManagementLocksListAtResourceLevelNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply on the operation. + */ + filter?: string; +} + +/** + * Optional Parameters. + */ +export interface ManagementLocksListAtSubscriptionLevelNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply on the operation. + */ + filter?: string; +} + +/** + * Optional Parameters. + */ +export interface ManagementLocksListByScopeNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply on the operation. + */ + filter?: string; +} + /** * An interface representing ManagementLockClientOptions. */ diff --git a/sdk/locks/arm-locks/src/models/managementLocksMappers.ts b/sdk/locks/arm-locks/src/models/managementLocksMappers.ts index 829964b3158a..ca0b95dc96f3 100644 --- a/sdk/locks/arm-locks/src/models/managementLocksMappers.ts +++ b/sdk/locks/arm-locks/src/models/managementLocksMappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/locks/arm-locks/src/models/mappers.ts b/sdk/locks/arm-locks/src/models/mappers.ts index 6a0539a576e5..b4a81ecd3b4e 100644 --- a/sdk/locks/arm-locks/src/models/mappers.ts +++ b/sdk/locks/arm-locks/src/models/mappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/locks/arm-locks/src/models/parameters.ts b/sdk/locks/arm-locks/src/models/parameters.ts index fe8e8e08a3b1..df9eaad06d05 100644 --- a/sdk/locks/arm-locks/src/models/parameters.ts +++ b/sdk/locks/arm-locks/src/models/parameters.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/locks/arm-locks/src/operations/authorizationOperations.ts b/sdk/locks/arm-locks/src/operations/authorizationOperations.ts index 29d0a0621e3b..fa837ad33dba 100644 --- a/sdk/locks/arm-locks/src/operations/authorizationOperations.ts +++ b/sdk/locks/arm-locks/src/operations/authorizationOperations.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -108,6 +107,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/locks/arm-locks/src/operations/index.ts b/sdk/locks/arm-locks/src/operations/index.ts index 83933898775f..7c3e495d3386 100644 --- a/sdk/locks/arm-locks/src/operations/index.ts +++ b/sdk/locks/arm-locks/src/operations/index.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/locks/arm-locks/src/operations/managementLocks.ts b/sdk/locks/arm-locks/src/operations/managementLocks.ts index d6f3a7b68d01..894eda1a1ff1 100644 --- a/sdk/locks/arm-locks/src/operations/managementLocks.ts +++ b/sdk/locks/arm-locks/src/operations/managementLocks.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -656,7 +655,7 @@ export class ManagementLocks { * @param [options] The optional parameters * @returns Promise */ - listAtResourceGroupLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listAtResourceGroupLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtResourceGroupLevelNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -667,8 +666,8 @@ export class ManagementLocks { * @param options The optional parameters * @param callback The callback */ - listAtResourceGroupLevelNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listAtResourceGroupLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listAtResourceGroupLevelNext(nextPageLink: string, options: Models.ManagementLocksListAtResourceGroupLevelNextOptionalParams, callback: msRest.ServiceCallback): void; + listAtResourceGroupLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtResourceGroupLevelNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -684,7 +683,7 @@ export class ManagementLocks { * @param [options] The optional parameters * @returns Promise */ - listAtResourceLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listAtResourceLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtResourceLevelNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -695,8 +694,8 @@ export class ManagementLocks { * @param options The optional parameters * @param callback The callback */ - listAtResourceLevelNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listAtResourceLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listAtResourceLevelNext(nextPageLink: string, options: Models.ManagementLocksListAtResourceLevelNextOptionalParams, callback: msRest.ServiceCallback): void; + listAtResourceLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtResourceLevelNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -712,7 +711,7 @@ export class ManagementLocks { * @param [options] The optional parameters * @returns Promise */ - listAtSubscriptionLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listAtSubscriptionLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtSubscriptionLevelNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -723,8 +722,8 @@ export class ManagementLocks { * @param options The optional parameters * @param callback The callback */ - listAtSubscriptionLevelNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listAtSubscriptionLevelNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listAtSubscriptionLevelNext(nextPageLink: string, options: Models.ManagementLocksListAtSubscriptionLevelNextOptionalParams, callback: msRest.ServiceCallback): void; + listAtSubscriptionLevelNext(nextPageLink: string, options?: Models.ManagementLocksListAtSubscriptionLevelNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -740,7 +739,7 @@ export class ManagementLocks { * @param [options] The optional parameters * @returns Promise */ - listByScopeNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listByScopeNext(nextPageLink: string, options?: Models.ManagementLocksListByScopeNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -751,8 +750,8 @@ export class ManagementLocks { * @param options The optional parameters * @param callback The callback */ - listByScopeNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByScopeNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listByScopeNext(nextPageLink: string, options: Models.ManagementLocksListByScopeNextOptionalParams, callback: msRest.ServiceCallback): void; + listByScopeNext(nextPageLink: string, options?: Models.ManagementLocksListByScopeNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -1216,6 +1215,10 @@ const listAtResourceGroupLevelNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -1237,6 +1240,10 @@ const listAtResourceLevelNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -1258,6 +1265,10 @@ const listAtSubscriptionLevelNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -1279,6 +1290,10 @@ const listByScopeNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/locks/arm-locks/tsconfig.json b/sdk/locks/arm-locks/tsconfig.json index 87bbf5b5fa49..422b584abd5e 100644 --- a/sdk/locks/arm-locks/tsconfig.json +++ b/sdk/locks/arm-locks/tsconfig.json @@ -9,7 +9,7 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6"], + "lib": ["es6", "dom"], "declaration": true, "outDir": "./esm", "importHelpers": true diff --git a/sdk/servicebus/service-bus/review/service-bus.api.md b/sdk/servicebus/service-bus/review/service-bus.api.md index 7d5d4cd9d5f2..d06a4e580dee 100644 --- a/sdk/servicebus/service-bus/review/service-bus.api.md +++ b/sdk/servicebus/service-bus/review/service-bus.api.md @@ -5,7 +5,6 @@ ```ts import { AmqpAnnotatedMessage } from '@azure/core-amqp'; -import { AmqpError } from 'rhea-promise'; import { delay } from '@azure/core-amqp'; import { Delivery } from 'rhea-promise'; import { HttpResponse } from '@azure/core-http'; @@ -136,7 +135,7 @@ export interface GetMessageIteratorOptions extends OperationOptionsBase { } // @public -export function isServiceBusError(err: Error | AmqpError | ServiceBusError): err is ServiceBusError; +export function isServiceBusError(err: any): err is ServiceBusError; // @public export interface MessageHandlers { diff --git a/sdk/servicebus/service-bus/src/serviceBusError.ts b/sdk/servicebus/service-bus/src/serviceBusError.ts index 6b49ee6af5be..5bcc465891ab 100644 --- a/sdk/servicebus/service-bus/src/serviceBusError.ts +++ b/sdk/servicebus/service-bus/src/serviceBusError.ts @@ -172,8 +172,6 @@ export function translateServiceBusError(err: AmqpError | Error): ServiceBusErro * * @param err An error to check to see if it's of type ServiceBusError */ -export function isServiceBusError( - err: Error | AmqpError | ServiceBusError -): err is ServiceBusError { - return (err as Error | ServiceBusError).name === "ServiceBusError"; +export function isServiceBusError(err: any): err is ServiceBusError { + return err?.name === "ServiceBusError"; }