6277: valid manifest must end with new line.

diff --git a/sdk/ruby/lib/arvados/keep.rb b/sdk/ruby/lib/arvados/keep.rb
index 2006d3359da658a5a116ca9675b723a10d701369..041058968e04fbb95593901f299469617116a8c3 100644 (file)
--- a/sdk/ruby/lib/arvados/keep.rb
+++ b/sdk/ruby/lib/arvados/keep.rb
@@ -232,6 +232,7 @@ module Keep
     # Valid format: stream name + one or more locators + one or more files for each stream in manifest.
     # https://arvados.org/projects/arvados/wiki/Keep_manifest_format
     def self.valid?(manifest)
+      raise ArgumentError.new "Invalid manifest: does not end with new line" if !manifest.end_with?("\n")
       line_count = 0
       manifest.each_line do |line|
         line_count += 1

diff --git a/sdk/ruby/test/test_keep_manifest.rb b/sdk/ruby/test/test_keep_manifest.rb
index 08965fa5fa0602862975ab35ebc562bbc318a693..3de34f03c21067d5900c600b648c91fb77a91885 100644 (file)
--- a/sdk/ruby/test/test_keep_manifest.rb
+++ b/sdk/ruby/test/test_keep_manifest.rb
@@ -281,22 +281,23 @@ class ManifestTest < Minitest::Test
   end
 
   [
-   [false, 'abc d41d8cd98f00b204e9800998ecf8427e 0:0:abc.txt', "invalid stream name \"abc\""],
-   [false, 'd41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt', "invalid stream name \"d41d8cd98f00b204e9800998ecf8427e+0\""],
-   [false, '. d41d8cd98f00b204e9800998ecf8427 0:0:abc.txt', "invalid locator \"d41d8cd98f00b204e9800998ecf8427\""],
-   [false, '. d41d8cd98f00b204e9800998ecf8427e', "Manifest invalid for stream 1: no file tokens"],
-   [true, '. d41d8cd98f00b204e9800998ecf8427e 0:0:abc.txt'],
-   [true, '. d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt'],
-   [true, '. d41d8cd98f00b204e9800998ecf8427e a41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt'], # 2 locators
-   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n/dir1 d41d8cd98f00b204e9800998ecf842 0:0:abc.txt",
+   [false, '. d41d8cd98f00b204e9800998ecf8427e 0:0:abc.txt', "Invalid manifest: does not end with new line"],
+   [false, "abc d41d8cd98f00b204e9800998ecf8427e 0:0:abc.txt\n", "invalid stream name \"abc\""],
+   [false, "d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n", "invalid stream name \"d41d8cd98f00b204e9800998ecf8427e+0\""],
+   [false, ". d41d8cd98f00b204e9800998ecf8427 0:0:abc.txt\n", "invalid locator \"d41d8cd98f00b204e9800998ecf8427\""],
+   [false, ". d41d8cd98f00b204e9800998ecf8427e\n", "Manifest invalid for stream 1: no file tokens"],
+   [true, ". d41d8cd98f00b204e9800998ecf8427e 0:0:abc.txt\n"],
+   [true, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n"],
+   [true, ". d41d8cd98f00b204e9800998ecf8427e a41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n"], # 2 locators
+   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n/dir1 d41d8cd98f00b204e9800998ecf842 0:0:abc.txt\n",
     "Manifest invalid for stream 2: missing or invalid stream name \"/dir1\""],
-   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n./dir1 d41d8cd98f00b204e9800998ecf842 0:0:abc.txt",
+   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n./dir1 d41d8cd98f00b204e9800998ecf842 0:0:abc.txt\n",
     "Manifest invalid for stream 2: missing or invalid locator \"d41d8cd98f00b204e9800998ecf842\""],
-   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n./dir1 a41d8cd98f00b204e9800998ecf8427e+0 abc.txt",
+   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n./dir1 a41d8cd98f00b204e9800998ecf8427e+0 abc.txt\n",
     "Manifest invalid for stream 2: invalid file token \"abc.txt\""],
-   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n./dir1 a41d8cd98f00b204e9800998ecf8427e+0 0:abc.txt",
+   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n./dir1 a41d8cd98f00b204e9800998ecf8427e+0 0:abc.txt\n",
     "Manifest invalid for stream 2: invalid file token \"0:abc.txt\""],
-   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n./dir1 a41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt xyz.txt",
+   [false, ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n./dir1 a41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt xyz.txt\n",
     "Manifest invalid for stream 2: invalid file token \"xyz.txt\""],
   ].each do |ok, manifest, expected_error=nil|
     define_method "test_manifest_valid_#{ok}_#{manifest}_and_expect_error_#{expected_error}" do