Merge 0452ce7 into 69bc320

Author: GrigoriyPA

ydb/library/yql/providers/yt/provider/yql_yt_datasource.cpp

@@ -99,7 +99,10 @@ class TYtDataSource : public TDataProviderBase {
  const TString& token = properties.Value("token", "");
 
  State_->Configuration->AddValidCluster(name);
- State_->Configuration->Tokens[name] = ComposeStructuredTokenJsonForTokenAuthWithSecret(properties.Value("tokenReference", ""), token);
+ if (token) {
+ // Empty token is forbidden for yt reader
+ State_->Configuration->Tokens[name] = ComposeStructuredTokenJsonForTokenAuthWithSecret(properties.Value("tokenReference", ""), token);
+ }
 
  TYtClusterConfig cluster;
  cluster.SetName(name);

ydb/library/yql/providers/yt/provider/yql_yt_dq_integration.cpp

@@ -507,7 +507,7 @@ class TYtDqIntegration: public TDqIntegrationBase {
  if (auto maybeYtReadTable = TMaybeNode<TYtReadTable>(read)) {
  TMaybeNode<TCoSecureParam> secParams;
  const auto cluster = maybeYtReadTable.Cast().DataSource().Cluster();
- if (State_->Configuration->Auth.Get().GetOrElse(TString()) || State_->Configuration->Tokens.contains(cluster)) {
+ if (State_->Configuration->Auth.Get().GetOrElse(TString()) || State_->Configuration->Tokens.Value(cluster, "")) {
  secParams = Build<TCoSecureParam>(ctx, read->Pos()).Name().Build(TString("cluster:default_").append(cluster)).Done();
  }
  return Build<TDqReadWrap>(ctx, read->Pos())