github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Rename codecgen "testdata" dir so ugorji works

Browse Source 
Go mistreats "testdata" and can't find vendor/ dirs.
This commit is contained in:
Tim Hockin 2016-05-05 20:51:23 -07:00
parent 18e7a3eb24
commit 7aff0f1486
15 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/libs/go2idl/client-gen/main.go
View File

@ -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/",

4
cmd/libs/go2idl/client-gen/test_apis/README Normal file
View File

@ -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.

6
cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/install/install.go → cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go
View File

@ -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()

0
cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/register.go → cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/register.go
View File

0
cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/types.generated.go → cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.generated.go
View File

0
cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/types.go → cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.go
View File

0
cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/register.go → cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/register.go
View File

0
cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/types.generated.go → cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.generated.go
View File

0
cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1/types.go → cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.go
View File

2
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype.go
View File

@ -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"

4
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_test.go
View File

@ -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"

2
cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go
View File

@ -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"
)

4
examples/apiserver/apiserver.go
View File

@ -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 (

2
examples/apiserver/apiserver_test.go
View File

@ -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"

2
examples/apiserver/rest/reststorage.go
View File

@ -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"