@@ -1197,7 +1197,7 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
1197
1197
IHTTPGateway::TPtr gateway,
1198
1198
const NKikimr::NMiniKQL::THolderFactory& holderFactory,
1199
1199
const TString& url,
1200
- const TS3Credentials::TAuthInfo& authInfo ,
1200
+ const TS3Credentials& credentials ,
1201
1201
const TString& pattern,
1202
1202
ES3PatternVariant patternVariant,
1203
1203
TPathList&& paths,
@@ -1226,7 +1226,7 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
1226
1226
, ComputeActorId(computeActorId)
1227
1227
, RetryPolicy(retryPolicy)
1228
1228
, Url(url)
1229
- , AuthInfo(authInfo )
1229
+ , Credentials(credentials )
1230
1230
, Pattern(pattern)
1231
1231
, PatternVariant(patternVariant)
1232
1232
, Paths(std::move(paths))
@@ -1317,7 +1317,7 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
1317
1317
Gateway,
1318
1318
RetryPolicy,
1319
1319
Url,
1320
- AuthInfo ,
1320
+ Credentials ,
1321
1321
Pattern,
1322
1322
PatternVariant,
1323
1323
ES3PatternType::Wildcard));
@@ -1381,10 +1381,11 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
1381
1381
<< pathIndex);
1382
1382
1383
1383
TActorId actorId;
1384
+ const auto & authInfo = Credentials.GetAuthInfo ();
1384
1385
auto stuff = std::make_shared<TRetryStuff>(
1385
1386
Gateway,
1386
1387
Url + object.GetPath (),
1387
- IHTTPGateway::MakeYcHeaders (requestId, AuthInfo .GetToken (), {}, AuthInfo .GetAwsUserPwd (), AuthInfo .GetAwsSigV4 ()),
1388
+ IHTTPGateway::MakeYcHeaders (requestId, authInfo .GetToken (), {}, authInfo .GetAwsUserPwd (), authInfo .GetAwsSigV4 ()),
1388
1389
object.GetSize (),
1389
1390
TxId,
1390
1391
requestId,
@@ -1782,7 +1783,7 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
1782
1783
const IHTTPGateway::TRetryPolicy::TPtr RetryPolicy;
1783
1784
1784
1785
const TString Url;
1785
- const TS3Credentials::TAuthInfo AuthInfo ;
1786
+ const TS3Credentials Credentials ;
1786
1787
const TString Pattern;
1787
1788
const ES3PatternVariant PatternVariant;
1788
1789
TPathList Paths;
@@ -1996,7 +1997,7 @@ std::pair<NYql::NDq::IDqComputeActorAsyncInput*, IActor*> CreateS3ReadActor(
1996
1997
ReadPathsList (params, taskParams, readRanges, paths);
1997
1998
1998
1999
const auto token = secureParams.Value (params.GetToken (), TString{});
1999
- const auto authInfo = GetAuthInfo (credentialsFactory, token);
2000
+ const TS3Credentials credentials (credentialsFactory, token);
2000
2001
2001
2002
const auto & settings = params.GetSettings ();
2002
2003
TString pathPattern = " *" ;
@@ -2173,7 +2174,7 @@ std::pair<NYql::NDq::IDqComputeActorAsyncInput*, IActor*> CreateS3ReadActor(
2173
2174
sizeLimit = FromString<ui64>(it->second );
2174
2175
}
2175
2176
2176
- const auto actor = new TS3StreamReadActor (inputIndex, statsLevel, txId, std::move (gateway), holderFactory, params.GetUrl (), authInfo , pathPattern, pathPatternVariant,
2177
+ const auto actor = new TS3StreamReadActor (inputIndex, statsLevel, txId, std::move (gateway), holderFactory, params.GetUrl (), credentials , pathPattern, pathPatternVariant,
2177
2178
std::move (paths), addPathIndex, readSpec, computeActorId, retryPolicy,
2178
2179
cfg, counters, taskCounters, fileSizeLimit, sizeLimit, rowsLimitHint, memoryQuotaManager,
2179
2180
params.GetUseRuntimeListing (), fileQueueActor, fileQueueBatchSizeLimit, fileQueueBatchObjectCountLimit, fileQueueConsumersCountDelta,
@@ -2185,7 +2186,7 @@ std::pair<NYql::NDq::IDqComputeActorAsyncInput*, IActor*> CreateS3ReadActor(
2185
2186
if (const auto it = settings.find (" sizeLimit" ); settings.cend () != it)
2186
2187
sizeLimit = FromString<ui64>(it->second );
2187
2188
2188
- return CreateRawReadActor (inputIndex, statsLevel, txId, std::move (gateway), holderFactory, params.GetUrl (), authInfo , pathPattern, pathPatternVariant,
2189
+ return CreateRawReadActor (inputIndex, statsLevel, txId, std::move (gateway), holderFactory, params.GetUrl (), credentials , pathPattern, pathPatternVariant,
2189
2190
std::move (paths), addPathIndex, computeActorId, sizeLimit, retryPolicy,
2190
2191
cfg, counters, taskCounters, fileSizeLimit, rowsLimitHint,
2191
2192
params.GetUseRuntimeListing (), fileQueueActor, fileQueueBatchSizeLimit, fileQueueBatchObjectCountLimit, fileQueueConsumersCountDelta);
0 commit comments