updating mergo.Merge() to version passing override functions

.gitignore

@@ -1,3 +1,3 @@
 cover.out
 vendor/*
-!vendor/vendor.json
+.idea/

Gopkg.toml

@@ -0,0 +1,11 @@
+[[constraint]]
+  name = "github.com/davecgh/go-spew"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/imdario/mergo"
+  version = "0.3.2"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/paybyphone/phpipam-sdk-go"

phpipam/phpipam.go

@@ -105,7 +105,7 @@ func (bis *BoolIntString) UnmarshalJSON(b []byte) error {
 	switch s {
 	case "0", "":
 		*bis = false
-	case "1":
+	case "1","4": // for the bizarre case when IPAM returns "4" as true
 		*bis = true
 	default:
 		return &json.UnmarshalTypeError{

phpipam/request/request.go

@@ -129,12 +129,26 @@ func newRequestResponse(r *http.Response) *requestResponse {
 func (r *Request) Send() error {
 	var req *http.Request
 	var err error
-	client := &http.Client{
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+
+	r.Session.RLock()
+	client := r.Session.HttpClient
+	r.Session.RUnlock()
+
+	if client == nil {
+		client = new(http.Client)
+	}
+
+	if client.CheckRedirect == nil {
+		client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
-		},
+		}
 	}
 
+	// Write the client back to the session object and re-use it next time
+	r.Session.Lock()
+	r.Session.HttpClient = client
+	r.Session.Unlock()
+
 	switch r.Method {
 	case "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE":
 		bs, err := json.Marshal(r.Input)

phpipam/session/session.go

@@ -4,6 +4,8 @@ package session
 import (
 	"github.com/imdario/mergo"
 	"github.com/paybyphone/phpipam-sdk-go/phpipam"
+	"net/http"
+	"sync"
 )
 
 // timeLayout represents the datetime format returned by the PHPIPAM api.
@@ -22,6 +24,12 @@ type Session struct {
 
 	// The session token.
 	Token Token
+
+	// A session shares this client if provided
+	HttpClient *http.Client
+
+	sync.RWMutex // protect updates of HttpClient
+
 }
 
 // NewSession creates a new session based off supplied configs. It is up to the
@@ -32,8 +40,17 @@ func NewSession(configs ...phpipam.Config) *Session {
 		Config: phpipam.DefaultConfigProvider(),
 	}
 	for _, v := range configs {
-		mergo.MergeWithOverwrite(&s.Config, v)
+		mergo.Merge(&s.Config, v, mergo.WithOverride)
 	}
 
 	return s
 }
+
+// SetHttpClient sets a specific http client with a particular transport etc
+// For backwards compatibility, a CheckRedirect function will be added at call time if not present
+func (s *Session) SetHttpClient(hc *http.Client) {
+	s.Lock()
+	s.HttpClient = hc
+	s.Unlock()
+}
+