From 98042b77f3388b8b2bfa5843c4496e7d3a421074 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 24 Jul 2017 14:33:48 +0200 Subject: [PATCH] kube-gen: fixup moved tests --- hack/.golint_failures | 4 ++-- pkg/generated/openapi/BUILD | 2 +- .../src/k8s.io/kube-gen/cmd/client-gen/.import-restrictions | 1 - staging/src/k8s.io/kube-gen/cmd/client-gen/main.go | 6 +++--- staging/src/k8s.io/kube-gen/test/apis/testgroup/doc.go | 2 +- .../k8s.io/kube-gen/test/apis/testgroup/install/install.go | 6 +++--- .../k8s.io/kube-gen/test/clientset/internal/clientset.go | 4 ++-- staging/src/k8s.io/kube-gen/test/clientset/internal/doc.go | 2 +- .../test/clientset/internal/fake/clientset_generated.go | 6 +++--- .../kube-gen/test/clientset/internal/fake/register.go | 2 +- .../kube-gen/test/clientset/internal/scheme/register.go | 2 +- .../testgroup/internalversion/fake/fake_testgroup_client.go | 2 +- .../typed/testgroup/internalversion/fake/fake_testtype.go | 2 +- .../typed/testgroup/internalversion/testgroup_client.go | 2 +- .../internal/typed/testgroup/internalversion/testtype.go | 4 ++-- 15 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 staging/src/k8s.io/kube-gen/cmd/client-gen/.import-restrictions diff --git a/hack/.golint_failures b/hack/.golint_failures index 674d2177194..231097d8844 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -772,13 +772,13 @@ staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd staging/src/k8s.io/kube-gen/cmd/client-gen/args staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme -staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup -staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1 staging/src/k8s.io/kube-gen/cmd/client-gen/types staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf staging/src/k8s.io/kube-gen/cmd/informer-gen/generators staging/src/k8s.io/kube-gen/cmd/lister-gen/generators +staging/src/k8s.io/kube-gen/test/apis/testgroup +staging/src/k8s.io/kube-gen/test/apis/testgroup/v1 staging/src/k8s.io/metrics/pkg/apis/custom_metrics staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1 staging/src/k8s.io/metrics/pkg/apis/metrics diff --git a/pkg/generated/openapi/BUILD b/pkg/generated/openapi/BUILD index 2672ebc1ca6..6d867fedab7 100644 --- a/pkg/generated/openapi/BUILD +++ b/pkg/generated/openapi/BUILD @@ -51,7 +51,7 @@ openapi_library( "k8s.io/apiserver/pkg/apis/example/v1", "k8s.io/client-go/pkg/version", "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1", - "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1", + "k8s.io/kube-gen/test/apis/testgroup/v1", "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1", "k8s.io/metrics/pkg/apis/metrics/v1alpha1", ], diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/.import-restrictions b/staging/src/k8s.io/kube-gen/cmd/client-gen/.import-restrictions deleted file mode 100644 index 0967ef424bc..00000000000 --- a/staging/src/k8s.io/kube-gen/cmd/client-gen/.import-restrictions +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go index 7ee7fead6a4..2d5d5382aa1 100644 --- a/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go +++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go @@ -172,15 +172,15 @@ func main() { if *test { arguments.InputDirs = append(dependencies, []string{ - "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup", + "k8s.io/kube-gen/test/apis/testgroup", }...) arguments.CustomArgs = clientgenargs.Args{ Groups: []types.GroupVersions{{Group: "testgroup", Versions: []types.Version{""}}}, GroupVersionToInputPath: map[types.GroupVersion]string{ - {Group: "testgroup", Version: ""}: "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup", + {Group: "testgroup", Version: ""}: "k8s.io/kube-gen/test/apis/testgroup", }, ClientsetName: "test_internalclientset", - ClientsetOutputPath: "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/", + ClientsetOutputPath: "k8s.io/kube-gen/test/clientset/internal", ClientsetOnly: false, FakeClient: true, CmdArgs: cmdArgs, diff --git a/staging/src/k8s.io/kube-gen/test/apis/testgroup/doc.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/doc.go index 923a74dd2dc..8245a703b4d 100644 --- a/staging/src/k8s.io/kube-gen/test/apis/testgroup/doc.go +++ b/staging/src/k8s.io/kube-gen/test/apis/testgroup/doc.go @@ -16,4 +16,4 @@ limitations under the License. // +k8s:deepcopy-gen=package,register // +groupName=testgroup.k8s.io -package testgroup // import "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup" +package testgroup // import "k8s.io/kube-gen/test/apis/testgroup" diff --git a/staging/src/k8s.io/kube-gen/test/apis/testgroup/install/install.go b/staging/src/k8s.io/kube-gen/test/apis/testgroup/install/install.go index 3a6e00d6ccf..2f0194918e9 100644 --- a/staging/src/k8s.io/kube-gen/test/apis/testgroup/install/install.go +++ b/staging/src/k8s.io/kube-gen/test/apis/testgroup/install/install.go @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup" - "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1" + "k8s.io/kube-gen/test/apis/testgroup" + "k8s.io/kube-gen/test/apis/testgroup/v1" ) // Install registers the API group and adds types to a scheme @@ -32,7 +32,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: testgroup.SchemeGroupVersion.Group, VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup", + ImportPrefix: "k8s.io/kube-gen/test/apis/testgroup", AddInternalObjectsToScheme: testgroup.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go index db7cb63423f..a5582812224 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/clientset.go @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package test_internalclientset +package internal import ( glog "github.com/golang/glog" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" + testgroupinternalversion "k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion" ) type Interface interface { diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/doc.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/doc.go index 2d1ecdad6dc..3d1cbb7eb96 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/doc.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with custom arguments. // This package has the automatically generated clientset. -package test_internalclientset +package internal diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/clientset_generated.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/clientset_generated.go index 83d0afd2679..35deb3b0342 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/clientset_generated.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/clientset_generated.go @@ -22,9 +22,9 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset" - testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" - faketestgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake" + clientset "k8s.io/kube-gen/test/clientset/internal" + testgroupinternalversion "k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion" + faketestgroupinternalversion "k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/register.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/register.go index ab9c7553c01..6f19bd5f25f 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/register.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/fake/register.go @@ -21,7 +21,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup" + testgroupinternalversion "k8s.io/kube-gen/test/apis/testgroup" ) var scheme = runtime.NewScheme() diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/register.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/register.go index f7a4896ccb0..979fcc4b660 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/register.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/scheme/register.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install" + testgroup "k8s.io/kube-gen/test/apis/testgroup/install" os "os" ) diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go index d99e323d8b4..343b2fcbd66 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testgroup_client.go @@ -19,7 +19,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - internalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" + internalversion "k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion" ) type FakeTestgroup struct { diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go index 7693ee188ba..e7ca6ee575f 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/fake/fake_testtype.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup" + testgroup "k8s.io/kube-gen/test/apis/testgroup" ) // FakeTestTypes implements TestTypeInterface diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go index 22dab51cd56..f511f78ecb0 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testgroup_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme" + "k8s.io/kube-gen/test/clientset/internal/scheme" ) type TestgroupInterface interface { diff --git a/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testtype.go b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testtype.go index 54610e80bc9..058540a5ed7 100644 --- a/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testtype.go +++ b/staging/src/k8s.io/kube-gen/test/clientset/internal/typed/testgroup/internalversion/testtype.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup" - scheme "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme" + testgroup "k8s.io/kube-gen/test/apis/testgroup" + scheme "k8s.io/kube-gen/test/clientset/internal/scheme" ) // TestTypesGetter has a method to return a TestTypeInterface.