Fix name key in S3 child map

elastic · Jun 4, 2019 · 29ac16b · 29ac16b
1 parent ab56c73
commit 29ac16b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java
@@ -256,8 +256,10 @@ public Map<String, BlobContainer> children() throws IOException {
                 for (final String summary : list.getCommonPrefixes()) {
                     final String name = summary.substring(keyPath.length());
                     if (name.isEmpty() == false) {
-                        final BlobPath path = path().add(name);
-                        entries.add(entry(name.substring(0, name.length() - 1), blobStore.blobContainer(path)));
+                        // Stripping the trailing slash off of the common prefix
+                        final String last = name.substring(0, name.length() - 1);
+                        final BlobPath path = path().add(last);
+                        entries.add(entry(last, blobStore.blobContainer(path)));
                     }
                 }
                 assert list.getObjectSummaries().stream().noneMatch(s -> {

diff --git a/...itory-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryThirdPartyTests.java b/...itory-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryThirdPartyTests.java
@@ -60,7 +60,7 @@ protected SecureSettings credentials() {
     protected void createRepository(String repoName) {
         Settings.Builder settings = Settings.builder()
             .put("bucket", System.getProperty("test.s3.bucket"))
-            .put("base_path", System.getProperty("test.s3.base", ""));
+            .put("base_path", System.getProperty("test.s3.base", "testpath"));
         final String endpointPath = System.getProperty("test.s3.endpoint");
         if (endpointPath != null) {
             try {