From f07c6486baf7ecf49a978b8aac7eac095b1f1e0b Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Thu, 5 Jan 2017 15:10:34 -0500 Subject: [PATCH] Rename metav1.Event to metav1.WatchEvent to avoid swagger collision The kind on this object was always WatchEvent --- pkg/api/serialization_test.go | 4 ++-- pkg/api/v1/conversion.go | 4 ++-- pkg/apis/meta/v1/register.go | 2 +- pkg/apis/meta/v1/watch.go | 13 ++++++------- pkg/client/restclient/watch/decoder.go | 2 +- pkg/client/restclient/watch/decoder_test.go | 2 +- pkg/client/restclient/watch/encoder.go | 7 +++++-- pkg/genericapiserver/api/watch_test.go | 4 ++-- .../extensions/thirdpartyresourcedata/codec.go | 2 +- .../extensions/thirdpartyresourcedata/codec_test.go | 2 +- pkg/watch/filter_test.go | 10 +++++----- pkg/watch/mux_test.go | 12 ++++++------ pkg/watch/streamwatcher_test.go | 2 +- 13 files changed, 34 insertions(+), 32 deletions(-) diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 25246e3eafd..7610225eba1 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -444,7 +444,7 @@ func TestObjectWatchFraming(t *testing.T) { if err := embedded.Encode(v1secret, obj); err != nil { t.Fatal(err) } - event := &metav1.Event{Type: string(watch.Added)} + event := &metav1.WatchEvent{Type: string(watch.Added)} event.Object.Raw = obj.Bytes() obj = &bytes.Buffer{} if err := s.Encode(event, obj); err != nil { @@ -456,7 +456,7 @@ func TestObjectWatchFraming(t *testing.T) { t.Fatal(err) } sr = streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s) - outEvent := &metav1.Event{} + outEvent := &metav1.WatchEvent{} res, _, err = sr.Decode(nil, outEvent) if err != nil || outEvent.Type != string(watch.Added) { t.Fatalf("%v: %#v", err, outEvent) diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index 9bb0e1fb0d6..2331d8da21c 100644 --- a/pkg/api/v1/conversion.go +++ b/pkg/api/v1/conversion.go @@ -123,14 +123,14 @@ func addFastPathConversionFuncs(scheme *runtime.Scheme) error { return true, Convert_api_Endpoints_To_v1_Endpoints(a, b, s) } - case *metav1.Event: + case *metav1.WatchEvent: switch b := objB.(type) { case *metav1.InternalEvent: return true, metav1.Convert_versioned_Event_to_versioned_InternalEvent(a, b, s) } case *metav1.InternalEvent: switch b := objB.(type) { - case *metav1.Event: + case *metav1.WatchEvent: return true, metav1.Convert_versioned_InternalEvent_to_versioned_Event(a, b, s) } } diff --git a/pkg/apis/meta/v1/register.go b/pkg/apis/meta/v1/register.go index b083aa9c992..959cb0dba43 100644 --- a/pkg/apis/meta/v1/register.go +++ b/pkg/apis/meta/v1/register.go @@ -37,7 +37,7 @@ func Kind(kind string) schema.GroupKind { // AddToGroupVersion registers common meta types into schemas. func AddToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion) { - scheme.AddKnownTypeWithName(groupVersion.WithKind(WatchEventKind), &Event{}) + scheme.AddKnownTypeWithName(groupVersion.WithKind(WatchEventKind), &WatchEvent{}) scheme.AddKnownTypeWithName( schema.GroupVersion{Group: groupVersion.Group, Version: runtime.APIVersionInternal}.WithKind(WatchEventKind), &InternalEvent{}, diff --git a/pkg/apis/meta/v1/watch.go b/pkg/apis/meta/v1/watch.go index 2a15d3cb5fe..126848e7a36 100644 --- a/pkg/apis/meta/v1/watch.go +++ b/pkg/apis/meta/v1/watch.go @@ -26,8 +26,7 @@ import ( // Event represents a single event to a watched resource. // // +protobuf=true -// +k8s:openapi-gen=false -type Event struct { +type WatchEvent struct { Type string `json:"type" protobuf:"bytes,1,opt,name=type"` // Object is: @@ -38,7 +37,7 @@ type Event struct { Object runtime.RawExtension `json:"object" protobuf:"bytes,2,opt,name=object"` } -func Convert_watch_Event_to_versioned_Event(in *watch.Event, out *Event, s conversion.Scope) error { +func Convert_watch_Event_to_versioned_Event(in *watch.Event, out *WatchEvent, s conversion.Scope) error { out.Type = string(in.Type) switch t := in.Object.(type) { case *runtime.Unknown: @@ -51,11 +50,11 @@ func Convert_watch_Event_to_versioned_Event(in *watch.Event, out *Event, s conve return nil } -func Convert_versioned_InternalEvent_to_versioned_Event(in *InternalEvent, out *Event, s conversion.Scope) error { +func Convert_versioned_InternalEvent_to_versioned_Event(in *InternalEvent, out *WatchEvent, s conversion.Scope) error { return Convert_watch_Event_to_versioned_Event((*watch.Event)(in), out, s) } -func Convert_versioned_Event_to_watch_Event(in *Event, out *watch.Event, s conversion.Scope) error { +func Convert_versioned_Event_to_watch_Event(in *WatchEvent, out *watch.Event, s conversion.Scope) error { out.Type = watch.EventType(in.Type) if in.Object.Object != nil { out.Object = in.Object.Object @@ -69,7 +68,7 @@ func Convert_versioned_Event_to_watch_Event(in *Event, out *watch.Event, s conve return nil } -func Convert_versioned_Event_to_versioned_InternalEvent(in *Event, out *InternalEvent, s conversion.Scope) error { +func Convert_versioned_Event_to_versioned_InternalEvent(in *WatchEvent, out *InternalEvent, s conversion.Scope) error { return Convert_versioned_Event_to_watch_Event(in, (*watch.Event)(out), s) } @@ -78,4 +77,4 @@ func Convert_versioned_Event_to_versioned_InternalEvent(in *Event, out *Internal type InternalEvent watch.Event func (e *InternalEvent) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } -func (e *Event) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } +func (e *WatchEvent) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } diff --git a/pkg/client/restclient/watch/decoder.go b/pkg/client/restclient/watch/decoder.go index c142441f4ac..77bebc9b205 100644 --- a/pkg/client/restclient/watch/decoder.go +++ b/pkg/client/restclient/watch/decoder.go @@ -45,7 +45,7 @@ func NewDecoder(decoder streaming.Decoder, embeddedDecoder runtime.Decoder) *Dec // Decode blocks until it can return the next object in the reader. Returns an error // if the reader is closed or an object can't be decoded. func (d *Decoder) Decode() (watch.EventType, runtime.Object, error) { - var got metav1.Event + var got metav1.WatchEvent res, _, err := d.decoder.Decode(nil, &got) if err != nil { return "", nil, err diff --git a/pkg/client/restclient/watch/decoder_test.go b/pkg/client/restclient/watch/decoder_test.go index 21ec7575bad..7c2dcf18364 100644 --- a/pkg/client/restclient/watch/decoder_test.go +++ b/pkg/client/restclient/watch/decoder_test.go @@ -47,7 +47,7 @@ func TestDecoder(t *testing.T) { if err != nil { t.Fatalf("Unexpected error %v", err) } - event := metav1.Event{ + event := metav1.WatchEvent{ Type: string(eventType), Object: runtime.RawExtension{Raw: json.RawMessage(data)}, } diff --git a/pkg/client/restclient/watch/encoder.go b/pkg/client/restclient/watch/encoder.go index c1abfeb9ace..72d95ca6eef 100644 --- a/pkg/client/restclient/watch/encoder.go +++ b/pkg/client/restclient/watch/encoder.go @@ -19,7 +19,7 @@ package versioned import ( "encoding/json" - "k8s.io/kubernetes/pkg/apis/meta/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/serializer/streaming" "k8s.io/kubernetes/pkg/watch" @@ -49,5 +49,8 @@ func (e *Encoder) Encode(event *watch.Event) error { return err } // FIXME: get rid of json.RawMessage. - return e.encoder.Encode(&v1.Event{string(event.Type), runtime.RawExtension{Raw: json.RawMessage(data)}}) + return e.encoder.Encode(&metav1.WatchEvent{ + Type: string(event.Type), + Object: runtime.RawExtension{Raw: json.RawMessage(data)}, + }) } diff --git a/pkg/genericapiserver/api/watch_test.go b/pkg/genericapiserver/api/watch_test.go index dc65b3df13d..f6779ddc3cf 100644 --- a/pkg/genericapiserver/api/watch_test.go +++ b/pkg/genericapiserver/api/watch_test.go @@ -333,7 +333,7 @@ func TestWatchRead(t *testing.T) { // Send w.Action(action, object) // Test receive - var got metav1.Event + var got metav1.WatchEvent _, _, err := d.Decode(nil, &got) if err != nil { t.Fatalf("%s: Unexpected error: %v", name, err) @@ -355,7 +355,7 @@ func TestWatchRead(t *testing.T) { } w.Stop() - var got metav1.Event + var got metav1.WatchEvent _, _, err := d.Decode(nil, &got) if err == nil { t.Errorf("Unexpected non-error") diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go index f7a1331121c..4058021d534 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec.go @@ -535,7 +535,7 @@ func (t *thirdPartyResourceDataEncoder) Encode(obj runtime.Object, stream io.Wri _, err = stream.Write(encBytes) return err case *metav1.InternalEvent: - event := &metav1.Event{} + event := &metav1.WatchEvent{} err := metav1.Convert_versioned_InternalEvent_to_versioned_Event(obj, event, nil) if err != nil { return err diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go index d51bbea8da8..f96db3f077c 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go @@ -238,7 +238,7 @@ func TestEncodeToStreamForInternalEvent(t *testing.T) { Kind: "Foo", }, delegate: testapi.Extensions.Codec()} buf := bytes.NewBuffer([]byte{}) - expected := &metav1.Event{ + expected := &metav1.WatchEvent{ Type: "Added", } err := e.Encode(&metav1.InternalEvent{ diff --git a/pkg/watch/filter_test.go b/pkg/watch/filter_test.go index fb2d5c3a092..abe714df9aa 100644 --- a/pkg/watch/filter_test.go +++ b/pkg/watch/filter_test.go @@ -25,11 +25,11 @@ import ( func TestFilter(t *testing.T) { table := []Event{ - {Added, testType("foo")}, - {Added, testType("bar")}, - {Added, testType("baz")}, - {Added, testType("qux")}, - {Added, testType("zoo")}, + {Type: Added, Object: testType("foo")}, + {Type: Added, Object: testType("bar")}, + {Type: Added, Object: testType("baz")}, + {Type: Added, Object: testType("qux")}, + {Type: Added, Object: testType("zoo")}, } source := NewFake() diff --git a/pkg/watch/mux_test.go b/pkg/watch/mux_test.go index a13802e676f..96e26de11f5 100644 --- a/pkg/watch/mux_test.go +++ b/pkg/watch/mux_test.go @@ -36,10 +36,10 @@ func (obj *myType) GetObjectKind() schema.ObjectKind { return schema.EmptyObject func TestBroadcaster(t *testing.T) { table := []Event{ - {Added, &myType{"foo", "hello world 1"}}, - {Added, &myType{"bar", "hello world 2"}}, - {Modified, &myType{"foo", "goodbye world 3"}}, - {Deleted, &myType{"bar", "hello world 4"}}, + {Type: Added, Object: &myType{"foo", "hello world 1"}}, + {Type: Added, Object: &myType{"bar", "hello world 2"}}, + {Type: Modified, Object: &myType{"foo", "goodbye world 3"}}, + {Type: Deleted, Object: &myType{"bar", "hello world 4"}}, } // The broadcaster we're testing @@ -124,8 +124,8 @@ func TestBroadcasterWatcherStopDeadlock(t *testing.T) { func TestBroadcasterDropIfChannelFull(t *testing.T) { m := NewBroadcaster(1, DropIfChannelFull) - event1 := Event{Added, &myType{"foo", "hello world 1"}} - event2 := Event{Added, &myType{"bar", "hello world 2"}} + event1 := Event{Type: Added, Object: &myType{"foo", "hello world 1"}} + event2 := Event{Type: Added, Object: &myType{"bar", "hello world 2"}} // Add a couple watchers watches := make([]Interface, 2) diff --git a/pkg/watch/streamwatcher_test.go b/pkg/watch/streamwatcher_test.go index 48960e3d93d..50afdd5f2e4 100644 --- a/pkg/watch/streamwatcher_test.go +++ b/pkg/watch/streamwatcher_test.go @@ -43,7 +43,7 @@ func (f fakeDecoder) Close() { func TestStreamWatcher(t *testing.T) { table := []Event{ - {Added, testType("foo")}, + {Type: Added, Object: testType("foo")}, } fd := fakeDecoder{make(chan Event, 5)}