move things around a bit

Author: endigma

v2/pkg/engine/datasource/graphql_datasource/graphql_subscription_client.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/jensneuse/abstractlogger"
 
-	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client"
+	client "github.com/wundergraph/graphql-go-tools/v2/pkg/engine/datasource/graphql_datasource/subscriptionclient"
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/resolve"
 )
 

v2/pkg/engine/datasource/graphql_datasource/graphql_subscription_client_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	subclient "github.com/wundergraph/graphql-go-tools/v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client"
+	client "github.com/wundergraph/graphql-go-tools/v2/pkg/engine/datasource/graphql_datasource/subscriptionclient"
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/resolve"
 )
 
@@ -43,13 +43,13 @@ func (t *testBridgeUpdater) Subscriptions() map[context.Context]resolve.Subscrip
 
 func TestCloseKindForMessageError(t *testing.T) {
 	t.Run("connection closed uses downstream service error close kind", func(t *testing.T) {
-		closeKind, sendPayload := closeKindForMessageError(subclient.ErrConnectionClosed)
+		closeKind, sendPayload := closeKindForMessageError(client.ErrConnectionClosed)
 		require.Equal(t, resolve.SubscriptionCloseKindDownstreamServiceError, closeKind)
 		require.False(t, sendPayload)
 	})
 
 	t.Run("connection error uses downstream service error close kind", func(t *testing.T) {
-		err := fmt.Errorf("wrapped: %w", subclient.ErrConnectionError)
+		err := fmt.Errorf("wrapped: %w", client.ErrConnectionError)
 		closeKind, sendPayload := closeKindForMessageError(err)
 		require.Equal(t, resolve.SubscriptionCloseKindDownstreamServiceError, closeKind)
 		require.False(t, sendPayload)
@@ -65,12 +65,12 @@ func TestCloseKindForMessageError(t *testing.T) {
 func TestSubscriptionClientV2ReadLoopCloseKinds(t *testing.T) {
 	t.Run("connection errors close as downstream service error without payload", func(t *testing.T) {
 		updater := &testBridgeUpdater{}
-		msgCh := make(chan *subclient.Message, 1)
-		msgCh <- &subclient.Message{Err: subclient.ErrConnectionClosed}
+		msgCh := make(chan *client.Message, 1)
+		msgCh <- &client.Message{Err: client.ErrConnectionClosed}
 		close(msgCh)
 
-		client := &subscriptionClientV2{}
-		client.readLoop(context.Background(), msgCh, func() {}, updater)
+		subClient := &subscriptionClientV2{}
+		subClient.readLoop(context.Background(), msgCh, func() {}, updater)
 
 		require.True(t, updater.closed)
 		require.Equal(t, resolve.SubscriptionCloseKindDownstreamServiceError, updater.closeKind)
@@ -80,12 +80,12 @@ func TestSubscriptionClientV2ReadLoopCloseKinds(t *testing.T) {
 
 	t.Run("non-connection errors send payload and close normally", func(t *testing.T) {
 		updater := &testBridgeUpdater{}
-		msgCh := make(chan *subclient.Message, 1)
-		msgCh <- &subclient.Message{Err: errors.New("validation failed")}
+		msgCh := make(chan *client.Message, 1)
+		msgCh <- &client.Message{Err: errors.New("validation failed")}
 		close(msgCh)
 
-		client := &subscriptionClientV2{}
-		client.readLoop(context.Background(), msgCh, func() {}, updater)
+		subClient := &subscriptionClientV2{}
+		subClient.readLoop(context.Background(), msgCh, func() {}, updater)
 
 		require.True(t, updater.closed)
 		require.Equal(t, resolve.SubscriptionCloseKindNormal, updater.closeKind)

…urce/subscriptionclient/client/client.go …_datasource/subscriptionclient/client.gov2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client/client.go renamed to v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client.go v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client/client.go renamed to v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client.go

@@ -180,13 +180,11 @@ func (c *sseConnection) cleanup() {
 }
 
 // closeConn terminates the SSE connection.
-func (c *sseConnection) closeConn() error {
+func (c *sseConnection) closeConn() {
 	if !c.closed.CompareAndSwap(false, true) {
-		return nil
+		return
 	}
 
 	close(c.done)
 	c.resp.Body.Close()
-
-	return nil
 }

…subscriptionclient/client/client_test.go …source/subscriptionclient/client_test.gov2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client/client_test.go renamed to v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client_test.go v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client/client_test.go renamed to v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/client_test.go

@@ -94,8 +94,7 @@ func TestSSEConnection_Close(t *testing.T) {
 
 		go conn.readLoop()
 
-		err := conn.closeConn()
-		require.NoError(t, err)
+		conn.closeConn()
 		pw.Close() // Ensure pipe is fully closed
 
 		// Channel close signals cleanup completed
@@ -114,11 +113,8 @@ func TestSSEConnection_Close(t *testing.T) {
 		resp := &http.Response{Body: body}
 		conn := newSSEConnection(resp)
 
-		err1 := conn.closeConn()
-		err2 := conn.closeConn()
-
-		assert.NoError(t, err1)
-		assert.NoError(t, err2)
+		conn.closeConn()
+		conn.closeConn() // second call is a no-op
 	})
 }