From c12a931dbf5f4ffd0f8d48d32291d7f1325f417a Mon Sep 17 00:00:00 2001 From: Javier Adriel Date: Tue, 15 Nov 2022 20:29:36 -0600 Subject: [PATCH] Update madmin-go (#2460) --- go.mod | 5 +++-- go.sum | 11 +++++++++-- restapi/admin_health_info_test.go | 27 ++++++--------------------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 3f2de432b..262302a8b 100644 --- a/go.mod +++ b/go.mod @@ -23,8 +23,8 @@ require ( github.com/minio/directpv v1.4.4-0.20220805090942-948ca4731651 github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.21.1 - github.com/minio/madmin-go v1.7.1 - github.com/minio/mc v0.0.0-20221101010057-15e52fd862f5 + github.com/minio/madmin-go v1.7.5 + github.com/minio/mc v0.0.0-20221115155611-9051548c802d github.com/minio/minio-go/v7 v7.0.41 github.com/minio/operator v0.0.0-20220902184351-21e4073132b0 github.com/minio/pkg v1.5.4 @@ -96,6 +96,7 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/jedib0t/go-pretty/v6 v6.3.8 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.1.2 // indirect diff --git a/go.sum b/go.sum index 83129c1ce..ecd37aff1 100644 --- a/go.sum +++ b/go.sum @@ -590,6 +590,9 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jedib0t/go-pretty v4.3.0+incompatible h1:CGs8AVhEKg/n9YbUenWmNStRW2PHJzaeDodcfvRAbIo= +github.com/jedib0t/go-pretty/v6 v6.3.8 h1:p5eZqLFMEGr7CC+9915lC4Dk7Gub6mH7NE35jDhkJsQ= +github.com/jedib0t/go-pretty/v6 v6.3.8/go.mod h1:MgmISkTWDSFu0xOqiZ0mKNntMQ2mDgOcwOkwBEkMDJI= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= @@ -712,10 +715,12 @@ github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT github.com/minio/kes v0.21.1 h1:Af+CsnuvnOA9mGBAf05VY8ebf4vDfLDDu3uCO0VrKJU= github.com/minio/kes v0.21.1/go.mod h1:3FW1BQkMGQW78yhy+69tUq5bdcf5rnXJizyeKB9a/tc= github.com/minio/madmin-go v1.6.6/go.mod h1:ATvkBOLiP3av4D++2v1UEHC/QzsGtgXD5kYvvRYzdKs= -github.com/minio/madmin-go v1.7.1 h1:4eMyMkLSVUFZmrrwxJrYnzRimy6eCoobqijaQxzYqak= -github.com/minio/madmin-go v1.7.1/go.mod h1:3SO8SROxHN++tF6QxdTii2SSUaYSrr8lnE9EJWjvz0k= +github.com/minio/madmin-go v1.7.5 h1:IF8j2HR0jWc7msiOcy0KJ8EyY7Q3z+j+lsmSDksQm+I= +github.com/minio/madmin-go v1.7.5/go.mod h1:3SO8SROxHN++tF6QxdTii2SSUaYSrr8lnE9EJWjvz0k= github.com/minio/mc v0.0.0-20221101010057-15e52fd862f5 h1:+G6yvmRG5YMKx8l7LFjuXU9GhRwy0Fmaqm2SU5DZyRM= github.com/minio/mc v0.0.0-20221101010057-15e52fd862f5/go.mod h1:wbyQ/nZAvwzk/5b+cCYolP23AhIOj8PbcX5/NuZXMug= +github.com/minio/mc v0.0.0-20221115155611-9051548c802d h1:MiGzgmVeOKiJdACe983C31iUtwD06K1n/8AS/QYMF4s= +github.com/minio/mc v0.0.0-20221115155611-9051548c802d/go.mod h1:HBltqeWoOlWbtYBcVsD8IfCHEyhojASobWkEFuU4yAI= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.41 h1:Qhc82nDRep+VSuDEPSawKUHkARnZI5st7acEqgqVX+k= @@ -808,6 +813,7 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/xattr v0.4.9 h1:5883YPCtkSd8LFbs13nXplj9g9tlrwoJRjgpgMu1/fE= github.com/pkg/xattr v0.4.9/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= @@ -932,6 +938,7 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= diff --git a/restapi/admin_health_info_test.go b/restapi/admin_health_info_test.go index 70568647a..2a50e0a77 100644 --- a/restapi/admin_health_info_test.go +++ b/restapi/admin_health_info_test.go @@ -57,15 +57,8 @@ func Test_serverHealthInfo(t *testing.T) { { test: "Return simple health info, no errors", args: args{ - deadline: deadlineDuration, - mockMessages: []madmin.HealthInfo{ - { - Perf: madmin.SpeedTestResults{}, - }, - { - Perf: madmin.SpeedTestResults{}, - }, - }, + deadline: deadlineDuration, + mockMessages: []madmin.HealthInfo{{}, {}}, wsWriteMock: func(messageType int, data []byte) error { // mock connection WriteMessage() no error // emulate that receiver gets the message written @@ -80,12 +73,8 @@ func Test_serverHealthInfo(t *testing.T) { { test: "Return simple health info2, no errors", args: args{ - deadline: deadlineDuration, - mockMessages: []madmin.HealthInfo{ - { - Perf: madmin.SpeedTestResults{}, - }, - }, + deadline: deadlineDuration, + mockMessages: []madmin.HealthInfo{{}}, wsWriteMock: func(messageType int, data []byte) error { // mock connection WriteMessage() no error // emulate that receiver gets the message written @@ -100,12 +89,8 @@ func Test_serverHealthInfo(t *testing.T) { { test: "Handle error on ws write", args: args{ - deadline: deadlineDuration, - mockMessages: []madmin.HealthInfo{ - { - Perf: madmin.SpeedTestResults{}, - }, - }, + deadline: deadlineDuration, + mockMessages: []madmin.HealthInfo{{}}, wsWriteMock: func(messageType int, data []byte) error { // mock connection WriteMessage() no error // emulate that receiver gets the message written