go.mod

@@ -1,15 +1,12 @@
 module go.unistack.org/micro-client-http/v3
 
-go 1.22
+go 1.20
 
-toolchain go1.23.1
-
-require go.unistack.org/micro/v3 v3.10.97
+require go.unistack.org/micro/v3 v3.10.69
 
 require (
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 )

go.sum

@@ -1,39 +1,13 @@
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
 go.unistack.org/micro/v3 v3.10.69 h1:V4g9LqUhzGab73U2aevnjtffCdJqGTuMfWY7fy4qGwI=
 go.unistack.org/micro/v3 v3.10.69/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-go.unistack.org/micro/v3 v3.10.88 h1:MxlzP+77Y6Kphb3lzHxROL4XfE/WdCQMQpnPv4D9Z8U=
-go.unistack.org/micro/v3 v3.10.88/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-go.unistack.org/micro/v3 v3.10.91 h1:vuJY4tXwpqimwIkEJ3TozMYNVQQs+C5QMlQWPgSY/YM=
-go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
-go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
 golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
 golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
 google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
 google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
-google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
-google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
-google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
-google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

http_test.go

@@ -1,36 +1,18 @@
 package http
 
 import (
-	"encoding/json"
-	"fmt"
 	"net/url"
 	"strings"
 	"testing"
 )
 
-func TestNestedPathPost(t *testing.T) {
-	req := &request{Name: "first", Field1: "fieldval"}
-	p, m, err := newPathRequest("/api/v1/xxxx", "POST", "*", req, []string{"json", "protobuf"}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	u, err := url.Parse(p)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s := u.String(); s != "/api/v1/xxxx" {
-		t.Fatalf("nested path error %s", s)
-	}
-	_ = m
-}
-
 type request struct {
-	NestedTest *request `json:"nested_test,omitempty"`
-	Name       string   `json:"name,omitempty"`
-	Field1     string   `json:"field1,omitempty"`
-	ClientID   string   `json:",omitempty"`
-	Field2     string   `json:",omitempty"`
-	Field3     int64    `json:",omitempty"`
+	NestedTest *request `json:"nested_test"`
+	Name       string   `json:"name"`
+	Field1     string   `json:"field1"`
+	ClientID   string
+	Field2     string
+	Field3     int64
 }
 
 func TestNestedPath(t *testing.T) {
@@ -43,14 +25,10 @@ func TestNestedPath(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if s := u.String(); s != "/api/v1/first/second" {
+	if s := u.String(); s != "/api/v1/first/second?field1=fieldval" {
 		t.Fatalf("nested path error %s", s)
 	}
-	b, err := json.Marshal(m)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Printf("m %#+v %s\n", m, b)
+	_ = m
 }
 
 func TestPathWithHeader(t *testing.T) {

stream.go

@@ -134,14 +134,14 @@ func (h *httpStream) parseRsp(ctx context.Context, log logger.Logger, hrsp *http
 			buf, err = io.ReadAll(hrsp.Body)
 			if err != nil {
 				if log.V(logger.ErrorLevel) {
-					log.Error(ctx, "failed to read body", err)
+					log.Errorf(ctx, "failed to read body: %v", err)
 				}
 				return errors.InternalServerError("go.micro.client", string(buf))
 			}
 		}
 
 		if log.V(logger.DebugLevel) {
-			log.Debug(ctx, fmt.Sprintf("response %s with %v", buf, hrsp.Header))
+			log.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
 		}
 
 		if hrsp.StatusCode < 400 {

util.go

@@ -195,23 +195,24 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 					cleanPath[strings.Join(clean, ".")] = true
 				}
 			}
+
+			if (body == "*" || body == t.name) && method != http.MethodGet {
+				if tnmsg.Field(i).CanSet() {
+					tnmsg.Field(i).Set(val)
+				}
+			}
 			for k := range cleanPath {
 				if err = rutil.ZeroFieldByPath(nmsg, k); err != nil {
 					return "", nil, err
 				}
 			}
-			if (body == "*" || body == t.name) && method != http.MethodGet {
-				if tnmsg.Field(i).CanSet() {
-					tnmsg.Field(i).Set(val)
-				}
-			} else if method == http.MethodGet {
-				if val.Type().Kind() == reflect.Slice {
-					for idx := 0; idx < val.Len(); idx++ {
-						values.Add(t.name, getParam(val.Index(idx)))
-					}
-				} else if !rutil.IsEmpty(val) {
-					values.Add(t.name, getParam(val))
+
+			if val.Type().Kind() == reflect.Slice {
+				for idx := 0; idx < val.Len(); idx++ {
+					values.Add(t.name, getParam(val.Index(idx)))
 				}
+			} else if !rutil.IsEmpty(val) {
+				values.Add(t.name, getParam(val))
 			}
 
 		}
@@ -265,8 +266,6 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 		_, _ = b.WriteString(values.Encode())
 	}
 
-	// rutil.ZeroEmpty(tnmsg.Interface())
-
 	if rutil.IsZero(nmsg) && !isEmptyStruct(nmsg) {
 		return b.String(), nil, nil
 	}

util_test.go

@@ -1,7 +1,6 @@
 package http
 
 import (
-	"net/http"
 	"net/url"
 	"testing"
 )
@@ -53,16 +52,10 @@ func TestNewPathRequest(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		switch m {
-		case http.MethodPost, http.MethodPut, http.MethodPatch, http.MethodDelete:
-			break
-		case http.MethodGet:
-			vals := u.Query()
-			if v, ok := vals["name"]; !ok || v[0] != "test_name" {
-				t.Fatalf("%s invalid path: %v nmsg: %v", m, path, nmsg)
-			}
+		vals := u.Query()
+		if v, ok := vals["name"]; !ok || v[0] != "test_name" {
+			t.Fatalf("invalid path: %v nmsg: %v", path, nmsg)
 		}
-
 	}
 }