From 413870e995a98baf368bf22d428d6ccfbf7e6325 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sun, 2 Oct 2022 23:04:34 -0700 Subject: [PATCH] update madmin-go and mc deps for new changes (#2352) --- .github/workflows/jobs.yaml | 8 -------- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- restapi/admin_config.go | 3 +++ restapi/admin_config_test.go | 2 +- restapi/admin_health_info.go | 2 -- 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/.github/workflows/jobs.yaml b/.github/workflows/jobs.yaml index 56eb46dd6..2b7401acb 100644 --- a/.github/workflows/jobs.yaml +++ b/.github/workflows/jobs.yaml @@ -54,14 +54,6 @@ jobs: # To have two repositories under the same test path: 'minio_repository' - - uses: actions/cache@v2 - name: Go Mod Cache - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ github.run_id }} - - name: Build on ${{ matrix.os }} run: | echo "The idea is to build minio image from downloaded repository"; diff --git a/go.mod b/go.mod index 3863820d9..bdf76e7fc 100644 --- a/go.mod +++ b/go.mod @@ -19,15 +19,15 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/jessevdk/go-flags v1.5.0 github.com/klauspost/compress v1.15.9 - github.com/minio/cli v1.23.0 + github.com/minio/cli v1.24.0 github.com/minio/directpv v1.4.4-0.20220805090942-948ca4731651 github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.19.2 - github.com/minio/madmin-go v1.4.26 - github.com/minio/mc v0.0.0-20220818165341-8c239d16aa37 - github.com/minio/minio-go/v7 v7.0.35 + github.com/minio/madmin-go v1.5.3 + github.com/minio/mc v0.0.0-20221001175248-68ca2bf457e4 + github.com/minio/minio-go/v7 v7.0.40-0.20220928095841-8848d8affe8a github.com/minio/operator v0.0.0-20220902184351-21e4073132b0 - github.com/minio/pkg v1.4.0 + github.com/minio/pkg v1.4.3 github.com/minio/selfupdate v0.5.0 github.com/mitchellh/go-homedir v1.1.0 github.com/rs/xid v1.4.0 diff --git a/go.sum b/go.sum index 5102be6c6..e05533c00 100644 --- a/go.sum +++ b/go.sum @@ -545,8 +545,8 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.48 h1:Ucfr7IIVyMBz4lRE8qmGUuZ4Wt3/ZGu9hmcMT3Uu4tQ= github.com/miekg/dns v1.1.48/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/minio/argon2 v1.0.0/go.mod h1:XtOGJ7MjwUJDPtCqqrisx5QwVB/jDx+adQHigJVsQHQ= -github.com/minio/cli v1.23.0 h1:hNuf8xi/JU5EJRX+T38e2zcnh2EpdVqs8aH4lNXWe3w= -github.com/minio/cli v1.23.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= +github.com/minio/cli v1.24.0 h1:QrSIs7iISwaFmTlGFAR9cSpkZn7/tTaFsj5oAUCC47I= +github.com/minio/cli v1.24.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/colorjson v1.0.2 h1:Em3IM68MTm3h+Oxa0nxrV9VQqDgbxvC5iq5A+pqzDeI= github.com/minio/colorjson v1.0.2/go.mod h1:JWxcL2n8T8JVf+NY6awl6kn5nK49aAzHOeQEM33dL0k= github.com/minio/directpv v1.4.4-0.20220805090942-948ca4731651 h1:Uy3Fq5glAYPM0JeeleFQIxwCzMdVZMUmyEuyIQHN3ls= @@ -558,21 +558,21 @@ github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT github.com/minio/kes v0.19.2 h1:0kdMAgLMSkiDA33k8pMHC7d6erDuseuLrZF+N3017SM= github.com/minio/kes v0.19.2/go.mod h1:X2fMkDbAkjbSKDGOQZvyPkHxoG7nuzP6R78Jw+TzXtM= github.com/minio/madmin-go v1.3.5/go.mod h1:vGKGboQgGIWx4DuDUaXixjlIEZOCIp6ivJkQoiVaACc= -github.com/minio/madmin-go v1.4.26 h1:hss2NjaMpZEHlaGJh2rGRYH6GiNY6g8+ogrUoxbjafg= -github.com/minio/madmin-go v1.4.26/go.mod h1:ez87VmMtsxP7DRxjKJKD4RDNW+nhO2QF9KSzwxBDQ98= -github.com/minio/mc v0.0.0-20220818165341-8c239d16aa37 h1:UE9kHgdza2HB4DDx0nIn0jHRl6YASUomVoKjciMfqjM= -github.com/minio/mc v0.0.0-20220818165341-8c239d16aa37/go.mod h1:O3pvs5/n57bZ0mpcG/skBuD4pHX6m+wVbW7lw8LO5go= +github.com/minio/madmin-go v1.5.3 h1:G/xtuOzKuQf2wJhyH2I/wyO6aNzkHQm1sUmpdURbScY= +github.com/minio/madmin-go v1.5.3/go.mod h1:ez87VmMtsxP7DRxjKJKD4RDNW+nhO2QF9KSzwxBDQ98= +github.com/minio/mc v0.0.0-20221001175248-68ca2bf457e4 h1:DStvFAaRrNCvAa6je41F8WBgziXeF1sZymSQJCWxbKY= +github.com/minio/mc v0.0.0-20221001175248-68ca2bf457e4/go.mod h1:cqIVmUIAVDVCwR2/XztvlBdZpbI/hPx0ilEOvtG47Tw= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= 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.23/go.mod h1:ei5JjmxwHaMrgsMrn4U/+Nmg+d8MKS1U2DAn1ou4+Do= -github.com/minio/minio-go/v7 v7.0.35 h1:JuPPxWLdxQmNLSaS8AWZnO5HBadeI1xg6FGrEELQEVU= -github.com/minio/minio-go/v7 v7.0.35/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw= +github.com/minio/minio-go/v7 v7.0.40-0.20220928095841-8848d8affe8a h1:COFh7S3tOKmJNYtKKFAuHQFH7MAaXxg4aAluXC9KQgc= +github.com/minio/minio-go/v7 v7.0.40-0.20220928095841-8848d8affe8a/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw= github.com/minio/operator v0.0.0-20220902184351-21e4073132b0 h1:Ak/IkcWaY/ntGIzpeZIw43hwFKMh1242qIELpk4bVqI= github.com/minio/operator v0.0.0-20220902184351-21e4073132b0/go.mod h1:pMMJ+WzD3znzYC3Ae/clcKocdSRyenK4kzdstibdafk= github.com/minio/pkg v1.1.20/go.mod h1:Xo7LQshlxGa9shKwJ7NzQbgW4s8T/Wc1cOStR/eUiMY= -github.com/minio/pkg v1.4.0 h1:bVdmz8vgv5bvLysHY2kuviuof0kteY6YPMRXCjDqJU4= -github.com/minio/pkg v1.4.0/go.mod h1:mxCLAG+fOGIQr6odQ5Ukqc6qv9Zj6v1d6TD3NP82B7Y= +github.com/minio/pkg v1.4.3 h1:RJdhFj+5qK/oYuTuLGtTzn6GKniwI57eJ0LxrZ7xpw4= +github.com/minio/pkg v1.4.3/go.mod h1:mxCLAG+fOGIQr6odQ5Ukqc6qv9Zj6v1d6TD3NP82B7Y= github.com/minio/selfupdate v0.5.0 h1:0UH1HlL49+2XByhovKl5FpYTjKfvrQ2sgL1zEXK6mfI= github.com/minio/selfupdate v0.5.0/go.mod h1:mcDkzMgq8PRcpCRJo/NlPY7U45O5dfYl2Y0Rg7IustY= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= diff --git a/restapi/admin_config.go b/restapi/admin_config.go index 1c118bef8..c3f1b244d 100644 --- a/restapi/admin_config.go +++ b/restapi/admin_config.go @@ -124,6 +124,9 @@ func getConfig(ctx context.Context, client MinioAdmin, name string) ([]*models.C } var configSubSysList []*models.Configuration for _, scfg := range subSysConfigs { + if !madmin.SubSystems.Contains(scfg.SubSystem) { + return nil, fmt.Errorf("no sub-systems found") + } var confkv []*models.ConfigurationKV for _, kv := range scfg.KV { // FIXME: Ignoring env-overrides for now as support for this diff --git a/restapi/admin_config_test.go b/restapi/admin_config_test.go index 274f4c5c9..95f20b8cd 100644 --- a/restapi/admin_config_test.go +++ b/restapi/admin_config_test.go @@ -520,7 +520,7 @@ func Test_getConfig(t *testing.T) { } }, want: nil, - wantErr: true, + wantErr: false, }, { name: "random bytes coming out of getConfigKv", diff --git a/restapi/admin_health_info.go b/restapi/admin_health_info.go index 9b2f0ee23..b0d92c723 100644 --- a/restapi/admin_health_info.go +++ b/restapi/admin_health_info.go @@ -40,8 +40,6 @@ func startHealthInfo(ctx context.Context, conn WSConn, client MinioAdmin, deadli // Fetch info of all servers (cluster or single server) healthDataTypes := []madmin.HealthDataType{ - madmin.HealthDataTypePerfDrive, - madmin.HealthDataTypePerfNet, madmin.HealthDataTypeMinioInfo, madmin.HealthDataTypeMinioConfig, madmin.HealthDataTypeSysCPU,