diff options
| author | chrislu <chris.lu@gmail.com> | 2024-03-16 23:17:27 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-03-16 23:18:11 -0700 |
| commit | 1516e0249f5c7259880c3b5365b42ee0469510dd (patch) | |
| tree | 0f07ce628d9a3cd51123b255490ef7b22233f544 /weed/shell | |
| parent | b74e8082bac408138be99e128b8c28fd19eca7a6 (diff) | |
| download | seaweedfs-1516e0249f5c7259880c3b5365b42ee0469510dd.tar.xz seaweedfs-1516e0249f5c7259880c3b5365b42ee0469510dd.zip | |
remove github.com/golang/protobuf/proto
Diffstat (limited to 'weed/shell')
| -rw-r--r-- | weed/shell/command_volume_list_test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/weed/shell/command_volume_list_test.go b/weed/shell/command_volume_list_test.go index 1c8368229..b2fe9c862 100644 --- a/weed/shell/command_volume_list_test.go +++ b/weed/shell/command_volume_list_test.go @@ -5,8 +5,9 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding" "github.com/seaweedfs/seaweedfs/weed/storage/types" "github.com/stretchr/testify/assert" - //"google.golang.org/protobuf/proto" - "github.com/golang/protobuf/proto" + // "google.golang.org/protobuf/proto" + //"github.com/golang/protobuf/proto" + jsonpb "google.golang.org/protobuf/encoding/protojson" "strconv" "strings" "testing" @@ -91,7 +92,7 @@ func parseOutput(output string) *master_pb.TopologyInfo { case "volume": volumeLine := line[len("volume "):] volume := &master_pb.VolumeInformationMessage{} - proto.UnmarshalText(volumeLine, volume) + jsonpb.Unmarshal([]byte(volumeLine), volume) disk.VolumeInfos = append(disk.VolumeInfos, volume) case "ec": ecVolumeLine := line[len("ec volume "):] |