Merge pull request #47 from kshitij8/master

Adds unix socket based client transport provider

Author: xibz

Makefile

@@ -19,10 +19,10 @@ all: build
 test: all-tests
 
 unit-tests:
-	go test -short $(EXTRAGOARGS)
+	go test -short ./... $(EXTRAGOARGS)
 
 all-tests:
-	go test $(EXTRAGOARGS)
+	go test ./... $(EXTRAGOARGS)
 
 generate build clean:
 	go $@ $(EXTRAGOARGS)

client/client_transports.go

@@ -0,0 +1,39 @@
+package client
+
+import (
+	"context"
+	"github.com/go-openapi/runtime"
+	"net"
+	"net/http"
+
+	"github.com/sirupsen/logrus"
+
+	httptransport "github.com/go-openapi/runtime/client"
+)
+
+// NewUnixSocketTransport creates a new clientTransport configured at the specified Unix socketPath.
+func NewUnixSocketTransport(socketPath string, logger *logrus.Entry, debug bool) runtime.ClientTransport {
+	socketTransport := &http.Transport{
+		DialContext: func(ctx context.Context, network, path string) (net.Conn, error) {
+			addr, err := net.ResolveUnixAddr("unix", socketPath)
+			if err != nil {
+				return nil, err
+			}
+
+			return net.DialUnix("unix", nil, addr)
+		},
+	}
+
+	transport := httptransport.New(DefaultHost, DefaultBasePath, DefaultSchemes)
+	transport.Transport = socketTransport
+
+	if debug {
+		transport.SetDebug(debug)
+	}
+
+	if logger != nil {
+		transport.SetLogger(logger)
+	}
+
+	return transport
+}

client/client_transports_test.go

@@ -0,0 +1,58 @@
+package client
+
+import (
+	"github.com/firecracker-microvm/firecracker-go-sdk/client/operations"
+	"github.com/go-openapi/runtime"
+	"github.com/stretchr/testify/assert"
+	"net"
+	"testing"
+	"time"
+)
+
+func TestNewUnixSocketTransport(t *testing.T) {
+	done := make(chan bool)
+
+	expectedMessage := "PUT /logger HTTP/1.1\r\nHost: localhost\r\nUser-Agent: Go-http-client/1.1\r\nContent-Length: 0\r\nAccept: application/json\r\nContent-Type: application/json\r\nAccept-Encoding: gzip\r\n\r\n"
+	socketPath := "testingUnixSocket.sock"
+	addr, _ := net.ResolveUnixAddr("unix", socketPath)
+	listener, _ := net.ListenUnix("unix", addr)
+	defer listener.Close()
+
+	go func() {
+		conn, err := listener.AcceptUnix()
+		if err != nil {
+			t.Error(err)
+		}
+
+		buf := make([]byte, 512)
+		nr, err := conn.Read(buf)
+		if err != nil {
+			return
+		}
+
+		data := string(buf[0:nr])
+		assert.Equal(t, expectedMessage, data, "expectedMessage received on socket is different than what was sent")
+		done <- true
+	}()
+
+	unixTransport := NewUnixSocketTransport(socketPath, nil, false)
+
+	unixTransport.Submit(testOperation())
+
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Errorf("Timed out from the listener")
+	case <-done:
+	}
+}
+
+func testOperation() *runtime.ClientOperation {
+	return &runtime.ClientOperation{
+		ID:                 "putLogger",
+		Method:             "PUT",
+		PathPattern:        "/logger",
+		ProducesMediaTypes: []string{"application/json"},
+		Schemes:            []string{"http"},
+		Params:             operations.NewPutLoggerParams(),
+	}
+}

firecracker.go

@@ -15,17 +15,14 @@ package firecracker
 
 import (
 	"context"
-	"net"
-	"net/http"
+	"github.com/go-openapi/strfmt"
 	"time"
 
-	"github.com/go-openapi/strfmt"
 	"github.com/sirupsen/logrus"
 
 	"github.com/firecracker-microvm/firecracker-go-sdk/client"
 	models "github.com/firecracker-microvm/firecracker-go-sdk/client/models"
 	ops "github.com/firecracker-microvm/firecracker-go-sdk/client/operations"
-	httptransport "github.com/go-openapi/runtime/client"
 )
 
 const firecrackerRequestTimeout = 500 * time.Millisecond
@@ -37,33 +34,10 @@ type FirecrackerClient struct {
 
 // NewFirecrackerClient creates a FirecrackerClient
 func NewFirecrackerClient(socketPath string, logger *logrus.Entry, debug bool) *FirecrackerClient {
-	httpClient := client.NewHTTPClient(strfmt.NewFormats())
-
-	socketTransport := &http.Transport{
-		DialContext: func(ctx context.Context, network, path string) (net.Conn, error) {
-			addr, err := net.ResolveUnixAddr("unix", socketPath)
-			if err != nil {
-				return nil, err
-			}
-
-			return net.DialUnix("unix", nil, addr)
-		},
-	}
-
-	transport := httptransport.New(client.DefaultHost, client.DefaultBasePath, client.DefaultSchemes)
-	transport.Transport = socketTransport
-
-	if debug {
-		transport.SetDebug(debug)
-	}
-
-	if logger != nil {
-		transport.SetLogger(logger)
-	}
-
-	httpClient.SetTransport(transport)
+	unixTransport := client.NewUnixSocketTransport(socketPath, logger, debug)
+	firecracker := client.New(unixTransport, strfmt.NewFormats())
 
-	return &FirecrackerClient{client: httpClient}
+	return &FirecrackerClient{client: firecracker}
 }
 
 func (f *FirecrackerClient) PutLogger(ctx context.Context, logger *models.Logger) (*ops.PutLoggerNoContent, error) {

go.mod

@@ -8,5 +8,6 @@ require (
 	github.com/go-openapi/validate v0.17.1
 	github.com/golang/mock v1.1.1
 	github.com/sirupsen/logrus v1.1.1
+	github.com/stretchr/testify v1.2.2
 	golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519
 )