Fix setting none as StreamCompression

Add test for stream and consumer metadata

Signed-off-by: Waldemar Quevedo <[email protected]>

Author: wallyqs

nats/js/api.py

@@ -233,11 +233,11 @@ class StoreCompression(str, Enum):
     If stream is file-based and a compression algorithm is specified,
     the stream data will be compressed on disk.
 
-    Valid options are nothing (empty string) or s2 for Snappy compression.
+    Valid options are none or s2 for Snappy compression.
     Introduced in nats-server 2.10.0.
     """
 
-    NONE = ""
+    NONE = "none"
     S2 = "s2"
 
 
@@ -327,8 +327,10 @@ def as_dict(self) -> Dict[str, object]:
         result['max_age'] = self._to_nanoseconds(self.max_age)
         if self.sources:
             result['sources'] = [src.as_dict() for src in self.sources]
-        if self.compression and self.compression != StoreCompression.NONE and self.compression != StoreCompression.S2:
+        if self.compression and (self.compression != StoreCompression.NONE and self.compression != StoreCompression.S2):
             raise ValueError("nats: invalid store compression type: %s" % self.compression)
+        if self.metadata and not isinstance(self.metadata, dict):
+            raise ValueError("nats: invalid metadata format")
         return result
 
 

tests/test_js.py

@@ -3896,4 +3896,54 @@ async def test_stream_compression(self):
                 compression="s3",
             )
         assert str(err.value) == 'nats: invalid store compression type: s3'
+
+        # An empty string means not setting compression, but to be explicit
+        # can also use 
+        js = nc.jetstream()
+        await js.add_stream(
+            name="NONE",
+            subjects=["bar"],
+            compression="none",
+            )
+        sinfo = await js.stream_info("NONE")
+        assert sinfo.config.compression == nats.js.api.StoreCompression.NONE
+
+        # By default it should be using 'none' as the configured compression value.
+        js = nc.jetstream()
+        await js.add_stream(
+            name="NONE2",
+            subjects=["quux"],
+            )
+        sinfo = await js.stream_info("NONE2")
+        assert sinfo.config.compression == nats.js.api.StoreCompression.NONE
+        await nc.close()
+
+    @async_test
+    async def test_stream_consumer_metadata(self):
+        nc = await nats.connect()
+
+        js = nc.jetstream()
+        await js.add_stream(
+            name="META",
+            subjects=["test", "foo"],
+            metadata={'foo':'bar'},
+            )
+        sinfo = await js.stream_info("META")
+        assert sinfo.config.metadata['foo'] == 'bar'
+
+        with pytest.raises(ValueError) as err:
+            await js.add_stream(
+                name="META2",
+                subjects=["test", "foo"],
+                metadata=["hello", "world"],
+            )
+        assert str(err.value) == 'nats: invalid metadata format'
+
+        await js.add_consumer("META", config=nats.js.api.ConsumerConfig(
+            durable_name="b",
+            metadata={'hello':'world'}
+        ))
+        cinfo = await js.consumer_info("META", "b")
+        assert cinfo.config.metadata['hello'] == 'world'
+
         await nc.close()