Skip to content

Commit

Permalink
Merge pull request #58 from xibz/client_transport
Browse files Browse the repository at this point in the history
client: moves transport files to firecracker package
  • Loading branch information
xibz authored Jan 30, 2019
2 parents 91b60ca + 89d5f84 commit 98c2a05
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions client/client_transports.go → client_transports.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package client
package firecracker

import (
"context"
"github.com/go-openapi/runtime"
"net"
"net/http"

httptransport "github.com/go-openapi/runtime/client"
"github.com/sirupsen/logrus"

httptransport "github.com/go-openapi/runtime/client"
"github.com/firecracker-microvm/firecracker-go-sdk/client"
)

// NewUnixSocketTransport creates a new clientTransport configured at the specified Unix socketPath.
Expand All @@ -24,7 +25,7 @@ func NewUnixSocketTransport(socketPath string, logger *logrus.Entry, debug bool)
},
}

transport := httptransport.New(DefaultHost, DefaultBasePath, DefaultSchemes)
transport := httptransport.New(client.DefaultHost, client.DefaultBasePath, client.DefaultSchemes)
transport.Transport = socketTransport

if debug {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package client
package firecracker

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion firecracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type FirecrackerClient struct {

// NewFirecrackerClient creates a FirecrackerClient
func NewFirecrackerClient(socketPath string, logger *logrus.Entry, debug bool) *FirecrackerClient {
unixTransport := client.NewUnixSocketTransport(socketPath, logger, debug)
unixTransport := NewUnixSocketTransport(socketPath, logger, debug)
firecracker := client.New(unixTransport, strfmt.NewFormats())

return &FirecrackerClient{client: firecracker}
Expand Down

0 comments on commit 98c2a05

Please sign in to comment.