Skip to content

Commit 37bd0ec

Browse files
Fix vtgate.txt, static check
Signed-off-by: Rohit Nayak <[email protected]>
1 parent 4d3201e commit 37bd0ec

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

go/flags/endtoend/vtgate.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ Flags:
124124
--min-number-serving-vttablets int The minimum number of vttablets for each replicating tablet_type (e.g. replica, rdonly) that will be continue to be used even with replication lag above discovery_low_replication_lag, but still below discovery_high_replication_lag_minimum_serving. (default 2)
125125
--mysql-allow-clear-text-without-tls If set, the server will allow the use of a clear text password over non-SSL connections.
126126
--mysql-auth-server-impl string Which auth server implementation to use. Options: none, ldap, clientcert, static, vault. (default "static")
127+
--mysql-auth-server-static-file string JSON File to read the users/passwords from.
128+
--mysql-auth-server-static-string string JSON representation of the users/passwords config.
129+
--mysql-auth-static-reload-interval duration Ticker to reload credentials
127130
--mysql-auth-vault-addr string URL to Vault server
128131
--mysql-auth-vault-path string Vault path to vtgate credentials JSON blob, e.g.: secret/data/prod/vtgatecreds
129132
--mysql-auth-vault-role-mountpoint string Vault AppRole mountpoint; can also be passed using VAULT_MOUNTPOINT environment variable (default "approle")
@@ -159,9 +162,6 @@ Flags:
159162
--mysql-server-write-timeout duration connection write timeout
160163
--mysql-slow-connect-warn-threshold duration Warn if it takes more than the given threshold for a mysql connection to establish
161164
--mysql-tcp-version string Select tcp, tcp4, or tcp6 to control the socket type. (default "tcp")
162-
--mysql_auth_server_static_file string JSON File to read the users/passwords from.
163-
--mysql_auth_server_static_string string JSON representation of the users/passwords config.
164-
--mysql_auth_static_reload_interval duration Ticker to reload credentials
165165
--no-scatter when set to true, the planner will fail instead of producing a plan that includes scatter queries
166166
--normalize-queries Rewrite queries with bind vars. Turn this off if the app itself sends normalized queries with bind vars. (default true)
167167
--onclose-timeout duration wait no more than this for OnClose handlers before stopping (default 10s)
@@ -244,7 +244,7 @@ Flags:
244244
--v Level log level for V logs
245245
-v, --version print binary version
246246
--vmodule vModuleFlag comma-separated list of pattern=N settings for file-filtered logging
247-
--vschema_ddl_authorized_users string List of users authorized to execute vschema ddl operations, or '%' to allow all users.
247+
--vschema-ddl-authorized-users string List of users authorized to execute vschema ddl operations, or '%' to allow all users.
248248
--vtgate-config-terse-errors prevent bind vars from escaping in returned errors
249249
--warming-reads-concurrency int Number of concurrent warming reads allowed (default 500)
250250
--warming-reads-percent int Percentage of reads on the primary to forward to replicas. Useful for keeping buffer pools warm

go/viperutil/config.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@ func LoadConfig() (context.CancelFunc, error) {
167167
msg := "Failed to read in config %s: %s"
168168
switch configFileNotFoundHandling.Get() {
169169
case WarnOnConfigFileNotFound:
170-
msg += ". This is optional, and can be ignored if you are not using config files. For a detailed explanation, see https://github.com/vitessio/vitess/blob/main/doc/viper/viper.md#config-files."
171-
// log.WARN(msg, registry.Static.ConfigFileUsed(), err.Error())
172-
fallthrough // after warning, ignore the error
170+
fallthrough // ignore the error
173171
case IgnoreConfigFileNotFound:
174172
return func() {}, nil
175173
case ErrorOnConfigFileNotFound:

0 commit comments

Comments
 (0)