File tree Expand file tree Collapse file tree 4 files changed +5
-6
lines changed
common/lib/plugins/federated_auth Expand file tree Collapse file tree 4 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ import { WrapperProperties } from "../../wrapper_property";
21
21
import { SamlCredentialsProviderFactory } from "./saml_credentials_provider_factory" ;
22
22
import axios from "axios" ;
23
23
import { stringify } from "querystring" ;
24
- import tough from "tough-cookie" ;
24
+ import { CookieJar } from "tough-cookie" ;
25
25
import { wrapper } from "axios-cookiejar-support" ;
26
26
import { HttpsCookieAgent } from "http-cookie-agent/http" ;
27
27
import { SamlUtils } from "../../utils/saml_utils" ;
@@ -109,7 +109,7 @@ export class AdfsCredentialsProviderFactory extends SamlCredentialsProviderFacto
109
109
logger . debug ( Messages . get ( "AdfsCredentialsProviderFactory.signOnPagePostActionUrl" , uri ) ) ;
110
110
SamlUtils . validateUrl ( uri ) ;
111
111
wrapper ( axios ) ;
112
- const jar = new tough . CookieJar ( ) ;
112
+ const jar = new CookieJar ( ) ;
113
113
const httpsAgentOptions = { ...WrapperProperties . HTTPS_AGENT_OPTIONS . get ( props ) , ...{ cookies : { jar } } } ;
114
114
const httpsAgent = new HttpsCookieAgent ( httpsAgentOptions ) ;
115
115
Original file line number Diff line number Diff line change @@ -212,7 +212,7 @@ export class AwsMySQLClient extends AwsClient {
212
212
213
213
async end ( ) {
214
214
if ( ! this . isConnected || ! this . targetClient ?. client ) {
215
- // No connections has been initialized.
215
+ // No connections have been initialized.
216
216
// This might happen if end is called in a finally block when an error occurred while initializing the first connection.
217
217
return ;
218
218
}
Original file line number Diff line number Diff line change @@ -193,7 +193,7 @@ export class AwsPGClient extends AwsClient {
193
193
194
194
async end ( ) {
195
195
if ( ! this . isConnected || ! this . targetClient ?. client ) {
196
- // No connections has been initialized.
196
+ // No connections have been initialized.
197
197
// This might happen if end is called in a finally block when an error occurred while initializing the first connection.
198
198
return ;
199
199
}
Original file line number Diff line number Diff line change @@ -24,10 +24,9 @@ import { TransactionIsolationLevel } from "../../../common/lib/utils/transaction
24
24
import { ClientWrapper } from "../../../common/lib/client_wrapper" ;
25
25
import { FailoverRestriction } from "../../../common/lib/plugins/failover/failover_restriction" ;
26
26
import { AwsPoolClient } from "../../../common/lib/aws_pool_client" ;
27
- import { AwsMysqlPoolClient } from "../../../mysql/lib/mysql_pool_client" ;
28
27
import { AwsPgPoolClient } from "../pg_pool_client" ;
29
28
import { AwsPoolConfig } from "../../../common/lib/aws_pool_config" ;
30
- import { PoolClient , PoolConfig } from "pg" ;
29
+ import { PoolConfig } from "pg" ;
31
30
import { WrapperProperties } from "../../../common/lib/wrapper_property" ;
32
31
33
32
export class PgDatabaseDialect implements DatabaseDialect {
You can’t perform that action at this time.
0 commit comments