Merge pull request #96 from LavaGames/main

handle cases where bucket or entry doesn't exist
nats-io · Sep 21, 2023 · ebe784e · ebe784e
2 parents 270a14b + 9c8689b
commit ebe784e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/jetstream/resource_kv_bucket.go b/jetstream/resource_kv_bucket.go
@@ -172,6 +172,10 @@ func resourceKVBucketRead(d *schema.ResourceData, m any) error {
 	}
 	bucket, err := js.KeyValue(name)
 	if err != nil {
+		if err == nats.ErrBucketNotFound {
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
 	status, err := bucket.Status()

diff --git a/jetstream/resource_kv_entry.go b/jetstream/resource_kv_entry.go
@@ -93,10 +93,18 @@ func resourceKVEntryRead(d *schema.ResourceData, m any) error {
 	}
 	kv, err := js.KeyValue(bucket)
 	if err != nil {
+		if err == nats.ErrBucketNotFound {
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
 	entry, err := kv.Get(key)
 	if err != nil {
+		if err == nats.ErrKeyNotFound {
+			d.SetId("")
+			return nil
+		}
 		return err
 	}