Skip to content

Commit b674f1b

Browse files
J12934Weltraumschaf
J12934
authored and
Weltraumschaf
committed
Replace axios with build in fetch in parser & hook sdk
Signed-off-by: Jannik Hollenbach <jannik.hollenbach@iteratec.com>
1 parent 555b26e commit b674f1b

File tree

6 files changed

+47
-200
lines changed

6 files changed

+47
-200
lines changed

‎hook-sdk/nodejs/hook-wrapper.js‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
const axios = require("axios");
65
const { handle } = require("./hook/hook");
76
const k8s = require("@kubernetes/client-node");
87

@@ -16,7 +15,37 @@ kc.loadFromCluster();
1615
const k8sApi = kc.makeApiClient(k8s.CustomObjectsApi);
1716

1817
function downloadFile(url) {
19-
return axios.get(url);
18+
return fetch(url)
19+
.then(response => {
20+
if (!response.ok) {
21+
return response.text().then(body => {
22+
throw new Error(`Failed to download file with Response Code: ${response.status} - ${body}`);
23+
});
24+
}
25+
return response;
26+
});
27+
}
28+
29+
function uploadFile(url, fileContents) {
30+
return fetch(url, {
31+
method: 'PUT',
32+
headers: { 'Content-Type': '' },
33+
body: fileContents
34+
})
35+
.then(response => {
36+
if (!response.ok) {
37+
return response.text().then(body => {
38+
console.error(`File Upload Failed with Response Code: ${response.status}`);
39+
console.error(`Error Response Body: ${body}`);
40+
process.exit(1);
41+
});
42+
}
43+
// Successful response
44+
})
45+
.catch(error => {
46+
console.error(error.message);
47+
process.exit(1);
48+
});
2049
}
2150

2251
function getRawResults() {
@@ -35,32 +64,6 @@ function getFindings() {
3564
});
3665
}
3766

38-
function uploadFile(url, fileContents) {
39-
return axios
40-
.put(url, fileContents, {
41-
headers: { "content-type": "" },
42-
})
43-
.catch(function(error) {
44-
if (error.response) {
45-
// The request was made and the server responded with a status code
46-
// that falls out of the range of 2xx
47-
console.error(
48-
`File Upload Failed with Response Code: ${error.response.status}`
49-
);
50-
console.error(`Error Response Body: ${error.response.data}`);
51-
} else if (error.request) {
52-
console.error(
53-
"No response received from FileStorage when uploading finding"
54-
);
55-
console.error(error);
56-
} else {
57-
// Something happened in setting up the request that triggered an Error
58-
console.log("Error", error.message);
59-
}
60-
process.exit(1);
61-
});
62-
}
63-
6467
function updateRawResults(fileContents) {
6568
const rawResultUploadUrl = process.argv[4];
6669
if (rawResultUploadUrl === undefined) {

‎hook-sdk/nodejs/package-lock.json‎

Lines changed: 0 additions & 80 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hook-sdk/nodejs/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"license": "Apache-2.0",
1212
"dependencies": {
1313
"@kubernetes/client-node": "^0.19.0",
14-
"axios": "^1.6.0",
1514
"ws": "^8.13.0"
1615
}
1716
}

‎parser-sdk/nodejs/package-lock.json‎

Lines changed: 0 additions & 80 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎parser-sdk/nodejs/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"ajv": "^8.12.0",
1212
"ajv-draft-04": "^1.0.0",
1313
"ajv-formats": "^2.1.0",
14-
"axios": "^1.6.0",
1514
"jsonpointer": "^5.0.1",
1615
"ws": "^8.13.0"
1716
}

0 commit comments

Comments
 (0)