admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devlopment branch (#1736)

Browse Source
This commit is contained in:
zryfish
2020-01-02 20:52:00 +08:00
committed by GitHub
parent ff0ffe8650
commit eceadec69c
440 changed files with 61524 additions and 3699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/simple/client/mysql/mysql.go
View File

@@ -19,12 +19,12 @@ import (
"k8s.io/klog"
)
type MySQLClient struct {
type Client struct {
database *Database
}
func NewMySQLClient(options *MySQLOptions, stopCh <-chan struct{}) (*MySQLClient, error) {
var m MySQLClient
func NewMySQLClient(options *Options, stopCh <-chan struct{}) (*Client, error) {
var m Client
conn, err := dbr.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s)/devops?parseTime=1&multiStatements=1&charset=utf8mb4&collation=utf8mb4_unicode_ci", options.Username, options.Password, options.Host), nil)
if err != nil {
@@ -50,8 +50,8 @@ func NewMySQLClient(options *MySQLOptions, stopCh <-chan struct{}) (*MySQLClient
return &m, nil
}
func NewMySQLClientOrDie(options *MySQLOptions, stopCh <-chan struct{}) *MySQLClient {
var m MySQLClient
func NewMySQLClientOrDie(options *Options, stopCh <-chan struct{}) *Client {
var m Client
conn, err := dbr.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s)/devops?parseTime=1&multiStatements=1&charset=utf8mb4&collation=utf8mb4_unicode_ci", options.Username, options.Password, options.Host), nil)
if err != nil {
@@ -77,6 +77,6 @@ func NewMySQLClientOrDie(options *MySQLOptions, stopCh <-chan struct{}) *MySQLCl
return &m
}
func (m *MySQLClient) Database() *Database {
func (m *Client) Database() *Database {
return m.database
}

26
pkg/simple/client/mysql/options.go
View File

@@ -6,7 +6,7 @@ import (
"time"
)
type MySQLOptions struct {
type Options struct {
Host string `json:"host,omitempty" yaml:"host" description:"MySQL service host address"`
Username string `json:"username,omitempty" yaml:"username"`
Password string `json:"-" yaml:"password"`
@@ -16,8 +16,8 @@ type MySQLOptions struct {
}
// NewMySQLOptions create a `zero` value instance
func NewMySQLOptions() *MySQLOptions {
return &MySQLOptions{
func NewMySQLOptions() *Options {
return &Options{
Host: "",
Username: "",
Password: "",
@@ -27,33 +27,33 @@ func NewMySQLOptions() *MySQLOptions {
}
}
func (m *MySQLOptions) Validate() []error {
errors := []error{}
func (m *Options) Validate() []error {
var errors []error
return errors
}
func (m *MySQLOptions) ApplyTo(options *MySQLOptions) {
func (m *Options) ApplyTo(options *Options) {
reflectutils.Override(options, m)
}
func (m *MySQLOptions) AddFlags(fs *pflag.FlagSet) {
func (m *Options) AddFlags(fs *pflag.FlagSet, c *Options) {
fs.StringVar(&m.Host, "mysql-host", m.Host, ""+
fs.StringVar(&m.Host, "mysql-host", c.Host, ""+
"MySQL service host address. If left blank, the following related mysql options will be ignored.")
fs.StringVar(&m.Username, "mysql-username", m.Username, ""+
fs.StringVar(&m.Username, "mysql-username", c.Username, ""+
"Username for access to mysql service.")
fs.StringVar(&m.Password, "mysql-password", m.Password, ""+
fs.StringVar(&m.Password, "mysql-password", c.Password, ""+
"Password for access to mysql, should be used pair with password.")
fs.IntVar(&m.MaxIdleConnections, "mysql-max-idle-connections", m.MaxOpenConnections, ""+
fs.IntVar(&m.MaxIdleConnections, "mysql-max-idle-connections", c.MaxOpenConnections, ""+
"Maximum idle connections allowed to connect to mysql.")
fs.IntVar(&m.MaxOpenConnections, "mysql-max-open-connections", m.MaxOpenConnections, ""+
fs.IntVar(&m.MaxOpenConnections, "mysql-max-open-connections", c.MaxOpenConnections, ""+
"Maximum open connections allowed to connect to mysql.")
fs.DurationVar(&m.MaxConnectionLifeTime, "mysql-max-connection-life-time", m.MaxConnectionLifeTime, ""+
fs.DurationVar(&m.MaxConnectionLifeTime, "mysql-max-connection-life-time", c.MaxConnectionLifeTime, ""+
"Maximum connection life time allowed to connecto to mysql.")
}