Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update validate logic to use MemorySize #782

Merged
merged 9 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/configLoadHelpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ func Test_loadMemsize(t *testing.T) {
want any
wantErr bool
}{
{"yaml", FormatYAML, `M: 1Gb`, &mem{}, &mem{MemorySize(0x4000_0000)}, false},
{"json", FormatJSON, `{"M": "1Gb"}`, &mem{}, &mem{MemorySize(0x4000_0000)}, false},
{"toml", FormatTOML, `M="1Gb"`, &mem{}, &mem{MemorySize(0x4000_0000)}, false},
{"yaml", FormatYAML, `M: 1Gb`, &mem{}, &mem{MemorySize(G)}, false},
{"json", FormatJSON, `{"M": "1Gb"}`, &mem{}, &mem{MemorySize(G)}, false},
{"toml", FormatTOML, `M="1Gb"`, &mem{}, &mem{MemorySize(G)}, false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
187 changes: 185 additions & 2 deletions config/config_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package config

import (
"fmt"
"os"
"strings"
"sync"
Expand Down Expand Up @@ -739,12 +740,12 @@ func TestMemorySizeUnmarshal(t *testing.T) {
{
name: "single letter",
input: "1G",
expected: 1024 * 1024 * 1024,
expected: 1000 * 1000 * 1000,
},
{
name: "B included",
input: "1GB",
expected: 1024 * 1024 * 1024,
expected: 1000 * 1000 * 1000,
},
{
name: "iB included",
Expand All @@ -756,15 +757,197 @@ func TestMemorySizeUnmarshal(t *testing.T) {
input: "1Gi",
expected: 1024 * 1024 * 1024,
},
{
name: "single letter lowercase",
input: "1g",
expected: 1000 * 1000 * 1000,
},
{
name: "b included lowercase",
input: "1gb",
expected: 1000 * 1000 * 1000,
},
{
name: "ib included lowercase",
input: "1gib",
expected: 1024 * 1024 * 1024,
},
{
name: "k8s format lowercase",
input: "1gi",
expected: 1024 * 1024 * 1024,
},
{
name: "bytes",
input: "100000",
expected: 100000,
},
{
name: "b",
input: "1b",
expected: 1,
},
{
name: "bi",
input: "1Bi",
expected: 1,
},
{
name: "k",
input: "1K",
expected: 1000,
},
{
name: "ki",
input: "1Ki",
expected: 1024,
},
{
name: "m",
input: "1M",
expected: 1000 * 1000,
},
{
name: "mi",
input: "1Mi",
expected: 1024 * 1024,
},
{
name: "t",
input: "1T",
expected: 1000 * 1000 * 1000 * 1000,
},
{
name: "ti",
input: "1Ti",
expected: 1024 * 1024 * 1024 * 1024,
},
{
name: "p",
input: "1p",
expected: 1000 * 1000 * 1000 * 1000 * 1000,
},
{
name: "pi",
input: "1pi",
expected: 1024 * 1024 * 1024 * 1024 * 1024,
},
{
name: "e",
input: "1e",
expected: 1000 * 1000 * 1000 * 1000 * 1000 * 1000,
},
{
name: "ei",
input: "1ei",
expected: 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var m MemorySize
err := m.UnmarshalText([]byte(tt.input))
assert.NoError(t, err)
assert.Equal(t, tt.expected, m)
})
}
}

func TestMemorySizeUnmarshalInvalid(t *testing.T) {
tests := []struct {
name string
input string
}{
{
name: "no number",
input: "G",
},
{
name: "invalid unit",
input: "1A",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var m MemorySize
err := m.UnmarshalText([]byte(tt.input))
assert.Contains(t, err.Error(), fmt.Sprintf(invalidSizeError, tt.input))
})
}
}

func TestMemorySizeMarshal(t *testing.T) {
tests := []struct {
name string
input MemorySize
expected string
}{
{
name: "zero",
input: 0,
expected: "0",
},
{
name: "ei",
input: MemorySize(3 * Ei),
expected: "3Ei",
},
{
name: "e",
input: MemorySize(3 * E),
expected: "3E",
},
{
name: "pi",
input: MemorySize(3 * Pi),
expected: "3Pi",
},
{
name: "p",
input: MemorySize(3 * P),
expected: "3P",
},
{
name: "gi",
input: MemorySize(3 * Gi),
expected: "3Gi",
},
{
name: "g",
input: MemorySize(3 * G),
expected: "3G",
},
{
name: "mi",
input: MemorySize(3 * Mi),
expected: "3Mi",
},
{
name: "m",
input: MemorySize(3 * M),
expected: "3M",
},
{
name: "ki",
input: MemorySize(3 * Ki),
expected: "3Ki",
},
{
name: "k",
input: MemorySize(3 * K),
expected: "3K",
},
{
name: "b",
input: MemorySize(3),
expected: "3",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result, err := tt.input.MarshalText()
assert.NoError(t, err)
assert.Equal(t, tt.expected, string(result))
})
}
}
Loading