From 7aff0f14865d29119fad9349274dfd12fc1da411 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 5 May 2016 20:51:23 -0700 Subject: [PATCH] Rename codecgen "testdata" dir so ugorji works Go mistreats "testdata" and can't find vendor/ dirs. --- cmd/libs/go2idl/client-gen/main.go | 7 ++++--- cmd/libs/go2idl/client-gen/test_apis/README | 4 ++++ .../apis => test_apis}/testgroup.k8s.io/install/install.go | 6 +++--- .../apis => test_apis}/testgroup.k8s.io/register.go | 0 .../apis => test_apis}/testgroup.k8s.io/types.generated.go | 0 .../{testdata/apis => test_apis}/testgroup.k8s.io/types.go | 0 .../apis => test_apis}/testgroup.k8s.io/v1/register.go | 0 .../testgroup.k8s.io/v1/types.generated.go | 0 .../apis => test_apis}/testgroup.k8s.io/v1/types.go | 0 .../testgroup.k8s.io/unversioned/fake/fake_testtype.go | 2 +- .../typed/testgroup.k8s.io/unversioned/testgroup_test.go | 4 ++-- .../typed/testgroup.k8s.io/unversioned/testtype.go | 2 +- examples/apiserver/apiserver.go | 4 ++-- examples/apiserver/apiserver_test.go | 2 +- examples/apiserver/rest/reststorage.go | 2 +- 15 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 cmd/libs/go2idl/client-gen/test_apis/README rename cmd/libs/go2idl/client-gen/{testdata/apis => test_apis}/testgroup.k8s.io/install/install.go (95%) rename cmd/libs/go2idl/client-gen/{testdata/apis => test_apis}/testgroup.k8s.io/register.go (100%) rename cmd/libs/go2idl/client-gen/{testdata/apis => test_apis}/testgroup.k8s.io/types.generated.go (100%) rename cmd/libs/go2idl/client-gen/{testdata/apis => test_apis}/testgroup.k8s.io/types.go (100%) rename cmd/libs/go2idl/client-gen/{testdata/apis => test_apis}/testgroup.k8s.io/v1/register.go (100%) rename cmd/libs/go2idl/client-gen/{testdata/apis => test_apis}/testgroup.k8s.io/v1/types.generated.go (100%) rename cmd/libs/go2idl/client-gen/{testdata/apis => test_apis}/testgroup.k8s.io/v1/types.go (100%) diff --git a/cmd/libs/go2idl/client-gen/main.go b/cmd/libs/go2idl/client-gen/main.go index 29129f9ddf4..c14fe6aa8a5 100644 --- a/cmd/libs/go2idl/client-gen/main.go +++ b/cmd/libs/go2idl/client-gen/main.go @@ -26,9 +26,10 @@ import ( "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators" "k8s.io/kubernetes/pkg/api/unversioned" + "strings" + "github.com/golang/glog" flag "github.com/spf13/pflag" - "strings" ) var ( @@ -105,12 +106,12 @@ func main() { if *test { arguments.InputDirs = append(dependencies, []string{ - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io", + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io", }...) arguments.CustomArgs = clientgenargs.Args{ GroupVersions: []unversioned.GroupVersion{{Group: "testgroup.k8s.io", Version: ""}}, GroupVersionToInputPath: map[unversioned.GroupVersion]string{ - unversioned.GroupVersion{Group: "testgroup.k8s.io", Version: ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io", + unversioned.GroupVersion{Group: "testgroup.k8s.io", Version: ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io", }, ClientsetName: "test_internalclientset", ClientsetOutputPath: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/", diff --git a/cmd/libs/go2idl/client-gen/test_apis/README b/cmd/libs/go2idl/client-gen/test_apis/README new file mode 100644 index 00000000000..454887a72a7 --- /dev/null +++ b/cmd/libs/go2idl/client-gen/test_apis/README @@ -0,0 +1,4 @@ +This dir can not be named "testdata" because of the way ugorji gnerates code. +Specifically, it emits a .go file and then calls `go run` on it. Because +"testdata" is a special name to Go, it decides NOT to find the vendor dir, and +therefore fails to compile. Just name it something else. diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/install/install.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go similarity index 95% rename from cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/install/install.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go index 43febdfc521..d81633aab54 100644 --- a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/install/install.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go @@ -23,8 +23,8 @@ import ( "github.com/golang/glog" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/unversioned" @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/util/sets" ) -const importPrefix = "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io" +const importPrefix = "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" var accessor = meta.NewAccessor() diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/register.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/register.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/register.go diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.generated.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/types.generated.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.generated.go diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/types.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.go diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/register.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/register.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/register.go diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.generated.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/types.generated.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.generated.go diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/types.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.go diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype.go index b59a1ec512b..dbc88d80ace 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - testgroup_k8s_io "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io" + testgroup_k8s_io "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" api "k8s.io/kubernetes/pkg/api" unversioned "k8s.io/kubernetes/pkg/api/unversioned" core "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_test.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_test.go index 0e55bc92573..04817c91f19 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_test.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_test.go @@ -21,8 +21,8 @@ import ( "net/url" "testing" - testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io" - _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/install" + testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" + _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install" . "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go index 3125dd27cbb..812f13a0a70 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go @@ -17,7 +17,7 @@ limitations under the License. package unversioned import ( - testgroup_k8s_io "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io" + testgroup_k8s_io "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" api "k8s.io/kubernetes/pkg/api" watch "k8s.io/kubernetes/pkg/watch" ) diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index 7aeee2f6752..891e52363da 100644 --- a/examples/apiserver/apiserver.go +++ b/examples/apiserver/apiserver.go @@ -20,7 +20,7 @@ import ( "fmt" "net" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1" testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/storage/storagebackend" // Install the testgroup API - _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/install" + _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install" ) const ( diff --git a/examples/apiserver/apiserver_test.go b/examples/apiserver/apiserver_test.go index 5e5ab8140b8..73ace78a543 100644 --- a/examples/apiserver/apiserver_test.go +++ b/examples/apiserver/apiserver_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1" "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/api/unversioned" diff --git a/examples/apiserver/rest/reststorage.go b/examples/apiserver/rest/reststorage.go index c87a5aed1ad..271f51bcc6d 100644 --- a/examples/apiserver/rest/reststorage.go +++ b/examples/apiserver/rest/reststorage.go @@ -17,7 +17,7 @@ limitations under the License. package rest import ( - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels"