Intermediate changes

robot-piglet · robot-piglet · commit 3a7cb5704aaa · 2024-09-10T00:10:50.000+03:00
diff --git a/contrib/python/cffi/py2/gen/lib/ya.make b/contrib/python/cffi/py2/gen/lib/ya.make
@@ -1,5 +1,7 @@
 PY2_LIBRARY()
 
+VERSION(Service-proxy-version)
+
 LICENSE(MIT)
 
 PEERDIR(
diff --git a/contrib/python/cffi/py2/gen/ya.make b/contrib/python/cffi/py2/gen/ya.make
@@ -2,6 +2,8 @@ PY2_PROGRAM(cffigen)
 
 DISABLE(PYTHON_SQLITE3)
 
+VERSION(Service-proxy-version)
+
 LICENSE(MIT)
 
 PEERDIR(
diff --git a/contrib/python/cffi/py3/gen/lib/ya.make b/contrib/python/cffi/py3/gen/lib/ya.make
@@ -1,5 +1,7 @@
 PY3_LIBRARY()
 
+VERSION(Service-proxy-version)
+
 LICENSE(MIT)
 
 PEERDIR(
diff --git a/contrib/python/cffi/py3/gen/ya.make b/contrib/python/cffi/py3/gen/ya.make
@@ -2,6 +2,8 @@ PY3_PROGRAM(cffigen)
 
 DISABLE(PYTHON_SQLITE3)
 
+VERSION(Service-proxy-version)
+
 LICENSE(MIT)
 
 PEERDIR(
diff --git a/contrib/python/ipython/py3/bin/ya.make b/contrib/python/ipython/py3/bin/ya.make
@@ -1,5 +1,7 @@
 PY3_PROGRAM(ipython)
 
+VERSION(Service-proxy-version)
+
 LICENSE(BSD-3-Clause)
 
 PEERDIR(
diff --git a/contrib/python/matplotlib/py3/extern/agg24-svn/ya.make b/contrib/python/matplotlib/py3/extern/agg24-svn/ya.make
@@ -1,5 +1,7 @@
 LIBRARY()
 
+VERSION(Service-proxy-version)
+
 LICENSE(PSF-2.0)
 
 ADDINCL(
diff --git a/contrib/python/matplotlib/py3/extern/ttconv/ya.make b/contrib/python/matplotlib/py3/extern/ttconv/ya.make
@@ -1,5 +1,7 @@
 PY23_LIBRARY()
 
+VERSION(Service-proxy-version)
+
 LICENSE(PSF-2.0)
 
 NO_COMPILER_WARNINGS()
diff --git a/contrib/python/moto/bin/ya.make b/contrib/python/moto/bin/ya.make
@@ -1,5 +1,7 @@
 PY3_PROGRAM(moto_server)
 
+VERSION(Service-proxy-version)
+
 LICENSE(Apache-2.0)
 
 PEERDIR(
diff --git a/contrib/python/mypy-protobuf/bin/protoc-gen-mypy/bin/ya.make b/contrib/python/mypy-protobuf/bin/protoc-gen-mypy/bin/ya.make
@@ -1,5 +1,7 @@
 PY3_PROGRAM_BIN(protoc-gen-mypy)
 
+VERSION(Service-proxy-version)
+
 LICENSE(Apache-2.0)
 
 PEERDIR(
diff --git a/contrib/python/mypy-protobuf/bin/protoc-gen-mypy_grpc/ya.make b/contrib/python/mypy-protobuf/bin/protoc-gen-mypy_grpc/ya.make
@@ -1,5 +1,7 @@
 PY3_PROGRAM(protoc-gen-mypy_grpc)
 
+VERSION(Service-proxy-version)
+
 LICENSE(Apache-2.0)
 
 PEERDIR(
diff --git a/contrib/python/pythran/bin/pythran/ya.make b/contrib/python/pythran/bin/pythran/ya.make
@@ -1,5 +1,7 @@
 PY3_PROGRAM(pythran)
 
+VERSION(Service-proxy-version)
+
 LICENSE(BSD-3-Clause)
 
 PEERDIR(
diff --git a/yt/yt/client/cache/cache.cpp b/yt/yt/client/cache/cache.cpp
@@ -26,6 +26,7 @@ TStringBuf GetNormalClusterName(TStringBuf clusterName)
 // TODO(ignat): move this logic to ads/bsyeti/libs/ytex/client/
 TClientsCacheConfigPtr GetClustersConfigWithNormalClusterName(const TClientsCacheConfigPtr& config)
 {
+    YT_VERIFY(config);
     auto newConfig = New<TClientsCacheConfig>();
 
     newConfig->DefaultConfig = CloneYsonStruct(config->DefaultConfig, /*postprocess*/ false, /*setDefaults*/ false);
@@ -49,7 +50,7 @@ TConnectionConfigPtr MakeClusterConfig(
     const bool useDefaultConfig = (it == clustersConfig->ClusterConfigs.end());
     const auto& config = useDefaultConfig ? clustersConfig->DefaultConfig : it->second;
 
-    auto newConfig = CloneYsonStruct(config, /*postprocess*/ false, /*setDefaults*/ false);
+    auto newConfig = config ? CloneYsonStruct(config, /*postprocess*/ false, /*setDefaults*/ false) : New<NApi::NRpcProxy::TConnectionConfig>();
     // Ignore cluster url from DefaultConfig, but use it from ClusterConfigs[_] if it is set.
     if (useDefaultConfig || !newConfig->ClusterUrl.has_value() || newConfig->ClusterUrl->empty()) {
         newConfig->ClusterUrl = ToString(cluster);
@@ -58,6 +59,7 @@ TConnectionConfigPtr MakeClusterConfig(
     if (!proxyRole.empty()) {
         newConfig->ProxyRole = ToString(proxyRole);
     }
+    newConfig->Postprocess();
     return newConfig;
 }
 
diff --git a/yt/yt/client/cache/config.cpp b/yt/yt/client/cache/config.cpp
@@ -10,8 +10,10 @@ using namespace NApi;
 
 void TClientsCacheConfig::Register(TRegistrar registrar)
 {
+    // TODO(shishmak): Need to handle default config properly.
+    // Now it fails postprocess validation when set to default, so it made optional.
     registrar.Parameter("default_config", &TThis::DefaultConfig)
-        .DefaultNew();
+        .Optional();
     registrar.Parameter("cluster_configs", &TThis::ClusterConfigs)
         .Default();
 }
diff --git a/yt/yt/client/cache/unittests/cache_ut.cpp b/yt/yt/client/cache/unittests/cache_ut.cpp
@@ -93,6 +93,7 @@ TEST(TClientsCacheTest, MultiThreads)
 TEST(TClientsCacheTest, MakeClusterConfig)
 {
     auto clientsCacheConfig = New<TClientsCacheConfig>();
+    clientsCacheConfig->DefaultConfig = New<NApi::NRpcProxy::TConnectionConfig>();
     clientsCacheConfig->DefaultConfig->ClusterUrl = "seneca-nan"; // will be ignored
     clientsCacheConfig->DefaultConfig->ProxyRole = "default_role"; // can be overwritten
     clientsCacheConfig->DefaultConfig->DynamicChannelPool->MaxPeerCount = 42;
