Snapshot: fix gofmt and golint errors

kubernetes-retired · Sep 4, 2017 · 0c2b15a · 0c2b15a
1 parent 01fddeb
commit 0c2b15a
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/snapshot/cmd/snapshot-pv-provisioner/snapshot-pv-provisioner.go b/snapshot/cmd/snapshot-pv-provisioner/snapshot-pv-provisioner.go
@@ -34,11 +34,11 @@ import (
 	"github.com/kubernetes-incubator/external-storage/snapshot/pkg/volume/cinder"
 	"github.com/kubernetes-incubator/external-storage/snapshot/pkg/volume/gce_pd"
 	"github.com/kubernetes-incubator/external-storage/snapshot/pkg/volume/hostpath"
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/api/core/v1"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -134,7 +134,7 @@ func (p *snapshotProvisioner) Provision(options controller.VolumeOptions) (*v1.P
 	}
 	// FIXME: should also check if any VolumeSnapshotData points to this VolumeSnapshot
 	if len(snapshot.Spec.SnapshotDataName) == 0 {
-		return nil, fmt.Errorf("VolumeSnapshot %s is not bound to any VolumeSnapshotData", snapshotName, err)
+		return nil, fmt.Errorf("VolumeSnapshot %s is not bound to any VolumeSnapshotData", snapshotName)
 	}
 	var snapshotData crdv1.VolumeSnapshotData
 	err = p.crdclient.Get().
@@ -191,7 +191,7 @@ func (p *snapshotProvisioner) Delete(volume *v1.PersistentVolume) error {
 		return errors.New("identity annotation not found on PV")
 	}
 	if ann != p.identity {
-		return &controller.IgnoredError{"identity annotation on PV does not match ours"}
+		return &controller.IgnoredError{Reason: "identity annotation on PV does not match ours"}
 	}
 
 	volumeType := crdv1.GetSupportedVolumeFromPVSpec(&volume.Spec)

diff --git a/snapshot/pkg/apis/crd/v1/types.go b/snapshot/pkg/apis/crd/v1/types.go
@@ -235,9 +235,9 @@ func GetSupportedVolumeFromPVSpec(spec *core_v1.PersistentVolumeSpec) string {
 	if spec.GCEPersistentDisk != nil {
 		return "gce-pd"
 	}
-        if spec.Cinder != nil {
-                return "cinder"
-        }
+	if spec.Cinder != nil {
+		return "cinder"
+	}
 	return ""
 }
 

diff --git a/snapshot/pkg/client/client.go b/snapshot/pkg/client/client.go
@@ -22,14 +22,14 @@ import (
 
 	"github.com/golang/glog"
 	crdv1 "github.com/kubernetes-incubator/external-storage/snapshot/pkg/apis/crd/v1"
+	apiv1 "k8s.io/api/core/v1"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/util/wait"
-	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/rest"
 )
 

diff --git a/snapshot/pkg/cloudprovider/providers/aws/aws_test.go b/snapshot/pkg/cloudprovider/providers/aws/aws_test.go
@@ -28,9 +28,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/golang/glog"
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/api/core/v1"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

diff --git a/snapshot/pkg/cloudprovider/providers/openstack/openstack.go b/snapshot/pkg/cloudprovider/providers/openstack/openstack.go
@@ -37,10 +37,10 @@ import (
 	"gopkg.in/gcfg.v1"
 
 	"github.com/kubernetes-incubator/external-storage/snapshot/pkg/cloudprovider"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	netutil "k8s.io/apimachinery/pkg/util/net"
 	certutil "k8s.io/client-go/util/cert"
-	"k8s.io/api/core/v1"
 	"k8s.io/kubernetes/pkg/controller"
 )
 
@@ -179,13 +179,13 @@ func (c *Caller) Call(f func()) {
 }
 
 func init() {
-        cloudprovider.RegisterCloudProvider(ProviderName, func(config io.Reader) (cloudprovider.Interface, error) {
-                cfg, err := readConfig(config)
-                if err != nil {
-                        return nil, err
-                }
-                return newOpenStack(cfg)
-        })
+	cloudprovider.RegisterCloudProvider(ProviderName, func(config io.Reader) (cloudprovider.Interface, error) {
+		cfg, err := readConfig(config)
+		if err != nil {
+			return nil, err
+		}
+		return newOpenStack(cfg)
+	})
 }
 
 func newOpenStack(cfg Config) (*OpenStack, error) {

diff --git a/snapshot/pkg/cloudprovider/providers/openstack/openstack_snapshots.go b/snapshot/pkg/cloudprovider/providers/openstack/openstack_snapshots.go
@@ -73,16 +73,16 @@ func (snapshots *SnapshotsV2) createSnapshot(opts SnapshotCreateOpts) (string, e
 
 func (snapshots *SnapshotsV2) getSnapshot(snapshotID string) (Snapshot, error) {
 	var snap Snapshot
-        glog.Infof("getSnapshot for snapshotID: %s.", snapshotID)
-        snapshot, err := snapshotsV2.Get(snapshots.blockstorage, snapshotID).Extract()
-        if err != nil {
-                return snap, err
-        }
-        glog.Infof("Snapshot details: %#v", snapshot)
-        snap.ID = snapshot.ID
-        snap.Name = snapshot. Name
-        snap.Status = snapshot.Status
-        snap.SourceVolumeID = snapshot.VolumeID
+	glog.Infof("getSnapshot for snapshotID: %s.", snapshotID)
+	snapshot, err := snapshotsV2.Get(snapshots.blockstorage, snapshotID).Extract()
+	if err != nil {
+		return snap, err
+	}
+	glog.Infof("Snapshot details: %#v", snapshot)
+	snap.ID = snapshot.ID
+	snap.Name = snapshot.Name
+	snap.Status = snapshot.Status
+	snap.SourceVolumeID = snapshot.VolumeID
 
 	return snap, nil
 }

diff --git a/snapshot/pkg/controller/snapshot-controller/snapshot-controller.go b/snapshot/pkg/controller/snapshot-controller/snapshot-controller.go
@@ -24,8 +24,8 @@ import (
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"k8s.io/client-go/kubernetes"
 	apiv1 "k8s.io/api/core/v1"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	kcache "k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"

diff --git a/snapshot/pkg/controller/snapshotter/snapshotter.go b/snapshot/pkg/controller/snapshotter/snapshotter.go
@@ -22,11 +22,11 @@ import (
 
 	"github.com/golang/glog"
 
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/client-go/kubernetes"
-	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/kubernetes/pkg/util/goroutinemap"
 	"k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff"
@@ -102,7 +102,7 @@ func (vs *volumeSnapshotter) getPVFromVolumeSnapshot(snapshotName string, snapsh
 		return nil, fmt.Errorf("Failed to retrieve PVC %s from the API server: %q", pvcName, err)
 	}
 	if pvc.Status.Phase != v1.ClaimBound {
-		return nil, fmt.Errorf("The PVC %s not yet bound to a PV, will not attempt to take a snapshot yet.")
+		return nil, fmt.Errorf("The PVC %s not yet bound to a PV, will not attempt to take a snapshot yet.", pvcName)
 	}
 
 	pvName := pvc.Spec.VolumeName

diff --git a/snapshot/pkg/volume/hostpath/processor.go b/snapshot/pkg/volume/hostpath/processor.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"os/exec"
 
-	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/uuid"
 
 	crdv1 "github.com/kubernetes-incubator/external-storage/snapshot/pkg/apis/crd/v1"
 	"github.com/kubernetes-incubator/external-storage/snapshot/pkg/cloudprovider"