chore: update connection plugin interfaces

Author: karenc-bq

common/lib/authentication/aws_secrets_manager_plugin_factory.ts

@@ -15,20 +15,20 @@
 */
 
 import { ConnectionPluginFactory } from "../plugin_factory";
-import { PluginService } from "../plugin_service";
 import { ConnectionPlugin } from "../connection_plugin";
 import { AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
+import { FullServicesContainer } from "../utils/full_services_container";
 
 export class AwsSecretsManagerPluginFactory extends ConnectionPluginFactory {
   private static awsSecretsManagerPlugin: any;
 
-  async getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
+  async getInstance(servicesContainer: FullServicesContainer, properties: Map<string, any>): Promise<ConnectionPlugin> {
     try {
       if (!AwsSecretsManagerPluginFactory.awsSecretsManagerPlugin) {
         AwsSecretsManagerPluginFactory.awsSecretsManagerPlugin = await import("./aws_secrets_manager_plugin");
       }
-      return new AwsSecretsManagerPluginFactory.awsSecretsManagerPlugin.AwsSecretsManagerPlugin(pluginService, new Map(properties));
+      return new AwsSecretsManagerPluginFactory.awsSecretsManagerPlugin.AwsSecretsManagerPlugin(servicesContainer.getPluginService(), new Map(properties));
     } catch (error: any) {
       if (error.code === "MODULE_NOT_FOUND") {
         throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", error.message, "AwsSecretsManagerPlugin"));

common/lib/authentication/iam_authentication_plugin_factory.ts

@@ -15,20 +15,20 @@
 */
 
 import { ConnectionPluginFactory } from "../plugin_factory";
-import { PluginService } from "../plugin_service";
 import { ConnectionPlugin } from "../connection_plugin";
 import { AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
+import { FullServicesContainer } from "../utils/full_services_container";
 
 export class IamAuthenticationPluginFactory extends ConnectionPluginFactory {
   private static iamAuthenticationPlugin: any;
 
-  async getInstance(pluginService: PluginService, properties: object): Promise<ConnectionPlugin> {
+  async getInstance(servicesContainer: FullServicesContainer, properties: object): Promise<ConnectionPlugin> {
     try {
       if (!IamAuthenticationPluginFactory.iamAuthenticationPlugin) {
         IamAuthenticationPluginFactory.iamAuthenticationPlugin = await import("./iam_authentication_plugin");
       }
-      return new IamAuthenticationPluginFactory.iamAuthenticationPlugin.IamAuthenticationPlugin(pluginService);
+      return new IamAuthenticationPluginFactory.iamAuthenticationPlugin.IamAuthenticationPlugin(servicesContainer.getPluginService());
     } catch (error: any) {
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", error.message, "IamAuthenticationPlugin"));
     }

common/lib/connection_plugin_chain_builder.ts

@@ -43,6 +43,7 @@ import { CustomEndpointPluginFactory } from "./plugins/custom_endpoint/custom_en
 import { ConfigurationProfile } from "./profile/configuration_profile";
 import { HostMonitoring2PluginFactory } from "./plugins/efm2/host_monitoring2_plugin_factory";
 import { BlueGreenPluginFactory } from "./plugins/bluegreen/blue_green_plugin_factory";
+import { FullServicesContainer } from "./utils/full_services_container";
 
 /*
   Type alias used for plugin factory sorting. It holds a reference to a plugin
@@ -99,7 +100,7 @@ export class ConnectionPluginChainBuilder {
   ]);
 
   static async getPlugins(
-    pluginService: PluginService,
+    servicesContainer: FullServicesContainer,
     props: Map<string, any>,
     connectionProviderManager: ConnectionProviderManager,
     configurationProfile: ConfigurationProfile | null
@@ -162,10 +163,10 @@ export class ConnectionPluginChainBuilder {
 
     for (const pluginFactoryInfo of pluginFactoryInfoList) {
       const factoryObj = new pluginFactoryInfo.factory();
-      plugins.push(await factoryObj.getInstance(pluginService, props));
+      plugins.push(await factoryObj.getInstance(servicesContainer, props));
     }
 
-    plugins.push(new DefaultPlugin(pluginService, connectionProviderManager));
+    plugins.push(new DefaultPlugin(servicesContainer, connectionProviderManager));
 
     return plugins;
   }

common/lib/plugin_factory.ts

@@ -16,9 +16,10 @@
 
 import { PluginService } from "./plugin_service";
 import { ConnectionPlugin } from "./connection_plugin";
+import { FullServicesContainer } from "./utils/full_services_container";
 
 export class ConnectionPluginFactory {
-  getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
+  getInstance(servicesContainer: FullServicesContainer, properties: Map<string, any>): Promise<ConnectionPlugin> {
     return;
   }
 }

common/lib/plugin_manager.ts

@@ -80,7 +80,7 @@ export class PluginManager {
   private readonly props: Map<string, any>;
   private _plugins: ConnectionPlugin[] = [];
   private readonly connectionProviderManager: ConnectionProviderManager;
-  private fullServiceContainer: FullServicesContainer;
+  private fullServicesContainer: FullServicesContainer;
   protected telemetryFactory: TelemetryFactory;
 
   constructor(
@@ -89,7 +89,7 @@ export class PluginManager {
     connectionProviderManager: ConnectionProviderManager,
     telemetryFactory: TelemetryFactory
   ) {
-    this.fullServiceContainer = fullServicesContainer;
+    this.fullServicesContainer = fullServicesContainer;
     this.connectionProviderManager = connectionProviderManager;
     this.props = props;
     this.telemetryFactory = telemetryFactory;
@@ -102,7 +102,7 @@ export class PluginManager {
       this._plugins = plugins;
     } else {
       this._plugins = await ConnectionPluginChainBuilder.getPlugins(
-        this.fullServiceContainer.getPluginService(),
+        this.fullServicesContainer,
         this.props,
         this.connectionProviderManager,
         configurationProfile
@@ -126,8 +126,8 @@ export class PluginManager {
     }
 
     const telemetryContext = this.telemetryFactory.openTelemetryContext(methodName, TelemetryTraceLevel.NESTED);
-    const currentClient: ClientWrapper = this.fullServiceContainer.getPluginService().getCurrentClient().targetClient;
-    this.fullServiceContainer.getPluginService().attachNoOpErrorListener(currentClient);
+    const currentClient: ClientWrapper = this.fullServicesContainer.getPluginService().getCurrentClient().targetClient;
+    this.fullServicesContainer.getPluginService().attachNoOpErrorListener(currentClient);
     try {
       return await telemetryContext.start(() => {
         return this.executeWithSubscribedPlugins(
@@ -140,7 +140,7 @@ export class PluginManager {
         );
       });
     } finally {
-      this.fullServiceContainer.getPluginService().attachErrorListener(currentClient);
+      this.fullServicesContainer.getPluginService().attachErrorListener(currentClient);
     }
   }
 

common/lib/plugins/aurora_initial_connection_strategy_plugin_factory.ts

@@ -15,19 +15,19 @@
 */
 
 import { ConnectionPluginFactory } from "../plugin_factory";
-import { PluginService } from "../plugin_service";
 import { AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
+import { FullServicesContainer } from "../utils/full_services_container";
 
 export class AuroraInitialConnectionStrategyFactory extends ConnectionPluginFactory {
   private static auroraInitialConnectionStrategyPlugin: any;
 
-  async getInstance(pluginService: PluginService, props: Map<string, any>) {
+  async getInstance(servicesContainer: FullServicesContainer, props: Map<string, any>) {
     try {
       if (!AuroraInitialConnectionStrategyFactory.auroraInitialConnectionStrategyPlugin) {
         AuroraInitialConnectionStrategyFactory.auroraInitialConnectionStrategyPlugin = await import("./aurora_initial_connection_strategy_plugin");
       }
-      return new AuroraInitialConnectionStrategyFactory.auroraInitialConnectionStrategyPlugin.AuroraInitialConnectionStrategyPlugin(pluginService);
+      return new AuroraInitialConnectionStrategyFactory.auroraInitialConnectionStrategyPlugin.AuroraInitialConnectionStrategyPlugin(servicesContainer.getPluginService());
     } catch (error: any) {
       throw new AwsWrapperError(
         Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", error.message, "AuroraInitialConnectionStrategyPlugin")

common/lib/plugins/bluegreen/blue_green_plugin_factory.ts

@@ -15,20 +15,20 @@
 */
 
 import { ConnectionPluginFactory } from "../../plugin_factory";
-import { PluginService } from "../../plugin_service";
 import { ConnectionPlugin } from "../../connection_plugin";
 import { AwsWrapperError } from "../../utils/errors";
 import { Messages } from "../../utils/messages";
+import { FullServicesContainer } from "../../utils/full_services_container";
 
 export class BlueGreenPluginFactory extends ConnectionPluginFactory {
   private static blueGreenPlugin: any;
 
-  async getInstance(pluginService: PluginService, props: Map<string, any>): Promise<ConnectionPlugin> {
+  async getInstance(servicesContainer: FullServicesContainer, props: Map<string, any>): Promise<ConnectionPlugin> {
     try {
       if (!BlueGreenPluginFactory.blueGreenPlugin) {
         BlueGreenPluginFactory.blueGreenPlugin = await import("./blue_green_plugin");
       }
-      return new BlueGreenPluginFactory.blueGreenPlugin.BlueGreenPlugin(pluginService, props);
+      return new BlueGreenPluginFactory.blueGreenPlugin.BlueGreenPlugin(servicesContainer.getPluginService(), props);
     } catch (error: any) {
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", error.message, "BlueGreenPluginFactory"));
     }

common/lib/plugins/connect_time_plugin_factory.ts

@@ -15,15 +15,15 @@
 */
 
 import { ConnectionPluginFactory } from "../plugin_factory";
-import { PluginService } from "../plugin_service";
 import { ConnectionPlugin } from "../connection_plugin";
 import { AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
+import { FullServicesContainer } from "../utils/full_services_container";
 
 export class ConnectTimePluginFactory extends ConnectionPluginFactory {
   private static connectTimePlugin: any;
 
-  async getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
+  async getInstance(servicesContainer: FullServicesContainer, properties: Map<string, any>): Promise<ConnectionPlugin> {
     try {
       if (!ConnectTimePluginFactory.connectTimePlugin) {
         ConnectTimePluginFactory.connectTimePlugin = await import("./connect_time_plugin");

common/lib/plugins/connection_tracker/aurora_connection_tracker_plugin_factory.ts

@@ -15,20 +15,22 @@
 */
 
 import { ConnectionPluginFactory } from "../../plugin_factory";
-import { PluginService } from "../../plugin_service";
 import { ConnectionPlugin } from "../../connection_plugin";
 import { AwsWrapperError } from "../../utils/errors";
 import { Messages } from "../../utils/messages";
+import { FullServicesContainer } from "../../utils/full_services_container";
 
 export class AuroraConnectionTrackerPluginFactory extends ConnectionPluginFactory {
   private static auroraConnectionTrackerPlugin: any;
 
-  async getInstance(pluginService: PluginService, props: Map<string, any>): Promise<ConnectionPlugin> {
+  async getInstance(servicesContainer: FullServicesContainer, props: Map<string, any>): Promise<ConnectionPlugin> {
     try {
       if (!AuroraConnectionTrackerPluginFactory.auroraConnectionTrackerPlugin) {
         AuroraConnectionTrackerPluginFactory.auroraConnectionTrackerPlugin = await import("./aurora_connection_tracker_plugin");
       }
-      return new AuroraConnectionTrackerPluginFactory.auroraConnectionTrackerPlugin.AuroraConnectionTrackerPlugin(pluginService);
+      return new AuroraConnectionTrackerPluginFactory.auroraConnectionTrackerPlugin.AuroraConnectionTrackerPlugin(
+        servicesContainer.getPluginService()
+      );
     } catch (error: any) {
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", error.message, "AuroraConnectionTrackerPlugin"));
     }

common/lib/plugins/custom_endpoint/custom_endpoint_plugin_factory.ts

@@ -15,19 +15,19 @@
 */
 
 import { ConnectionPluginFactory } from "../../plugin_factory";
-import { PluginService } from "../../plugin_service";
 import { AwsWrapperError } from "../../utils/errors";
 import { Messages } from "../../utils/messages";
+import { FullServicesContainer } from "../../utils/full_services_container";
 
 export class CustomEndpointPluginFactory extends ConnectionPluginFactory {
   private static customEndpointPlugin: any;
 
-  async getInstance(pluginService: PluginService, props: Map<string, any>) {
+  async getInstance(servicesContainer: FullServicesContainer, props: Map<string, any>) {
     try {
       if (!CustomEndpointPluginFactory.customEndpointPlugin) {
         CustomEndpointPluginFactory.customEndpointPlugin = await import("./custom_endpoint_plugin");
       }
-      return new CustomEndpointPluginFactory.customEndpointPlugin.CustomEndpointPlugin(pluginService, props);
+      return new CustomEndpointPluginFactory.customEndpointPlugin.CustomEndpointPlugin(servicesContainer.getPluginService(), props);
     } catch (error: any) {
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", error.message, "CustomEndpointPlugin"));
     }