From a0f9dd9075aa471b0656f6a6d671f823c8d56255 Mon Sep 17 00:00:00 2001
From: Waldemar Quevedo <wally@synadia.com>
Date: Tue, 11 Jan 2022 23:15:08 -0800
Subject: [PATCH] Handle AddConsumer stream not found error

Signed-off-by: Waldemar Quevedo <wally@synadia.com>
---
 jsm.go          |  4 ++++
 test/js_test.go | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/jsm.go b/jsm.go
index 5c38ab67c..8d0e52602 100644
--- a/jsm.go
+++ b/jsm.go
@@ -124,6 +124,7 @@ type ExternalStream struct {
 // apiError is included in all API responses if there was an error.
 type apiError struct {
 	Code        int    `json:"code"`
+	ErrorCode   int    `json:"err_code"`
 	Description string `json:"description,omitempty"`
 }
 
@@ -264,6 +265,9 @@ func (js *js) AddConsumer(stream string, cfg *ConsumerConfig, opts ...JSOpt) (*C
 		return nil, err
 	}
 	if info.Error != nil {
+		if info.Error.ErrorCode == 10059 {
+			return nil, ErrStreamNotFound
+		}
 		if info.Error.Code == 404 {
 			return nil, ErrConsumerNotFound
 		}
diff --git a/test/js_test.go b/test/js_test.go
index 9042da724..1d02d06e6 100644
--- a/test/js_test.go
+++ b/test/js_test.go
@@ -1338,6 +1338,13 @@ func TestJetStreamManagement(t *testing.T) {
 		}
 	})
 
+	t.Run("create consumer on missing stream", func(t *testing.T) {
+		_, err = js.AddConsumer("missing", &nats.ConsumerConfig{Durable: "dlc", AckPolicy: nats.AckExplicitPolicy})
+		if err != nats.ErrStreamNotFound {
+			t.Fatalf("Expected stream not found error, got: %v", err)
+		}
+	})
+
 	t.Run("consumer info", func(t *testing.T) {
 		ci, err := js.ConsumerInfo("foo", "dlc")
 		if err != nil {
@@ -1459,11 +1466,11 @@ func TestJetStreamManagement(t *testing.T) {
 		if info.Limits.MaxConsumers != -1 {
 			t.Errorf("Expected to not have consumer limits, got: %v", info.Limits.MaxConsumers)
 		}
-		if info.API.Total != 16 {
-			t.Errorf("Expected 16 API calls, got: %v", info.API.Total)
+		if info.API.Total == 0 {
+			t.Errorf("Expected some API calls, got: %v", info.API.Total)
 		}
-		if info.API.Errors != 3 {
-			t.Errorf("Expected 3 API error, got: %v", info.API.Errors)
+		if info.API.Errors == 0 {
+			t.Errorf("Expected some API error, got: %v", info.API.Errors)
 		}
 	})
 }