mroot/lazydocker
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazydocker.git synced 2026-07-25 08:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix wrong extra dot

Browse source
This commit is contained in:
tonysken 2026-05-14 21:15:55 +01:00
parent 8bd4400ba8
commit 4120c207ed
No known key found for this signature in database
GPG key ID: 67D2B9EB6131A6CE
2 changed files with 135 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/gui/presentation/container_stats.go
View file

@ -210,12 +210,12 @@ func convertBigMetricFromSchema(data *map[string]interface{}, path string, schem
switch value := schema.(type) {
case map[string]interface{}:
for key, val := range value {
path = strings.TrimSuffix(path, fmt.Sprintf(".%s", key))
path = fmt.Sprintf("%s.%s", path, key)
return convertBigMetricFromSchema(data, path, val)
}
case []string:
// use path to translate from []int to []string
metric, err := lookup.LookupString(data, path)
metric, err := lookup.LookupString(data, strings.TrimPrefix(path, "."))
if err != nil {
return err
}
@ -230,7 +230,7 @@ func convertBigMetricFromSchema(data *map[string]interface{}, path string, schem
}
case string:
// use path to translate from int/int64 to string
metric, err := lookup.LookupString(data, path)
metric, err := lookup.LookupString(data, strings.TrimPrefix(path, "."))
if err != nil {
return err
}

132
pkg/gui/presentation/container_stats_test.go Normal file
View file

@ -0,0 +1,132 @@
package presentation
import (
"encoding/json"
"fmt"
"testing"
"github.com/stretchr/testify/assert"
)
func TestConvertBigMetricFromSchema(t *testing.T) {
type scenario struct {
name string
data map[string]interface{}
path string
schema interface{}
expected map[string]interface{}
expectedErr string
}
var schema map[string]interface{}
err := json.Unmarshal([]byte(SCHEMA_JSON), &schema)
if err != nil {
fmt.Println("Error:", err)
return
}
scenarios := []scenario{
{
name: "string schema: converts int64 bytes",
data: map[string]interface{}{
"client_stats": map[string]interface{}{
"memory_stats": map[string]interface{}{
"limit": int64(2048),
},
},
},
path: "",
schema: schema,
expected: map[string]interface{}{
"client_stats": map[string]interface{}{
"memory_stats": map[string]interface{}{
"limit": "2.000 KB",
},
},
},
},
{
name: "string schema: converts int64 nanoseconds",
data: map[string]interface{}{
"client_stats": map[string]interface{}{
"cpu_stats": map[string]interface{}{
"cpu_usage": map[string]interface{}{
"total_usage": int64(100000000000),
"percpu_usage": []int64{50000000000, 50000000000},
"usage_in_kernelmode": int64(200000),
"usage_in_usermode": int64(200000),
},
"system_cpu_usage": int64(100000000000),
},
},
},
path: "",
schema: schema,
expected: map[string]interface{}{
"client_stats": map[string]interface{}{
"cpu_stats": map[string]interface{}{
"cpu_usage": map[string]interface{}{
"total_usage": "100.000 s",
"percpu_usage": []string{"50.000 ms", "50.000 ms"},
"usage_in_kernelmode": "200.000 µs",
"usage_in_usermode": "200.000 µs",
},
"system_cpu_usage": "100.000 s",
},
},
},
},
// {
// name: "unknown schema type is a no-op",
// data: map[string]interface{}{
// "limit": int64(2048),
// },
// path: ".limit",
// schema: 42,
// expected: map[string]interface{}{
// "limit": int64(2048),
// },
// },
// {
// name: "string schema: errors when value at path is not int64",
// data: map[string]interface{}{
// "limit": "not a number",
// },
// path: ".limit",
// schema: "bytes",
// expected: map[string]interface{}{"limit": "not a number"},
// expectedErr: "Can't convert string to int64",
// },
// {
// name: "[]string schema: errors when value at path is not []int64",
// data: map[string]interface{}{
// "percpu_usage": []string{"a", "b"},
// },
// path: ".percpu_usage",
// schema: []string{"nanoseconds", "nanoseconds"},
// expected: map[string]interface{}{"percpu_usage": []string{"a", "b"}},
// expectedErr: "Can't convert []string to []int64",
// },
// {
// name: "string schema: errors when path does not exist in data",
// data: map[string]interface{}{},
// path: ".missing",
// schema: "bytes",
// expected: map[string]interface{}{},
// expectedErr: "Unable to find the key",
// },
}
for _, s := range scenarios {
t.Run(s.name, func(t *testing.T) {
data := s.data
err := convertBigMetricFromSchema(&data, s.path, s.schema)
if s.expectedErr != "" {
assert.EqualError(t, err, s.expectedErr)
} else {
assert.NoError(t, err)
}
assert.Equal(t, s.expected, data)
})
}
}