updating files for goimports - and fixed a unit test

.travis.yml

@@ -2,7 +2,8 @@ language: go
 go:
   - 1.8
   - 1.9
-  - tip
+# removed because of govet issue with apimahcinery
+#  - tip
 
 go_import_path: k8s.io/kops
 

cloudmock/aws/mockec2/subnets.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"
 )
 
 type subnetInfo struct {

pkg/assets/builder_test.go

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

pkg/client/simple/vfsclientset/cluster.go

@@ -18,6 +18,10 @@ package vfsclientset
 
 import (
 	"fmt"
+	"os"
+	"strings"
+	"time"
+
 	"github.com/golang/glog"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -28,9 +32,6 @@ import (
 	"k8s.io/kops/pkg/apis/kops/v1alpha1"
 	"k8s.io/kops/pkg/apis/kops/validation"
 	"k8s.io/kops/util/pkg/vfs"
-	"os"
-	"strings"
-	"time"
 )
 
 type ClusterVFS struct {

pkg/client/simple/vfsclientset/commonvfs.go

@@ -19,6 +19,11 @@ package vfsclientset
 import (
 	"bytes"
 	"fmt"
+	"os"
+	"reflect"
+	"sort"
+	"time"
+
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,10 +35,6 @@ import (
 	"k8s.io/kops/pkg/apis/kops/v1alpha2"
 	"k8s.io/kops/pkg/kopscodecs"
 	"k8s.io/kops/util/pkg/vfs"
-	"os"
-	"reflect"
-	"sort"
-	"time"
 )
 
 var StoreVersion = v1alpha2.SchemeGroupVersion

pkg/client/simple/vfsclientset/federation.go

@@ -18,6 +18,7 @@ package vfsclientset
 
 import (
 	"fmt"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"

pkg/client/simple/vfsclientset/instancegroup.go

@@ -18,6 +18,7 @@ package vfsclientset
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/model/components/kubecontrollermanager_test.go

@@ -17,11 +17,12 @@ limitations under the License.
 package components
 
 import (
+	"testing"
+	"time"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/assets"
-	"testing"
-	"time"
 )
 
 type ClusterParams struct {

pkg/model/gcemodel/storageacl.go

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

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

@@ -18,15 +18,16 @@ package awstasks
 
 import (
 	"bytes"
+	"os"
+	"reflect"
+	"testing"
+	"time"
+
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"k8s.io/kops/cloudmock/aws/mockec2"
 	"k8s.io/kops/pkg/assets"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
-	"os"
-	"reflect"
-	"testing"
-	"time"
 )
 
 const defaultDeadline = 2 * time.Second

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

@@ -17,13 +17,14 @@ limitations under the License.
 package awstasks
 
 import (
+	"reflect"
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"k8s.io/kops/cloudmock/aws/mockec2"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
-	"reflect"
-	"testing"
 )
 
 func TestParseRemovalRule(t *testing.T) {

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

@@ -18,13 +18,14 @@ package awstasks
 
 import (
 	"fmt"
+	"reflect"
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"k8s.io/kops/cloudmock/aws/mockec2"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
-	"reflect"
-	"testing"
 )
 
 func Test_Subnet_ValidateRequired(t *testing.T) {
@@ -95,7 +96,7 @@ func TestSubnetCreate(t *testing.T) {
 			Cloud: cloud,
 		}
 
-		context, err := fi.NewContext(target, cloud, nil, nil, nil, true, allTasks)
+		context, err := fi.NewContext(target, nil, cloud, nil, nil, nil, true, allTasks)
 		if err != nil {
 			t.Fatalf("error building context: %v", err)
 		}
@@ -213,7 +214,7 @@ func TestSharedSubnetCreateDoesNotCreateNew(t *testing.T) {
 			Cloud: cloud,
 		}
 
-		context, err := fi.NewContext(target, cloud, nil, nil, nil, true, allTasks)
+		context, err := fi.NewContext(target, nil, cloud, nil, nil, nil, true, allTasks)
 		if err != nil {
 			t.Fatalf("error building context: %v", err)
 		}

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

@@ -17,13 +17,14 @@ limitations under the License.
 package awstasks
 
 import (
+	"reflect"
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"k8s.io/kops/cloudmock/aws/mockec2"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
-	"reflect"
-	"testing"
 )
 
 func TestVPCCreate(t *testing.T) {

upup/pkg/fi/cloudup/gce/gce_cloud.go

@@ -21,6 +21,8 @@ import (
 	"net/http"
 	"strings"
 
+	"os"
+
 	"github.com/golang/glog"
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2/google"
@@ -32,7 +34,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns"
-	"os"
 )
 
 type GCECloud interface {

upup/pkg/fi/cloudup/networking_test.go

@@ -17,9 +17,10 @@ limitations under the License.
 package cloudup
 
 import (
-	api "k8s.io/kops/pkg/apis/kops"
 	"os"
 	"testing"
+
+	api "k8s.io/kops/pkg/apis/kops"
 )
 
 func Test_FindCNIAssetFromEnvironmentVariable(t *testing.T) {

upup/pkg/fi/context.go

@@ -19,15 +19,16 @@ package fi
 import (
 	"bytes"
 	"fmt"
-	"github.com/golang/glog"
 	"io/ioutil"
-	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/util/pkg/vfs"
-	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 	"os"
 	"reflect"
 	"strings"
 	"time"
+
+	"github.com/golang/glog"
+	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/util/pkg/vfs"
+	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 )
 
 type Context struct {

upup/pkg/fi/default_methods.go

@@ -18,8 +18,9 @@ package fi
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/fi/utils"
 	"reflect"
+
+	"k8s.io/kops/upup/pkg/fi/utils"
 )
 
 // DefaultDeltaRunMethod implements the standard change-based run procedure:

upup/pkg/fi/dryrun_target.go

@@ -24,11 +24,12 @@ import (
 	"strings"
 	"sync"
 
+	"sort"
+
 	"github.com/golang/glog"
 	"k8s.io/kops/pkg/assets"
 	"k8s.io/kops/pkg/diff"
 	"k8s.io/kops/upup/pkg/fi/utils"
-	"sort"
 )
 
 // DryRunTarget is a special Target that does not execute anything, but instead tracks all changes.

upup/pkg/fi/fitasks/managedfile.go

@@ -18,10 +18,11 @@ package fitasks
 
 import (
 	"fmt"
+	"os"
+
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/kops/pkg/acls"
 	"k8s.io/kops/upup/pkg/fi"
-	"os"
 )
 
 //go:generate fitask -type=ManagedFile

upup/pkg/fi/secrets/vfs_secretstore.go

@@ -19,12 +19,13 @@ package secrets
 import (
 	"encoding/json"
 	"fmt"
+	"os"
+
 	"github.com/golang/glog"
 	"k8s.io/kops/pkg/acls"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/util/pkg/vfs"
-	"os"
 )
 
 type VFSSecretStore struct {

util/pkg/vfs/context.go

@@ -18,18 +18,19 @@ package vfs
 
 import (
 	"fmt"
-	"github.com/golang/glog"
-	"golang.org/x/net/context"
-	"golang.org/x/oauth2/google"
-	storage "google.golang.org/api/storage/v1"
 	"io/ioutil"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/golang/glog"
+	"golang.org/x/net/context"
+	"golang.org/x/oauth2/google"
+	storage "google.golang.org/api/storage/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 // VFSContext is a 'context' for VFS, that is normally a singleton

util/pkg/vfs/fs.go

@@ -18,13 +18,14 @@ package vfs
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"io"
 	"io/ioutil"
-	"k8s.io/kops/util/pkg/hashing"
 	"os"
 	"path"
 	"sync"
+
+	"github.com/golang/glog"
+	"k8s.io/kops/util/pkg/hashing"
 )
 
 type FSPath struct {

util/pkg/vfs/gsfs.go

@@ -21,19 +21,20 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
-	"github.com/golang/glog"
-	"golang.org/x/net/context"
-	"google.golang.org/api/googleapi"
-	storage "google.golang.org/api/storage/v1"
 	"io/ioutil"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/kops/util/pkg/hashing"
 	"net/http"
 	"os"
 	"path"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/golang/glog"
+	"golang.org/x/net/context"
+	"google.golang.org/api/googleapi"
+	storage "google.golang.org/api/storage/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/kops/util/pkg/hashing"
 )
 
 // GSPath is a vfs path for Google Cloud Storage

util/pkg/vfs/k8sfs.go

@@ -18,9 +18,10 @@ package vfs
 
 import (
 	"fmt"
-	"k8s.io/kops/util/pkg/hashing"
 	"path"
 	"strings"
+
+	"k8s.io/kops/util/pkg/hashing"
 )
 
 // KubernetesPath is a path for a VFS backed by the kubernetes API