[YQ-1198] Exclude directories from S3 listing

ref:5dae42b7b9670f2110f5be06f9bbb96c8dd45caf

2 files changed, 6 insertions, 1 deletions

diff --git a/ydb/library/yql/providers/s3/provider/yql_s3_io_discovery.cpp b/ydb/library/yql/providers/s3/provider/yql_s3_io_discovery.cpp
index 528fec319a..306cd0c5f6 100644
--- a/ydb/library/yql/providers/s3/provider/yql_s3_io_discovery.cpp
+++ b/ydb/library/yql/providers/s3/provider/yql_s3_io_discovery.cpp
@@ -134,7 +134,8 @@ public:
                     if (IS3Lister::HasWildcards(req.Pattern)) {
                         ctx.AddError(TIssue(ctx.GetPosition(object.Pos()), TStringBuilder() << "Object " << req.Pattern << " has no items."));
                     } else {
-                        ctx.AddError(TIssue(ctx.GetPosition(object.Pos()), TStringBuilder() << "Object " << req.Pattern << " doesn't exist."));
+                        ctx.AddError(TIssue(ctx.GetPosition(object.Pos()),
+                            TStringBuilder() << "Object " << req.Pattern << " doesn't exist" << (req.Pattern.EndsWith('/') ? " or is a directory." : ".")));
                     }
                     return TStatus::Error;
                 }
diff --git a/ydb/library/yql/providers/s3/provider/yql_s3_list.cpp b/ydb/library/yql/providers/s3/provider/yql_s3_list.cpp
index 780e0b964d..5b6af20c7b 100644
--- a/ydb/library/yql/providers/s3/provider/yql_s3_list.cpp
+++ b/ydb/library/yql/providers/s3/provider/yql_s3_list.cpp
@@ -166,6 +166,10 @@ private:
 
                     for (const auto& content : contents) {
                         TString path = content.Node("s3:Key", false, nss).Value<TString>();
+                        if (path.EndsWith('/')) {
+                            // skip 'directories'
+                            continue;
+                        }
                         TVector<TString> matchedGlobs;
                         if (filter(path, matchedGlobs)) {
                             output->emplace_back();