From b10bcb4d46fbff5b610aee8f9522243bf8435c70 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <devops@tben.me>
Date: Mon, 29 Dec 2025 06:35:37 +0100
Subject: [PATCH] Updates

---
 .../functions/api/query-dsql-api.js               | 14 ++++++++------
 package-shared/functions/api/query-dsql-api.ts    | 15 +++++++++------
 package.json                                      |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/dist/package-shared/functions/api/query-dsql-api.js b/dist/package-shared/functions/api/query-dsql-api.js
index 63ee12f..937d927 100644
--- a/dist/package-shared/functions/api/query-dsql-api.js
+++ b/dist/package-shared/functions/api/query-dsql-api.js
@@ -32,6 +32,7 @@ function queryDSQLAPI(_a) {
             process.env.DSQL_FULL_ACCESS_API_KEY ||
             process.env.DSQL_API_KEY;
         let requestOptions;
+        let loggedRequestOptions;
         try {
             /**
              * Make https request
@@ -59,6 +60,8 @@ function queryDSQLAPI(_a) {
                     hostname: host,
                     path: finalPath,
                 };
+                loggedRequestOptions = lodash_1.default.cloneDeep(requestOptions);
+                delete loggedRequestOptions["headers"];
                 const httpsRequest = scheme.request(requestOptions, 
                 /**
                  * Callback Function
@@ -93,7 +96,7 @@ function queryDSQLAPI(_a) {
                                 msg: `An error occurred while parsing the response`,
                                 error: error.message,
                                 errorData: {
-                                    requestOptions,
+                                    requestOptions: loggedRequestOptions,
                                     grabedHostNames: lodash_1.default.omit(grabedHostNames, [
                                         "scheme",
                                     ]),
@@ -107,8 +110,8 @@ function queryDSQLAPI(_a) {
                             singleRes: undefined,
                             msg: `An error occurred on the response`,
                             error: err.message,
-                            errorData: { requestOptions, grabedHostNames },
-                            requestOptions,
+                            errorData: { grabedHostNames },
+                            requestOptions: loggedRequestOptions,
                         });
                     });
                 });
@@ -119,10 +122,9 @@ function queryDSQLAPI(_a) {
                         msg: `An error occurred while making the request`,
                         error: err.message,
                         errorData: {
-                            requestOptions,
                             grabedHostNames: lodash_1.default.omit(grabedHostNames, ["scheme"]),
                         },
-                        requestOptions,
+                        requestOptions: loggedRequestOptions,
                     });
                 });
                 if (reqPayload) {
@@ -138,7 +140,7 @@ function queryDSQLAPI(_a) {
                 singleRes: undefined,
                 msg: `Request Failed`,
                 error: error.message,
-                requestOptions,
+                requestOptions: loggedRequestOptions,
             };
         }
     });
diff --git a/package-shared/functions/api/query-dsql-api.ts b/package-shared/functions/api/query-dsql-api.ts
index 5d2bee0..61ef348 100644
--- a/package-shared/functions/api/query-dsql-api.ts
+++ b/package-shared/functions/api/query-dsql-api.ts
@@ -54,6 +54,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
         process.env.DSQL_API_KEY;
 
     let requestOptions: RequestOptions | undefined;
+    let loggedRequestOptions: RequestOptions | undefined;
 
     try {
         /**
@@ -88,6 +89,9 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                 path: finalPath,
             };
 
+            loggedRequestOptions = _.cloneDeep(requestOptions);
+            delete loggedRequestOptions["headers"];
+
             const httpsRequest = scheme.request(
                 requestOptions,
 
@@ -128,7 +132,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                                 msg: `An error occurred while parsing the response`,
                                 error: error.message,
                                 errorData: {
-                                    requestOptions,
+                                    requestOptions: loggedRequestOptions,
                                     grabedHostNames: _.omit(grabedHostNames, [
                                         "scheme",
                                     ]),
@@ -143,8 +147,8 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                             singleRes: undefined,
                             msg: `An error occurred on the response`,
                             error: err.message,
-                            errorData: { requestOptions, grabedHostNames },
-                            requestOptions,
+                            errorData: { grabedHostNames },
+                            requestOptions: loggedRequestOptions,
                         } as APIResponseObject);
                     });
                 }
@@ -157,10 +161,9 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
                     msg: `An error occurred while making the request`,
                     error: err.message,
                     errorData: {
-                        requestOptions,
                         grabedHostNames: _.omit(grabedHostNames, ["scheme"]),
                     },
-                    requestOptions,
+                    requestOptions: loggedRequestOptions,
                 } as APIResponseObject);
             });
 
@@ -177,7 +180,7 @@ export default async function queryDSQLAPI<T = { [k: string]: any }>({
             singleRes: undefined,
             msg: `Request Failed`,
             error: error.message,
-            requestOptions,
+            requestOptions: loggedRequestOptions,
         };
     }
 }
diff --git a/package.json b/package.json
index decc670..715753d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.6.8",
+    "version": "5.6.9",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {