From d41e7ecf531b2b743d003bd954cfa51cb4d07e0f Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 17 Dec 2015 16:20:22 -0500 Subject: [PATCH] miscellaneous group version updates --- cmd/genconversion/conversion.go | 7 +++++-- cmd/gendeepcopy/deep_copy.go | 7 +++++-- pkg/api/copy_test.go | 4 ++-- pkg/api/serialization_test.go | 16 ++++++++-------- pkg/api/testapi/testapi.go | 5 ++++- pkg/api/testing/fuzzer.go | 2 +- pkg/api/unversioned/group_version.go | 9 --------- pkg/api/validation/schema_test.go | 2 +- test/e2e/dns.go | 2 +- test/e2e/empty_dir.go | 2 +- test/e2e/host_path.go | 2 +- test/e2e/kubelet_etc_hosts.go | 4 ++-- test/e2e/kubeproxy.go | 4 ++-- test/e2e/pd.go | 2 +- test/e2e/privileged.go | 2 +- test/e2e/resize_nodes.go | 2 +- test/e2e/util.go | 2 +- 17 files changed, 37 insertions(+), 37 deletions(-) diff --git a/cmd/genconversion/conversion.go b/cmd/genconversion/conversion.go index ee2ca60ffd..7b6b6091b8 100644 --- a/cmd/genconversion/conversion.go +++ b/cmd/genconversion/conversion.go @@ -84,9 +84,12 @@ func main() { data := new(bytes.Buffer) - gv := unversioned.ParseGroupVersionOrDie(*groupVersion) + gv, err := unversioned.ParseGroupVersion(*groupVersion) + if err != nil { + glog.Fatalf("Error parsing groupversion %v: %v", *groupVersion, err) + } - _, err := data.WriteString(fmt.Sprintf("package %v\n", gv.Version)) + _, err = data.WriteString(fmt.Sprintf("package %v\n", gv.Version)) if err != nil { glog.Fatalf("Error while writing package line: %v", err) } diff --git a/cmd/gendeepcopy/deep_copy.go b/cmd/gendeepcopy/deep_copy.go index 963264ab7e..015beb47d6 100644 --- a/cmd/gendeepcopy/deep_copy.go +++ b/cmd/gendeepcopy/deep_copy.go @@ -94,7 +94,10 @@ func main() { data := new(bytes.Buffer) - gv := unversioned.ParseGroupVersionOrDie(*groupVersion) + gv, err := unversioned.ParseGroupVersion(*groupVersion) + if err != nil { + glog.Fatalf("Error parsing groupversion %v: %v", *groupVersion, err) + } registerTo := destScheme(gv) var pkgname string @@ -108,7 +111,7 @@ func main() { pkgname = gv.Version } - _, err := data.WriteString(fmt.Sprintf("package %s\n", pkgname)) + _, err = data.WriteString(fmt.Sprintf("package %s\n", pkgname)) if err != nil { glog.Fatalf("Error while writing package line: %v", err) } diff --git a/pkg/api/copy_test.go b/pkg/api/copy_test.go index 1866c7cf0e..94575c8853 100644 --- a/pkg/api/copy_test.go +++ b/pkg/api/copy_test.go @@ -33,7 +33,7 @@ import ( func TestDeepCopyApiObjects(t *testing.T) { for i := 0; i < *fuzzIters; i++ { for _, version := range []unversioned.GroupVersion{testapi.Default.InternalGroupVersion(), *testapi.Default.GroupVersion()} { - f := apitesting.FuzzerFor(t, version.String(), rand.NewSource(rand.Int63())) + f := apitesting.FuzzerFor(t, version, rand.NewSource(rand.Int63())) for kind := range api.Scheme.KnownTypes(version) { doDeepCopyTest(t, version.WithKind(kind), f) } @@ -61,7 +61,7 @@ func doDeepCopyTest(t *testing.T, kind unversioned.GroupVersionKind, f *fuzz.Fuz func TestDeepCopySingleType(t *testing.T) { for i := 0; i < *fuzzIters; i++ { for _, version := range []unversioned.GroupVersion{testapi.Default.InternalGroupVersion(), *testapi.Default.GroupVersion()} { - f := apitesting.FuzzerFor(t, version.String(), rand.NewSource(rand.Int63())) + f := apitesting.FuzzerFor(t, version, rand.NewSource(rand.Int63())) doDeepCopyTest(t, version.WithKind("Pod"), f) } } diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 3f4f4fcb74..10253ed6f6 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -41,13 +41,13 @@ import ( var fuzzIters = flag.Int("fuzz-iters", 20, "How many fuzzing iterations to do.") -var codecsToTest = []func(version string, item runtime.Object) (runtime.Codec, error){ - func(version string, item runtime.Object) (runtime.Codec, error) { +var codecsToTest = []func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, error){ + func(version unversioned.GroupVersion, item runtime.Object) (runtime.Codec, error) { return testapi.GetCodecForObject(item) }, } -func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, seed int64) runtime.Object { +func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item runtime.Object, seed int64) runtime.Object { apitesting.FuzzerFor(t, forVersion, rand.NewSource(seed)).Fuzz(item) j, err := meta.TypeAccessor(item) @@ -99,9 +99,9 @@ func roundTrip(t *testing.T, codec runtime.Codec, item runtime.Object) { func roundTripSame(t *testing.T, item runtime.Object, except ...string) { set := sets.NewString(except...) seed := rand.Int63() - fuzzInternalObject(t, testapi.Default.InternalGroupVersion().String(), item, seed) + fuzzInternalObject(t, testapi.Default.InternalGroupVersion(), item, seed) - version := testapi.Default.GroupVersion().String() + version := *testapi.Default.GroupVersion() codecs := []runtime.Codec{} for _, fn := range codecsToTest { codec, err := fn(version, item) @@ -112,7 +112,7 @@ func roundTripSame(t *testing.T, item runtime.Object, except ...string) { codecs = append(codecs, codec) } - if !set.Has(version) { + if !set.Has(version.String()) { fuzzInternalObject(t, version, item, seed) for _, codec := range codecs { roundTrip(t, codec, item) @@ -183,7 +183,7 @@ func doRoundTripTest(kind string, t *testing.T) { roundTripSame(t, item, nonRoundTrippableTypesByVersion[kind]...) } if !nonInternalRoundTrippableTypes.Has(kind) { - roundTrip(t, api.Codec, fuzzInternalObject(t, testapi.Default.InternalGroupVersion().String(), item, rand.Int63())) + roundTrip(t, api.Codec, fuzzInternalObject(t, testapi.Default.InternalGroupVersion(), item, rand.Int63())) } } @@ -266,7 +266,7 @@ func TestUnversionedTypes(t *testing.T) { const benchmarkSeed = 100 func benchmarkItems() []v1.Pod { - apiObjectFuzzer := apitesting.FuzzerFor(nil, "", rand.NewSource(benchmarkSeed)) + apiObjectFuzzer := apitesting.FuzzerFor(nil, api.SchemeGroupVersion, rand.NewSource(benchmarkSeed)) items := make([]v1.Pod, 2) for i := range items { apiObjectFuzzer.Fuzz(&items[i]) diff --git a/pkg/api/testapi/testapi.go b/pkg/api/testapi/testapi.go index 9c8d3bab4a..b4e0bd189f 100644 --- a/pkg/api/testapi/testapi.go +++ b/pkg/api/testapi/testapi.go @@ -50,7 +50,10 @@ func init() { if kubeTestAPI != "" { testGroupVersions := strings.Split(kubeTestAPI, ",") for _, gvString := range testGroupVersions { - groupVersion := unversioned.ParseGroupVersionOrDie(gvString) + groupVersion, err := unversioned.ParseGroupVersion(gvString) + if err != nil { + panic(fmt.Sprintf("Error parsing groupversion %v: %v", gvString, err)) + } Groups[groupVersion.Group] = TestGroup{ externalGroupVersion: groupVersion, diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index 0e923a2789..578f6b77aa 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -39,7 +39,7 @@ import ( ) // FuzzerFor can randomly populate api objects that are destined for version. -func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer { +func FuzzerFor(t *testing.T, version unversioned.GroupVersion, src rand.Source) *fuzz.Fuzzer { f := fuzz.New().NilChance(.5).NumElements(1, 1) if src != nil { f.RandSource(src) diff --git a/pkg/api/unversioned/group_version.go b/pkg/api/unversioned/group_version.go index 14af802f5b..3f5e325f64 100644 --- a/pkg/api/unversioned/group_version.go +++ b/pkg/api/unversioned/group_version.go @@ -162,15 +162,6 @@ func ParseGroupVersion(gv string) (GroupVersion, error) { } } -func ParseGroupVersionOrDie(gv string) GroupVersion { - ret, err := ParseGroupVersion(gv) - if err != nil { - panic(err) - } - - return ret -} - // WithKind creates a GroupVersionKind based on the method receiver's GroupVersion and the passed Kind. func (gv GroupVersion) WithKind(kind string) GroupVersionKind { return GroupVersionKind{Group: gv.Group, Version: gv.Version, Kind: kind} diff --git a/pkg/api/validation/schema_test.go b/pkg/api/validation/schema_test.go index 14b365bd82..f35df2bd84 100644 --- a/pkg/api/validation/schema_test.go +++ b/pkg/api/validation/schema_test.go @@ -67,7 +67,7 @@ func TestValidateOk(t *testing.T) { } seed := rand.Int63() - apiObjectFuzzer := apitesting.FuzzerFor(nil, "", rand.NewSource(seed)) + apiObjectFuzzer := apitesting.FuzzerFor(nil, testapi.Default.InternalGroupVersion(), rand.NewSource(seed)) for i := 0; i < 5; i++ { for _, test := range tests { testObj := test.obj diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 356188b4bc..1c4126c558 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -42,7 +42,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string) *api.Pod { pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: "dns-test-" + string(util.NewUUID()), diff --git a/test/e2e/empty_dir.go b/test/e2e/empty_dir.go index 9fd978bfeb..b5cd5f042f 100644 --- a/test/e2e/empty_dir.go +++ b/test/e2e/empty_dir.go @@ -313,7 +313,7 @@ func testPodWithVolume(image, path string, source *api.EmptyDirVolumeSource) *ap return &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: podName, diff --git a/test/e2e/host_path.go b/test/e2e/host_path.go index 1b62b07df8..4e446ce41a 100644 --- a/test/e2e/host_path.go +++ b/test/e2e/host_path.go @@ -111,7 +111,7 @@ func testPodWithHostVol(path string, source *api.HostPathVolumeSource) *api.Pod return &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: podName, diff --git a/test/e2e/kubelet_etc_hosts.go b/test/e2e/kubelet_etc_hosts.go index eaf2fd75b9..6e0ed80b03 100644 --- a/test/e2e/kubelet_etc_hosts.go +++ b/test/e2e/kubelet_etc_hosts.go @@ -143,7 +143,7 @@ func (config *KubeletManagedHostConfig) createPodSpec(podName string) *api.Pod { pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: podName, @@ -204,7 +204,7 @@ func (config *KubeletManagedHostConfig) createPodSpecWithHostNetwork(podName str pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: podName, diff --git a/test/e2e/kubeproxy.go b/test/e2e/kubeproxy.go index 934e4d07ed..f255ae24e5 100644 --- a/test/e2e/kubeproxy.go +++ b/test/e2e/kubeproxy.go @@ -255,7 +255,7 @@ func (config *KubeProxyTestConfig) createNetShellPodSpec(podName string, node st pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: podName, @@ -295,7 +295,7 @@ func (config *KubeProxyTestConfig) createTestPodSpec() *api.Pod { pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: testPodName, diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 0c0c9f981b..e97c2cf0c4 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -413,7 +413,7 @@ func testPDPod(diskNames []string, targetHost string, readOnly bool, numContaine pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: "pd-test-" + string(util.NewUUID()), diff --git a/test/e2e/privileged.go b/test/e2e/privileged.go index c1a34ab6c6..1a191f9ad0 100644 --- a/test/e2e/privileged.go +++ b/test/e2e/privileged.go @@ -102,7 +102,7 @@ func (config *PrivilegedPodTestConfig) createPrivilegedPodSpec() *api.Pod { pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: privilegedPodName, diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 6c71b01c82..9b2f4b912f 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -188,7 +188,7 @@ func rcByNameContainer(name string, replicas int, image string, labels map[strin return &api.ReplicationController{ TypeMeta: unversioned.TypeMeta{ Kind: "ReplicationController", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: name, diff --git a/test/e2e/util.go b/test/e2e/util.go index d355ba83ea..1fae3e4032 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -2149,7 +2149,7 @@ func NewHostExecPodSpec(ns, name string) *api.Pod { pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.Version, + APIVersion: latest.GroupOrDie(api.GroupName).GroupVersion.String(), }, ObjectMeta: api.ObjectMeta{ Name: name,