From a98b6ce5bb70e6b7c68bab1ebf803a3d6fb0d689 Mon Sep 17 00:00:00 2001 From: coward Date: Wed, 3 Jan 2024 10:36:20 +0800 Subject: [PATCH] :art:add get provider error --- README.md | 7 ++++++- nacos.go | 8 ++++---- nacos_test.go | 21 +++++++++++++-------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 3b58167..2b5bb6a 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,18 @@ type YourConfig struct { } func main() { - np := Provider(Config{ + np,err := Provider(Config{ Host: "ip or domain", Port: 8848, NamespaceId: "", Group: "", ConfigName: "", }) + + if err != nil { + fmt.Println("get provider failed: ",err.Error()) + return + } if err := k.Load(np, yaml.Parser()); err != nil { // error diff --git a/nacos.go b/nacos.go index 503e8a0..b06fb83 100644 --- a/nacos.go +++ b/nacos.go @@ -49,11 +49,11 @@ func validateConfig(config *Config) error { // @description: create nacos provider // @param config // @return *Nacos -func Provider(config Config) *Nacos { +func Provider(config Config) (*Nacos, error) { // validate config if err := validateConfig(&config); err != nil { - return nil + return nil, err } // create nacos config client @@ -78,10 +78,10 @@ func Provider(config Config) *Nacos { // create client failed if err != nil { - return nil + return nil, err } - return &Nacos{nclient, config} + return &Nacos{nclient, config}, nil } // Read diff --git a/nacos_test.go b/nacos_test.go index 3e1a828..4108e29 100644 --- a/nacos_test.go +++ b/nacos_test.go @@ -9,7 +9,7 @@ import ( ) func ExampleProvider() { - _ = Provider(Config{ + _, _ = Provider(Config{ Host: "", Port: 8848, NamespaceId: "", @@ -21,7 +21,7 @@ func ExampleProvider() { } func ExampleNacos_Read() { - np := Provider(Config{ + np, err := Provider(Config{ Host: "ip or domain", Port: 8848, NamespaceId: "", @@ -29,9 +29,14 @@ func ExampleNacos_Read() { ConfigName: "", }) + if err != nil { + fmt.Println("error: ", err.Error()) + return + } + result, err := np.Read() if err != nil { - panic(err) + fmt.Println("get config failed: ", err.Error()) } fmt.Println(result) @@ -40,7 +45,7 @@ func ExampleNacos_Read() { func ExampleNacos_ReadBytes() { - np := Provider(Config{ + np, _ := Provider(Config{ Host: "ip or domain", Port: 8848, NamespaceId: "", @@ -69,7 +74,7 @@ func ExampleNacos_ReadBytes() { func ExampleNacos_Watch() { k := koanf.New(".") - np := Provider(Config{ + np, _ := Provider(Config{ Host: "ip or domain", Port: 8848, NamespaceId: "", @@ -121,7 +126,7 @@ func TestNacos_Read(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - n := Provider(tt.fields.config) + n, _ := Provider(tt.fields.config) gotResult, err := n.Read() if (err != nil) != tt.wantErr { @@ -159,7 +164,7 @@ func TestNacos_ReadBytes(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - n := Provider(tt.fields.config) + n, _ := Provider(tt.fields.config) gotResult, err := n.ReadBytes() if (err != nil) != tt.wantErr { @@ -199,7 +204,7 @@ func TestNacos_Watch(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - n := Provider(tt.fields.config) + n, _ := Provider(tt.fields.config) if err := n.Watch(tt.args.cb); (err != nil) != tt.wantErr { t.Errorf("Watch() error = %v, wantErr %v", err, tt.wantErr)