Skip to content

Commit 365ec87

Browse files
authored
mgmt security, remove deprecated request package (Azure#45406)
* remove deprecated request * replace request-promise with axios
1 parent 64d69f5 commit 365ec87

File tree

3 files changed

+38
-21
lines changed

3 files changed

+38
-21
lines changed

sdk/resourcemanager/autocent.js

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const fs = require("fs");
22
const path = require("path");
3-
const request = require("request-promise");
3+
const axios = require("axios");
44
const yaml = require("yaml");
55

66
// mapping for services with different spec folder names
@@ -11,7 +11,7 @@ const verRegEx = /<version>(.+)<\/version>/g;
1111
const pkgRegEx = /Package\s+tag\s+(.+)\.\s+For/;
1212
const pkgRegEx2 = /Package\s+tag\s+(.+)\.</;
1313
const data = {};
14-
const servicesInvalidUrl = ["securitydevops"];
14+
const servicesInvalidUrl = ["securitydevops", "deploymentmanager"];
1515
const deprecatedArtifacts = [
1616
"azure-resourcemanager-loadtestservice",
1717
"azure-resourcemanager-networkanalytics",
@@ -41,6 +41,7 @@ const excludeArtifacts = [
4141
"azure-resourcemanager-sql",
4242
"azure-resourcemanager-storage"
4343
]
44+
const requestTimeoutInMilli = 5000;
4445

4546
async function autocent() {
4647
console.log("[INFO] Automation task to update the mapping of services and API version tags.");
@@ -227,27 +228,34 @@ function versionCompare(a, b) {
227228
}
228229

229230
async function existUrl(url, callback) {
230-
var result = await request({
231-
url: url,
232-
method: "HEAD",
233-
headers: {
234-
"user-agent": "AutoCent",
235-
},
236-
simple: false,
237-
resolveWithFullResponse: true,
238-
});
239-
return result.statusCode == 200 || result.statusCode == 429;
231+
var result = await axios.head(
232+
url,
233+
{
234+
headers: {
235+
"user-agent": "AutoCent",
236+
},
237+
responseType: "json",
238+
validateStatus: (status) => status < 500,
239+
timeout: requestTimeoutInMilli
240+
}
241+
);
242+
return result.status == 200 || result.status == 429;
240243
}
241244

242245
// method to send GET request
243246
async function sendRequest(url) {
244-
return await request({
245-
url: url,
246-
method: "GET",
247-
headers: {
248-
"user-agent": "AutoCent",
249-
},
250-
});
247+
var result = await axios.get(
248+
url,
249+
{
250+
headers: {
251+
"user-agent": "AutoCent",
252+
},
253+
responseType: "json",
254+
validateStatus: (status) => status === 200,
255+
timeout: requestTimeoutInMilli
256+
}
257+
);
258+
return result.data;
251259
}
252260

253261
function getSpecsMapping() {

sdk/resourcemanager/docs/SINGLE_SERVICE_PACKAGES.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ service
5959
<details>
6060
<summary> apimanagement </summary>
6161

62+
* [package-2024-05](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/apimanagement/resource-manager#tag-package-2024-05)
63+
* [2.0.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-apimanagement/2.0.0)
6264
* [package-2022-08](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/apimanagement/resource-manager#tag-package-2022-08)
6365
* [1.0.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-apimanagement/1.0.0)
6466
* [1.0.0-beta.5](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-apimanagement/1.0.0-beta.5)
@@ -415,6 +417,8 @@ service
415417
<details>
416418
<summary> confidentialledger </summary>
417419

420+
* [package-preview-2024-09](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/confidentialledger/resource-manager#tag-package-preview-2024-09)
421+
* [1.1.0-beta.1](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-confidentialledger/1.1.0-beta.1)
418422
* [package-2022-05-13](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/confidentialledger/resource-manager#tag-package-2022-05-13)
419423
* [1.0.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-confidentialledger/1.0.0)
420424
* [1.0.0-beta.1](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-confidentialledger/1.0.0-beta.1)
@@ -1556,6 +1560,8 @@ service
15561560
<details>
15571561
<summary> netapp </summary>
15581562

1563+
* [package-2025-01-01-preview](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/netapp/resource-manager#tag-package-2025-01-01-preview)
1564+
* [1.8.0-beta.1](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-netapp/1.8.0-beta.1)
15591565
* [package-2025-01-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/netapp/resource-manager#tag-package-2025-01-01)
15601566
* [1.7.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-netapp/1.7.0)
15611567
* [package-2024-09-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/netapp/resource-manager#tag-package-2024-09-01)
@@ -1782,6 +1788,8 @@ service
17821788
<details>
17831789
<summary> postgresqlflexibleserver </summary>
17841790

1791+
* [package-flexibleserver-2025-01-01-preview](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/postgresql/resource-manager#tag-package-flexibleserver-2025-01-01-preview)
1792+
* [1.2.0-beta.1](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-postgresqlflexibleserver/1.2.0-beta.1)
17851793
* [package-flexibleserver-2024-08-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/postgresql/resource-manager#tag-package-flexibleserver-2024-08-01)
17861794
* [1.1.0](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-postgresqlflexibleserver/1.1.0)
17871795
* [package-flexibleserver-2023-12-01-preview](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/postgresql/resource-manager#tag-package-flexibleserver-2023-12-01-preview)
@@ -1969,6 +1977,8 @@ service
19691977
<details>
19701978
<summary> redisenterprise </summary>
19711979

1980+
* [package-preview-2025-05-01](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/redisenterprise/resource-manager#tag-package-preview-2025-05-01)
1981+
* [2.1.0-beta.3](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-redisenterprise/2.1.0-beta.3)
19721982
* [package-preview-2024-09](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/redisenterprise/resource-manager#tag-package-preview-2024-09)
19731983
* [2.1.0-beta.2](https://repo1.maven.org/maven2/com/azure/resourcemanager/azure-resourcemanager-redisenterprise/2.1.0-beta.2)
19741984
* [package-preview-2024-03](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/redisenterprise/resource-manager#tag-package-preview-2024-03)

sdk/resourcemanager/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
"yargs": "3.31.0",
3333
"npm-run-all": "4.1.5",
3434
"pom-parser": "1.2.0",
35-
"request": "2.88.2",
36-
"request-promise": "4.2.6",
35+
"axios": "1.9.0",
3736
"yaml": "2.1.0",
3837
"prettier": "2.8.4"
3938
}

0 commit comments

Comments
 (0)