This commit is contained in:
Benjamin Toby 2025-12-29 06:35:37 +01:00
parent 83eb4b976f
commit b10bcb4d46
3 changed files with 18 additions and 13 deletions

View File

@ -32,6 +32,7 @@ function queryDSQLAPI(_a) {
process.env.DSQL_FULL_ACCESS_API_KEY || process.env.DSQL_FULL_ACCESS_API_KEY ||
process.env.DSQL_API_KEY; process.env.DSQL_API_KEY;
let requestOptions; let requestOptions;
let loggedRequestOptions;
try { try {
/** /**
* Make https request * Make https request
@ -59,6 +60,8 @@ function queryDSQLAPI(_a) {
hostname: host, hostname: host,
path: finalPath, path: finalPath,
}; };
loggedRequestOptions = lodash_1.default.cloneDeep(requestOptions);
delete loggedRequestOptions["headers"];
const httpsRequest = scheme.request(requestOptions, const httpsRequest = scheme.request(requestOptions,
/** /**
* Callback Function * Callback Function
@ -93,7 +96,7 @@ function queryDSQLAPI(_a) {
msg: `An error occurred while parsing the response`, msg: `An error occurred while parsing the response`,
error: error.message, error: error.message,
errorData: { errorData: {
requestOptions, requestOptions: loggedRequestOptions,
grabedHostNames: lodash_1.default.omit(grabedHostNames, [ grabedHostNames: lodash_1.default.omit(grabedHostNames, [
"scheme", "scheme",
]), ]),
@ -107,8 +110,8 @@ function queryDSQLAPI(_a) {
singleRes: undefined, singleRes: undefined,
msg: `An error occurred on the response`, msg: `An error occurred on the response`,
error: err.message, error: err.message,
errorData: { requestOptions, grabedHostNames }, errorData: { grabedHostNames },
requestOptions, requestOptions: loggedRequestOptions,
}); });
}); });
}); });
@ -119,10 +122,9 @@ function queryDSQLAPI(_a) {
msg: `An error occurred while making the request`, msg: `An error occurred while making the request`,
error: err.message, error: err.message,
errorData: { errorData: {
requestOptions,
grabedHostNames: lodash_1.default.omit(grabedHostNames, ["scheme"]), grabedHostNames: lodash_1.default.omit(grabedHostNames, ["scheme"]),
}, },
requestOptions, requestOptions: loggedRequestOptions,
}); });
}); });
if (reqPayload) { if (reqPayload) {
@ -138,7 +140,7 @@ function queryDSQLAPI(_a) {
singleRes: undefined, singleRes: undefined,
msg: `Request Failed`, msg: `Request Failed`,
error: error.message, error: error.message,
requestOptions, requestOptions: loggedRequestOptions,
}; };
} }
}); });

View File

@ -54,6 +54,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
process.env.DSQL_API_KEY; process.env.DSQL_API_KEY;
let requestOptions: RequestOptions | undefined; let requestOptions: RequestOptions | undefined;
let loggedRequestOptions: RequestOptions | undefined;
try { try {
/** /**
@ -88,6 +89,9 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
path: finalPath, path: finalPath,
}; };
loggedRequestOptions = _.cloneDeep(requestOptions);
delete loggedRequestOptions["headers"];
const httpsRequest = scheme.request( const httpsRequest = scheme.request(
requestOptions, requestOptions,
@ -128,7 +132,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
msg: `An error occurred while parsing the response`, msg: `An error occurred while parsing the response`,
error: error.message, error: error.message,
errorData: { errorData: {
requestOptions, requestOptions: loggedRequestOptions,
grabedHostNames: _.omit(grabedHostNames, [ grabedHostNames: _.omit(grabedHostNames, [
"scheme", "scheme",
]), ]),
@ -143,8 +147,8 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
singleRes: undefined, singleRes: undefined,
msg: `An error occurred on the response`, msg: `An error occurred on the response`,
error: err.message, error: err.message,
errorData: { requestOptions, grabedHostNames }, errorData: { grabedHostNames },
requestOptions, requestOptions: loggedRequestOptions,
} as APIResponseObject); } as APIResponseObject);
}); });
} }
@ -157,10 +161,9 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
msg: `An error occurred while making the request`, msg: `An error occurred while making the request`,
error: err.message, error: err.message,
errorData: { errorData: {
requestOptions,
grabedHostNames: _.omit(grabedHostNames, ["scheme"]), grabedHostNames: _.omit(grabedHostNames, ["scheme"]),
}, },
requestOptions, requestOptions: loggedRequestOptions,
} as APIResponseObject); } as APIResponseObject);
}); });
@ -177,7 +180,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
singleRes: undefined, singleRes: undefined,
msg: `Request Failed`, msg: `Request Failed`,
error: error.message, error: error.message,
requestOptions, requestOptions: loggedRequestOptions,
}; };
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "5.6.8", "version": "5.6.9",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {