Skip to content

Eventing conversion v1 <> v1beta1 #3402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow-robot merged 1 commit into from
Jun 24, 2020
Merged

Eventing conversion v1 <> v1beta1 #3402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkg/apis/eventing/v1beta1/broker_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,20 @@ import (
"context"
"fmt"

v1 "knative.dev/eventing/pkg/apis/eventing/v1"
duckv1 "knative.dev/eventing/pkg/apis/duck/v1"
duckv1beta1 "knative.dev/eventing/pkg/apis/duck/v1beta1"
"knative.dev/eventing/pkg/apis/eventing/v1"
Comment thread
aliok marked this conversation as resolved.
"knative.dev/pkg/apis"
)

// ConvertTo implements apis.Convertible
func (source *Broker) ConvertTo(ctx context.Context, to apis.Convertible) error {
switch sink := to.(type) {
case *v1.Broker:
sink.ObjectMeta = source.ObjectMeta
sink.Spec.Config = source.Spec.Config
if source.Spec.Delivery != nil {
sink.Spec.Delivery = &duckv1.DeliverySpec{}
if err := source.Spec.Delivery.ConvertTo(ctx, sink.Spec.Delivery); err != nil {
return err
}
Expand All @@ -46,9 +50,11 @@ func (source *Broker) ConvertTo(ctx context.Context, to apis.Convertible) error
func (sink *Broker) ConvertFrom(ctx context.Context, from apis.Convertible) error {
switch source := from.(type) {
case *v1.Broker:
sink.ObjectMeta = source.ObjectMeta
sink.Spec.Config = source.Spec.Config
if source.Spec.Delivery != nil {
if err := source.Spec.Delivery.ConvertFrom(ctx, sink.Spec.Delivery); err != nil {
sink.Spec.Delivery = &duckv1beta1.DeliverySpec{}
if err := sink.Spec.Delivery.ConvertFrom(ctx, source.Spec.Delivery); err != nil {
return err
}
}
Expand Down
191 changes: 178 additions & 13 deletions pkg/apis/eventing/v1beta1/broker_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,16 @@ import (
"context"
"testing"

v1 "knative.dev/eventing/pkg/apis/eventing/v1"
"github.com/google/go-cmp/cmp"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
eventingduckv1beta1 "knative.dev/eventing/pkg/apis/duck/v1beta1"
"knative.dev/eventing/pkg/apis/eventing/v1"
Comment thread
aliok marked this conversation as resolved.
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
)

func TestBrokerConversion(t *testing.T) {
objv1betav1, objv1 := &Broker{}, &v1.Broker{}

if err := objv1betav1.ConvertTo(context.Background(), objv1); err != nil {
t.Errorf("ConvertTo() = %#v, unexpected error", objv1betav1)
}

if err := objv1betav1.ConvertFrom(context.Background(), objv1); err != nil {
t.Errorf("ConvertFrom() = %#v, unexpected error", objv1)
}
}

func TestBrokerConversionBadType(t *testing.T) {
good, bad := &Broker{}, &Trigger{}

Expand All @@ -58,3 +53,173 @@ func TestBrokerConversionBadVersion(t *testing.T) {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}

// Test v1beta1 -> v1 -> v1beta1
func TestBrokerConversionRoundTripV1beta1(t *testing.T) {
// Just one for now, just adding the for loop for ease of future changes.
versions := []apis.Convertible{&v1.Broker{}}

linear := eventingduckv1beta1.BackoffPolicyLinear

tests := []struct {
name string
in *Broker
}{{
name: "min configuration",
in: &Broker{
ObjectMeta: metav1.ObjectMeta{
Name: "broker-name",
Namespace: "broker-ns",
Generation: 17,
},
Spec: BrokerSpec{},
},
}, {
name: "full configuration",
in: &Broker{
ObjectMeta: metav1.ObjectMeta{
Name: "broker-name",
Namespace: "broker-ns",
Generation: 17,
},
Spec: BrokerSpec{
Config: &duckv1.KReference{
Kind: "config-kind",
Namespace: "config-ns",
Name: "config-name",
APIVersion: "config-version",
},
Delivery: &eventingduckv1beta1.DeliverySpec{
DeadLetterSink: &duckv1.Destination{
Ref: &duckv1.KReference{
Kind: "dl-sink-kind",
Namespace: "dl-sink-ns",
Name: "dl-sink-name",
APIVersion: "dl-sink-version",
},
URI: apis.HTTP("dl-sink.example.com"),
},
Retry: pointer.Int32Ptr(5),
BackoffPolicy: &linear,
BackoffDelay: pointer.StringPtr("5s"),
},
},
Status: BrokerStatus{
Status: duckv1.Status{
ObservedGeneration: 1,
Conditions: duckv1.Conditions{{
Type: "Ready",
Status: "True",
}},
},
Address: duckv1.Addressable{
URL: apis.HTTP("address"),
},
},
},
}}

for _, test := range tests {
for _, version := range versions {
t.Run(test.name, func(t *testing.T) {
ver := version
if err := test.in.ConvertTo(context.Background(), ver); err != nil {
t.Errorf("ConvertTo() = %v", err)
}
got := &Broker{}
if err := got.ConvertFrom(context.Background(), ver); err != nil {
t.Errorf("ConvertFrom() = %v", err)
}

if diff := cmp.Diff(test.in, got); diff != "" {
t.Errorf("roundtrip (-want, +got) = %v", diff)
}
})
}
}
}

// Test v1 -> v1beta1 -> v1
func TestBrokerConversionRoundTripV1(t *testing.T) {
// Just one for now, just adding the for loop for ease of future changes.
versions := []apis.Convertible{&Broker{}}

linear := eventingduckv1.BackoffPolicyLinear

tests := []struct {
name string
in *v1.Broker
}{{
name: "min configuration",
in: &v1.Broker{
ObjectMeta: metav1.ObjectMeta{
Name: "par-name",
Namespace: "par-ns",
Generation: 17,
},
Spec: v1.BrokerSpec{},
},
}, {
name: "full configuration",
in: &v1.Broker{
ObjectMeta: metav1.ObjectMeta{
Name: "broker-name",
Namespace: "broker-ns",
Generation: 17,
},
Spec: v1.BrokerSpec{
Config: &duckv1.KReference{
Kind: "config-kind",
Namespace: "config-ns",
Name: "config-name",
APIVersion: "config-version",
},
Delivery: &eventingduckv1.DeliverySpec{
DeadLetterSink: &duckv1.Destination{
Ref: &duckv1.KReference{
Kind: "dl-sink-kind",
Namespace: "dl-sink-ns",
Name: "dl-sink-name",
APIVersion: "dl-sink-version",
},
URI: apis.HTTP("dl-sink.example.com"),
},
Retry: pointer.Int32Ptr(5),
BackoffPolicy: &linear,
BackoffDelay: pointer.StringPtr("5s"),
},
},
Status: v1.BrokerStatus{
Status: duckv1.Status{
ObservedGeneration: 1,
Conditions: duckv1.Conditions{{
Type: "Ready",
Status: "True",
}},
},
Address: duckv1.Addressable{
URL: apis.HTTP("address"),
},
},
},
}}

for _, test := range tests {
for _, version := range versions {
t.Run(test.name, func(t *testing.T) {
ver := version
if err := ver.ConvertFrom(context.Background(), test.in); err != nil {
t.Errorf("ConvertDown() = %v", err)
}
got := &v1.Broker{}
if err := ver.ConvertTo(context.Background(), got); err != nil {
t.Errorf("ConvertUp() = %v", err)
}

if diff := cmp.Diff(test.in, got); diff != "" {
t.Errorf("roundtrip (-want, +got) = %v", diff)
}
})
}
}
}
15 changes: 11 additions & 4 deletions pkg/apis/eventing/v1beta1/trigger_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,21 @@ import (
"context"
"fmt"

v1 "knative.dev/eventing/pkg/apis/eventing/v1"
"knative.dev/eventing/pkg/apis/eventing/v1"
Comment thread
aliok marked this conversation as resolved.
"knative.dev/pkg/apis"
)

// ConvertTo implements apis.Convertible
func (source *Trigger) ConvertTo(_ context.Context, to apis.Convertible) error {
switch sink := to.(type) {
case *v1.Trigger:
sink.ObjectMeta = source.ObjectMeta
sink.Spec.Broker = source.Spec.Broker
sink.Spec.Subscriber = source.Spec.Subscriber
if source.Spec.Filter != nil {
sink.Spec.Filter = &v1.TriggerFilter{}
sink.Spec.Filter = &v1.TriggerFilter{
Attributes: make(v1.TriggerFilterAttributes, 0),
}
for k, v := range source.Spec.Filter.Attributes {
sink.Spec.Filter.Attributes[k] = v
}
Expand All @@ -48,12 +51,16 @@ func (source *Trigger) ConvertTo(_ context.Context, to apis.Convertible) error {
func (sink *Trigger) ConvertFrom(_ context.Context, from apis.Convertible) error {
switch source := from.(type) {
case *v1.Trigger:
sink.ObjectMeta = source.ObjectMeta
sink.Spec.Broker = source.Spec.Broker
sink.Spec.Subscriber = source.Spec.Subscriber
if source.Spec.Filter != nil {
sink.Spec.Filter = &TriggerFilter{}
attributes := TriggerFilterAttributes{}
for k, v := range source.Spec.Filter.Attributes {
sink.Spec.Filter.Attributes[k] = v
attributes[k] = v
}
sink.Spec.Filter = &TriggerFilter{
Attributes: attributes,
}
}
sink.Status.Status = source.Status.Status
Expand Down
Loading