Merge pull request kubevirt#242 from copejon/gofmt-project

gofmt'd cmd, pkg, and test dirs (no change in cmd)
kubevirt-bot · Jul 6, 2018 · f5b698d · f5b698d
2 parents 45b321d + bcf2694
commit f5b698d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/pkg/common/common.go b/pkg/common/common.go
@@ -52,7 +52,7 @@ const (
 	Vadmin          = 2
 	Vdebug          = 3
 	DEFAULT_VERBOSE = Vuser
-	
+
 	// the length of the random generated cloning label
 	GENERATED_CLONING_LABEL_LEN = 10
 )
diff --git a/pkg/controller/clone-controller.go b/pkg/controller/clone-controller.go
@@ -2,7 +2,6 @@ package controller
 
 import (
 	"fmt"
-	"time"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
@@ -12,6 +11,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 	. "kubevirt.io/containerized-data-importer/pkg/common"
+	"time"
 )
 
 const (
@@ -170,11 +170,11 @@ func (c *CloneController) processPodItem(pod *v1.Pod) error {
 	// see if pvc's pod phase anno needs to be added/updated. The update is done only on the target PVC
 	phase := string(pod.Status.Phase)
 	_, exists := pvc.ObjectMeta.Annotations[AnnCloneRequest]
-	if !checkIfAnnoExists(pvc, AnnPodPhase, phase) && exists{
+	if !checkIfAnnoExists(pvc, AnnPodPhase, phase) && exists {
 		pvc, err = setPVCAnnotation(c.clientset, pvc, AnnPodPhase, phase)
 		if err != nil {
 			return errors.WithMessage(err, fmt.Sprintf("could not set annotation \"%s: %s\" on pvc %q", AnnPodPhase, phase, pvc.Name))
-			
+
 		}
 		glog.V(Vdebug).Infof("processPodItem: pod phase %q annotated in pvc %q", pod.Status.Phase, pvcKey)
 		if phase == "Succeeded" {

diff --git a/pkg/controller/util.go b/pkg/controller/util.go
@@ -2,9 +2,6 @@ package controller
 
 import (
 	"fmt"
-	"math/rand"
-	"strings"
-	"time"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
@@ -14,6 +11,9 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
 	. "kubevirt.io/containerized-data-importer/pkg/common"
+	"math/rand"
+	"strings"
+	"time"
 )
 
 const DataVolName = "cdi-data-vol"
@@ -376,7 +376,7 @@ func MakeCloneSourcePodSpec(image, verbose, pullPolicy, pvcName string, generate
 				AnnCloningCreatedBy: "yes",
 			},
 			Labels: map[string]string{
-				CDI_LABEL_KEY:     CDI_LABEL_VALUE,                     //filtered by the podInformer
+				CDI_LABEL_KEY:     CDI_LABEL_VALUE,                               //filtered by the podInformer
 				CLONING_LABEL_KEY: CLONING_LABEL_VALUE + "-" + generatedLabelStr, //used by podAffity
 			},
 		},
@@ -475,7 +475,7 @@ func MakeCloneTargetPodSpec(image, verbose, pullPolicy string, pvc *v1.Persisten
 				AnnCloningCreatedBy: "yes",
 			},
 			Labels: map[string]string{
-				CDI_LABEL_KEY:     CDI_LABEL_VALUE,                     //filtered by the podInformer
+				CDI_LABEL_KEY:     CDI_LABEL_VALUE,                               //filtered by the podInformer
 				CLONING_LABEL_KEY: CLONING_LABEL_VALUE + "-" + generatedLabelStr, //used by PodAffinity
 			},
 		},

diff --git a/pkg/image/filefmt.go b/pkg/image/filefmt.go
@@ -5,8 +5,8 @@ import (
 	"encoding/hex"
 	"strconv"
 
-	"github.com/pkg/errors"
 	"github.com/golang/glog"
+	"github.com/pkg/errors"
 	. "kubevirt.io/containerized-data-importer/pkg/common"
 )
 

diff --git a/pkg/importer/dataStream.go b/pkg/importer/dataStream.go
@@ -313,7 +313,7 @@ func (d dataStream) xzReader() (*Reader, int64, error) {
 }
 
 // Return the tar reader and size of the endpoint "through the eye" of the previous reader.
-// Assumes a single file was archived. 
+// Assumes a single file was archived.
 // Note: the size stored in the header is used rather than raw metadata.
 func (d dataStream) tarReader() (*Reader, int64, error) {
 	tr := tar.NewReader(d.topReader())

diff --git a/test/functional/controller/controller_test.go b/test/functional/controller/controller_test.go
@@ -5,16 +5,16 @@ package controller
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "kubevirt.io/containerized-data-importer/pkg/common"
-	. "kubevirt.io/containerized-data-importer/pkg/controller"
+	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
 	k8stesting "k8s.io/client-go/tools/cache/testing"
+	. "kubevirt.io/containerized-data-importer/pkg/common"
+	. "kubevirt.io/containerized-data-importer/pkg/controller"
 )
 
 type operation int

diff --git a/test/functional/importer/datastream_test.go b/test/functional/importer/datastream_test.go
@@ -12,9 +12,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pkg/errors"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/pkg/errors"
 	"kubevirt.io/containerized-data-importer/pkg/image"
 	"kubevirt.io/containerized-data-importer/pkg/importer"
 	imagesize "kubevirt.io/containerized-data-importer/pkg/lib/size"