From 8712fe719dd8683eec2939ea39371eca7b450bc8 Mon Sep 17 00:00:00 2001 From: actatum Date: Thu, 24 Jun 2021 12:26:18 -0400 Subject: [PATCH] renaming ErrNoStream and ErrNoConsumer to ErrStreamNotFound and ErrConsumerNotFound respectively --- js.go | 6 +++--- jsm.go | 8 ++++---- nats.go | 4 ++-- test/js_test.go | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/js.go b/js.go index 8bad5b7ea..7ee9f9f4d 100644 --- a/js.go +++ b/js.go @@ -1048,7 +1048,7 @@ func (js *js) subscribe(subj, queue string, cb MsgHandler, ch chan *Msg, isSync // to which it should be attaching to. if consumer != _EMPTY_ { info, err = js.ConsumerInfo(stream, consumer) - notFoundErr = errors.Is(err, ErrNoConsumer) + notFoundErr = errors.Is(err, ErrConsumerNotFound) lookupErr = err == ErrJetStreamNotEnabled || err == ErrTimeout || err == context.DeadlineExceeded } @@ -1195,7 +1195,7 @@ func (js *js) subscribe(subj, queue string, cb MsgHandler, ch chan *Msg, isSync attached = true } else { if cinfo.Error.Code == 404 { - return nil, ErrNoStream + return nil, ErrStreamNotFound } return nil, fmt.Errorf("nats: %s", cinfo.Error.Description) } @@ -1894,7 +1894,7 @@ func (js *js) getConsumerInfoContext(ctx context.Context, stream, consumer strin } if info.Error != nil { if info.Error.Code == 404 { - return nil, ErrNoConsumer + return nil, ErrConsumerNotFound } return nil, fmt.Errorf("nats: %s", info.Error.Description) } diff --git a/jsm.go b/jsm.go index 61c386eff..db38ff825 100644 --- a/jsm.go +++ b/jsm.go @@ -259,7 +259,7 @@ func (js *js) AddConsumer(stream string, cfg *ConsumerConfig, opts ...JSOpt) (*C } if info.Error != nil { if info.Error.Code == 404 { - return nil, ErrNoConsumer + return nil, ErrConsumerNotFound } return nil, errors.New(info.Error.Description) } @@ -298,7 +298,7 @@ func (js *js) DeleteConsumer(stream, consumer string, opts ...JSOpt) error { if resp.Error != nil { if resp.Error.Code == 404 { - return ErrNoConsumer + return ErrConsumerNotFound } return errors.New(resp.Error.Description) } @@ -596,7 +596,7 @@ func (js *js) StreamInfo(stream string, opts ...JSOpt) (*StreamInfo, error) { } if resp.Error != nil { if resp.Error.Code == 404 { - return nil, ErrNoStream + return nil, ErrStreamNotFound } return nil, errors.New(resp.Error.Description) } @@ -716,7 +716,7 @@ func (js *js) DeleteStream(name string, opts ...JSOpt) error { if resp.Error != nil { if resp.Error.Code == 404 { - return ErrNoStream + return ErrStreamNotFound } return errors.New(resp.Error.Description) } diff --git a/nats.go b/nats.go index 446291f38..196f2e4b6 100644 --- a/nats.go +++ b/nats.go @@ -146,8 +146,8 @@ var ( ErrInvalidJSAck = errors.New("nats: invalid jetstream publish response") ErrMultiStreamUnsupported = errors.New("nats: multiple streams are not supported") ErrStreamNameRequired = errors.New("nats: stream name is required") - ErrNoStream = errors.New("stream not found") - ErrNoConsumer = errors.New("consumer not found") + ErrStreamNotFound = errors.New("stream not found") + ErrConsumerNotFound = errors.New("consumer not found") ErrConsumerNameRequired = errors.New("nats: consumer name is required") ErrConsumerConfigRequired = errors.New("nats: consumer configuration is required") ErrStreamSnapshotConfigRequired = errors.New("nats: stream snapshot configuration is required") diff --git a/test/js_test.go b/test/js_test.go index c126ca54c..fba2a4691 100644 --- a/test/js_test.go +++ b/test/js_test.go @@ -1745,8 +1745,8 @@ func TestJetStreamManagement(t *testing.T) { t.Run("stream not found", func(t *testing.T) { si, err = js.StreamInfo("bar") - if !errors.Is(err, nats.ErrNoStream) { - t.Fatalf("Expected error: %v, got: %v", nats.ErrNoStream, err) + if !errors.Is(err, nats.ErrStreamNotFound) { + t.Fatalf("Expected error: %v, got: %v", nats.ErrStreamNotFound, err) } if si != nil { t.Fatalf("StreamInfo should be nil %+v", si) @@ -1817,8 +1817,8 @@ func TestJetStreamManagement(t *testing.T) { t.Run("consumer not found", func(t *testing.T) { ci, err := js.ConsumerInfo("foo", "cld") - if !errors.Is(err, nats.ErrNoConsumer) { - t.Fatalf("Expected error: %v, got: %v", nats.ErrNoConsumer, err) + if !errors.Is(err, nats.ErrConsumerNotFound) { + t.Fatalf("Expected error: %v, got: %v", nats.ErrConsumerNotFound, err) } if ci != nil { t.Fatalf("ConsumerInfo should be nil %+v", ci) @@ -3902,7 +3902,7 @@ func TestJetStream_UnsubscribeCloseDrain(t *testing.T) { if err == nil { t.Fatalf("Unexpected success") } - if !errors.Is(err, nats.ErrNoConsumer) { + if !errors.Is(err, nats.ErrConsumerNotFound) { t.Errorf("Expected consumer not found error, got: %v", err) } @@ -4608,7 +4608,7 @@ func testJetStreamMirror_Source(t *testing.T, nodes ...*jsServer) { if err == nil { t.Fatal("Unexpected success") } - if !errors.Is(err, nats.ErrNoStream) { + if !errors.Is(err, nats.ErrStreamNotFound) { t.Fatal("Expected stream not found error", err.Error()) } }) @@ -6120,13 +6120,13 @@ func TestJetStreamBindConsumer(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } _, err = js.SubscribeSync("foo", nats.Bind("foo", "push")) - if err == nil || !errors.Is(err, nats.ErrNoConsumer) { + if err == nil || !errors.Is(err, nats.ErrConsumerNotFound) { t.Fatalf("Unexpected error: %v", err) } // Pull consumer _, err = js.PullSubscribe("foo", "pull", nats.Bind("foo", "pull")) - if err == nil || !errors.Is(err, nats.ErrNoConsumer) { + if err == nil || !errors.Is(err, nats.ErrConsumerNotFound) { t.Fatalf("Unexpected error: %v", err) }