From ee2386a08b91a66d74374472f00e4b421e6a4691 Mon Sep 17 00:00:00 2001 From: leonwanghui Date: Wed, 24 Oct 2018 14:24:31 +0800 Subject: [PATCH] Fix some format errors --- opensds-provisioner/cmd/provisioner/main.go | 3 +-- opensds-provisioner/pkg/client/client.go | 11 ++++++----- opensds-provisioner/pkg/volume/provision.go | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/opensds-provisioner/cmd/provisioner/main.go b/opensds-provisioner/cmd/provisioner/main.go index 9819fca1a..b3f30946a 100644 --- a/opensds-provisioner/cmd/provisioner/main.go +++ b/opensds-provisioner/cmd/provisioner/main.go @@ -19,10 +19,10 @@ package main import ( "flag" + "strings" "github.com/golang/glog" "github.com/kubernetes-incubator/external-storage/lib/controller" - "github.com/opensds/nbp/opensds-provisioner/pkg/client" "github.com/opensds/nbp/opensds-provisioner/pkg/volume" "k8s.io/apimachinery/pkg/util/validation" @@ -31,7 +31,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "strings" ) var ( diff --git a/opensds-provisioner/pkg/client/client.go b/opensds-provisioner/pkg/client/client.go index aaa5a6026..9f07220d3 100644 --- a/opensds-provisioner/pkg/client/client.go +++ b/opensds-provisioner/pkg/client/client.go @@ -18,17 +18,18 @@ package client import ( "fmt" + "os" + "strconv" + "github.com/opensds/opensds/client" "github.com/opensds/opensds/pkg/model" "github.com/opensds/opensds/pkg/utils/constants" - "os" - "strconv" ) const ( // OpenSDSEndPoint environment variable name OpenSDSEndPoint = "OPENSDS_ENDPOINT" - + // OpenSDSAuthStrategy environment variable name OpenSDSAuthStrategy = "OPENSDS_AUTH_STRATEGY" ) @@ -108,9 +109,9 @@ func getSdsClient(endpoint string, authStrategy string) *client.Client { // Using default auth strategy authStrategy = "noauth" } - + cfg := &client.Config{Endpoint: endpoint} - + switch authStrategy { case client.Keystone: cfg.AuthOptions = client.LoadKeystoneAuthOptionsFromEnv() diff --git a/opensds-provisioner/pkg/volume/provision.go b/opensds-provisioner/pkg/volume/provision.go index b61ba745f..28a4f2cb5 100644 --- a/opensds-provisioner/pkg/volume/provision.go +++ b/opensds-provisioner/pkg/volume/provision.go @@ -18,6 +18,8 @@ limitations under the License. package volume import ( + "strconv" + "github.com/golang/glog" "github.com/kubernetes-incubator/external-storage/lib/controller" "github.com/opensds/nbp/opensds-provisioner/pkg/client" @@ -26,7 +28,6 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/pkg/volume" - "strconv" ) const (