fix: make pkg client independent to other inner pkgs

apis/server/server.go

@@ -10,10 +10,10 @@ import (
 	"syscall"
 
 	"github.com/alibaba/pouch/apis/plugins"
+	"github.com/alibaba/pouch/client"
 	"github.com/alibaba/pouch/daemon/config"
 	"github.com/alibaba/pouch/daemon/mgr"
 
-	"github.com/alibaba/pouch/pkg/utils"
 	"github.com/sirupsen/logrus"
 )
 
@@ -44,7 +44,7 @@ func (s *Server) Start() (err error) {
 
 	var tlsConfig *tls.Config
 	if s.Config.TLS.Key != "" && s.Config.TLS.Cert != "" {
-		tlsConfig, err = utils.GenTLSConfig(s.Config.TLS.Key, s.Config.TLS.Cert, s.Config.TLS.CA)
+		tlsConfig, err = client.GenTLSConfig(s.Config.TLS.Key, s.Config.TLS.Cert, s.Config.TLS.CA)
 		if err != nil {
 			return err
 		}

cli/cli.go

@@ -7,7 +7,6 @@ import (
 	"text/tabwriter"
 
 	"github.com/alibaba/pouch/client"
-	"github.com/alibaba/pouch/pkg/utils"
 
 	"github.com/fatih/structs"
 	"github.com/sirupsen/logrus"
@@ -22,7 +21,7 @@ var pouchDescription = "pouch is a client side tool pouch to interact with daemo
 // Option uses to define the global options.
 type Option struct {
 	host string
-	TLS  utils.TLSConfig
+	TLS  client.TLSConfig
 }
 
 // Cli is the client's core struct, it will be used to manage all subcommand, send http request

client/client.go

@@ -3,15 +3,15 @@ package client
 import (
 	"context"
 	"crypto/tls"
+	"crypto/x509"
 	"fmt"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
 	"time"
-
-	"github.com/alibaba/pouch/pkg/utils"
 )
 
 var (
@@ -32,8 +32,16 @@ type APIClient struct {
 	version string
 }
 
+// TLSConfig contains information of tls which users can specify
+type TLSConfig struct {
+	CA           string `json:"tlscacert,omitempty"`
+	Cert         string `json:"tlscert,omitempty"`
+	Key          string `json:"tlskey,omitempty"`
+	VerifyRemote bool
+}
+
 // NewAPIClient initializes a new API client for the given host
-func NewAPIClient(host string, tls utils.TLSConfig) (CommonAPIClient, error) {
+func NewAPIClient(host string, tls TLSConfig) (CommonAPIClient, error) {
 	if host == "" {
 		host = defaultHost
 	}
@@ -110,10 +118,10 @@ func newHTTPClient(u *url.URL, tlsConfig *tls.Config) *http.Client {
 }
 
 // generateTLSConfig configures TLS for API Client.
-func generateTLSConfig(host string, tls utils.TLSConfig) *tls.Config {
+func generateTLSConfig(host string, tls TLSConfig) *tls.Config {
 	// init tls config
 	if tls.Key != "" && tls.Cert != "" && !strings.HasPrefix(host, "unix://") {
-		tlsCfg, err := utils.GenTLSConfig(tls.Key, tls.Cert, tls.CA)
+		tlsCfg, err := GenTLSConfig(tls.Key, tls.Cert, tls.CA)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "fail to parse tls config %v", err)
 			os.Exit(1)
@@ -125,7 +133,7 @@ func generateTLSConfig(host string, tls utils.TLSConfig) *tls.Config {
 	return nil
 }
 
-func generateBaseURL(u *url.URL, tls utils.TLSConfig) string {
+func generateBaseURL(u *url.URL, tls TLSConfig) string {
 	if tls.Key != "" && tls.Cert != "" && u.Scheme != "unix" {
 		return "https://" + u.Host
 	}
@@ -165,3 +173,29 @@ func (client *APIClient) GetAPIPath(path string, query url.Values) string {
 func (client *APIClient) UpdateClientVersion(v string) {
 	client.version = v
 }
+
+// GenTLSConfig returns a tls config object according to inputting parameters.
+func GenTLSConfig(key, cert, ca string) (*tls.Config, error) {
+	tlsConfig := &tls.Config{}
+	tlsCert, err := tls.LoadX509KeyPair(cert, key)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read X509 key pair (cert: %q, key: %q): %v", cert, key, err)
+	}
+	tlsConfig.Certificates = []tls.Certificate{tlsCert}
+	if ca == "" {
+		return tlsConfig, nil
+	}
+	cp, err := x509.SystemCertPool()
+	if err != nil {
+		return nil, fmt.Errorf("failed to read system certificates: %v", err)
+	}
+	pem, err := ioutil.ReadFile(ca)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read CA certificate %q: %v", ca, err)
+	}
+	if !cp.AppendCertsFromPEM(pem) {
+		return nil, fmt.Errorf("failed to append certificates from PEM file: %q", ca)
+	}
+	tlsConfig.ClientCAs = cp
+	return tlsConfig, nil
+}

client/client_test.go

@@ -1,11 +1,12 @@
 package client
 
 import (
+	"crypto/tls"
 	"fmt"
 	"net/url"
+	"reflect"
 	"testing"
 
-	"github.com/alibaba/pouch/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -23,7 +24,7 @@ func TestNewAPIClient(t *testing.T) {
 	}
 
 	for host, expectError := range kvs {
-		cli, err := NewAPIClient(host, utils.TLSConfig{})
+		cli, err := NewAPIClient(host, TLSConfig{})
 		if expectError {
 			assert.Error(err, fmt.Sprintf("test data: %v", host))
 		} else {
@@ -67,7 +68,7 @@ func TestParseHost(t *testing.T) {
 func Test_generateBaseURL(t *testing.T) {
 	type args struct {
 		u   *url.URL
-		tls utils.TLSConfig
+		tls TLSConfig
 	}
 	tests := []struct {
 		name string
@@ -84,3 +85,31 @@ func Test_generateBaseURL(t *testing.T) {
 		})
 	}
 }
+
+func TestGenTLSConfig(t *testing.T) {
+	type args struct {
+		key  string
+		cert string
+		ca   string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    *tls.Config
+		wantErr bool
+	}{
+	// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := GenTLSConfig(tt.args.key, tt.args.cert, tt.args.ca)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GenTLSConfig() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("GenTLSConfig() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

client/utils.go

@@ -2,15 +2,14 @@ package client
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
-
-	"github.com/pkg/errors"
 )
 
 func decodeBody(obj interface{}, body io.Reader) error {
 	if err := json.NewDecoder(body).Decode(obj); err != nil {
-		return errors.Wrap(err, "failed to decode body")
+		return fmt.Errorf("failed to decode body: %v", err)
 	}
 
 	return nil

daemon/config/config.go

@@ -1,9 +1,9 @@
 package config
 
 import (
+	"github.com/alibaba/pouch/client"
 	"github.com/alibaba/pouch/cri"
 	"github.com/alibaba/pouch/network"
-	"github.com/alibaba/pouch/pkg/utils"
 	"github.com/alibaba/pouch/volume"
 )
 
@@ -44,7 +44,7 @@ type Config struct {
 	ContainerdPath string `json:"containerd-path"`
 
 	// TLS configuration
-	TLS utils.TLSConfig
+	TLS client.TLSConfig
 
 	// Default OCI Runtime
 	DefaultRuntime string `json:"default-runtime,omitempty"`

test/environment/env.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/alibaba/pouch/pkg/utils"
+	"github.com/alibaba/pouch/client"
 	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
@@ -19,7 +19,7 @@ var (
 	PouchdUnixDomainSock = "/var/run/pouchd.sock"
 
 	// TLSConfig is default tls config
-	TLSConfig = utils.TLSConfig{}
+	TLSConfig = client.TLSConfig{}
 )
 
 // IsLinux checks if the OS of test environment is Linux.

test/request/request.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/alibaba/pouch/client"
-	"github.com/alibaba/pouch/pkg/utils"
 	"github.com/alibaba/pouch/test/environment"
 )
 
@@ -117,7 +116,7 @@ func Post(endpoint string, opts ...Option) (*http.Response, error) {
 // newAPIClient return new HTTP client with tls.
 //
 // FIXME: Could we make some functions exported in alibaba/pouch/client?
-func newAPIClient(host string, tls utils.TLSConfig) (*client.APIClient, error) {
+func newAPIClient(host string, tls client.TLSConfig) (*client.APIClient, error) {
 	commonAPIClient, err := client.NewAPIClient(host, tls)
 	if err != nil {
 		return nil, err