Merge pull request #340 from go-resty/dev-iteration

Dev iteration

Author: jeevatkm

.travis.yml

@@ -3,7 +3,7 @@ language: go
 sudo: false
 
 go: # use travis ci resource effectively, keep always latest 2 versions and tip :) 
-  - 1.12.x
+  - 1.14.x
   - 1.13.x
   - tip
 

client.go

@@ -15,12 +15,10 @@ import (
 	"io"
 	"io/ioutil"
 	"math"
-	"net"
 	"net/http"
 	"net/url"
 	"reflect"
 	"regexp"
-	"runtime"
 	"strings"
 	"sync"
 	"time"
@@ -961,23 +959,3 @@ func createClient(hc *http.Client) *Client {
 
 	return c
 }
-
-func createTransport(localAddr net.Addr) *http.Transport {
-	dialer := &net.Dialer{
-		Timeout:   30 * time.Second,
-		KeepAlive: 30 * time.Second,
-		DualStack: true,
-	}
-	if localAddr != nil {
-		dialer.LocalAddr = localAddr
-	}
-	return &http.Transport{
-		Proxy:                 http.ProxyFromEnvironment,
-		DialContext:           dialer.DialContext,
-		MaxIdleConns:          100,
-		IdleConnTimeout:       90 * time.Second,
-		TLSHandshakeTimeout:   10 * time.Second,
-		ExpectContinueTimeout: 1 * time.Second,
-		MaxIdleConnsPerHost:   runtime.GOMAXPROCS(0) + 1,
-	}
-}

client_test.go

@@ -107,11 +107,13 @@ func TestClientRedirectPolicy(t *testing.T) {
 	c := dc().SetRedirectPolicy(FlexibleRedirectPolicy(20))
 	_, err := c.R().Get(ts.URL + "/redirect-1")
 
-	assertEqual(t, "Get /redirect-21: stopped after 20 redirects", err.Error())
+	assertEqual(t, true, ("Get /redirect-21: stopped after 20 redirects" == err.Error() ||
+		"Get \"/redirect-21\": stopped after 20 redirects" == err.Error()))
 
 	c.SetRedirectPolicy(NoRedirectPolicy())
 	_, err = c.R().Get(ts.URL + "/redirect-1")
-	assertEqual(t, "Get /redirect-2: auto redirect is disabled", err.Error())
+	assertEqual(t, true, ("Get /redirect-2: auto redirect is disabled" == err.Error() ||
+		"Get \"/redirect-2\": auto redirect is disabled" == err.Error()))
 }
 
 func TestClientTimeout(t *testing.T) {

context_test.go

@@ -192,7 +192,8 @@ func TestClientRetryWithSetContext(t *testing.T) {
 		SetContext(context.Background()).
 		Get(ts.URL + "/")
 
-	assertEqual(t, true, strings.HasPrefix(err.Error(), "Get "+ts.URL+"/"))
+	assertEqual(t, true, (strings.HasPrefix(err.Error(), "Get "+ts.URL+"/") ||
+		strings.HasPrefix(err.Error(), "Get \""+ts.URL+"/\"")))
 }
 
 func TestRequestContext(t *testing.T) {

middleware.go

@@ -314,6 +314,7 @@ func responseLogger(c *Client, res *Response) error {
 		debugLog := res.Request.values[debugRequestLogKey].(string)
 		debugLog += "~~~ RESPONSE ~~~\n" +
 			fmt.Sprintf("STATUS       : %s\n", res.Status()) +
+			fmt.Sprintf("PROTO        : %s\n", res.RawResponse.Proto) +
 			fmt.Sprintf("RECEIVED AT  : %v\n", res.ReceivedAt().Format(time.RFC3339Nano)) +
 			fmt.Sprintf("TIME DURATION: %v\n", res.Time()) +
 			"HEADERS      :\n" +

request_test.go

@@ -38,6 +38,7 @@ func TestGet(t *testing.T) {
 
 	assertError(t, err)
 	assertEqual(t, http.StatusOK, resp.StatusCode())
+	assertEqual(t, "HTTP/1.1", resp.Proto())
 	assertEqual(t, "200 OK", resp.Status())
 	assertNotNil(t, resp.Body())
 	assertEqual(t, "TestGet: text response", resp.String())
@@ -56,6 +57,7 @@ func TestGetCustomUserAgent(t *testing.T) {
 
 	assertError(t, err)
 	assertEqual(t, http.StatusOK, resp.StatusCode())
+	assertEqual(t, "HTTP/1.1", resp.Proto())
 	assertEqual(t, "200 OK", resp.Status())
 	assertEqual(t, "TestGet: text response", resp.String())
 
@@ -80,6 +82,7 @@ func TestGetClientParamRequestParam(t *testing.T) {
 
 	assertError(t, err)
 	assertEqual(t, http.StatusOK, resp.StatusCode())
+	assertEqual(t, "HTTP/1.1", resp.Proto())
 	assertEqual(t, "200 OK", resp.Status())
 	assertEqual(t, "TestGet: text response", resp.String())
 
@@ -825,20 +828,8 @@ func TestGetWithCookies(t *testing.T) {
 	ts := createGetServer(t)
 	defer ts.Close()
 
-	cookies := []*http.Cookie{
-		{
-			Name:  "go-resty-1",
-			Value: "This is cookie 1 value",
-		},
-		{
-			Name:  "go-resty-2",
-			Value: "This is cookie 2 value",
-		},
-	}
-
 	c := dc()
-	c.SetHostURL(ts.URL).
-		SetCookies(cookies)
+	c.SetHostURL(ts.URL).SetDebug(true)
 
 	tu, _ := url.Parse(ts.URL)
 	c.GetClient().Jar.SetCookies(tu, []*http.Cookie{
@@ -852,10 +843,26 @@ func TestGetWithCookies(t *testing.T) {
 		},
 	})
 
-	resp, err := c.R().
-		SetCookie(&http.Cookie{
+	resp, err := c.R().SetHeader("Cookie", "").Get("mypage2")
+	assertError(t, err)
+	assertEqual(t, http.StatusOK, resp.StatusCode())
+
+	// Client cookies
+	c.SetCookies([]*http.Cookie{
+		{
 			Name:  "go-resty-1",
-			Value: "This is cookie 1 value additional append",
+			Value: "This is cookie 1 value",
+		},
+		{
+			Name:  "go-resty-2",
+			Value: "This is cookie 2 value",
+		},
+	})
+
+	resp, err = c.R().
+		SetCookie(&http.Cookie{
+			Name:  "req-go-resty-1",
+			Value: "This is request cookie 1 value additional append",
 		}).
 		Get("mypage2")
 
@@ -952,7 +959,8 @@ func TestHTTPAutoRedirectUpTo10(t *testing.T) {
 
 	_, err := dc().R().Get(ts.URL + "/redirect-1")
 
-	assertEqual(t, "Get /redirect-11: stopped after 10 redirects", err.Error())
+	assertEqual(t, true, ("Get /redirect-11: stopped after 10 redirects" == err.Error() ||
+		"Get \"/redirect-11\": stopped after 10 redirects" == err.Error()))
 }
 
 func TestHostCheckRedirectPolicy(t *testing.T) {
@@ -1119,11 +1127,13 @@ func TestGetClient(t *testing.T) {
 func TestIncorrectURL(t *testing.T) {
 	c := dc()
 	_, err := c.R().Get("//not.a.user@%66%6f%6f.com/just/a/path/also")
-	assertEqual(t, true, strings.Contains(err.Error(), "parse //not.a.user@%66%6f%6f.com/just/a/path/also"))
+	assertEqual(t, true, (strings.Contains(err.Error(), "parse //not.a.user@%66%6f%6f.com/just/a/path/also") ||
+		strings.Contains(err.Error(), "parse \"//not.a.user@%66%6f%6f.com/just/a/path/also\"")))
 
 	c.SetHostURL("//not.a.user@%66%6f%6f.com")
 	_, err1 := c.R().Get("/just/a/path/also")
-	assertEqual(t, true, strings.Contains(err1.Error(), "parse //not.a.user@%66%6f%6f.com/just/a/path/also"))
+	assertEqual(t, true, (strings.Contains(err1.Error(), "parse //not.a.user@%66%6f%6f.com/just/a/path/also") ||
+		strings.Contains(err1.Error(), "parse \"//not.a.user@%66%6f%6f.com/just/a/path/also\"")))
 }
 
 func TestDetectContentTypeForPointer(t *testing.T) {

response.go

@@ -55,6 +55,14 @@ func (r *Response) StatusCode() int {
 	return r.RawResponse.StatusCode
 }
 
+// Proto method returns the HTTP response protocol used for the request.
+func (r *Response) Proto() string {
+	if r.RawResponse == nil {
+		return ""
+	}
+	return r.RawResponse.Proto
+}
+
 // Result method returns the response value as an object if it has one
 func (r *Response) Result() interface{} {
 	return r.Request.Result

retry_test.go

@@ -146,12 +146,14 @@ func TestClientRetryGet(t *testing.T) {
 
 	resp, err := c.R().Get(ts.URL + "/set-retrycount-test")
 	assertEqual(t, "", resp.Status())
+	assertEqual(t, "", resp.Proto())
 	assertEqual(t, 0, resp.StatusCode())
 	assertEqual(t, 0, len(resp.Cookies()))
 	assertNotNil(t, resp.Body())
 	assertEqual(t, 0, len(resp.Header()))
 
-	assertEqual(t, true, strings.HasPrefix(err.Error(), "Get "+ts.URL+"/set-retrycount-test"))
+	assertEqual(t, true, (strings.HasPrefix(err.Error(), "Get "+ts.URL+"/set-retrycount-test") ||
+		strings.HasPrefix(err.Error(), "Get \""+ts.URL+"/set-retrycount-test\"")))
 }
 
 func TestClientRetryWait(t *testing.T) {
@@ -608,6 +610,7 @@ func TestClientRetryCount(t *testing.T) {
 
 	resp, err := c.R().Get(ts.URL + "/set-retrycount-test")
 	assertEqual(t, "", resp.Status())
+	assertEqual(t, "", resp.Proto())
 	assertEqual(t, 0, resp.StatusCode())
 	assertEqual(t, 0, len(resp.Cookies()))
 	assertNotNil(t, resp.Body())
@@ -616,7 +619,8 @@ func TestClientRetryCount(t *testing.T) {
 	// 2 attempts were made
 	assertEqual(t, attempt, 2)
 
-	assertEqual(t, true, strings.HasPrefix(err.Error(), "Get "+ts.URL+"/set-retrycount-test"))
+	assertEqual(t, true, (strings.HasPrefix(err.Error(), "Get "+ts.URL+"/set-retrycount-test") ||
+		strings.HasPrefix(err.Error(), "Get \""+ts.URL+"/set-retrycount-test\"")))
 }
 
 func filler(*Response, error) bool {

transport.go

@@ -0,0 +1,35 @@
+// +build go1.13
+
+// Copyright (c) 2015-2020 Jeevanandam M ([email protected]), All rights reserved.
+// resty source code and usage is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package resty
+
+import (
+	"net"
+	"net/http"
+	"runtime"
+	"time"
+)
+
+func createTransport(localAddr net.Addr) *http.Transport {
+	dialer := &net.Dialer{
+		Timeout:   30 * time.Second,
+		KeepAlive: 30 * time.Second,
+		DualStack: true,
+	}
+	if localAddr != nil {
+		dialer.LocalAddr = localAddr
+	}
+	return &http.Transport{
+		Proxy:                 http.ProxyFromEnvironment,
+		DialContext:           dialer.DialContext,
+		ForceAttemptHTTP2:     true,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		MaxIdleConnsPerHost:   runtime.GOMAXPROCS(0) + 1,
+	}
+}

transport112.go

@@ -0,0 +1,34 @@
+// +build !go1.13
+
+// Copyright (c) 2015-2020 Jeevanandam M ([email protected]), All rights reserved.
+// resty source code and usage is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package resty
+
+import (
+	"net"
+	"net/http"
+	"runtime"
+	"time"
+)
+
+func createTransport(localAddr net.Addr) *http.Transport {
+	dialer := &net.Dialer{
+		Timeout:   30 * time.Second,
+		KeepAlive: 30 * time.Second,
+		DualStack: true,
+	}
+	if localAddr != nil {
+		dialer.LocalAddr = localAddr
+	}
+	return &http.Transport{
+		Proxy:                 http.ProxyFromEnvironment,
+		DialContext:           dialer.DialContext,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		MaxIdleConnsPerHost:   runtime.GOMAXPROCS(0) + 1,
+	}
+}

util.go

@@ -297,11 +297,13 @@ func composeHeaders(c *Client, r *Request, hdrs http.Header) string {
 		var v string
 		if k == "Cookie" {
 			cv := strings.TrimSpace(strings.Join(hdrs[k], ", "))
-			for _, c := range c.GetClient().Jar.Cookies(r.RawRequest.URL) {
-				if cv != "" {
-					cv = cv + "; " + c.String()
-				} else {
-					cv = c.String()
+			if c.GetClient().Jar != nil {
+				for _, c := range c.GetClient().Jar.Cookies(r.RawRequest.URL) {
+					if cv != "" {
+						cv = cv + "; " + c.String()
+					} else {
+						cv = c.String()
+					}
 				}
 			}
 			v = strings.TrimSpace(fmt.Sprintf("%25s: %s", k, cv))