Skip to content

Commit 9f3adab

Browse files
chore: change tough default import to named import (#259)
1 parent 7a1b060 commit 9f3adab

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

common/lib/plugins/federated_auth/adfs_credentials_provider_factory.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { WrapperProperties } from "../../wrapper_property";
2121
import { SamlCredentialsProviderFactory } from "./saml_credentials_provider_factory";
2222
import axios from "axios";
2323
import { stringify } from "querystring";
24-
import tough from "tough-cookie";
24+
import { CookieJar } from "tough-cookie";
2525
import { wrapper } from "axios-cookiejar-support";
2626
import { HttpsCookieAgent } from "http-cookie-agent/http";
2727
import { SamlUtils } from "../../utils/saml_utils";
@@ -109,7 +109,7 @@ export class AdfsCredentialsProviderFactory extends SamlCredentialsProviderFacto
109109
logger.debug(Messages.get("AdfsCredentialsProviderFactory.signOnPagePostActionUrl", uri));
110110
SamlUtils.validateUrl(uri);
111111
wrapper(axios);
112-
const jar = new tough.CookieJar();
112+
const jar = new CookieJar();
113113
const httpsAgentOptions = { ...WrapperProperties.HTTPS_AGENT_OPTIONS.get(props), ...{ cookies: { jar } } };
114114
const httpsAgent = new HttpsCookieAgent(httpsAgentOptions);
115115

mysql/lib/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ export class AwsMySQLClient extends AwsClient {
212212

213213
async end() {
214214
if (!this.isConnected || !this.targetClient?.client) {
215-
// No connections has been initialized.
215+
// No connections have been initialized.
216216
// This might happen if end is called in a finally block when an error occurred while initializing the first connection.
217217
return;
218218
}

pg/lib/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export class AwsPGClient extends AwsClient {
193193

194194
async end() {
195195
if (!this.isConnected || !this.targetClient?.client) {
196-
// No connections has been initialized.
196+
// No connections have been initialized.
197197
// This might happen if end is called in a finally block when an error occurred while initializing the first connection.
198198
return;
199199
}

pg/lib/dialect/pg_database_dialect.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ import { TransactionIsolationLevel } from "../../../common/lib/utils/transaction
2424
import { ClientWrapper } from "../../../common/lib/client_wrapper";
2525
import { FailoverRestriction } from "../../../common/lib/plugins/failover/failover_restriction";
2626
import { AwsPoolClient } from "../../../common/lib/aws_pool_client";
27-
import { AwsMysqlPoolClient } from "../../../mysql/lib/mysql_pool_client";
2827
import { AwsPgPoolClient } from "../pg_pool_client";
2928
import { AwsPoolConfig } from "../../../common/lib/aws_pool_config";
30-
import { PoolClient, PoolConfig } from "pg";
29+
import { PoolConfig } from "pg";
3130
import { WrapperProperties } from "../../../common/lib/wrapper_property";
3231

3332
export class PgDatabaseDialect implements DatabaseDialect {

0 commit comments

Comments
 (0)