Merge pull request #41548 from sttts/sttts-staging-gofmt

Automatic merge from submit-queue (batch tested with PRs 41548, 41221)

hack/*.sh: re-add staging dirs to verify+update scripts

hack/update-gofmt.sh

@@ -34,11 +34,10 @@ find_files() {
         -o -wholename './_output' \
         -o -wholename './_gopath' \
         -o -wholename './release' \
-        -o -wholename './staging' \
         -o -wholename './target' \
         -o -wholename '*/third_party/*' \
         -o -wholename '*/vendor/*' \
-        -o -wholename './staging' \
+        -o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
       \) -prune \
     \) -name '*.go'
 }

hack/verify-gofmt.sh

@@ -42,7 +42,7 @@ find_files() {
         -o -wholename './target' \
         -o -wholename '*/third_party/*' \
         -o -wholename '*/vendor/*' \
-        -o -wholename './staging' \
+        -o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
         -o -wholename '*/bindata.go' \
       \) -prune \
     \) -name '*.go'

hack/verify-pkg-names.sh

@@ -26,7 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 kube::golang::verify_go_version
 
 cd "${KUBE_ROOT}"
-if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/*'; then
+if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/src/k8s.io/client-go/*vendor/*'; then
   echo "!!! Some package aliases break go conventions."
   echo "To fix these errors, do not use capitalized or underlined characters"
   echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info."

hack/verify-readonly-packages.sh

@@ -37,7 +37,8 @@ find_files() {
         -o -wholename './target' \
         -o -wholename '*/third_party/*' \
         -o -wholename '*/vendor/*' \
-        -o -wholename './staging' \
+        -o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
+        -o -wholename './staging/src/k8s.io/client-go/pkg/*' \
       \) -prune \
     \) -name '.readonly'
 }

staging/src/k8s.io/apimachinery/pkg/api/testing/codec.go

@@ -17,13 +17,13 @@ limitations under the License.
 package testing
 
 import (
-	"os"
-	"mime"
 	"fmt"
+	"mime"
+	"os"
 
 	"k8s.io/apimachinery/pkg/runtime"
-	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/runtime/serializer/recognizer"
 )
 

staging/src/k8s.io/apimachinery/pkg/api/testing/valuefuzz_test.go

@@ -37,7 +37,7 @@ func TestValueFuzz(t *testing.T) {
 	x := X{
 		Ptr:   &X{},
 		Map:   map[string]int{"foo": 42},
-		Slice: []int{1,2,3},
+		Slice: []int{1, 2, 3},
 	}
 
 	p := x.Ptr

staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register_test.go

@@ -49,8 +49,8 @@ func TestListOptions(t *testing.T) {
 
 	// verify failing conversion
 	for i, failingObject := range []*metav1.ListOptions{
-		&metav1.ListOptions{LabelSelector: "a!!!"},
+		{LabelSelector: "a!!!"},
-		&metav1.ListOptions{FieldSelector: "a!!!"},
+		{FieldSelector: "a!!!"},
 	} {
 		out = &ListOptions{}
 		if err := scheme.Convert(failingObject, out, nil); err == nil {

staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/converter_test.go

@@ -142,7 +142,7 @@ func doRoundTrip(t *testing.T, item runtime.Object) {
 
 func TestRoundTrip(t *testing.T) {
 	intVal := int64(42)
-	testCases := []struct{
+	testCases := []struct {
 		obj runtime.Object
 	}{
 		{
@@ -250,7 +250,7 @@ func doUnrecognized(t *testing.T, jsonData string, item runtime.Object, expected
 }
 
 func TestUnrecognized(t *testing.T) {
-	testCases := []struct{
+	testCases := []struct {
 		data string
 		obj  runtime.Object
 		err  error

staging/src/k8s.io/apimachinery/pkg/util/jsonmergepatch/patch.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"k8s.io/apimachinery/pkg/util/json"
 	"github.com/evanphx/json-patch"
+	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/apimachinery/pkg/util/mergepatch"
 )
 

staging/src/k8s.io/apimachinery/pkg/util/jsonmergepatch/patch_test.go

@@ -21,9 +21,9 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/davecgh/go-spew/spew"
 	"github.com/evanphx/json-patch"
 	"github.com/ghodss/yaml"
-	"github.com/davecgh/go-spew/spew"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 
@@ -171,7 +171,6 @@ func TestKeepOrDeleteNullInObj(t *testing.T) {
 	}
 }
 
-
 type JSONMergePatchTestCases struct {
 	TestCases []JSONMergePatchTestCase
 }

staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/util/json"
-	forkedjson "k8s.io/apimachinery/third_party/forked/golang/json"
 	"k8s.io/apimachinery/pkg/util/mergepatch"
+	forkedjson "k8s.io/apimachinery/third_party/forked/golang/json"
 )
 
 // An alternate implementation of JSON Merge Patch

staging/src/k8s.io/apiserver/pkg/apis/example/fuzzer/fuzzer.go

@@ -22,8 +22,8 @@ import (
 	apitesting "k8s.io/apimachinery/pkg/api/testing"
 	"k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
-	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
 	"k8s.io/apiserver/pkg/apis/example"
+	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
 )
 
 // overrideGenericFuncs override some generic fuzzer funcs from k8s.io/apiserver in order to have more realistic

staging/src/k8s.io/apiserver/pkg/apis/example/v1/defaults.go

@@ -23,4 +23,3 @@ import (
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
 	return nil
 }
-

staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go

@@ -54,9 +54,9 @@ import (
 	"k8s.io/apiserver/pkg/apis/example"
 	examplefuzzer "k8s.io/apiserver/pkg/apis/example/fuzzer"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
-	"k8s.io/apiserver/pkg/endpoints/request"
 	genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	genericapitesting "k8s.io/apiserver/pkg/endpoints/testing"
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/kubernetes/plugin/pkg/admission/admit"

staging/src/k8s.io/apiserver/pkg/endpoints/discovery.go

@@ -27,8 +27,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
 	"k8s.io/apiserver/pkg/endpoints/handlers"
+	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 

staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go

@@ -30,9 +30,9 @@ import (
 	"github.com/pborman/uuid"
 
 	utilnet "k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	authenticationapi "k8s.io/client-go/pkg/apis/authentication"
-	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 var _ http.ResponseWriter = &auditResponseWriter{}

staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization.go

@@ -23,8 +23,8 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/request"
 )
 
 // WithAuthorizationCheck passes all authorized requests on to handler, and returns a forbidden error otherwise.

staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go

@@ -24,9 +24,9 @@ import (
 	"testing"
 
 	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/apis/batch"
-	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 func TestGetAuthorizerAttributes(t *testing.T) {

staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go

@@ -27,11 +27,11 @@ import (
 	"k8s.io/apiserver/pkg/authentication/serviceaccount"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/server/httplog"
 	"k8s.io/client-go/pkg/api"
 	authenticationapi "k8s.io/client-go/pkg/apis/authentication"
-	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 // WithImpersonation is a filter that will inspect and check requests that attempt to change the user.Info for their requests

staging/src/k8s.io/apiserver/pkg/endpoints/filters/requestinfo.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/request"
 )
 
 // WithRequestInfo attaches a RequestInfo to the context.

staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go

@@ -30,8 +30,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apiserver/pkg/admission"
-	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/endpoints/handlers"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/registry/rest"
 )
 

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/proxy.go

@@ -32,12 +32,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/httpstream"
 	"k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/metrics"
 	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/server/httplog"
 	proxyutil "k8s.io/apiserver/pkg/util/proxy"
-	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
-	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/golang/glog"
 )

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go

@@ -27,9 +27,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
+	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/util/flushwriter"
 	"k8s.io/apiserver/pkg/util/wsstream"
-	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 // WriteObject renders a returned runtime.Object to the response as a stream or an encoded object. If the object

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go

@@ -38,15 +38,15 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/mergepatch"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
-	"k8s.io/apiserver/pkg/endpoints/request"
-	utiltrace "k8s.io/apiserver/pkg/util/trace"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/registry/rest"
+	utiltrace "k8s.io/apiserver/pkg/util/trace"
 )
 
 // ContextFunc returns a Context given a request - a context must be returned

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go

@@ -35,10 +35,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 type testPatchType struct {

staging/src/k8s.io/apiserver/pkg/registry/generic/registry/storage_factory.go

@@ -18,11 +18,11 @@ package registry
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/storage"
 	etcdstorage "k8s.io/apiserver/pkg/storage/etcd"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
 	"k8s.io/apiserver/pkg/storage/storagebackend/factory"
-	"k8s.io/apiserver/pkg/registry/generic"
 )
 
 var _ generic.StorageDecorator = StorageWithCacher

staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go

@@ -36,10 +36,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apimachinery/pkg/watch"
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/apiserver/pkg/storage"
-	storeerr "k8s.io/apiserver/pkg/storage/errors"
 	"k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/registry/rest"
+	"k8s.io/apiserver/pkg/storage"
+	storeerr "k8s.io/apiserver/pkg/storage/errors"
 
 	"github.com/golang/glog"
 )

staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store_test.go

@@ -42,14 +42,14 @@ import (
 	"k8s.io/apiserver/pkg/apis/example"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/storage"
 	etcdstorage "k8s.io/apiserver/pkg/storage/etcd"
 	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
 	"k8s.io/apiserver/pkg/storage/names"
 	"k8s.io/apiserver/pkg/storage/storagebackend/factory"
 	storagetesting "k8s.io/apiserver/pkg/storage/testing"
-	"k8s.io/apiserver/pkg/registry/generic"
-	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 var scheme = runtime.NewScheme()

staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight_test.go

@@ -26,8 +26,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
-	apirequest "k8s.io/apiserver/pkg/endpoints/request"
 	apifilters "k8s.io/apiserver/pkg/endpoints/filters"
+	apirequest "k8s.io/apiserver/pkg/endpoints/request"
 )
 
 func createMaxInflightServer(callsWg, blockWg *sync.WaitGroup, disableCallsWg *bool, disableCallsWgMutex *sync.Mutex, nonMutating, mutating int) *httptest.Server {

staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go

@@ -27,8 +27,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/openapi"
 	"k8s.io/apimachinery/pkg/util/json"
-	"k8s.io/apiserver/pkg/util/trie"
 	genericmux "k8s.io/apiserver/pkg/server/mux"
+	"k8s.io/apiserver/pkg/util/trie"
 )
 
 const (

staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go

@@ -21,8 +21,8 @@ import (
 	"net/http"
 
 	apimetrics "k8s.io/apiserver/pkg/endpoints/metrics"
-	etcdmetrics "k8s.io/apiserver/pkg/storage/etcd/metrics"
 	"k8s.io/apiserver/pkg/server/mux"
+	etcdmetrics "k8s.io/apiserver/pkg/storage/etcd/metrics"
 
 	"github.com/prometheus/client_golang/prometheus"
 )

staging/src/k8s.io/apiserver/pkg/server/routes/swaggerui.go

@@ -21,8 +21,8 @@ import (
 
 	assetfs "github.com/elazarl/go-bindata-assetfs"
 
-	"k8s.io/apiserver/pkg/server/routes/data/swagger"
 	"k8s.io/apiserver/pkg/server/mux"
+	"k8s.io/apiserver/pkg/server/routes/data/swagger"
 )
 
 // SwaggerUI exposes files in third_party/swagger-ui/ under /swagger-ui.

staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go

@@ -23,14 +23,14 @@ import (
 
 	"k8s.io/apimachinery/pkg/apimachinery/announced"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
-	exampleinstall "k8s.io/apiserver/pkg/apis/example/install"
-	"k8s.io/apiserver/pkg/storage/storagebackend"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apiserver/pkg/apis/example"
+	exampleinstall "k8s.io/apiserver/pkg/apis/example/install"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 var (

staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go

@@ -29,9 +29,9 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/apiserver/pkg/storage/storagebackend"
 	"k8s.io/apiserver/pkg/storage/etcd/etcdtest"
 	"k8s.io/apiserver/pkg/storage/etcd/testing/testingcert"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
 
 	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/clientv3"

staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go

@@ -26,8 +26,8 @@ import (
 
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apiserver/pkg/storage"
-	"k8s.io/apiserver/pkg/storage/storagebackend"
 	"k8s.io/apiserver/pkg/storage/etcd"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
 )
 
 func newETCD2Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {

staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go

@@ -18,8 +18,8 @@ package factory
 
 import (
 	"k8s.io/apiserver/pkg/storage"
-	"k8s.io/apiserver/pkg/storage/storagebackend"
 	"k8s.io/apiserver/pkg/storage/etcd3"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/pkg/transport"

staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go

@@ -33,8 +33,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apiserver/pkg/apis/example"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
-	"k8s.io/apiserver/pkg/storage/storagebackend"
 	"k8s.io/apiserver/pkg/storage/etcd/testing/testingcert"
+	"k8s.io/apiserver/pkg/storage/storagebackend"
 )
 
 var scheme = runtime.NewScheme()