Merge pull request #3764 from chrislovecnm/goimports-cleanup

Automatic merge from submit-queue.

goimports cleanup && basel files

This is a dry PR.  Only goimports updates and gazelle fixes.

channels/cmd/channels/main.go

@@ -18,8 +18,9 @@ package main
 
 import (
 	"fmt"
-	"k8s.io/kops/channels/pkg/cmd"
 	"os"
+
+	"k8s.io/kops/channels/pkg/cmd"
 )
 
 func main() {

channels/pkg/channels/addon.go

@@ -18,11 +18,12 @@ package channels
 
 import (
 	"fmt"
+	"net/url"
+
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/kops/channels/pkg/api"
-	"net/url"
 )
 
 // Addon is a wrapper around a single version of an addon

channels/pkg/channels/addons.go

@@ -18,13 +18,14 @@ package channels
 
 import (
 	"fmt"
+	"net/url"
+	"strings"
+
 	"github.com/blang/semver"
 	"github.com/golang/glog"
 	"k8s.io/kops/channels/pkg/api"
 	"k8s.io/kops/upup/pkg/fi/utils"
 	"k8s.io/kops/util/pkg/vfs"
-	"net/url"
-	"strings"
 )
 
 type Addons struct {

channels/pkg/channels/addons_test.go

@@ -17,9 +17,10 @@ limitations under the License.
 package channels
 
 import (
+	"testing"
+
 	"github.com/blang/semver"
 	"k8s.io/kops/channels/pkg/api"
-	"testing"
 )
 
 func Test_Filtering(t *testing.T) {

channels/pkg/channels/apply.go

@@ -18,13 +18,14 @@ package channels
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"io/ioutil"
-	"k8s.io/kops/util/pkg/vfs"
 	"os"
 	"os/exec"
 	"path"
 	"strings"
+
+	"github.com/golang/glog"
+	"k8s.io/kops/util/pkg/vfs"
 )
 
 // Apply calls kubectl apply to apply the manifest.

channels/pkg/channels/channel_version.go

@@ -19,13 +19,14 @@ package channels
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	"github.com/blang/semver"
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
-	"strings"
 )
 
 const AnnotationPrefix = "addons.k8s.io/"

channels/pkg/cmd/apply.go

@@ -17,8 +17,9 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"io"
+
+	"github.com/spf13/cobra"
 )
 
 func NewCmdApply(f Factory, out io.Writer) *cobra.Command {

channels/pkg/cmd/apply_channel.go

@@ -18,14 +18,15 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/blang/semver"
-	"github.com/spf13/cobra"
 	"io"
-	"k8s.io/kops/channels/pkg/channels"
-	"k8s.io/kops/util/pkg/tables"
 	"net/url"
 	"os"
 	"strings"
+
+	"github.com/blang/semver"
+	"github.com/spf13/cobra"
+	"k8s.io/kops/channels/pkg/channels"
+	"k8s.io/kops/util/pkg/tables"
 )
 
 type ApplyChannelOptions struct {

channels/pkg/cmd/get.go

@@ -17,8 +17,9 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"io"
+
+	"github.com/spf13/cobra"
 )
 
 func NewCmdGet(f Factory, out io.Writer) *cobra.Command {

channels/pkg/cmd/get_addons.go

@@ -34,13 +34,14 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"io"
+	"os"
+
+	"github.com/spf13/cobra"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kops/channels/pkg/channels"
 	"k8s.io/kops/util/pkg/tables"
-	"os"
 )
 
 type GetAddonsOptions struct {

channels/pkg/cmd/root.go

@@ -20,9 +20,10 @@ import (
 	goflag "flag"
 	"fmt"
 
+	"io"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"io"
 )
 
 type CmdRootOptions struct {

cloudmock/aws/mockec2/address.go

@@ -19,10 +19,11 @@ package mockec2
 import (
 	"encoding/binary"
 	"fmt"
+	"net"
+
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"net"
 )
 
 func (m *MockEC2) AllocateAddressRequest(*ec2.AllocateAddressInput) (*request.Request, *ec2.AllocateAddressOutput) {

cloudmock/aws/mockec2/images.go

@@ -18,11 +18,12 @@ package mockec2
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"strings"
 )
 
 func (m *MockEC2) DescribeImageAttributeRequest(*ec2.DescribeImageAttributeInput) (*request.Request, *ec2.DescribeImageAttributeOutput) {

cloudmock/aws/mockec2/keypairs.go

@@ -18,6 +18,7 @@ package mockec2
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"

cloudmock/aws/mockec2/securitygroups.go

@@ -18,10 +18,11 @@ package mockec2
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"strings"
 )
 
 func (m *MockEC2) CreateSecurityGroupRequest(*ec2.CreateSecurityGroupInput) (*request.Request, *ec2.CreateSecurityGroupOutput) {

cloudmock/aws/mockec2/volumes.go

@@ -18,10 +18,11 @@ package mockec2
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"strings"
 )
 
 func (m *MockEC2) DescribeVolumeAttributeRequest(*ec2.DescribeVolumeAttributeInput) (*request.Request, *ec2.DescribeVolumeAttributeOutput) {

cloudmock/aws/mockec2/vpcs.go

@@ -18,11 +18,12 @@ package mockec2
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"strings"
 )
 
 type vpcInfo struct {

cloudmock/aws/mockroute53/api.go

@@ -17,10 +17,11 @@ limitations under the License.
 package mockroute53
 
 import (
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/aws/aws-sdk-go/service/route53/route53iface"
-	"strings"
 )
 
 type zoneInfo struct {

cloudmock/aws/mockroute53/records.go

@@ -18,6 +18,7 @@ package mockroute53
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/route53"

cloudmock/aws/mockroute53/zones.go

@@ -18,6 +18,7 @@ package mockroute53
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/golang/glog"

cmd/kops-server/main.go

@@ -21,11 +21,12 @@ import (
 	"os"
 	"runtime"
 
+	"math/rand"
+	"time"
+
 	"github.com/golang/glog"
 	"k8s.io/apiserver/pkg/util/logs"
 	"k8s.io/kops/pkg/apiserver/cmd/server"
-	"math/rand"
-	"time"
 )
 
 func main() {

cmd/kops/delete.go

@@ -21,6 +21,7 @@ import (
 	"io"
 
 	"bytes"
+
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime/schema"

cmd/kops/status_discovery.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"

dns-controller/pkg/dns/zonespec.go

@@ -18,9 +18,10 @@ package dns
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
-	"strings"
 )
 
 type ZoneSpec struct {

examples/kops-api-example/main.go

@@ -19,9 +19,10 @@ package main
 import (
 	"flag"
 	"fmt"
-	"k8s.io/kops/util/pkg/vfs"
 	"os"
 	"strings"
+
+	"k8s.io/kops/util/pkg/vfs"
 )
 
 // registryBase is the base path where state files are kept (the state store)

examples/kops-api-example/up.go

@@ -19,6 +19,7 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
 	"k8s.io/kops/upup/pkg/fi"

federation/federation_cluster.go

@@ -18,6 +18,7 @@ package federation
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	k8sapiv1 "k8s.io/api/core/v1"

federation/federation_configuration.go

@@ -18,6 +18,7 @@ package federation
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

federation/federation_namespace.go

@@ -18,6 +18,7 @@ package federation
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

federation/targets/kubernetestarget/kubernetestarget.go

@@ -18,6 +18,7 @@ package kubernetestarget
 
 import (
 	"fmt"
+
 	"k8s.io/client-go/kubernetes"
 	kopsapi "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple"

federation/tasks/kubernetesresource.go

@@ -18,6 +18,7 @@ package tasks
 
 import (
 	"fmt"
+
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/kops/federation/targets/kubernetestarget"
 	"k8s.io/kops/upup/pkg/fi"

nodeup/pkg/distros/identify.go

@@ -18,11 +18,12 @@ package distros
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"io/ioutil"
 	"os"
 	"path"
 	"strings"
+
+	"github.com/golang/glog"
 )
 
 // FindDistribution identifies the distribution on which we are running

nodeup/pkg/model/docker_test.go

@@ -17,11 +17,12 @@ limitations under the License.
 package model
 
 import (
+	"path"
+	"testing"
+
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/flagbuilder"
 	"k8s.io/kops/upup/pkg/fi"
-	"path"
-	"testing"
 )
 
 func TestDockerBuilder_Simple(t *testing.T) {

nodeup/pkg/model/kubelet_test.go

@@ -25,6 +25,7 @@ import (
 	"testing"
 
 	"fmt"
+
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/kops/nodeup/pkg/distros"
 	"k8s.io/kops/pkg/apis/kops"

nodeup/pkg/model/network.go

@@ -18,9 +18,10 @@ package model
 
 import (
 	"fmt"
+	"path/filepath"
+
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
-	"path/filepath"
 )
 
 // NetworkBuilder writes CNI assets

pkg/apis/kops/channel.go

@@ -18,13 +18,14 @@ package kops
 
 import (
 	"fmt"
+	"net/url"
+
 	"github.com/blang/semver"
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kops/pkg/apis/kops/util"
 	"k8s.io/kops/util/pkg/vfs"
-	"net/url"
 )
 
 var DefaultChannelBase = "https://raw.githubusercontent.com/kubernetes/kops/master/channels/"

pkg/apis/kops/model/utils.go

@@ -18,6 +18,7 @@ package model
 
 import (
 	"fmt"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kops/pkg/apis/kops"
 )

pkg/apis/kops/model/utils_test.go

@@ -17,9 +17,10 @@ limitations under the License.
 package model
 
 import (
-	"k8s.io/kops/pkg/apis/kops"
 	"reflect"
 	"testing"
+
+	"k8s.io/kops/pkg/apis/kops"
 )
 
 // Test_FindSubnet tests FindSubnet

pkg/apis/kops/registry/helpers.go

@@ -18,6 +18,7 @@ package registry
 
 import (
 	"fmt"
+
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple"
 )

pkg/apis/kops/registry/registry.go

@@ -18,6 +18,7 @@ package registry
 
 import (
 	"fmt"
+
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/util/pkg/vfs"

pkg/apis/kops/semver_test.go

@@ -17,8 +17,9 @@ limitations under the License.
 package kops
 
 import (
-	"github.com/blang/semver"
 	"testing"
+
+	"github.com/blang/semver"
 )
 
 // Test_SemverOrdering is a test of semver ordering, but highlights the case that trips everyone one:

pkg/apis/kops/util/labels.go

@@ -17,8 +17,9 @@ limitations under the License.
 package util
 
 import (
-	"k8s.io/api/core/v1"
 	"strings"
+
+	"k8s.io/api/core/v1"
 )
 
 func GetNodeRole(node *v1.Node) string {

pkg/apis/kops/v1alpha1/conversion.go

@@ -18,11 +18,12 @@ package v1alpha1
 
 import (
 	"fmt"
-	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/kops/pkg/apis/kops"
 	"reflect"
 	"sort"
 	"strings"
+
+	"k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/kops/pkg/apis/kops"
 )
 
 func Convert_v1alpha1_BastionSpec_To_kops_BastionSpec(in *BastionSpec, out *kops.BastionSpec, s conversion.Scope) error {

pkg/apis/kops/validation/helpers.go

@@ -17,9 +17,10 @@ limitations under the License.
 package validation
 
 import (
-	"k8s.io/apimachinery/pkg/util/validation/field"
 	"net"
 	"net/url"
+
+	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
 // isSubnet checks if child is a subnet of parent

pkg/apis/kops/validation/instancegroup.go

@@ -18,6 +18,7 @@ package validation
 
 import (
 	"fmt"
+
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/util"

pkg/apis/kops/validation/instancegroup_test.go

@@ -17,10 +17,11 @@ limitations under the License.
 package validation
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/kops/pkg/apis/kops"
 	"strings"
 	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/kops/pkg/apis/kops"
 )
 
 func TestDefaultTaintsEnforcedBefore160(t *testing.T) {

pkg/apiserver/apiserver.go

@@ -18,6 +18,7 @@ package apiserver
 
 import (
 	"fmt"
+
 	"k8s.io/apimachinery/pkg/apimachinery/announced"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/client/simple/vfsclientset/import_known_versions.go

@@ -19,6 +19,7 @@ package vfsclientset
 // These imports are the API groups the client will support.
 import (
 	"fmt"
+
 	"k8s.io/kops/pkg/kopscodecs"
 )
 

pkg/client/simple/vfsclientset/utils.go

@@ -18,8 +18,9 @@ package vfsclientset
 
 import (
 	"fmt"
-	"k8s.io/kops/util/pkg/vfs"
 	"os"
+
+	"k8s.io/kops/util/pkg/vfs"
 )
 
 func listChildNames(vfsPath vfs.Path) ([]string, error) {

pkg/diff/diff_test.go

@@ -17,8 +17,9 @@ limitations under the License.
 package diff
 
 import (
-	"github.com/sergi/go-diff/diffmatchpatch"
 	"testing"
+
+	"github.com/sergi/go-diff/diffmatchpatch"
 )
 
 func Test_Diff_1(t *testing.T) {

pkg/edit/edit.go

@@ -18,6 +18,7 @@ package edit
 
 import (
 	"bytes"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kops/pkg/diff"
 	"k8s.io/kops/pkg/kopscodecs"

pkg/featureflag/featureflag_test.go

@@ -17,9 +17,10 @@ limitations under the License.
 package featureflag
 
 import (
-	"github.com/golang/glog"
 	"os"
 	"testing"
+
+	"github.com/golang/glog"
 )
 
 func TestFlagToFalse(t *testing.T) {

pkg/formatter/instancegroup.go

@@ -17,10 +17,11 @@ limitations under the License.
 package formatter
 
 import (
+	"strings"
+
 	"github.com/golang/glog"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/model"
-	"strings"
 )
 
 // InstanceGroupRenderFunction is a render function for an InstanceGroup

pkg/formatter/instancegroup_test.go

@@ -17,8 +17,9 @@ limitations under the License.
 package formatter
 
 import (
-	"k8s.io/kops/pkg/apis/kops"
 	"testing"
+
+	"k8s.io/kops/pkg/apis/kops"
 )
 
 func TestRenderInstanceGroupZones(t *testing.T) {

pkg/k8scodecs/codecs.go

@@ -19,6 +19,8 @@ package k8scodecs
 import (
 	"bytes"
 	"fmt"
+	"os"
+
 	"github.com/golang/glog"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apimachinery/announced"
@@ -27,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"os"
 )
 
 var Scheme = runtime.NewScheme()

pkg/k8scodecs/codecs_test.go

@@ -17,14 +17,15 @@ limitations under the License.
 package k8scodecs
 
 import (
+	"strings"
+	"testing"
+	"time"
+
 	"github.com/MakeNowJust/heredoc"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kops/pkg/diff"
-	"strings"
-	"testing"
-	"time"
 )
 
 // An arbitrary timestamp for testing

pkg/kopscodecs/codecs.go

@@ -19,6 +19,8 @@ package kopscodecs
 import (
 	"bytes"
 	"fmt"
+	"os"
+
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/apimachinery/announced"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
@@ -29,7 +31,6 @@ import (
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/install"
 	"k8s.io/kops/pkg/apis/kops/v1alpha2"
-	"os"
 )
 
 var Scheme = runtime.NewScheme()

pkg/kopscodecs/codecs_test.go

@@ -17,14 +17,15 @@ limitations under the License.
 package kopscodecs
 
 import (
+	"strings"
+	"testing"
+	"time"
+
 	"github.com/MakeNowJust/heredoc"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kops/pkg/apis/kops/v1alpha2"
 	"k8s.io/kops/pkg/diff"
-	"strings"
-	"testing"
-	"time"
 )
 
 // An arbitrary timestamp for testing

pkg/kubeconfig/create_kubecfg.go

@@ -18,11 +18,12 @@ package kubeconfig
 
 import (
 	"fmt"
+	"sort"
+
 	"github.com/golang/glog"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/dns"
 	"k8s.io/kops/upup/pkg/fi"
-	"sort"
 )
 
 func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.SecretStore, status kops.StatusStore) (*KubeconfigBuilder, error) {

pkg/kubemanifest/images.go

@@ -18,8 +18,9 @@ package kubemanifest
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"strings"
+
+	"github.com/golang/glog"
 )
 
 type ImageRemapFunction func(image string) (string, error)

pkg/kubemanifest/manifest.go

@@ -19,6 +19,7 @@ package kubemanifest
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/ghodss/yaml"
 	"github.com/golang/glog"
 )

pkg/kubemanifest/visitor.go

@@ -18,8 +18,9 @@ package kubemanifest
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"strings"
+
+	"github.com/golang/glog"
 )
 
 type visitorBase struct {

pkg/model/awsmodel/autoscalinggroup_test.go

@@ -17,11 +17,12 @@ limitations under the License.
 package awsmodel
 
 import (
+	"testing"
+
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/model"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
-	"testing"
 )
 
 func buildMinimalCluster() *kops.Cluster {

pkg/model/components/networking.go

@@ -18,6 +18,7 @@ package components
 
 import (
 	"fmt"
+
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"

pkg/model/context_test.go

@@ -17,9 +17,10 @@ limitations under the License.
 package model
 
 import (
+	"testing"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kops/pkg/apis/kops"
-	"testing"
 )
 
 func Test_GetELBName32(t *testing.T) {

pkg/model/dns.go

@@ -18,11 +18,12 @@ package model
 
 import (
 	"fmt"
+	"strings"
+
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/dns"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
-	"strings"
 )
 
 // DNSModelBuilder builds DNS related model objects

pkg/model/gcemodel/api_loadbalancer.go

@@ -18,6 +18,7 @@ package gcemodel
 
 import (
 	"fmt"
+
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/gcetasks"

pkg/model/names.go

@@ -18,6 +18,7 @@ package model
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"

pkg/model/template_resource.go

@@ -20,8 +20,9 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"k8s.io/kops/upup/pkg/fi"
 	"text/template"
+
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 type templateResource struct {

pkg/pki/certificate.go

@@ -25,8 +25,9 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"github.com/golang/glog"
 	"io"
+
+	"github.com/golang/glog"
 )
 
 type Certificate struct {

pkg/pki/privatekey.go

@@ -26,8 +26,9 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"github.com/golang/glog"
 	"io"
+
+	"github.com/golang/glog"
 )
 
 func ParsePEMPrivateKey(data []byte) (*PrivateKey, error) {

pkg/pretty/help.go

@@ -18,8 +18,9 @@ package pretty
 
 import (
 	"fmt"
-	"github.com/MakeNowJust/heredoc"
 	"strings"
+
+	"github.com/MakeNowJust/heredoc"
 )
 
 // Bash markdown-quotes a bash command for insertion into help text.

pkg/templates/templates.go

@@ -19,14 +19,15 @@ package templates
 import (
 	"bytes"
 	"fmt"
-	"github.com/golang/glog"
 	"io"
-	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/upup/pkg/fi"
-	"k8s.io/kops/util/pkg/vfs"
 	"os"
 	"strings"
 	"text/template"
+
+	"github.com/golang/glog"
+	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/util/pkg/vfs"
 )
 
 type Templates struct {

protokube/pkg/gossip/aws/seeds.go

@@ -18,6 +18,7 @@ package aws
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"

protokube/pkg/gossip/dns/hosts.go

@@ -18,12 +18,13 @@ package dns
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
+
+	"github.com/golang/glog"
 )
 
 const GUARD_BEGIN = "# Begin host entries managed by kops - do not edit"

protokube/pkg/gossip/dns/provider/zone.go

@@ -18,6 +18,7 @@ package provider
 
 import (
 	"fmt"
+
 	"k8s.io/kops/protokube/pkg/gossip/dns"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"

protokube/pkg/gossip/dns/provider/zones.go

@@ -18,6 +18,7 @@ package provider
 
 import (
 	"fmt"
+
 	"k8s.io/kops/protokube/pkg/gossip/dns"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 )

protokube/pkg/gossip/gce/seeds.go

@@ -18,10 +18,11 @@ package gce
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/golang/glog"
 	compute "google.golang.org/api/compute/v0.beta"
 	"k8s.io/kops/protokube/pkg/gossip"
-	"strings"
 )
 
 type SeedProvider struct {

protokube/pkg/gossip/mesh/gossip.go

@@ -18,12 +18,13 @@ package mesh
 
 import (
 	"fmt"
-	"github.com/golang/glog"
-	"github.com/weaveworks/mesh"
-	"k8s.io/kops/protokube/pkg/gossip"
 	"net"
 	"strconv"
 	"time"
+
+	"github.com/golang/glog"
+	"github.com/weaveworks/mesh"
+	"k8s.io/kops/protokube/pkg/gossip"
 )
 
 type MeshGossiper struct {

protokube/pkg/gossip/mesh/state.go

@@ -18,11 +18,12 @@ package mesh
 
 import (
 	"fmt"
+	"sync"
+	"time"
+
 	"github.com/gogo/protobuf/proto"
 	"github.com/weaveworks/mesh"
 	"k8s.io/kops/protokube/pkg/gossip"
-	"sync"
-	"time"
 )
 
 // state is an implementation of a LWW map

protokube/pkg/protokube/kube_dns.go

@@ -17,9 +17,10 @@ limitations under the License.
 package protokube
 
 import (
+	"time"
+
 	"github.com/golang/glog"
 	"k8s.io/kops/dns-controller/pkg/dns"
-	"time"
 )
 
 const defaultTTL = time.Minute

protokube/pkg/protokube/volume_mounter_test.go

@@ -17,10 +17,11 @@ limitations under the License.
 package protokube
 
 import (
-	"k8s.io/kops/protokube/pkg/etcd"
 	"sort"
 	"strings"
 	"testing"
+
+	"k8s.io/kops/protokube/pkg/etcd"
 )
 
 func getIDs(volumes []*Volume) string {

protokube/pkg/protokube/vsphere_volume.go

@@ -21,14 +21,15 @@ package protokube
 import (
 	"errors"
 	"fmt"
-	"github.com/golang/glog"
 	"io/ioutil"
-	etcdmanager "k8s.io/kops/protokube/pkg/etcd"
-	"k8s.io/kops/upup/pkg/fi/cloudup/vsphere"
 	"net"
 	"os/exec"
 	"runtime"
 	"strings"
+
+	"github.com/golang/glog"
+	etcdmanager "k8s.io/kops/protokube/pkg/etcd"
+	"k8s.io/kops/upup/pkg/fi/cloudup/vsphere"
 )
 
 const VolumeMetaDataFile = "/vol-metadata/metadata.json"

tests/codecs/componentconfig_test.go

@@ -17,10 +17,11 @@ limitations under the License.
 package codecs
 
 import (
+	"testing"
+
 	"k8s.io/kops/pkg/apis/kops/v1alpha2"
 	"k8s.io/kops/pkg/diff"
 	"k8s.io/kops/pkg/kopscodecs"
-	"testing"
 )
 
 func TestSerializeEmptyCluster(t *testing.T) {

tests/integration/channel/integration_test.go

@@ -17,11 +17,12 @@ limitations under the License.
 package main
 
 import (
-	"github.com/blang/semver"
 	"io/ioutil"
-	"k8s.io/kops/pkg/apis/kops"
 	"path"
 	"testing"
+
+	"github.com/blang/semver"
+	"k8s.io/kops/pkg/apis/kops"
 )
 
 // TestKopsUpgrades tests the version logic for kops versions

tests/integration/conversion/integration_test.go

@@ -19,6 +19,10 @@ package main
 import (
 	"bytes"
 	"io/ioutil"
+	"path"
+	"strings"
+	"testing"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/kops/pkg/apis/kops"
@@ -26,9 +30,6 @@ import (
 	"k8s.io/kops/pkg/apis/kops/v1alpha2"
 	"k8s.io/kops/pkg/diff"
 	"k8s.io/kops/pkg/kopscodecs"
-	"path"
-	"strings"
-	"testing"
 )
 
 // TestConversionMinimal runs the test on a minimum configuration, similar to kops create cluster minimal.example.com --zones us-west-1a

upup/pkg/fi/assettasks/docker_cli.go

@@ -18,8 +18,9 @@ package assettasks
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"os/exec"
+
+	"github.com/golang/glog"
 )
 
 // dockerCLI encapsulates access to docker via the CLI

upup/pkg/fi/changes.go

@@ -17,8 +17,9 @@ limitations under the License.
 package fi
 
 import (
-	"github.com/golang/glog"
 	"reflect"
+
+	"github.com/golang/glog"
 )
 
 // An important part of our state synchronization is to compare two tasks, to see what has changed

upup/pkg/fi/cloudup/awstasks/cloudformation.go

@@ -17,8 +17,9 @@ limitations under the License.
 package awstasks
 
 import (
-	"github.com/aws/aws-sdk-go/aws"
 	"sort"
+
+	"github.com/aws/aws-sdk-go/aws"
 )
 
 type cloudformationTag struct {

upup/pkg/fi/cloudup/awstasks/dhcp_options.go

@@ -19,6 +19,8 @@ package awstasks
 import (
 	"fmt"
 
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
@@ -26,7 +28,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/cloudformation"
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
-	"strings"
 )
 
 //go:generate fitask -type=DHCPOptions

upup/pkg/fi/cloudup/awstasks/dnszone.go

@@ -19,6 +19,11 @@ package awstasks
 import (
 	"fmt"
 
+	"math/rand"
+	"reflect"
+	"strconv"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/golang/glog"
@@ -26,10 +31,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/cloudformation"
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
-	"math/rand"
-	"reflect"
-	"strconv"
-	"strings"
 )
 
 // DNSZone is a zone object in a dns provider

upup/pkg/fi/cloudup/awstasks/iamrole.go

@@ -21,6 +21,9 @@ import (
 
 	"encoding/json"
 
+	"net/url"
+	"reflect"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/iam"
@@ -30,8 +33,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/cloudformation"
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
-	"net/url"
-	"reflect"
 )
 
 //go:generate fitask -type=IAMRole

upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go

@@ -20,6 +20,8 @@ import (
 	"fmt"
 
 	"encoding/json"
+	"net/url"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/iam"
@@ -29,7 +31,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/cloudformation"
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
-	"net/url"
 )
 
 //go:generate fitask -type=IAMRolePolicy

upup/pkg/fi/cloudup/awstasks/instance.go

@@ -20,13 +20,14 @@ import (
 	"fmt"
 
 	"encoding/base64"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
-	"strings"
 )
 
 const MaxUserDataSize = 16384

upup/pkg/fi/cloudup/awstasks/launchconfiguration.go

@@ -19,6 +19,10 @@ package awstasks
 import (
 	"encoding/base64"
 	"fmt"
+	"sort"
+	"strings"
+	"time"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/golang/glog"
@@ -27,9 +31,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/cloudformation"
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
-	"sort"
-	"strings"
-	"time"
 )
 
 //go:generate fitask -type=LaunchConfiguration

upup/pkg/fi/cloudup/awstasks/securitygrouprule.go

@@ -19,6 +19,8 @@ package awstasks
 import (
 	"fmt"
 
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
@@ -27,7 +29,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/cloudformation"
 	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
-	"strings"
 )
 
 //go:generate fitask -type=SecurityGroupRule

upup/pkg/fi/cloudup/awsup/aws_utils.go

@@ -18,6 +18,8 @@ package awsup
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -26,7 +28,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/elb"
 	"github.com/golang/glog"
 	"k8s.io/kops/pkg/apis/kops"
-	"os"
 )
 
 // allRegions is the list of all regions; tests will set the values

upup/pkg/fi/cloudup/awsup/aws_utils_test.go

@@ -17,10 +17,11 @@ limitations under the License.
 package awsup
 
 import (
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"k8s.io/kops/pkg/apis/kops"
-	"testing"
 )
 
 func TestValidateRegion(t *testing.T) {

upup/pkg/fi/cloudup/awsup/instancegroups.go

@@ -18,6 +18,7 @@ package awsup
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	"k8s.io/kops/pkg/apis/kops"
 )

upup/pkg/fi/cloudup/awsup/logging_retryer.go

@@ -18,10 +18,11 @@ package awsup
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/golang/glog"
-	"time"
 )
 
 // LoggingRetryer adds some logging when we are retrying, so we have some idea what is happening