From 16a45e5aff422caed577067b3eb3a16462debc74 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Fri, 12 Jul 2019 23:32:27 -0700 Subject: [PATCH] Fix dynamic help vars for sub-commands (#7925) The fix in #7646 introduced a regression which was left unnoticed, the fix didn't work for sub-commands unfortunately. This fixes it by moving v1.21.0 version of the minio/cli package. Fixes #7924 --- cmd/gateway/azure/gateway-azure.go | 2 +- cmd/gateway/s3/gateway-s3.go | 34 +++++++++++++++--------------- go.mod | 2 +- go.sum | 2 ++ 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/cmd/gateway/azure/gateway-azure.go b/cmd/gateway/azure/gateway-azure.go index 72dcbace1..eafb00f69 100644 --- a/cmd/gateway/azure/gateway-azure.go +++ b/cmd/gateway/azure/gateway-azure.go @@ -111,7 +111,7 @@ EXAMPLES: minio.RegisterGatewayCommand(cli.Command{ Name: azureBackend, - Usage: "Microsoft Azure Blob Storage.", + Usage: "Microsoft Azure Blob Storage", Action: azureGatewayMain, CustomHelpTemplate: azureGatewayTemplate, HideHelpCommand: true, diff --git a/cmd/gateway/s3/gateway-s3.go b/cmd/gateway/s3/gateway-s3.go index ac2b3605e..8b141e94b 100644 --- a/cmd/gateway/s3/gateway-s3.go +++ b/cmd/gateway/s3/gateway-s3.go @@ -77,37 +77,37 @@ ENVIRONMENT VARIABLES: EXAMPLES: 1. Start minio gateway server for AWS S3 backend. - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}accesskey - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}secretkey + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_ACCESS_KEY{{.AssignmentOperator}}accesskey + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_SECRET_KEY{{.AssignmentOperator}}secretkey {{.Prompt}} {{.HelpName}} 2. Start minio gateway server for S3 backend on custom endpoint. - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}Q3AM3UQ867SPQQA43P2F - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_ACCESS_KEY{{.AssignmentOperator}}Q3AM3UQ867SPQQA43P2F + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_SECRET_KEY{{.AssignmentOperator}}zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG {{.Prompt}} {{.HelpName}} https://play.min.io:9000 3. Start minio gateway server for AWS S3 backend logging all requests to http endpoint. - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}Q3AM3UQ867SPQQA43P2F - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}"http://localhost:8000/" + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_ACCESS_KEY{{.AssignmentOperator}}Q3AM3UQ867SPQQA43P2F + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_SECRET_KEY{{.AssignmentOperator}}zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_LOGGER_HTTP_ENDPOINT{{.AssignmentOperator}}"http://localhost:8000/" {{.Prompt}} {{.HelpName}} https://play.min.io:9000 4. Start minio gateway server for AWS S3 backend with edge caching enabled. - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}accesskey - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}secretkey - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}"/mnt/drive1;/mnt/drive2;/mnt/drive3;/mnt/drive4" - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}"bucket1/*;*.png" - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}40 - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}80 + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_ACCESS_KEY{{.AssignmentOperator}}accesskey + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_SECRET_KEY{{.AssignmentOperator}}secretkey + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_CACHE_DRIVES{{.AssignmentOperator}}"/mnt/drive1;/mnt/drive2;/mnt/drive3;/mnt/drive4" + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_CACHE_EXCLUDE{{.AssignmentOperator}}"bucket1/*;*.png" + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_CACHE_EXPIRY{{.AssignmentOperator}}40 + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_CACHE_MAXUSE{{.AssignmentOperator}}80 {{.Prompt}} {{.HelpName}} 4. Start minio gateway server for AWS S3 backend using AWS environment variables. NOTE: The access and secret key in this case will authenticate with MinIO instead of AWS and AWS envs will be used to authenticate to AWS S3. - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}aws_access_key - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}aws_secret_key - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}accesskey - {{.Prompt}} {{.EnvVarSetCommand}}(.*){{.AssignmentOperator}}secretkey + {{.Prompt}} {{.EnvVarSetCommand}} AWS_ACCESS_KEY_ID{{.AssignmentOperator}}aws_access_key + {{.Prompt}} {{.EnvVarSetCommand}} AWS_SECRET_ACCESS_KEY{{.AssignmentOperator}}aws_secret_key + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_ACCESS_KEY{{.AssignmentOperator}}accesskey + {{.Prompt}} {{.EnvVarSetCommand}} MINIO_SECRET_KEY{{.AssignmentOperator}}secretkey {{.Prompt}} {{.HelpName}} ` diff --git a/go.mod b/go.mod index f239ad9bd..1575ddeb3 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/marstr/guid v1.1.0 // indirect github.com/mattn/go-isatty v0.0.7 github.com/miekg/dns v1.1.8 - github.com/minio/cli v1.20.0 + github.com/minio/cli v1.21.0 github.com/minio/dsync/v2 v2.0.0 github.com/minio/hdfs/v3 v3.0.0 github.com/minio/highwayhash v1.0.0 diff --git a/go.sum b/go.sum index cb01e0e0d..6363b3531 100644 --- a/go.sum +++ b/go.sum @@ -412,6 +412,8 @@ github.com/minio/cli v1.3.0 h1:vB0iUpmyaH54+1jJJj62Aa0qFF3xO3i0J3IcKiM6bHM= github.com/minio/cli v1.3.0/go.mod h1:hLsWNQy2wIf3FKFnMlH69f4RdEyn8nbRA2shaulTjGY= github.com/minio/cli v1.20.0 h1:OVNIt8Rg5+mpYb8siWT2gBV5hvUyFbRvBikC+Ytvf5A= github.com/minio/cli v1.20.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= +github.com/minio/cli v1.21.0 h1:8gE8iZc0ONOhHy/T28tCsNew5f5VzWU558U9Myjfq50= +github.com/minio/cli v1.21.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY= github.com/minio/dsync v0.0.0-20190104003057-61c41ffdeea2/go.mod h1:eLQe3mXL0h02kNpPtBJiLr1fIEIJftgXRAjncjQbxJo= github.com/minio/dsync v1.0.0 h1:l6pQgUPBM41idlR0UOcpAP+EYim9MCwIAUh6sQQI1gk= github.com/minio/dsync v1.0.0/go.mod h1:eLQe3mXL0h02kNpPtBJiLr1fIEIJftgXRAjncjQbxJo=