chore: prefixs to prefixes

jianghushinian · jianghushinian · commit d284a0dd9cdf · 2024-04-30T09:46:04.000+08:00
diff --git a/internal/onexctl/util/options/server_options.go b/internal/onexctl/util/options/server_options.go
@@ -36,19 +36,19 @@ func (o *ServerOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to mysql storage for a specific APIServer to the specified FlagSet.
-func (o *ServerOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
-	fs.BoolVar(&o.Insecure, join(prefixs...)+"insecure-skip-tls-verify", o.Insecure, ""+
+func (o *ServerOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
+	fs.BoolVar(&o.Insecure, join(prefixes...)+"insecure-skip-tls-verify", o.Insecure, ""+
 		"If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure")
-	fs.StringVar(&o.CAFile, join(prefixs...)+"certificate-authority", o.CAFile, "Path to a cert file for the certificate authority")
-	fs.StringVar(&o.Addr, join(prefixs...)+"address", o.Addr, "The address and port of the OneX API server")
-	fs.DurationVar(&o.Timeout, join(prefixs...)+"timeout", o.Timeout, "The length of time to wait before giving up on a single "+
+	fs.StringVar(&o.CAFile, join(prefixes...)+"certificate-authority", o.CAFile, "Path to a cert file for the certificate authority")
+	fs.StringVar(&o.Addr, join(prefixes...)+"address", o.Addr, "The address and port of the OneX API server")
+	fs.DurationVar(&o.Timeout, join(prefixes...)+"timeout", o.Timeout, "The length of time to wait before giving up on a single "+
 		"server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests.")
-	fs.IntVar(&o.MaxRetries, join(prefixs...)+"max-retries", o.MaxRetries, "Maximum number of retries.")
-	fs.DurationVar(&o.RetryInterval, join(prefixs...)+"retry-interval", o.RetryInterval, "The interval time between each attempt.")
+	fs.IntVar(&o.MaxRetries, join(prefixes...)+"max-retries", o.MaxRetries, "Maximum number of retries.")
+	fs.DurationVar(&o.RetryInterval, join(prefixes...)+"retry-interval", o.RetryInterval, "The interval time between each attempt.")
 }
 
-func join(prefixs ...string) string {
-	joined := strings.Join(prefixs, ".")
+func join(prefixes ...string) string {
+	joined := strings.Join(prefixes, ".")
 	if joined != "" {
 		joined += "."
 	}
diff --git a/internal/pkg/client/usercenter/options.go b/internal/pkg/client/usercenter/options.go
@@ -43,7 +43,7 @@ func (o *UserCenterOptions) Validate() []error {
 }
 
 // AddFlags adds flags for a specific APIServer to the specified FlagSet.
-func (o *UserCenterOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *UserCenterOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	if o == nil {
 		return
 	}
diff --git a/pkg/options/authentication_options.go b/pkg/options/authentication_options.go
@@ -33,7 +33,7 @@ func (o *ClientCertAuthenticationOptions) Validate() []error {
 
 // AddFlags adds flags related to ClientCertAuthenticationOptions for a specific server to the
 // specified FlagSet.
-func (o *ClientCertAuthenticationOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *ClientCertAuthenticationOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&o.ClientCA, "client-ca-file", o.ClientCA, ""+
 		"If set, any request presenting a client certificate signed by one of "+
 		"the authorities in the client-ca-file is authenticated with an identity "+
diff --git a/pkg/options/consul_options.go b/pkg/options/consul_options.go
@@ -37,7 +37,7 @@ func (o *ConsulOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to mysql storage for a specific APIServer to the specified FlagSet.
-func (o *ConsulOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *ConsulOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&o.Addr, "consul.addr", o.Addr, ""+
 		"Addr is the address of the consul server.")
 
diff --git a/pkg/options/etcd_options.go b/pkg/options/etcd_options.go
@@ -51,7 +51,7 @@ func (o *EtcdOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to redis storage for a specific APIServer to the specified FlagSet.
-func (o *EtcdOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *EtcdOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	o.TLSOptions.AddFlags(fs, "etcd")
 
 	fs.StringSliceVar(&o.Endpoints, "etcd.endpoints", o.Endpoints, "Endpoints of etcd cluster.")
diff --git a/pkg/options/grpc_options.go b/pkg/options/grpc_options.go
@@ -51,7 +51,7 @@ func (o *GRPCOptions) Validate() []error {
 
 // AddFlags adds flags related to features for a specific api server to the
 // specified FlagSet.
-func (o *GRPCOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *GRPCOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&o.Network, "grpc.network", o.Network, "Specify the network for the gRPC server.")
 	fs.StringVar(&o.Addr, "grpc.addr", o.Addr, "Specify the gRPC server bind address and port.")
 	fs.DurationVar(&o.Timeout, "grpc.timeout", o.Timeout, "Timeout for server connections.")
diff --git a/pkg/options/health_options.go b/pkg/options/health_options.go
@@ -44,7 +44,7 @@ func (o *HealthOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to redis storage for a specific APIServer to the specified FlagSet.
-func (o *HealthOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *HealthOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.BoolVar(&o.HTTPProfile, "health.enable-http-profiler", o.HTTPProfile, "Expose runtime profiling data via HTTP.")
 	fs.StringVar(&o.HealthCheckPath, "health.check-path", o.HealthCheckPath, "Specifies liveness health check request path.")
 	fs.StringVar(&o.HealthCheckAddress, "health.check-address", o.HealthCheckAddress, "Specifies liveness health check bind address.")
diff --git a/pkg/options/helper.go b/pkg/options/helper.go
@@ -23,8 +23,8 @@ const (
 	TiB
 )
 
-func join(prefixs ...string) string {
-	joined := strings.Join(prefixs, ".")
+func join(prefixes ...string) string {
+	joined := strings.Join(prefixes, ".")
 	if joined != "" {
 		joined += "."
 	}
diff --git a/pkg/options/http_options.go b/pkg/options/http_options.go
@@ -53,7 +53,7 @@ func (o *HTTPOptions) Validate() []error {
 
 // AddFlags adds flags related to HTTPS server for a specific APIServer to the
 // specified FlagSet.
-func (o *HTTPOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *HTTPOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&o.Network, "http.network", o.Network, "Specify the network for the HTTP server.")
 	fs.StringVar(&o.Addr, "http.addr", o.Addr, "Specify the HTTP server bind address and port.")
 	fs.DurationVar(&o.Timeout, "http.timeout", o.Timeout, "Timeout for server connections.")
diff --git a/pkg/options/insecure_serving.go b/pkg/options/insecure_serving.go
@@ -36,6 +36,6 @@ func (s *InsecureServingOptions) Validate() []error {
 
 // AddFlags adds flags related to features for a specific api server to the
 // specified FlagSet.
-func (s *InsecureServingOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (s *InsecureServingOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&s.Addr, "insecure.addr", s.Addr, "Specify the HTTP server bind address and port.")
 }
diff --git a/pkg/options/jaeger_options.go b/pkg/options/jaeger_options.go
@@ -44,7 +44,7 @@ func (o *JaegerOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to mysql storage for a specific APIServer to the specified FlagSet.
-func (o *JaegerOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *JaegerOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&o.Server, "jaeger.server", o.Server, ""+
 		"Server is the url of the Jaeger server.")
 	fs.StringVar(&o.ServiceName, "jaeger.service-name", o.ServiceName, ""+
diff --git a/pkg/options/jwt_options.go b/pkg/options/jwt_options.go
@@ -49,7 +49,7 @@ func (s *JWTOptions) Validate() []error {
 
 // AddFlags adds flags related to features for a specific api server to the
 // specified FlagSet.
-func (s *JWTOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (s *JWTOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	if fs == nil {
 		return
 	}
diff --git a/pkg/options/kafka_options.go b/pkg/options/kafka_options.go
@@ -245,7 +245,7 @@ func (o *KafkaOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to redis storage for a specific APIServer to the specified FlagSet.
-func (o *KafkaOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *KafkaOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	o.TLSOptions.AddFlags(fs, "kafka")
 
 	fs.StringSliceVar(&o.Brokers, "kafka.brokers", o.Brokers, "The list of brokers used to discover the partitions available on the kafka cluster.")
diff --git a/pkg/options/logs_options.go b/pkg/options/logs_options.go
@@ -58,7 +58,7 @@ func (o *LogsOptions) Validate() []error {
 }
 
 // AddFlags adds command line flags for the configuration.
-func (o *LogsOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *LogsOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&o.Format, "logs.format", o.Format, "Sets the log format. Permitted formats: json, text.")
 	fs.DurationVar(&o.FlushFrequency, "log.flush-frequency", o.FlushFrequency, "Maximum number of seconds between log flushes.")
 	fs.VarP(logsapi.VerbosityLevelPflag(&o.Verbosity), "logs.verbosity", "", " Number for the log level verbosity.")
diff --git a/pkg/options/metrics_options.go b/pkg/options/metrics_options.go
@@ -42,7 +42,7 @@ func (o *MetricsOptions) Validate() []error {
 }
 
 // AddFlags adds flags for exposing component metrics.
-func (o *MetricsOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *MetricsOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	if o == nil {
 		return
 	}
diff --git a/pkg/options/mongo_options.go b/pkg/options/mongo_options.go
@@ -63,7 +63,7 @@ func (o *MongoOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to redis storage for a specific APIServer to the specified FlagSet.
-func (o *MongoOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *MongoOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	o.TLSOptions.AddFlags(fs, "mongo")
 
 	fs.DurationVar(&o.Timeout, "mongo.timeout", o.Timeout, "Timeout is the maximum amount of time a dial will wait for a connect to complete.")
diff --git a/pkg/options/mysql_options.go b/pkg/options/mysql_options.go
@@ -53,21 +53,21 @@ func (o *MySQLOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to mysql storage for a specific APIServer to the specified FlagSet.
-func (o *MySQLOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
-	fs.StringVar(&o.Host, join(prefixs...)+"db.host", o.Host, ""+
+func (o *MySQLOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
+	fs.StringVar(&o.Host, join(prefixes...)+"db.host", o.Host, ""+
 		"MySQL service host address. If left blank, the following related mysql options will be ignored.")
-	fs.StringVar(&o.Username, join(prefixs...)+"db.username", o.Username, "Username for access to mysql service.")
-	fs.StringVar(&o.Password, join(prefixs...)+"db.password", o.Password, ""+
+	fs.StringVar(&o.Username, join(prefixes...)+"db.username", o.Username, "Username for access to mysql service.")
+	fs.StringVar(&o.Password, join(prefixes...)+"db.password", o.Password, ""+
 		"Password for access to mysql, should be used pair with password.")
-	fs.StringVar(&o.Database, join(prefixs...)+"db.database", o.Database, ""+
+	fs.StringVar(&o.Database, join(prefixes...)+"db.database", o.Database, ""+
 		"Database name for the server to use.")
-	fs.IntVar(&o.MaxIdleConnections, join(prefixs...)+"db.max-idle-connections", o.MaxOpenConnections, ""+
+	fs.IntVar(&o.MaxIdleConnections, join(prefixes...)+"db.max-idle-connections", o.MaxOpenConnections, ""+
 		"Maximum idle connections allowed to connect to mysql.")
-	fs.IntVar(&o.MaxOpenConnections, join(prefixs...)+"db.max-open-connections", o.MaxOpenConnections, ""+
+	fs.IntVar(&o.MaxOpenConnections, join(prefixes...)+"db.max-open-connections", o.MaxOpenConnections, ""+
 		"Maximum open connections allowed to connect to mysql.")
-	fs.DurationVar(&o.MaxConnectionLifeTime, join(prefixs...)+"db.max-connection-life-time", o.MaxConnectionLifeTime, ""+
+	fs.DurationVar(&o.MaxConnectionLifeTime, join(prefixes...)+"db.max-connection-life-time", o.MaxConnectionLifeTime, ""+
 		"Maximum connection life time allowed to connect to mysql.")
-	fs.IntVar(&o.LogLevel, join(prefixs...)+"db.log-mode", o.LogLevel, ""+
+	fs.IntVar(&o.LogLevel, join(prefixes...)+"db.log-mode", o.LogLevel, ""+
 		"Specify gorm log level.")
 }
 
diff --git a/pkg/options/options.go b/pkg/options/options.go
@@ -14,5 +14,5 @@ type IOptions interface {
 	Validate() []error
 
 	// AddFlags adds flags related to given flagset.
-	AddFlags(fs *pflag.FlagSet, prefixs ...string)
+	AddFlags(fs *pflag.FlagSet, prefixes ...string)
 }
diff --git a/pkg/options/polaris_options.go b/pkg/options/polaris_options.go
@@ -35,7 +35,7 @@ func (o *PolarisOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to Polaris service to the specified FlagSet.
-func (o *PolarisOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *PolarisOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&o.Addr, "polaris.addr", o.Addr, "Address of your Polaris service(ip:port).")
 	fs.DurationVar(&o.ReadTimeout, "polaris.read-timeout", o.ReadTimeout, "Timeout for socket reads.")
 	fs.DurationVar(&o.WriteTimeout, "polaris.write-timeout", o.WriteTimeout, "Timeout for socket writes.")
diff --git a/pkg/options/redis_options.go b/pkg/options/redis_options.go
@@ -68,7 +68,7 @@ func (o *RedisOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to redis storage for a specific APIServer to the specified FlagSet.
-func (o *RedisOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (o *RedisOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&o.Addr, "redis.addr", o.Addr, "Address of your Redis server(ip:port).")
 	fs.StringVar(&o.Username, "redis.username", o.Username, "Username for access to redis service.")
 	fs.StringVar(&o.Password, "redis.password", o.Password, "Optional auth password for redis db.")
diff --git a/pkg/options/secure_serving.go b/pkg/options/secure_serving.go
@@ -82,7 +82,7 @@ func (s *SecureServingOptions) Validate() []error {
 
 // AddFlags adds flags related to HTTPS server for a specific APIServer to the
 // specified FlagSet.
-func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
+func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
 	fs.StringVar(&s.BindAddress, "secure.bind-address", s.BindAddress, ""+
 		"The IP address on which to listen for the --secure.bind-port port. The "+
 		"associated interface(s) must be reachable by the rest of the engine, and by CLI/web "+
diff --git a/pkg/options/tls_options.go b/pkg/options/tls_options.go
@@ -49,13 +49,13 @@ func (o *TLSOptions) Validate() []error {
 }
 
 // AddFlags adds flags related to redis storage for a specific APIServer to the specified FlagSet.
-func (o *TLSOptions) AddFlags(fs *pflag.FlagSet, prefixs ...string) {
-	fs.BoolVar(&o.UseTLS, join(prefixs...)+"tls.use-tls", o.UseTLS, "Use tls transport to connect the server.")
-	fs.BoolVar(&o.InsecureSkipVerify, join(prefixs...)+"tls.insecure-skip-verify", o.InsecureSkipVerify, ""+
+func (o *TLSOptions) AddFlags(fs *pflag.FlagSet, prefixes ...string) {
+	fs.BoolVar(&o.UseTLS, join(prefixes...)+"tls.use-tls", o.UseTLS, "Use tls transport to connect the server.")
+	fs.BoolVar(&o.InsecureSkipVerify, join(prefixes...)+"tls.insecure-skip-verify", o.InsecureSkipVerify, ""+
 		"Controls whether a client verifies the server's certificate chain and host name.")
-	fs.StringVar(&o.CaCert, join(prefixs...)+"tls.ca-cert", o.CaCert, "Path to ca cert for connecting to the server.")
-	fs.StringVar(&o.Cert, join(prefixs...)+"tls.cert", o.Cert, "Path to cert file for connecting to the server.")
-	fs.StringVar(&o.Key, join(prefixs...)+"tls.key", o.Key, "Path to key file for connecting to the server.")
+	fs.StringVar(&o.CaCert, join(prefixes...)+"tls.ca-cert", o.CaCert, "Path to ca cert for connecting to the server.")
+	fs.StringVar(&o.Cert, join(prefixes...)+"tls.cert", o.Cert, "Path to cert file for connecting to the server.")
+	fs.StringVar(&o.Key, join(prefixes...)+"tls.key", o.Key, "Path to key file for connecting to the server.")
 }
 
 func (o *TLSOptions) MustTLSConfig() *tls.Config {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (o *UserCenterOptions) Validate() []error {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// AddFlags adds flags for a specific APIServer to the specified FlagSet.`
`46`		`-func (o UserCenterOptions) AddFlags(fs pflag.FlagSet, prefixs ...string) {`
	`46`	`+func (o UserCenterOptions) AddFlags(fs pflag.FlagSet, prefixes ...string) {`
`47`	`47`	`if o == nil {`
`48`	`48`	`return`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (o *ConsulOptions) Validate() []error {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// AddFlags adds flags related to mysql storage for a specific APIServer to the specified FlagSet.`
`40`		`-func (o ConsulOptions) AddFlags(fs pflag.FlagSet, prefixs ...string) {`
	`40`	`+func (o ConsulOptions) AddFlags(fs pflag.FlagSet, prefixes ...string) {`
`41`	`41`	`fs.StringVar(&o.Addr, "consul.addr", o.Addr, ""+`
`42`	`42`	`"Addr is the address of the consul server.")`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (o *EtcdOptions) Validate() []error {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// AddFlags adds flags related to redis storage for a specific APIServer to the specified FlagSet.`
`54`		`-func (o EtcdOptions) AddFlags(fs pflag.FlagSet, prefixs ...string) {`
	`54`	`+func (o EtcdOptions) AddFlags(fs pflag.FlagSet, prefixes ...string) {`
`55`	`55`	`o.TLSOptions.AddFlags(fs, "etcd")`
`56`	`56`
`57`	`57`	`fs.StringSliceVar(&o.Endpoints, "etcd.endpoints", o.Endpoints, "Endpoints of etcd cluster.")`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (o *HealthOptions) Validate() []error {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// AddFlags adds flags related to redis storage for a specific APIServer to the specified FlagSet.`
`47`		`-func (o HealthOptions) AddFlags(fs pflag.FlagSet, prefixs ...string) {`
	`47`	`+func (o HealthOptions) AddFlags(fs pflag.FlagSet, prefixes ...string) {`
`48`	`48`	`fs.BoolVar(&o.HTTPProfile, "health.enable-http-profiler", o.HTTPProfile, "Expose runtime profiling data via HTTP.")`
`49`	`49`	`fs.StringVar(&o.HealthCheckPath, "health.check-path", o.HealthCheckPath, "Specifies liveness health check request path.")`
`50`	`50`	`fs.StringVar(&o.HealthCheckAddress, "health.check-address", o.HealthCheckAddress, "Specifies liveness health check bind address.")`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ const (`
`23`	`23`	`TiB`
`24`	`24`	`)`
`25`	`25`
`26`		`-func join(prefixs ...string) string {`
`27`		`- joined := strings.Join(prefixs, ".")`
	`26`	`+func join(prefixes ...string) string {`
	`27`	`+ joined := strings.Join(prefixes, ".")`
`28`	`28`	`if joined != "" {`
`29`	`29`	`joined += "."`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ func (s *InsecureServingOptions) Validate() []error {`
`36`	`36`
`37`	`37`	`// AddFlags adds flags related to features for a specific api server to the`
`38`	`38`	`// specified FlagSet.`
`39`		`-func (s InsecureServingOptions) AddFlags(fs pflag.FlagSet, prefixs ...string) {`
	`39`	`+func (s InsecureServingOptions) AddFlags(fs pflag.FlagSet, prefixes ...string) {`
`40`	`40`	`fs.StringVar(&s.Addr, "insecure.addr", s.Addr, "Specify the HTTP server bind address and port.")`
`41`	`41`	`}`