Skip to content

Commit

Permalink
[engsys] remove unused dependency url (#24380)
Browse files Browse the repository at this point in the history
* [engsys] remove unused dependency `url`

Related: #24379

* Replace usage of `url` with now globally available `URL`

* The negative LRO tests have been updated to have proper key identifier format.
Previously `url` is more forgiving on invalid urls.
  • Loading branch information
jeremymeng committed Jan 6, 2023
1 parent 53ae86d commit 95705cb
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 28 deletions.
1 change: 0 additions & 1 deletion sdk/core/core-amqp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
"rhea": "^2.0.3",
"rhea-promise": "^2.1.0",
"tslib": "^2.2.0",
"url": "^0.11.0",
"util": "^0.12.1"
},
"devDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions sdk/keyvault/keyvault-certificates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
"rimraf": "^3.0.0",
"sinon": "^9.0.2",
"source-map-support": "^0.5.9",
"typescript": "~4.8.0",
"url": "^0.11.0"
"typescript": "~4.8.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async deleteCertificate(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand All @@ -41,7 +41,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async deleteCertificate(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand All @@ -67,7 +67,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async deleteCertificate(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand Down Expand Up @@ -108,7 +108,7 @@ describe("The LROs properly throw on unexpected errors", () => {
requestId: "something",
};
const body = {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
const response: FullOperationResponse = {
Expand Down Expand Up @@ -153,7 +153,7 @@ describe("The LROs properly throw on unexpected errors", () => {
requestId: "something",
};
const body = {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
const response: FullOperationResponse = {
Expand Down Expand Up @@ -199,7 +199,7 @@ describe("The LROs properly throw on unexpected errors", () => {
requestId: "something",
};
const body = {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
const response: FullOperationResponse = {
Expand Down
4 changes: 1 addition & 3 deletions sdk/keyvault/keyvault-common/src/parseKeyVaultIdentifier.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import * as url from "url";

/**
* The parsed components of a Key Vault entity identifier.
*/
Expand Down Expand Up @@ -41,7 +39,7 @@ export function parseKeyVaultIdentifier(

let baseUri;
try {
baseUri = url.parse(identifier, true, true);
baseUri = new URL(identifier);
} catch (e: any) {
throw new Error(`Invalid ${collection} identifier: ${identifier}. Not a valid URI`);
}
Expand Down
3 changes: 1 addition & 2 deletions sdk/keyvault/keyvault-keys/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@
"rimraf": "^3.0.0",
"sinon": "^9.0.2",
"source-map-support": "^0.5.9",
"typescript": "~4.8.0",
"url": "^0.11.0"
"typescript": "~4.8.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe("The LROs properly throw on unexpected errors", () => {
async deleteKey(): Promise<any> {
return {
key: {
kid: "/version/name/version",
kid: "https://keyVaultName.vault.azure.net/version/name/version",
},
recoveryId: "something",
};
Expand All @@ -42,7 +42,7 @@ describe("The LROs properly throw on unexpected errors", () => {
async deleteKey(): Promise<any> {
return {
key: {
kid: "/version/name/version",
kid: "https://keyVaultName.vault.azure.net/version/name/version",
},
recoveryId: "something",
};
Expand Down Expand Up @@ -70,7 +70,7 @@ describe("The LROs properly throw on unexpected errors", () => {
async deleteKey(): Promise<any> {
return {
key: {
kid: "/version/name/version",
kid: "https://keyVaultName.vault.azure.net/version/name/version",
},
recoveryId: "something",
};
Expand Down Expand Up @@ -104,7 +104,7 @@ describe("The LROs properly throw on unexpected errors", () => {
async recoverDeletedKey(): Promise<any> {
return {
key: {
kid: "/version/name/version",
kid: "https://keyVaultName.vault.azure.net/version/name/version",
},
recoveryId: "something",
};
Expand All @@ -130,7 +130,7 @@ describe("The LROs properly throw on unexpected errors", () => {
async recoverDeletedKey(): Promise<any> {
return {
key: {
kid: "/version/name/version",
kid: "https://keyVaultName.vault.azure.net/version/name/version",
},
recoveryId: "something",
};
Expand Down Expand Up @@ -158,7 +158,7 @@ describe("The LROs properly throw on unexpected errors", () => {
async recoverDeletedKey(): Promise<any> {
return {
key: {
kid: "/version/name/version",
kid: "https://keyVaultName.vault.azure.net/version/name/version",
},
recoveryId: "something",
};
Expand Down
3 changes: 1 addition & 2 deletions sdk/keyvault/keyvault-secrets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
"rimraf": "^3.0.0",
"sinon": "^9.0.2",
"source-map-support": "^0.5.9",
"typescript": "~4.8.0",
"url": "^0.11.0"
"typescript": "~4.8.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async deleteSecret(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand All @@ -39,7 +39,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async deleteSecret(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand All @@ -65,7 +65,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async deleteSecret(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand Down Expand Up @@ -97,7 +97,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async recoverDeletedSecret(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand All @@ -121,7 +121,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async recoverDeletedSecret(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand All @@ -147,7 +147,7 @@ describe("The LROs properly throw on unexpected errors", () => {
const client: any = {
async recoverDeletedSecret(): Promise<any> {
return {
id: "/version/name/version",
id: "https://keyvaultname.vault.azure.net/version/name/version",
recoveryId: "something",
};
},
Expand Down

0 comments on commit 95705cb

Please sign in to comment.