Skip to content

Commit 7797fb8

Browse files
author
ignat
committed
YT-22751: Rename GetClientOpsFromEnv->GetClientOptionsFromEnv, move related tests to yt/yt/client/api/unittests
\[nodiff:caesar\] 878aead651e24a729a7613f0a0b3a33cde78814f
1 parent de89226 commit 7797fb8

File tree

9 files changed

+37
-21
lines changed

9 files changed

+37
-21
lines changed

‎yt/yt/client/api/options.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace NYT::NApi {
1212

1313
////////////////////////////////////////////////////////////////////////////////
1414

15-
NApi::TClientOptions GetClientOpsFromEnv()
15+
NApi::TClientOptions GetClientOptionsFromEnv()
1616
{
1717
NApi::TClientOptions options;
1818

@@ -37,9 +37,9 @@ NApi::TClientOptions GetClientOpsFromEnv()
3737
return options;
3838
}
3939

40-
const NApi::TClientOptions& GetClientOpsFromEnvStatic()
40+
const NApi::TClientOptions& GetClientOptionsFromEnvStatic()
4141
{
42-
static const NApi::TClientOptions options = GetClientOpsFromEnv();
42+
static const NApi::TClientOptions options = GetClientOptionsFromEnv();
4343
return options;
4444
}
4545

‎yt/yt/client/api/options.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ namespace NYT::NApi {
1313
* UserName is extracted from YT_USER env variable or uses current system username.
1414
* Token is extracted from YT_TOKEN env variable or from file `~/.yt/token`.
1515
*/
16-
TClientOptions GetClientOpsFromEnv();
16+
TClientOptions GetClientOptionsFromEnv();
1717

1818
//! Resolves options only once per launch and then returns the cached result.
19-
const TClientOptions& GetClientOpsFromEnvStatic();
19+
const TClientOptions& GetClientOptionsFromEnvStatic();
2020

2121
////////////////////////////////////////////////////////////////////////////////
2222

‎yt/yt/client/cache/unittests/options_ut.cpp renamed to ‎yt/yt/client/api/unittests/options_ut.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <util/system/env.h>
1212

13-
namespace NYT::NClient::NCache {
13+
namespace NYT::NApi {
1414

1515
////////////////////////////////////////////////////////////////////////////////
1616

@@ -29,7 +29,7 @@ TEST(TClientOptionsTest, TokenFromFile)
2929
{"YT_TOKEN", ""},
3030
{"YT_TOKEN_PATH", ""},
3131
}};
32-
const auto clientOptions = NApi::GetClientOpsFromEnv();
32+
const auto clientOptions = GetClientOptionsFromEnv();
3333
EXPECT_TRUE(clientOptions.Token);
3434
EXPECT_EQ("AAAA-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", *clientOptions.Token);
3535
}
@@ -46,15 +46,15 @@ TEST(TClientOptionsTest, TokenFromYtTokenPath)
4646
{"YT_TOKEN", ""},
4747
{"YT_TOKEN_PATH", tokenPath},
4848
}};
49-
const auto clientOptions = NApi::GetClientOpsFromEnv();
49+
const auto clientOptions = GetClientOptionsFromEnv();
5050
EXPECT_TRUE(clientOptions.Token);
5151
EXPECT_EQ("BBBB-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", *clientOptions.Token);
5252
}
5353

5454
TEST(TClientOptionsTest, TokenFromEnv)
5555
{
5656
NTesting::TScopedEnvironment tokenGuard("YT_TOKEN", "BBBB-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB");
57-
const auto& clientOptions = NApi::GetClientOpsFromEnv();
57+
const auto& clientOptions = GetClientOptionsFromEnv();
5858
EXPECT_TRUE(clientOptions.Token);
5959
EXPECT_EQ("BBBB-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", *clientOptions.Token);
6060
}
@@ -65,7 +65,7 @@ TEST(TClientOptionsTest, UserFromEnv)
6565
{"YT_TOKEN", "BBBB-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"},
6666
{"YT_USER", "yt_test_user"},
6767
}};
68-
const auto& clientOptions = NApi::GetClientOpsFromEnv();
68+
const auto& clientOptions = GetClientOptionsFromEnv();
6969
EXPECT_TRUE(clientOptions.User);
7070
EXPECT_EQ("yt_test_user", *clientOptions.User);
7171
}
@@ -76,7 +76,7 @@ TEST(TClientOptionsTest, AllowEmptyUser)
7676
{"YT_TOKEN", "BBBB-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"},
7777
{"YT_USER", ""},
7878
}};
79-
const auto& clientOptions = NApi::GetClientOpsFromEnv();
79+
const auto& clientOptions = GetClientOptionsFromEnv();
8080
EXPECT_TRUE(!clientOptions.User);
8181
}
8282

‎yt/yt/client/api/unittests/ya.make

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
GTEST()
2+
3+
INCLUDE(${ARCADIA_ROOT}/yt/ya_cpp.make.inc)
4+
5+
SRCS(
6+
options_ut.cpp
7+
)
8+
9+
INCLUDE(${ARCADIA_ROOT}/yt/opensource.inc)
10+
11+
PEERDIR(
12+
library/cpp/testing/common
13+
yt/yt/client
14+
)
15+
16+
END()

‎yt/yt/client/cache/cache.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ IClientsCachePtr CreateClientsCache(
116116

117117
IClientsCachePtr CreateClientsCache(const TConnectionConfigPtr& config)
118118
{
119-
return CreateClientsCache(config, NApi::GetClientOpsFromEnvStatic());
119+
return CreateClientsCache(config, NApi::GetClientOptionsFromEnvStatic());
120120
}
121121

122122
IClientsCachePtr CreateClientsCache(const NApi::TClientOptions& options)
@@ -128,7 +128,7 @@ IClientsCachePtr CreateClientsCache(const NApi::TClientOptions& options)
128128

129129
IClientsCachePtr CreateClientsCache()
130130
{
131-
return CreateClientsCache(NApi::GetClientOpsFromEnvStatic());
131+
return CreateClientsCache(NApi::GetClientOptionsFromEnvStatic());
132132
}
133133

134134
////////////////////////////////////////////////////////////////////////////////

‎yt/yt/client/cache/rpc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ NApi::IClientPtr CreateClient(const NApi::NRpcProxy::TConnectionConfigPtr& confi
6060

6161
NApi::IClientPtr CreateClient(const NApi::NRpcProxy::TConnectionConfigPtr& config)
6262
{
63-
return CreateClient(config, NApi::GetClientOpsFromEnvStatic());
63+
return CreateClient(config, NApi::GetClientOptionsFromEnvStatic());
6464
}
6565

6666
NApi::IClientPtr CreateClient(TStringBuf clusterUrl)
6767
{
68-
return CreateClient(clusterUrl, NApi::GetClientOpsFromEnvStatic());
68+
return CreateClient(clusterUrl, NApi::GetClientOptionsFromEnvStatic());
6969
}
7070

7171
NApi::IClientPtr CreateClient(TStringBuf cluster, TStringBuf proxyRole)

‎yt/yt/client/cache/unittests/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ INCLUDE(${ARCADIA_ROOT}/yt/ya_cpp.make.inc)
44

55
SRCS(
66
cache_ut.cpp
7-
options_ut.cpp
87
)
98

109
INCLUDE(${ARCADIA_ROOT}/yt/opensource.inc)

‎yt/yt/client/federated/unittests/cache_ut.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ TEST(TFederatedClientsCacheTest, GetSameClient)
2222
auto ytClientsCache = CreateFederatedClientsCache(
2323
New<TConnectionConfig>(),
2424
New<TClientsCacheConfig>(),
25-
NApi::GetClientOpsFromEnvStatic());
25+
NApi::GetClientOptionsFromEnvStatic());
2626

2727
auto client1 = ytClientsCache->GetClient("localhost");
2828
auto client2 = ytClientsCache->GetClient("localhost");
@@ -41,7 +41,7 @@ TEST(TFederatedClientsCacheTest, GetFederatedWithEmptyConfig)
4141
auto ytClientsCache = CreateFederatedClientsCache(
4242
New<TConnectionConfig>(),
4343
New<TClientsCacheConfig>(),
44-
NApi::GetClientOpsFromEnvStatic());
44+
NApi::GetClientOptionsFromEnvStatic());
4545

4646
EXPECT_THROW(
4747
ytClientsCache->GetClient("primary+secondary"),
@@ -61,7 +61,7 @@ TEST(TFederatedClientsCacheTest, ConfigurationAndClusterUrlMismatch1)
6161
auto ytClientsCache = CreateFederatedClientsCache(
6262
connectionConfig,
6363
New<TClientsCacheConfig>(),
64-
NApi::GetClientOpsFromEnvStatic());
64+
NApi::GetClientOptionsFromEnvStatic());
6565

6666
EXPECT_THROW(
6767
ytClientsCache->GetClient("primary+tertiary"),
@@ -83,7 +83,7 @@ TEST(TFederatedClientsCacheTest, ConfigurationAndClusterUrlMismatch2)
8383
auto ytClientsCache = CreateFederatedClientsCache(
8484
connectionConfig,
8585
New<TClientsCacheConfig>(),
86-
NApi::GetClientOpsFromEnvStatic());
86+
NApi::GetClientOptionsFromEnvStatic());
8787

8888
EXPECT_THROW(
8989
ytClientsCache->GetClient("primary+tertiary"),
@@ -103,7 +103,7 @@ TEST(TFederatedClientsCacheTest, ConfigurationMissingCluster)
103103
auto ytClientsCache = CreateFederatedClientsCache(
104104
connectionConfig,
105105
New<TClientsCacheConfig>(),
106-
NApi::GetClientOpsFromEnvStatic());
106+
NApi::GetClientOptionsFromEnvStatic());
107107

108108
EXPECT_THROW(
109109
ytClientsCache->GetClient("primary+secondary+tertiary"),

‎yt/yt/client/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ RECURSE(
227227
)
228228

229229
RECURSE_FOR_TESTS(
230+
api/unittests
230231
table_client/unittests
231232
unittests
232233
)

0 commit comments

Comments
 (0)