From d690790dfed2de13ff92a1c5c2d9b7771d02cf35 Mon Sep 17 00:00:00 2001
From: Dave <Dave>
Date: Thu, 21 Aug 2025 11:57:12 -0400
Subject: [PATCH 1/2] feature/IO-3255-simplified-parts-management - Remove
 unnecessary dotenv calls / fix import bug

---
 libs/awsUtils.js               | 3 ---
 os-loader.js                   | 2 +-
 server/utils/statusReporter.js | 5 +----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/libs/awsUtils.js b/libs/awsUtils.js
index 0cb29337a..2137eeef8 100644
--- a/libs/awsUtils.js
+++ b/libs/awsUtils.js
@@ -1,6 +1,3 @@
-require("dotenv").config({
-  path: require("path").resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
 const { isNil } = require("lodash");
 const aws4 = require("aws4");
 const { Connection, Client } = require("@opensearch-project/opensearch");
diff --git a/os-loader.js b/os-loader.js
index 08a5e7190..2e46c6fa7 100644
--- a/os-loader.js
+++ b/os-loader.js
@@ -4,7 +4,7 @@ require("dotenv").config({
 
 const { omit } = require("lodash");
 const gqlClient = require("./server/graphql-client/graphql-client").client;
-const getClient = require("./libs/awsUtils");
+const { getClient } = require("./libs/awsUtils");
 
 async function OpenSearchUpdateHandler(req, res) {
   try {
diff --git a/server/utils/statusReporter.js b/server/utils/statusReporter.js
index fc425da33..1670bc348 100644
--- a/server/utils/statusReporter.js
+++ b/server/utils/statusReporter.js
@@ -1,10 +1,7 @@
 // Load environment variables THIS MUST BE AT THE TOP
-const path = require("path");
+// Removed redundant dotenv initialization; server.js loads env vars at process start.
 const getHostNameOrIP = require("./getHostNameOrIP");
 const logger = require("./logger");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
 const CrispStatusReporter = require("crisp-status-reporter").CrispStatusReporter;
 const InstanceManager = require("../utils/instanceMgr").default;
 

From 9c45b49ab937ba236364952f5730929dfa373cd3 Mon Sep 17 00:00:00 2001
From: Dave <Dave>
Date: Thu, 21 Aug 2025 12:00:26 -0400
Subject: [PATCH 2/2] feature/IO-3255-simplified-parts-management - Remove
 unnecessary dotenv calls / fix import bug

---
 server/utils/logger.js         | 2 --
 server/utils/statusReporter.js | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/utils/logger.js b/server/utils/logger.js
index 2b28d95f5..9b4bea937 100644
--- a/server/utils/logger.js
+++ b/server/utils/logger.js
@@ -1,6 +1,4 @@
 // Load environment variables THIS MUST BE AT THE TOP
-const path = require("path");
-
 const InstanceManager = require("../utils/instanceMgr").default;
 const winston = require("winston");
 const WinstonCloudWatch = require("winston-cloudwatch");
diff --git a/server/utils/statusReporter.js b/server/utils/statusReporter.js
index 1670bc348..8e29c9454 100644
--- a/server/utils/statusReporter.js
+++ b/server/utils/statusReporter.js
@@ -1,7 +1,11 @@
 // Load environment variables THIS MUST BE AT THE TOP
-// Removed redundant dotenv initialization; server.js loads env vars at process start.
+const path = require("path");
 const getHostNameOrIP = require("./getHostNameOrIP");
 const logger = require("./logger");
+
+require("dotenv").config({
+  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
+});
 const CrispStatusReporter = require("crisp-status-reporter").CrispStatusReporter;
 const InstanceManager = require("../utils/instanceMgr").default;