From df0f2b93ca9c95d5a3835967f8542099ece2bc6f Mon Sep 17 00:00:00 2001 From: Mark Theunissen Date: Thu, 8 Aug 2024 13:21:05 +1000 Subject: [PATCH 1/2] Change KMSKeyInfo.CreatedAt to a time.Time --- api/admin_kms.go | 3 ++- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/admin_kms.go b/api/admin_kms.go index 07742d4e69..d80a028204 100644 --- a/api/admin_kms.go +++ b/api/admin_kms.go @@ -20,6 +20,7 @@ package api import ( "context" "sort" + "time" "github.com/go-openapi/runtime/middleware" "github.com/minio/console/api/operations" @@ -260,7 +261,7 @@ func listKeys(ctx context.Context, pattern string, minioClient MinioAdmin) (*mod func parseKeys(results []madmin.KMSKeyInfo) (data []*models.KmsKeyInfo) { for _, key := range results { data = append(data, &models.KmsKeyInfo{ - CreatedAt: key.CreatedAt, + CreatedAt: key.CreatedAt.Format(time.RFC3339), CreatedBy: key.CreatedBy, Name: key.Name, }) diff --git a/go.mod b/go.mod index 8c1753d614..a44851d09d 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/minio/cli v1.24.2 github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.23.0 - github.com/minio/madmin-go/v3 v3.0.55-0.20240603092915-420a67132c32 + github.com/minio/madmin-go/v3 v3.0.62 github.com/minio/mc v0.0.0-20240605181330-17adf0abbbca github.com/minio/minio-go/v7 v7.0.70 github.com/minio/selfupdate v0.6.0 diff --git a/go.sum b/go.sum index 4d0350f8bb..0a374adb84 100644 --- a/go.sum +++ b/go.sum @@ -175,8 +175,8 @@ github.com/minio/kes v0.23.0 h1:T0zHtyDoI3JdKrVvzdM4xwVryYYyh5pKwNUVBoqxsNs= github.com/minio/kes v0.23.0/go.mod h1:vvXVGcgu9mYLkbVWlEvFFl6bYR196RQlOU2Q+rHApl8= github.com/minio/kes-go v0.2.1 h1:KnqS+p6xoSFJZbQhmJaz/PbxeA6nQyRqT/ywrn5lU2o= github.com/minio/kes-go v0.2.1/go.mod h1:76xf7l41Wrh+IifisABXK2S8uZWYgWV1IGBKC3GdOJk= -github.com/minio/madmin-go/v3 v3.0.55-0.20240603092915-420a67132c32 h1:9se7/S4AlN2k/B1E7A8m1m07DM3p0JnIOzVhDuAV2PI= -github.com/minio/madmin-go/v3 v3.0.55-0.20240603092915-420a67132c32/go.mod h1:IFAwr0XMrdsLovxAdCcuq/eoL4nRuMVQQv0iubJANQw= +github.com/minio/madmin-go/v3 v3.0.62 h1:xfrDjqESRx6Dn4Jn94FYgrCpWeNZly1tu8mQFAMX4+k= +github.com/minio/madmin-go/v3 v3.0.62/go.mod h1:IFAwr0XMrdsLovxAdCcuq/eoL4nRuMVQQv0iubJANQw= github.com/minio/mc v0.0.0-20240605181330-17adf0abbbca h1:Z1oje5L5r4nNODyuEgjwDfkNLO3cT5BRcRHBBWsDT68= github.com/minio/mc v0.0.0-20240605181330-17adf0abbbca/go.mod h1:21/cb+wUd+lLRsdX7ACqyO8DzPNSpXftp1bOkQlIbh8= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= From 503791833863cf4425f1cc564ecff309718cf9be Mon Sep 17 00:00:00 2001 From: Mark Theunissen Date: Fri, 16 Aug 2024 10:27:28 +1000 Subject: [PATCH 2/2] fix govet complaint --- api/ws_handle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/ws_handle.go b/api/ws_handle.go index ab400140a2..cb26b2fdac 100644 --- a/api/ws_handle.go +++ b/api/ws_handle.go @@ -156,7 +156,7 @@ func serveWS(w http.ResponseWriter, req *http.Request) { session, err := auth.GetClaimsFromTokenInRequest(req) if err != nil && (errors.Is(err, auth.ErrReadingToken) && !strings.HasPrefix(wsPath, `/objectManager`)) { ErrorWithContext(ctx, err) - errorsApi.ServeError(w, req, errorsApi.New(http.StatusUnauthorized, err.Error())) + errorsApi.ServeError(w, req, errorsApi.New(http.StatusUnauthorized, "%s", err.Error())) return }