Fix token

commit_hash:c0fe9318f1064e504497dcb2950247dfb02ab053

2 files changed, 22 insertions, 12 deletions

diff --git a/yql/essentials/core/url_lister/url_lister_manager.cpp b/yql/essentials/core/url_lister/url_lister_manager.cpp
index 803c487d638..0b3284927c2 100644
--- a/yql/essentials/core/url_lister/url_lister_manager.cpp
+++ b/yql/essentials/core/url_lister/url_lister_manager.cpp
@@ -128,7 +128,7 @@ private:
 
             auto [preprocessedUrl, alias] = GetPreparedUrlAndAlias(currentEntry.Url);
 
-            Y_ENSURE(urlLister->Accept(preprocessedUrl), "URL: '" << currentEntry.Url << "' is not supported by the lister");
+            YQL_ENSURE(urlLister->Accept(preprocessedUrl), "URL: '" << currentEntry.Url << "' is not supported by the lister");
 
             TVector<TUrlListEntry> subEntries;
             try {
diff --git a/yql/essentials/providers/config/yql_config_provider.cpp b/yql/essentials/providers/config/yql_config_provider.cpp
index 588fed63a12..2a067dd5bb8 100644
--- a/yql/essentials/providers/config/yql_config_provider.cpp
+++ b/yql/essentials/providers/config/yql_config_provider.cpp
@@ -1307,19 +1307,17 @@ namespace {
             TStringBuf url = args[1];
             TStringBuf tokenName = args.size() == 3 ? args[2] : TStringBuf();
 
-            TStringBuf token;
-            if (tokenName) {
-                if (auto cred = Types_.Credentials->FindCredential(tokenName)) {
-                    token = cred->Content;
-                } else {
-                    ctx.AddError(TIssue(pos, TStringBuilder() << "Unknown token name '" << tokenName << "' for folder."));
-                    return false;
+            if (Types_.UseUrlListerForFolder) {
+                TStringBuf token;
+                if (tokenName) {
+                    if (auto cred = Types_.Credentials->FindCredential(tokenName)) {
+                        token = cred->Content;
+                    } else {
+                        ctx.AddError(TIssue(pos, TStringBuilder() << "Unknown token name '" << tokenName << "' for folder."));
+                        return false;
+                    }
                 }
-            } else if (auto cred = Types_.Credentials->FindCredential("default_sandbox")) {
-                token = cred->Content;
-            }
 
-            if (Types_.UseUrlListerForFolder) {
                 if (!Types_.UrlListerManager) {
                     ctx.AddError(TIssue(pos, TStringBuilder() << "UrlListerManager is not initialized, unable to add folder by url"));
                     return false;
@@ -1341,6 +1339,18 @@ namespace {
                 }
             } else {
 
+                TStringBuf token;
+                if (tokenName) {
+                    if (auto cred = Types_.Credentials->FindCredential(tokenName)) {
+                        token = cred->Content;
+                    } else {
+                        ctx.AddError(TIssue(pos, TStringBuilder() << "Unknown token name '" << tokenName << "' for folder."));
+                        return false;
+                    }
+                } else if (auto cred = Types_.Credentials->FindCredential("default_sandbox")) {
+                    token = cred->Content;
+                }
+
                 std::vector<std::pair<TString, TString>> queue;
                 queue.emplace_back(prefix, url);