fix(broker/nats): use errors.Is(..) to compare errors

anycable · Oct 5, 2024 · e672507 · e672507
1 parent 47fd638
commit e672507
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/broker/nats.go b/broker/nats.go
@@ -2,6 +2,7 @@ package broker
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"math"
@@ -714,7 +715,7 @@ bucketSetup:
 		}
 
 		// That means that bucket has been already created
-		if err == jetstream.ErrStreamNameAlreadyInUse {
+		if errors.Is(err, jetstream.ErrStreamNameAlreadyInUse) {
 			newBucket = false
 			bucket, err = n.js.KeyValue(context.Background(), key)
 

diff --git a/broker/nats_test.go b/broker/nats_test.go
@@ -238,7 +238,7 @@ func TestNATSBroker_Sessions(t *testing.T) {
 	require.NoError(t, anotherBroker.Start(nil))
 	defer anotherBroker.Shutdown(context.Background()) // nolint: errcheck
 
-	require.NoError(t, anotherBroker.Ready())
+	require.NoError(t, anotherBroker.Ready(jetstreamReadyTimeout))
 
 	restored, err := anotherBroker.RestoreSession("test123")
 
@@ -292,7 +292,7 @@ func TestNATSBroker_SessionsTTLChange(t *testing.T) {
 
 	defer broker.Shutdown(context.Background()) // nolint: errcheck
 
-	require.NoError(t, broker.Ready())
+	require.NoError(t, broker.Ready(jetstreamReadyTimeout))
 
 	err = broker.CommitSession("test123", &TestCacheable{"cache-me"})
 	require.NoError(t, err)
@@ -304,7 +304,7 @@ func TestNATSBroker_SessionsTTLChange(t *testing.T) {
 	require.NoError(t, anotherBroker.Start(nil))
 	defer anotherBroker.Shutdown(context.Background()) // nolint: errcheck
 
-	require.NoError(t, anotherBroker.Ready())
+	require.NoError(t, anotherBroker.Ready(jetstreamReadyTimeout))
 
 	// The session must be missing since we recreated the bucket due to TTL change
 	missing, err := anotherBroker.RestoreSession("test123")
@@ -358,7 +358,7 @@ func TestNATSBroker_Epoch(t *testing.T) {
 	require.NoError(t, err)
 	defer broker.Shutdown(context.Background()) // nolint: errcheck
 
-	require.NoError(t, broker.Ready())
+	require.NoError(t, broker.Ready(jetstreamReadyTimeout))
 	broker.Reset() // nolint: errcheck
 
 	epoch := broker.Epoch()
@@ -367,7 +367,7 @@ func TestNATSBroker_Epoch(t *testing.T) {
 	require.NoError(t, anotherBroker.Start(nil))
 	defer anotherBroker.Shutdown(context.Background()) // nolint: errcheck
 
-	require.NoError(t, anotherBroker.Ready())
+	require.NoError(t, anotherBroker.Ready(jetstreamReadyTimeout))
 
 	assert.Equal(t, epoch, anotherBroker.Epoch())