node/config: allow "1b" config values from memory amount

It was not used in practice before, so no issues were opened, or tests were written, but it still looks like a valid configuration value. Signed-off-by: Pavel Karpy <[email protected]>
nspcc-dev · Jul 25, 2024 · 3e22688 · 3e22688
1 parent 8448ff3
commit 3e22688
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Changelog for NeoFS Node
 
 ### Fixed
 - Control service's Drop call does not clean metabase (#2822)
+- It was impossible to specify memory amount as "1b" (one byte) in config, default was used instead (#2899)
 
 ### Changed
 - neofs-cli allows several objects deletion at a time (#2774)

diff --git a/cmd/neofs-node/config/cast.go b/cmd/neofs-node/config/cast.go
@@ -199,7 +199,7 @@ func parseSizeInBytes(sizeStr string) uint64 {
 		if sizeStr[lastChar] == 'b' || sizeStr[lastChar] == 'B' {
 			lastChar--
 		}
-		if lastChar > 0 {
+		if lastChar >= 0 {
 			switch unicode.ToLower(rune(sizeStr[lastChar])) {
 			case 'k':
 				multiplier = 1 << 10

diff --git a/cmd/neofs-node/config/cast_test.go b/cmd/neofs-node/config/cast_test.go
@@ -125,6 +125,8 @@ func TestSizeInBytes(t *testing.T) {
 	)
 	configtest.ForEachFileType("test/config", func(c *config.Config) {
 		c = c.Sub("sizes")
+		require.EqualValues(t, 1, config.SizeInBytesSafe(c, "size_b"))
+		require.EqualValues(t, 1, config.SizeInBytesSafe(c, "size_b_no_space"))
 		require.EqualValues(t, kb, config.SizeInBytesSafe(c, "size_kb"))
 		require.EqualValues(t, 2*kb, config.SizeInBytesSafe(c, "size_kb_no_space"))
 		require.EqualValues(t, 12*mb, config.SizeInBytesSafe(c, "size_mb"))

diff --git a/cmd/neofs-node/config/test/config.json b/cmd/neofs-node/config/test/config.json
@@ -49,6 +49,8 @@
   },
 
   "sizes": {
+    "size_b": "1 b",
+    "size_b_no_space": "1b",
     "size_kb": "1 kb",
     "size_kb_no_space": "2kb",
     "size_mb": "12m",

diff --git a/cmd/neofs-node/config/test/config.yaml b/cmd/neofs-node/config/test/config.yaml
@@ -42,6 +42,8 @@ bool:
   incorrect: not true
 
 sizes:
+  size_b: 1 b
+  size_b_no_space: 1b
   size_kb: 1 kb
   size_kb_no_space: 2kb
   size_mb: 12m