From b90cfd848b92d7b6caf7e148e528ebfea94ac531 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@overmind.tech>
Date: Mon, 4 Dec 2023 19:05:02 +0100
Subject: [PATCH] Another try at handling NOTFOUND errors

Eventually we should change NOTFOUND to not be an error. This is not the
first time I tripped over this.
---
 go.sum         |  8 --------
 sdpws/utils.go | 16 ++++++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/go.sum b/go.sum
index 5223747..8ab5c1b 100644
--- a/go.sum
+++ b/go.sum
@@ -67,25 +67,17 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
-golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0=
-golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM=
 golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
 golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/sdpws/utils.go b/sdpws/utils.go
index b6ca0cf..13b490c 100644
--- a/sdpws/utils.go
+++ b/sdpws/utils.go
@@ -50,6 +50,7 @@ func (c *Client) Query(ctx context.Context, q *sdp.Query) ([]*sdp.Item, error) {
 
 	items := make([]*sdp.Item, 0)
 
+	var otherErr *sdp.QueryError
 readLoop:
 	for {
 		select {
@@ -69,14 +70,13 @@ readLoop:
 				log.WithContext(ctx).WithField("query", q).WithField("queryError", qe).Trace("received query error")
 				switch qe.ErrorType {
 				case sdp.QueryError_OTHER, sdp.QueryError_TIMEOUT, sdp.QueryError_NOSCOPE:
-					// ignore query errors, query status will end us
+					// record that we received an error, but continue reading
+					// if we receive any item, mapping was still successful
+					otherErr = qe
 					continue readLoop
 				case sdp.QueryError_NOTFOUND:
-					// drain the channel, end the query
-					for resp := range r {
-						log.WithContext(ctx).WithField("message", resp).Trace("skipped message")
-					}
-					break readLoop
+					// never record not found as an error
+					continue readLoop
 				}
 			case *sdp.GatewayResponse_QueryStatus:
 				qs := resp.GetQueryStatus()
@@ -90,8 +90,8 @@ readLoop:
 					return nil, errors.New("query cancelled")
 				case sdp.QueryStatus_ERRORED:
 					// if we already received items, we can ignore the error
-					if len(items) == 0 {
-						err = errors.New("query errored")
+					if len(items) == 0 && otherErr != nil {
+						err = fmt.Errorf("query errored: %v", otherErr.String())
 						// query errors should not abort the connection
 						// c.abort(ctx, err)
 						return nil, err