From bb5f2e5525d576455e6349430939f11c20192b7b Mon Sep 17 00:00:00 2001 From: Ben Toogood Date: Wed, 27 May 2020 12:12:34 +0100 Subject: [PATCH 1/2] Handle config service not found errors --- config/source/service/service.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/source/service/service.go b/config/source/service/service.go index 9bacdf63..85c9f989 100644 --- a/config/source/service/service.go +++ b/config/source/service/service.go @@ -2,10 +2,12 @@ package service import ( "context" + "net/http" "github.com/micro/go-micro/v2/client" "github.com/micro/go-micro/v2/config/source" proto "github.com/micro/go-micro/v2/config/source/service/proto" + "github.com/micro/go-micro/v2/errors" "github.com/micro/go-micro/v2/logger" ) @@ -29,7 +31,9 @@ func (m *service) Read() (set *source.ChangeSet, err error) { Namespace: m.namespace, Path: m.path, }) - if err != nil { + if verr, ok := err.(*errors.Error); ok && verr.Code == http.StatusNotFound { + return &source.ChangeSet{Data: []byte{}}, nil + } else if err != nil { return nil, err } From d85b4197b41e5f96bedf08b60923d8be383c3edb Mon Sep 17 00:00:00 2001 From: Ben Toogood Date: Wed, 27 May 2020 12:20:31 +0100 Subject: [PATCH 2/2] Return nil changeset and not blank --- config/source/service/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/source/service/service.go b/config/source/service/service.go index 85c9f989..25c06d52 100644 --- a/config/source/service/service.go +++ b/config/source/service/service.go @@ -32,7 +32,7 @@ func (m *service) Read() (set *source.ChangeSet, err error) { Path: m.path, }) if verr, ok := err.(*errors.Error); ok && verr.Code == http.StatusNotFound { - return &source.ChangeSet{Data: []byte{}}, nil + return nil, nil } else if err != nil { return nil, err }