Skip to content

Commit bc54309

Browse files
authored
fix: export types (#542)
1 parent 700fe38 commit bc54309

File tree

121 files changed

+628
-365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+628
-365
lines changed

common/lib/authentication/aws_secrets_manager_plugin.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ import { WrapperProperties } from "../wrapper_property";
3030
import { logAndThrowError } from "../utils/utils";
3131
import { ClientWrapper } from "../client_wrapper";
3232
import { TelemetryTraceLevel } from "../utils/telemetry/telemetry_trace_level";
33+
import { CanReleaseResources } from "../can_release_resources";
3334

34-
export class AwsSecretsManagerPlugin extends AbstractConnectionPlugin {
35+
export class AwsSecretsManagerPlugin extends AbstractConnectionPlugin implements CanReleaseResources {
3536
private static readonly TELEMETRY_UPDATE_SECRETS = "fetch credentials";
3637
private static readonly TELEMETRY_FETCH_CREDENTIALS_COUNTER = "secretsManager.fetchCredentials.count";
3738
private static SUBSCRIBED_METHODS: Set<string> = new Set<string>(["connect", "forceConnect"]);
@@ -169,6 +170,11 @@ export class AwsSecretsManagerPlugin extends AbstractConnectionPlugin {
169170
}
170171
throw new AwsWrapperError(Messages.get("AwsSecretsManagerConnectionPlugin.failedToFetchDbCredentials"));
171172
}
173+
174+
releaseResources(): Promise<void> {
175+
AwsSecretsManagerPlugin.secretsCache.clear();
176+
return;
177+
}
172178
}
173179

174180
export class SecretCacheKey {

common/lib/authentication/iam_authentication_plugin.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ import { WrapperProperties } from "../wrapper_property";
2525
import { IamAuthUtils, TokenInfo } from "../utils/iam_auth_utils";
2626
import { ClientWrapper } from "../client_wrapper";
2727
import { RegionUtils } from "../utils/region_utils";
28+
import { CanReleaseResources } from "../can_release_resources";
2829

29-
export class IamAuthenticationPlugin extends AbstractConnectionPlugin {
30+
export class IamAuthenticationPlugin extends AbstractConnectionPlugin implements CanReleaseResources {
3031
private static readonly SUBSCRIBED_METHODS = new Set<string>(["connect", "forceConnect"]);
3132
protected static readonly tokenCache = new Map<string, TokenInfo>();
3233
private readonly telemetryFactory;
@@ -133,7 +134,8 @@ export class IamAuthenticationPlugin extends AbstractConnectionPlugin {
133134
}
134135
}
135136

136-
static clearCache(): void {
137+
releaseResources(): Promise<void> {
137138
IamAuthenticationPlugin.tokenCache.clear();
139+
return;
138140
}
139141
}

common/lib/aws_client.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ import { DriverDialect } from "./driver_dialect/driver_dialect";
3030
import { WrapperProperties } from "./wrapper_property";
3131
import { DriverConfigurationProfiles } from "./profile/driver_configuration_profiles";
3232
import { ConfigurationProfile } from "./profile/configuration_profile";
33-
import { AwsWrapperError } from "./utils/errors";
33+
import { AwsWrapperError, TransactionIsolationLevel, ConnectionProvider } from "./";
3434
import { Messages } from "./utils/messages";
35-
import { TransactionIsolationLevel } from "./utils/transaction_isolation_level";
3635
import { HostListProviderService } from "./host_list_provider_service";
3736
import { SessionStateClient } from "./session_state_client";
38-
import { ConnectionProvider } from "./connection_provider";
3937
import { DriverConnectionProvider } from "./driver_connection_provider";
4038

4139
const { EventEmitter } = pkgStream;

common/lib/driver_connection_provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { HostRole } from "./host_role";
1919
import { HostInfo } from "./host_info";
2020
import { HostSelector } from "./host_selector";
2121
import { RandomHostSelector } from "./random_host_selector";
22-
import { UnsupportedStrategyError } from "./utils/errors";
22+
import { UnsupportedStrategyError } from "./index";
2323
import { WrapperProperties } from "./wrapper_property";
2424
import { Messages } from "./utils/messages";
2525
import { RdsUtils } from "./utils/rds_utils";

common/lib/host_list_provider/monitoring/monitoring_host_list_provider.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
*/
1616

1717
import { RdsHostListProvider } from "../rds_host_list_provider";
18-
import { HostInfo } from "../../host_info";
19-
import { ClusterTopologyMonitor, ClusterTopologyMonitorImpl } from "./cluster_topology_monitor";
18+
import { HostInfo, AwsWrapperError } from "../../";
2019
import { PluginService } from "../../plugin_service";
20+
import { ClusterTopologyMonitor, ClusterTopologyMonitorImpl } from "./cluster_topology_monitor";
2121
import { HostListProviderService } from "../../host_list_provider_service";
2222
import { ClientWrapper } from "../../client_wrapper";
2323
import { DatabaseDialect } from "../../database_dialect/database_dialect";
24-
import { AwsWrapperError } from "../../utils/errors";
2524
import { Messages } from "../../utils/messages";
2625
import { WrapperProperties } from "../../wrapper_property";
2726
import { BlockingHostListProvider } from "../host_list_provider";

common/lib/host_list_provider/rds_host_list_provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { RdsUrlType } from "../utils/rds_url_type";
2121
import { RdsUtils } from "../utils/rds_utils";
2222
import { HostListProviderService } from "../host_list_provider_service";
2323
import { ConnectionUrlParser } from "../utils/connection_url_parser";
24-
import { AwsWrapperError } from "../utils/errors";
24+
import { AwsWrapperError } from "../";
2525
import { Messages } from "../utils/messages";
2626
import { WrapperProperties } from "../wrapper_property";
2727
import { logger } from "../../logutils";

common/lib/index.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,17 @@
1616

1717
export * from "./connection_plugin";
1818
export * from "./plugin_manager";
19+
export * from "./utils/errors";
20+
21+
export { AwsPoolConfig } from "./aws_pool_config";
22+
export { HostInfo } from "./host_info";
23+
export { HostRole } from "./host_role";
24+
export { HostInfoBuilder } from "./host_info_builder";
25+
export type { ConnectionProvider } from "./connection_provider";
26+
export { InternalPooledConnectionProvider } from "./internal_pooled_connection_provider";
27+
export type { InternalPoolMapping } from "./utils/internal_pool_mapping";
28+
29+
export { TransactionIsolationLevel } from "./utils/transaction_isolation_level";
30+
31+
export { HostAvailability } from "./host_availability/host_availability";
32+
export type { HostAvailabilityStrategy } from "./host_availability/host_availability_strategy";

common/lib/internal_pooled_connection_provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { lookup, LookupAddress } from "dns";
2727
import { promisify } from "util";
2828
import { HostInfoBuilder } from "./host_info_builder";
2929
import { RdsUrlType } from "./utils/rds_url_type";
30-
import { AwsWrapperError } from "./utils/errors";
30+
import { AwsWrapperError } from "./index";
3131
import { Messages } from "./utils/messages";
3232
import { HostSelector } from "./host_selector";
3333
import { RandomHostSelector } from "./random_host_selector";

common/lib/plugin_service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { BlockingHostListProvider, HostListProvider } from "./host_list_provider
2323
import { ConnectionUrlParser } from "./utils/connection_url_parser";
2424
import { DatabaseDialect, DatabaseType } from "./database_dialect/database_dialect";
2525
import { HostInfoBuilder } from "./host_info_builder";
26-
import { AwsWrapperError } from "./utils/errors";
26+
import { AwsWrapperError } from "./";
2727
import { HostAvailability } from "./host_availability/host_availability";
2828
import { CacheMap } from "./utils/cache_map";
2929
import { HostChangeOptions } from "./host_change_options";

common/lib/plugins/efm/host_monitoring_connection_plugin.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@
1414
limitations under the License.
1515
*/
1616

17+
import {
18+
HostInfo,
19+
AwsWrapperError,
20+
UnavailableHostError,
21+
HostAvailability
22+
} from "../../";
1723
import { PluginService } from "../../plugin_service";
1824
import { HostChangeOptions } from "../../host_change_options";
19-
import { HostInfo } from "../../host_info";
2025
import { OldConnectionSuggestionAction } from "../../old_connection_suggestion_action";
2126
import { RdsUtils } from "../../utils/rds_utils";
2227
import { AbstractConnectionPlugin } from "../../abstract_connection_plugin";
@@ -26,9 +31,7 @@ import { MonitorConnectionContext } from "./monitor_connection_context";
2631
import { logger, uniqueId } from "../../../logutils";
2732
import { Messages } from "../../utils/messages";
2833
import { MonitorService, MonitorServiceImpl } from "./monitor_service";
29-
import { AwsWrapperError, UnavailableHostError } from "../../utils/errors";
3034
import { HostListProvider } from "../../host_list_provider/host_list_provider";
31-
import { HostAvailability } from "../../host_availability/host_availability";
3235
import { CanReleaseResources } from "../../can_release_resources";
3336
import { SubscribedMethodHelper } from "../../utils/subscribed_method_helper";
3437
import { ClientWrapper } from "../../client_wrapper";

0 commit comments

Comments
 (0)