Reword missing credentials error msg (#6418)

Enhance a little bit the error message that is showing
when access & secret keys are not specified in the
environment when running Minio in gateway and server mode.

This commit also removes a redundant check of access/secret keys.
master
Anis Elleuch 6 years ago committed by Nitish Tiwari
parent 19202bae81
commit 92bc7caf7a
  1. 2
      cmd/server-main.go
  2. 10
      cmd/ui-errors.go

@ -271,7 +271,7 @@ func serverMain(ctx *cli.Context) {
logger.Info(`Supplying credentials from your 'config.json' is **DEPRECATED**, Access key and Secret key in distributed server mode is expected to be specified with environment variables MINIO_ACCESS_KEY and MINIO_SECRET_KEY. This approach will become mandatory in future releases, please migrate to this approach soon.`) logger.Info(`Supplying credentials from your 'config.json' is **DEPRECATED**, Access key and Secret key in distributed server mode is expected to be specified with environment variables MINIO_ACCESS_KEY and MINIO_SECRET_KEY. This approach will become mandatory in future releases, please migrate to this approach soon.`)
} else { } else {
// Credential is not available anywhere by both means, we cannot start distributed setup anymore, fail eagerly. // Credential is not available anywhere by both means, we cannot start distributed setup anymore, fail eagerly.
logger.Fatal(uiErrEnvCredentialsMissingServer(nil), "Unable to initialize distributed Minio server.") logger.Fatal(uiErrEnvCredentialsMissingDistributed(nil), "Unable to initialize the server in distributed mode")
} }
} }
} }

@ -74,14 +74,14 @@ Secret key should be in between 8 and 40 characters.`,
uiErrEnvCredentialsMissingGateway = newUIErrFn( uiErrEnvCredentialsMissingGateway = newUIErrFn(
"Credentials missing", "Credentials missing",
"Please provide correct credentials", "Please set your credentials in the environment",
`Access key and Secret key should be specified in Gateway mode from environment variables MINIO_ACCESS_KEY and MINIO_SECRET_KEY respectively.`, `In Gateway mode, access and secret keys should be specified via environment variables MINIO_ACCESS_KEY and MINIO_SECRET_KEY respectively.`,
) )
uiErrEnvCredentialsMissingServer = newUIErrFn( uiErrEnvCredentialsMissingDistributed = newUIErrFn(
"Credentials missing", "Credentials missing",
"Please provide correct credentials", "Please set your credentials in the environment",
`Access key and Secret key should be specified in distributed server mode from environment variables MINIO_ACCESS_KEY and MINIO_SECRET_KEY respectively.`, `In distributed server mode, access and secret keys should be specified via environment variables MINIO_ACCESS_KEY and MINIO_SECRET_KEY respectively.`,
) )
uiErrInvalidErasureEndpoints = newUIErrFn( uiErrInvalidErasureEndpoints = newUIErrFn(

Loading…
Cancel
Save