chore: remove unnecessary dependencies and update 3rd party license f…

…ile (#283)
aws · Nov 5, 2024 · 73a9e28 · 73a9e28
1 parent abf03fd
commit 73a9e28
Show file tree

Hide file tree

Showing 9 changed files with 448 additions and 177 deletions.
diff --git a/third-party-licenses.txt → THIRD-PARTY-LICENSES b/third-party-licenses.txt → THIRD-PARTY-LICENSES
diff --git a/common/lib/plugins/default_plugin.ts b/common/lib/plugins/default_plugin.ts
@@ -14,8 +14,7 @@
   limitations under the License.
 */
 
-import { uniqueId } from "lodash";
-import { logger } from "../../logutils";
+import { logger, uniqueId } from "../../logutils";
 import { Messages } from "../utils/messages";
 import { HostListProviderService } from "../host_list_provider_service";
 import { HostInfo } from "../host_info";

diff --git a/common/lib/plugins/efm/host_monitoring_connection_plugin.ts b/common/lib/plugins/efm/host_monitoring_connection_plugin.ts
@@ -19,12 +19,11 @@ import { HostChangeOptions } from "../../host_change_options";
 import { HostInfo } from "../../host_info";
 import { OldConnectionSuggestionAction } from "../../old_connection_suggestion_action";
 import { RdsUtils } from "../../utils/rds_utils";
-import { uniqueId } from "lodash";
 import { AbstractConnectionPlugin } from "../../abstract_connection_plugin";
 import { RdsUrlType } from "../../utils/rds_url_type";
 import { WrapperProperties } from "../../wrapper_property";
 import { MonitorConnectionContext } from "./monitor_connection_context";
-import { logger } from "../../../logutils";
+import { logger, uniqueId } from "../../../logutils";
 import { Messages } from "../../utils/messages";
 import { MonitorService, MonitorServiceImpl } from "./monitor_service";
 import { AwsWrapperError } from "../../utils/errors";

diff --git a/common/lib/plugins/efm/monitor_connection_context.ts b/common/lib/plugins/efm/monitor_connection_context.ts
@@ -15,12 +15,11 @@
 */
 
 import { Monitor } from "./monitor";
-import { logger } from "../../../logutils";
+import { logger, uniqueId } from "../../../logutils";
 import { Messages } from "../../utils/messages";
 import { ClientWrapper } from "../../client_wrapper";
 import { sleep } from "../../utils/utils";
 import { AwsWrapperError } from "../../utils/errors";
-import { uniqueId } from "lodash";
 import { PluginService } from "../../plugin_service";
 import { TelemetryCounter } from "../../utils/telemetry/telemetry_counter";
 

diff --git a/common/lib/plugins/failover/reader_failover_handler.ts b/common/lib/plugins/failover/reader_failover_handler.ts
@@ -21,11 +21,10 @@ import { getTimeoutTask, maskProperties, shuffleList, sleep } from "../../utils/
 import { HostRole } from "../../host_role";
 import { HostAvailability } from "../../host_availability/host_availability";
 import { AwsWrapperError, InternalQueryTimeoutError } from "../../utils/errors";
-import { logger } from "../../../logutils";
+import { logger, uniqueId } from "../../../logutils";
 import { Messages } from "../../utils/messages";
 import { WrapperProperties } from "../../wrapper_property";
 import { ReaderTaskSelectorHandler } from "./reader_task_selector";
-import { uniqueId } from "lodash";
 import { FailoverRestriction } from "./failover_restriction";
 
 export interface ReaderFailoverHandler {

diff --git a/common/lib/round_robin_host_selector.ts b/common/lib/round_robin_host_selector.ts
@@ -21,7 +21,6 @@ import { WrapperProperties, WrapperProperty } from "./wrapper_property";
 import { AwsWrapperError } from "./utils/errors";
 import { CacheMap } from "./utils/cache_map";
 import { HostAvailability } from "./host_availability/host_availability";
-import { isInteger } from "lodash";
 import { Messages } from "./utils/messages";
 
 export class RoundRobinHostSelector implements HostSelector {
@@ -153,7 +152,7 @@ export class RoundRobinHostSelector implements HostSelector {
     let defaultWeight = RoundRobinHostSelector.DEFAULT_WEIGHT;
     if (props) {
       defaultWeight = WrapperProperties.ROUND_ROBIN_DEFAULT_WEIGHT.get(props);
-      if (!isInteger(defaultWeight) || defaultWeight < RoundRobinHostSelector.DEFAULT_WEIGHT) {
+      if (!Number.isInteger(defaultWeight) || defaultWeight < RoundRobinHostSelector.DEFAULT_WEIGHT) {
         throw new AwsWrapperError(Messages.get("HostSelector.roundRobinInvalidDefaultWeight"));
       }
       roundRobinClusterInfo.lastClusterDefaultWeightPropertyValue = defaultWeight;
@@ -181,7 +180,7 @@ export class RoundRobinHostSelector implements HostSelector {
           }
 
           const weight = Number(hostWeight);
-          if (isNaN(weight) || !isInteger(weight) || weight < RoundRobinHostSelector.DEFAULT_WEIGHT) {
+          if (isNaN(weight) || !Number.isInteger(weight) || weight < RoundRobinHostSelector.DEFAULT_WEIGHT) {
             throw new AwsWrapperError(Messages.get("HostSelector.roundRobinInvalidHostWeightPairs"));
           }
           roundRobinClusterInfo.clusterWeightsMap.set(hostName, weight);

diff --git a/common/logutils.ts b/common/logutils.ts
@@ -23,6 +23,10 @@ dotenv.config();
 
 const logLevel = process.env.LOG_LEVEL;
 
+export function uniqueId(prefix: string): string {
+  return `${prefix}${Math.random().toString(16).slice(2)}`;
+}
+
 export const logger = createLogger({
   format: combine(
     colorize(),