ci: fix the deprecated docker-compose command (#154)

* ci: fix the deprecated docker-compose command
hasura · Sep 23, 2024 · 47ee315 · 47ee315
1 parent d4c8fea
commit 47ee315
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Setup integration test infrastructure
         run: |
           cd ./example/hasura
-          docker-compose up -d
+          docker compose up -d
       - name: Lint
         uses: golangci/golangci-lint-action@v6
         with:

diff --git a/example/graphqldev/go.mod b/example/graphqldev/go.mod
@@ -8,8 +8,8 @@ require (
 )
 
 require (
+	github.com/coder/websocket v1.8.12 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	nhooyr.io/websocket v1.8.10 // indirect
 )
 
 replace github.com/hasura/go-graphql-client => ../../
diff --git a/example/graphqldev/go.sum b/example/graphqldev/go.sum
@@ -1,3 +1,4 @@
+github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -17,5 +18,3 @@ go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5f
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q=
-nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
diff --git a/subscription_graphql_ws_test.go b/subscription_graphql_ws_test.go
@@ -71,9 +71,9 @@ func waitService(endpoint string, timeoutSecs int) error {
 	if res != nil {
 		body, err := io.ReadAll(res.Body)
 		if err != nil {
-			return fmt.Errorf(res.Status)
+			return errors.New(res.Status)
 		}
-		return fmt.Errorf(string(body))
+		return errors.New(string(body))
 	}
 	return errors.New("unknown error")
 }

diff --git a/subscriptions_transport_ws.go b/subscriptions_transport_ws.go
@@ -155,7 +155,7 @@ func (stw *subscriptionsTransportWS) OnMessage(ctx *SubscriptionContext, subscri
 
 		// try to parse the error object
 		var payload interface{}
-		err := fmt.Errorf(string(message.Payload))
+		err := errors.New(string(message.Payload))
 		jsonErr := json.Unmarshal(message.Payload, &payload)
 		if jsonErr == nil {
 			var errMsg string