@@ -1268,7 +1268,7 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
12681268 IHTTPGateway::TPtr gateway,
12691269 const THolderFactory& holderFactory,
12701270 const TString& url,
1271- const TS3Credentials::TAuthInfo& authInfo ,
1271+ const TS3Credentials& credentials ,
12721272 const TString& pattern,
12731273 ES3PatternVariant patternVariant,
12741274 TPathList&& paths,
@@ -1298,7 +1298,7 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
12981298 , ComputeActorId(computeActorId)
12991299 , RetryPolicy(retryPolicy)
13001300 , Url(url)
1301- , AuthInfo(authInfo )
1301+ , Credentials(credentials )
13021302 , Pattern(pattern)
13031303 , PatternVariant(patternVariant)
13041304 , Paths(std::move(paths))
@@ -1390,7 +1390,7 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
13901390 Gateway,
13911391 RetryPolicy,
13921392 Url,
1393- AuthInfo ,
1393+ Credentials ,
13941394 Pattern,
13951395 PatternVariant,
13961396 ES3PatternType::Wildcard));
@@ -1454,10 +1454,11 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
14541454 << pathIndex);
14551455
14561456 TActorId actorId;
1457+ const auto & authInfo = Credentials.GetAuthInfo ();
14571458 auto stuff = std::make_shared<TRetryStuff>(
14581459 Gateway,
14591460 Url + object.GetPath (),
1460- IHTTPGateway::MakeYcHeaders (requestId, AuthInfo .GetToken (), {}, AuthInfo .GetAwsUserPwd (), AuthInfo .GetAwsSigV4 ()),
1461+ IHTTPGateway::MakeYcHeaders (requestId, authInfo .GetToken (), {}, authInfo .GetAwsUserPwd (), authInfo .GetAwsSigV4 ()),
14611462 object.GetSize (),
14621463 TxId,
14631464 requestId,
@@ -1856,7 +1857,7 @@ class TS3StreamReadActor : public TActorBootstrapped<TS3StreamReadActor>, public
18561857 const IHTTPGateway::TRetryPolicy::TPtr RetryPolicy;
18571858
18581859 const TString Url;
1859- const TS3Credentials::TAuthInfo AuthInfo ;
1860+ const TS3Credentials Credentials ;
18601861 const TString Pattern;
18611862 const ES3PatternVariant PatternVariant;
18621863 TPathList Paths;
@@ -2071,7 +2072,7 @@ std::pair<NYql::NDq::IDqComputeActorAsyncInput*, IActor*> CreateS3ReadActor(
20712072 ReadPathsList (params, taskParams, readRanges, paths);
20722073
20732074 const auto token = secureParams.Value (params.GetToken (), TString{});
2074- const auto authInfo = GetAuthInfo (credentialsFactory, token);
2075+ const TS3Credentials credentials (credentialsFactory, token);
20752076
20762077 const auto & settings = params.GetSettings ();
20772078 TString pathPattern = " *" ;
@@ -2249,7 +2250,7 @@ std::pair<NYql::NDq::IDqComputeActorAsyncInput*, IActor*> CreateS3ReadActor(
22492250 sizeLimit = FromString<ui64>(it->second );
22502251 }
22512252
2252- const auto actor = new TS3StreamReadActor (inputIndex, statsLevel, txId, std::move (gateway), holderFactory, params.GetUrl (), authInfo , pathPattern, pathPatternVariant,
2253+ const auto actor = new TS3StreamReadActor (inputIndex, statsLevel, txId, std::move (gateway), holderFactory, params.GetUrl (), credentials , pathPattern, pathPatternVariant,
22532254 std::move (paths), addPathIndex, readSpec, computeActorId, retryPolicy,
22542255 cfg, counters, taskCounters, fileSizeLimit, sizeLimit, rowsLimitHint, memoryQuotaManager,
22552256 params.GetUseRuntimeListing (), fileQueueActor, fileQueueBatchSizeLimit, fileQueueBatchObjectCountLimit, fileQueueConsumersCountDelta,
@@ -2261,7 +2262,7 @@ std::pair<NYql::NDq::IDqComputeActorAsyncInput*, IActor*> CreateS3ReadActor(
22612262 if (const auto it = settings.find (" sizeLimit" ); settings.cend () != it)
22622263 sizeLimit = FromString<ui64>(it->second );
22632264
2264- return CreateRawReadActor (inputIndex, statsLevel, txId, std::move (gateway), holderFactory, params.GetUrl (), authInfo , pathPattern, pathPatternVariant,
2265+ return CreateRawReadActor (inputIndex, statsLevel, txId, std::move (gateway), holderFactory, params.GetUrl (), credentials , pathPattern, pathPatternVariant,
22652266 std::move (paths), addPathIndex, computeActorId, sizeLimit, retryPolicy,
22662267 cfg, counters, taskCounters, fileSizeLimit, rowsLimitHint,
22672268 params.GetUseRuntimeListing (), fileQueueActor, fileQueueBatchSizeLimit, fileQueueBatchObjectCountLimit, fileQueueConsumersCountDelta);
0 commit comments