mirror of
https://github.com/Noooste/garage-ui.git
synced 2026-08-30 16:59:55 +00:00
@@ -1,6 +1,9 @@
|
||||
package models
|
||||
|
||||
import "time"
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
// GarageKeyInfo represents detailed information about a Garage access key
|
||||
type GarageKeyInfo struct {
|
||||
@@ -180,6 +183,24 @@ type ClusterHealth struct {
|
||||
PartitionsAllOk int `json:"partitionsAllOk"`
|
||||
}
|
||||
|
||||
// UnmarshalJSON handles both "storageNodesOk" (Garage v2.0.0) and
|
||||
// "storageNodesUp" (Garage v2.1.0+, v1.x) field names.
|
||||
func (h *ClusterHealth) UnmarshalJSON(data []byte) error {
|
||||
type plain ClusterHealth
|
||||
var aux struct {
|
||||
plain
|
||||
StorageNodesOk int `json:"storageNodesOk"`
|
||||
}
|
||||
if err := json.Unmarshal(data, &aux); err != nil {
|
||||
return err
|
||||
}
|
||||
*h = ClusterHealth(aux.plain)
|
||||
if h.StorageNodesUp == 0 && aux.StorageNodesOk != 0 {
|
||||
h.StorageNodesUp = aux.StorageNodesOk
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ClusterStatus represents the current status of the cluster
|
||||
type ClusterStatus struct {
|
||||
LayoutVersion int `json:"layoutVersion"`
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestClusterHealth_StorageNodesOk_BackCompat(t *testing.T) {
|
||||
raw := `{
|
||||
"status": "healthy",
|
||||
"knownNodes": 3,
|
||||
"connectedNodes": 3,
|
||||
"storageNodes": 3,
|
||||
"storageNodesOk": 3,
|
||||
"partitions": 256,
|
||||
"partitionsQuorum": 256,
|
||||
"partitionsAllOk": 256
|
||||
}`
|
||||
var h ClusterHealth
|
||||
if err := json.Unmarshal([]byte(raw), &h); err != nil {
|
||||
t.Fatalf("unmarshal: %v", err)
|
||||
}
|
||||
if h.StorageNodesUp != 3 {
|
||||
t.Fatalf("expected StorageNodesUp=3, got %d", h.StorageNodesUp)
|
||||
}
|
||||
}
|
||||
|
||||
func TestClusterHealth_StorageNodesUp(t *testing.T) {
|
||||
raw := `{
|
||||
"status": "healthy",
|
||||
"knownNodes": 3,
|
||||
"connectedNodes": 3,
|
||||
"storageNodes": 3,
|
||||
"storageNodesUp": 3,
|
||||
"partitions": 256,
|
||||
"partitionsQuorum": 256,
|
||||
"partitionsAllOk": 256
|
||||
}`
|
||||
var h ClusterHealth
|
||||
if err := json.Unmarshal([]byte(raw), &h); err != nil {
|
||||
t.Fatalf("unmarshal: %v", err)
|
||||
}
|
||||
if h.StorageNodesUp != 3 {
|
||||
t.Fatalf("expected StorageNodesUp=3, got %d", h.StorageNodesUp)
|
||||
}
|
||||
}
|
||||
@@ -196,4 +196,5 @@ const (
|
||||
ErrCodeUploadFailed = "UPLOAD_FAILED"
|
||||
ErrCodeDeleteFailed = "DELETE_FAILED"
|
||||
ErrCodeListFailed = "LIST_FAILED"
|
||||
ErrCodeUnsupported = "UNSUPPORTED"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user