Merged
Conversation
sougou
force-pushed
the
ss-dbconfigs-yaml
branch
from
612bee9 to
7b4f88a
Compare
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
sougou
force-pushed
the
ss-dbconfigs-yaml
branch
from
7b4f88a to
0a7860c
Compare
Comment on lines
+140
to
+144
| flag.StringVar(&uc.User, "db-config-"+userKey+"-uname", "vt_"+userKey, "deprecated: use "+newUserFlag) | ||
| flag.StringVar(&uc.User, newUserFlag, "vt_"+userKey, "db "+userKey+" user userKey") | ||
|
|
||
| newPasswordFlag := "db_" + userKey + "_password" | ||
| flag.StringVar(&dbc.param.Pass, "db-config-"+userKey+"-pass", "", "db "+userKey+" deprecated: use "+newPasswordFlag) | ||
| flag.StringVar(&dbc.param.Pass, newPasswordFlag, "", "db "+userKey+" password") | ||
|
|
||
| flag.BoolVar(&dbc.useSSL, "db_"+userKey+"_use_ssl", true, "Set this flag to false to make the "+userKey+" connection to not use ssl") | ||
|
|
||
| flag.StringVar(&dbc.param.Host, "db-config-"+userKey+"-host", "", "deprecated: use db_host") | ||
| flag.IntVar(&dbc.param.Port, "db-config-"+userKey+"-port", 0, "deprecated: use db_port") | ||
| flag.StringVar(&dbc.param.UnixSocket, "db-config-"+userKey+"-unixsocket", "", "deprecated: use db_socket") | ||
| flag.StringVar(&dbc.param.Charset, "db-config-"+userKey+"-charset", "utf8", "deprecated: use db_charset") | ||
| flag.Uint64Var(&dbc.param.Flags, "db-config-"+userKey+"-flags", 0, "deprecated: use db_flags") | ||
| flag.StringVar(&dbc.param.SslCa, "db-config-"+userKey+"-ssl-ca", "", "deprecated: use db_ssl_ca") | ||
| flag.StringVar(&dbc.param.SslCaPath, "db-config-"+userKey+"-ssl-ca-path", "", "deprecated: use db_ssl_ca_path") | ||
| flag.StringVar(&dbc.param.SslCert, "db-config-"+userKey+"-ssl-cert", "", "deprecated: use db_ssl_cert") | ||
| flag.StringVar(&dbc.param.SslKey, "db-config-"+userKey+"-ssl-key", "", "deprecated: use db_ssl_key") | ||
| flag.StringVar(&dbc.param.ServerName, "db-config-"+userKey+"-server_name", "", "deprecated: use db_server_name") | ||
| flag.StringVar(&dbc.param.Flavor, "db-config-"+userKey+"-flavor", "", "deprecated: use db_flavor") | ||
|
|
||
| flag.StringVar(&dbc.param.DeprecatedDBName, "db-config-"+userKey+"-dbname", "", "deprecated: dbname does not need to be explicitly configured") | ||
| flag.StringVar(&uc.Password, "db-config-"+userKey+"-pass", "", "db "+userKey+" deprecated: use "+newPasswordFlag) |
Member
There was a problem hiding this comment.
making deprecated flag with recent flag backward compatible :)
Comment on lines
+313
to
+318
| dbcfgs.App.Password = "****" | ||
| dbcfgs.Dba.Password = "****" | ||
| dbcfgs.Filtered.Password = "****" | ||
| dbcfgs.Repl.Password = "****" | ||
| dbcfgs.Appdebug.Password = "****" | ||
| dbcfgs.Allprivs.Password = "****" |
Member
There was a problem hiding this comment.
this is fun.. does this needs to be done for ssl connections?
Contributor
Author
There was a problem hiding this comment.
It's just general safety whether it's SSL or not.
Comment on lines
+182
to
+183
| // Clone dbcfgs and override SidecarDBName because there will be one for each db. | ||
| copydbcfgs := dbcfgs.Clone() |
Member
There was a problem hiding this comment.
Is the cloning required? SidecarDBName setting is removed in the code.
Contributor
Author
There was a problem hiding this comment.
It's safer. I also think the DBName will get set differently for each tablet.
Comment on lines
+17
to
+19
| // Package yaml2 ensures that the right yaml package gets imported. | ||
| // The default package that goimports adds is not the one we want to use. | ||
| package yaml2 |
harshit-gangal
approved these changes
Apr 21, 2020
Member
should be we continue to support backward compatibility on deprecated db config flags as well. |
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We continue to support backward compatibility.