fix servicemesh options nil bug

This commit is contained in:
Jeff
2019-09-25 01:16:13 +08:00
committed by zryfish
parent 284c0d6425
commit d0dc66cf28
16 changed files with 48 additions and 105 deletions

View File

@@ -7,8 +7,8 @@ import (
)
type OpenPitrixOptions struct {
APIServer string `json:"apiServer,omitempty" yaml:"apiServer,omitempty"`
Token string `json:"token,omitempty" yaml:"token,omitempty"`
APIServer string `json:"apiServer,omitempty" yaml:"apiServer"`
Token string `json:"token,omitempty" yaml:"token"`
}
func NewOpenPitrixOptions() *OpenPitrixOptions {
@@ -19,11 +19,6 @@ func NewOpenPitrixOptions() *OpenPitrixOptions {
}
func (s *OpenPitrixOptions) ApplyTo(options *OpenPitrixOptions) {
if options == nil {
options = s
return
}
if s.APIServer != "" {
reflectutils.Override(options, s)
}