Skip to content

Commit

Permalink
renaming ErrNoStream and ErrNoConsumer to ErrStreamNotFound and ErrCo…
Browse files Browse the repository at this point in the history
…nsumerNotFound respectively
  • Loading branch information
actatum committed Jun 24, 2021
1 parent 0b9f6a1 commit 8712fe7
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions js.go
Expand Up @@ -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
}

Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
8 changes: 4 additions & 4 deletions jsm.go
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions nats.go
Expand Up @@ -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")
Expand Down
16 changes: 8 additions & 8 deletions test/js_test.go
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
}

Expand Down Expand Up @@ -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())
}
})
Expand Down Expand Up @@ -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)
}

Expand Down

0 comments on commit 8712fe7

Please sign in to comment.