vendor update

Signed-off-by: Harsh Desai <[email protected]>
Signed-off-by: pault84 <[email protected]>

Author: harsh-px

Makefile

@@ -121,6 +121,10 @@ build-kdmp:
 	-X github.com/portworx/kdmp/pkg/version.buildDate=${BUILD_DATE}" \
 	$(BASE_DIR)/cmd/kdmp
 
+build-encryptor:
+	@echo "Build encryptor"
+	@cd cmd/3ncryptor/ && go build -o ../../bin/3ncryptor -ldflags="-s" .
+
 container-kdmp:
 	@echo "Build kdmp docker image"
 	docker build --tag $(DOCKER_IMAGE) .

cmd/3ncryptor/3ncryptor.go

@@ -0,0 +1,111 @@
+package sdk
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net"
+	"net/url"
+	"os"
+
+	httpclient "github.com/libopenstorage/openstorage/api/client"
+	volumeclient "github.com/libopenstorage/openstorage/api/client/volume"
+	"github.com/libopenstorage/openstorage/volume"
+	"github.com/sirupsen/logrus"
+)
+
+var (
+	schedVolDriver volume.VolumeDriver
+	token          string
+	UseTLS         bool
+	tokenEndPoint  string
+	tlsConfig      *tls.Config
+)
+
+// InitVolDriver inits vol driver
+func InitVolDriver(host string, port string, auth_token string) error {
+	if len(auth_token) != 0 {
+		token = auth_token
+	}
+
+	schedClient, err := getNewVolumeclient(host, port, "pxd")
+	if err != nil {
+		logrus.Errorf("Error while initializing PX CLI for scheduler")
+		os.Exit(-1)
+	}
+
+	schedVolDriver = volumeclient.VolumeDriver(schedClient)
+	return nil
+}
+
+func getNewVolumeclient(endpoint, port, driverName string) (*httpclient.Client, error) {
+	return getNewAuthVolumeclient(endpoint, port, token, driverName)
+}
+
+// GetNewAuthVolumeclient create volume api client with auth token
+func getNewAuthVolumeclient(endpoint, port, bearerToken, driverName string) (*httpclient.Client, error) {
+	if len(endpoint) > 0 && len(port) > 0 {
+		endpoint = buildHTTPSEndpoint(endpoint, port)
+	} else if len(tokenEndPoint) > 0 {
+		endpoint = tokenEndPoint
+	}
+
+	driverVersion := "v1"
+
+	if driverName == "" {
+		driverName = "pxd"
+	}
+
+	var (
+		clnt *httpclient.Client
+		err  error
+	)
+	if len(bearerToken) != 0 {
+		clnt, err = volumeclient.NewAuthDriverClient(endpoint, driverName, driverVersion, bearerToken, "", driverName)
+	} else {
+		clnt, err = volumeclient.NewDriverClient(endpoint, driverName, driverVersion, driverName)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	if UseTLS && !IsUnixDomainSocket(endpoint) {
+		clnt.SetTLS(tlsConfig)
+	}
+
+	return clnt, nil
+}
+
+// BuildHTTPSEndpoint create http endpoint URL
+func buildHTTPSEndpoint(host string, port string) string {
+	if IsUnixDomainSocket(host) {
+		return host
+	}
+	endpoint := &url.URL{}
+	endpoint.Scheme = "http"
+	endpoint.Host = fmt.Sprintf("%s:%s", host, port)
+
+	if UseTLS {
+		endpoint.Scheme = "https"
+	}
+	return endpoint.String()
+}
+
+// IsUnixDomainSocket is a helper method that checks if the host is a unix DS endpoint in the format unix://<path>
+func IsUnixDomainSocket(host string) bool {
+	// Check if it is a unix:// URL
+	u, err := url.Parse(host)
+	if err == nil {
+		// Check if host just has an IP
+		if u.Scheme == "unix" {
+			return true
+		}
+		if !u.IsAbs() && net.ParseIP(host) == nil {
+			return true
+		}
+	}
+	return false
+}
+
+func GetVolumeDriver() volume.VolumeDriver {
+	return schedVolDriver
+}

cmd/3ncryptor/sdk/sdk.go

@@ -15,6 +15,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0
 	github.com/urfave/cli v1.22.2
+	golang.org/x/mod v0.4.2 // indirect
 	golang.org/x/tools v0.0.0-20200408132156-9ee5ef7a2c0d // indirect
 	k8s.io/api v0.17.0
 	k8s.io/apiextensions-apiserver v0.16.6

go.mod

@@ -81,6 +81,7 @@ github.com/brancz/gojsontoyaml v0.0.0-20190425155809-e8bd32d46b3d/go.mod h1:IyUJ
 github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E=
 github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8=
 github.com/cenk/backoff v2.0.0+incompatible/go.mod h1:7FtoeaSnHoZnmZzz47cM35Y9nSW7tNyaidugnHTaFDE=
+github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY=
 github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -759,6 +760,8 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

go.sum

@@ -11,6 +11,8 @@ github.com/PuerkitoBio/urlesc
 github.com/asaskevich/govalidator
 # github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973
 github.com/beorn7/perks/quantile
+# github.com/cenkalti/backoff v2.1.1+incompatible
+github.com/cenkalti/backoff
 # github.com/cheynewallace/tabby v1.1.0
 github.com/cheynewallace/tabby
 # github.com/coreos/go-oidc v2.1.0+incompatible
@@ -105,7 +107,12 @@ github.com/kubernetes-incubator/external-storage/snapshot/pkg/apis/crd/v1
 github.com/kubernetes-incubator/external-storage/snapshot/pkg/client
 # github.com/libopenstorage/openstorage v8.0.0+incompatible
 github.com/libopenstorage/openstorage/api
+github.com/libopenstorage/openstorage/api/client
+github.com/libopenstorage/openstorage/api/client/volume
+github.com/libopenstorage/openstorage/api/errors
 github.com/libopenstorage/openstorage/pkg/auth
+github.com/libopenstorage/openstorage/pkg/options
+github.com/libopenstorage/openstorage/volume
 # github.com/libopenstorage/openstorage-sdk-clients v0.69.27
 github.com/libopenstorage/openstorage-sdk-clients/sdk/golang
 # github.com/libopenstorage/stork v1.3.0-beta1.0.20200630005842-9255e7a98775
@@ -196,9 +203,10 @@ golang.org/x/crypto/ed25519
 golang.org/x/crypto/ed25519/internal/edwards25519
 golang.org/x/crypto/pbkdf2
 golang.org/x/crypto/ssh/terminal
-# golang.org/x/mod v0.2.0
+# golang.org/x/mod v0.4.2
 golang.org/x/mod/module
 golang.org/x/mod/semver
+golang.org/x/mod/sumdb/dirhash
 # golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
 golang.org/x/net/context
 golang.org/x/net/context/ctxhttp