Subscription v1<>v1beta conversion

pkg/apis/messaging/v1beta1/subscription_conversion.go

@@ -19,16 +19,63 @@ package v1beta1
 import (
 	"context"
 	"fmt"
+	duckv1 "knative.dev/eventing/pkg/apis/duck/v1"
+	duckv1beta1 "knative.dev/eventing/pkg/apis/duck/v1beta1"
 
+	"knative.dev/eventing/pkg/apis/messaging/v1"
 	"knative.dev/pkg/apis"
 )
 
-// ConvertTo implements apis.Convertible
-func (source *Subscription) ConvertTo(ctx context.Context, sink apis.Convertible) error {
-	return fmt.Errorf("v1beta1 is the highest known version, got: %T", sink)
+// ConvertTo implements apis.Convertible.
+// Converts source (from v1beta1.Subscription) into v1.Subscription
+func (source *Subscription) ConvertTo(ctx context.Context, obj apis.Convertible) error {
+	switch sink := obj.(type) {
+	case *v1.Subscription:
+		sink.ObjectMeta = source.ObjectMeta
+		sink.Spec.Channel = source.Spec.Channel
+		if source.Spec.Delivery != nil {
+			sink.Spec.Delivery = &duckv1.DeliverySpec{}
+			if err := source.Spec.Delivery.ConvertTo(ctx, sink.Spec.Delivery); err != nil {
+				return err
+			}
+		}
+		sink.Spec.Subscriber = source.Spec.Subscriber
+		sink.Spec.Reply = source.Spec.Reply
+
+		sink.Status.Status = source.Status.Status
+		sink.Status.PhysicalSubscription.SubscriberURI = source.Status.PhysicalSubscription.SubscriberURI
+		sink.Status.PhysicalSubscription.ReplyURI = source.Status.PhysicalSubscription.ReplyURI
+		sink.Status.PhysicalSubscription.DeadLetterSinkURI = source.Status.PhysicalSubscription.DeadLetterSinkURI
+		return nil
+	default:
+		return fmt.Errorf("Unknown conversion, got: %T", sink)
+
+	}
 }
 
-// ConvertFrom implements apis.Convertible
-func (sink *Subscription) ConvertFrom(ctx context.Context, source apis.Convertible) error {
-	return fmt.Errorf("v1beta1 is the highest known version, got: %T", source)
+// ConvertFrom implements apis.Convertible.
+// Converts obj from v1.Subscription into v1beta1.Subscription
+func (sink *Subscription) ConvertFrom(ctx context.Context, obj apis.Convertible) error {
+	switch source := obj.(type) {
+	case *v1.Subscription:
+		sink.ObjectMeta = source.ObjectMeta
+		sink.Spec.Channel = source.Spec.Channel
+		if source.Spec.Delivery != nil {
+			sink.Spec.Delivery = &duckv1beta1.DeliverySpec{}
+			if err := sink.Spec.Delivery.ConvertFrom(ctx, source.Spec.Delivery); err != nil {
+				return err
+			}
+		}
+		sink.Spec.Subscriber = source.Spec.Subscriber
+		sink.Spec.Reply = source.Spec.Reply
+
+		sink.Status.Status = source.Status.Status
+		sink.Status.PhysicalSubscription.SubscriberURI = source.Status.PhysicalSubscription.SubscriberURI
+		sink.Status.PhysicalSubscription.ReplyURI = source.Status.PhysicalSubscription.ReplyURI
+		sink.Status.PhysicalSubscription.DeadLetterSinkURI = source.Status.PhysicalSubscription.DeadLetterSinkURI
+
+		return nil
+	default:
+		return fmt.Errorf("Unknown conversion, got: %T", source)
+	}
 }

pkg/apis/messaging/v1beta1/subscription_conversion_test.go

@@ -19,9 +19,30 @@ package v1beta1
 import (
 	"context"
 	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
+	duckv1beta1 "knative.dev/eventing/pkg/apis/duck/v1beta1"
+	"knative.dev/eventing/pkg/apis/messaging/v1"
+	"knative.dev/pkg/apis"
+	duckv1 "knative.dev/pkg/apis/duck/v1"
 )
 
 func TestSubscriptionConversionBadType(t *testing.T) {
+	good, bad := &Subscription{}, &Channel{}
+
+	if err := good.ConvertTo(context.Background(), bad); err == nil {
+		t.Errorf("ConvertTo() = %#v, wanted error", bad)
+	}
+
+	if err := good.ConvertFrom(context.Background(), bad); err == nil {
+		t.Errorf("ConvertFrom() = %#v, wanted error", good)
+	}
+}
+
+func TestBrokerConversionBadVersion(t *testing.T) {
 	good, bad := &Subscription{}, &Subscription{}
 
 	if err := good.ConvertTo(context.Background(), bad); err == nil {
@@ -32,3 +53,105 @@ func TestSubscriptionConversionBadType(t *testing.T) {
 		t.Errorf("ConvertFrom() = %#v, wanted error", good)
 	}
 }
+
+func TestSubscriptionConversion(t *testing.T) {
+	// Just one for now, just adding the for loop for ease of future changes.
+	versions := []apis.Convertible{&v1.Subscription{}}
+
+	linear := duckv1beta1.BackoffPolicyLinear
+
+	tests := []struct {
+		name string
+		in   *Subscription
+	}{{
+		name: "min configuration",
+		in: &Subscription{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:       "subscription-name",
+				Namespace:  "subscription-ns",
+				Generation: 17,
+			},
+			Spec: SubscriptionSpec{},
+		},
+	}, {
+		name: "full configuration",
+		in: &Subscription{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:       "subscription-name",
+				Namespace:  "subscription-ns",
+				Generation: 17,
+			},
+			Spec: SubscriptionSpec{
+				Channel: corev1.ObjectReference{
+					Kind:       "channelKind",
+					Namespace:  "channelNamespace",
+					Name:       "channelName",
+					APIVersion: "channelAPIVersion",
+				},
+				Subscriber: &duckv1.Destination{
+					Ref: &duckv1.KReference{
+						Kind:       "subscriber-dest-kind",
+						Namespace:  "subscriber-dest-ns",
+						Name:       "subscriber-dest-name",
+						APIVersion: "subscriber-dest-version",
+					},
+					URI: apis.HTTP("address"),
+				},
+				Reply: &duckv1.Destination{
+					Ref: &duckv1.KReference{
+						Kind:       "reply-dest-kind",
+						Namespace:  "reply-dest-ns",
+						Name:       "reply-dest-name",
+						APIVersion: "reply-dest-version",
+					},
+					URI: apis.HTTP("address"),
+				},
+				Delivery: &duckv1beta1.DeliverySpec{
+					DeadLetterSink: &duckv1.Destination{
+						Ref: &duckv1.KReference{
+							Kind:       "dlKind",
+							Namespace:  "dlNamespace",
+							Name:       "dlName",
+							APIVersion: "dlAPIVersion",
+						},
+						URI: apis.HTTP("dls"),
+					},
+					Retry:         pointer.Int32Ptr(5),
+					BackoffPolicy: &linear,
+					BackoffDelay:  pointer.StringPtr("5s"),
+				},
+			},
+			Status: SubscriptionStatus{
+				Status: duckv1.Status{
+					ObservedGeneration: 1,
+					Conditions: duckv1.Conditions{{
+						Type:   "Ready",
+						Status: "True",
+					}},
+				},
+				PhysicalSubscription: SubscriptionStatusPhysicalSubscription{
+					SubscriberURI:     apis.HTTP("subscriber.example.com"),
+					ReplyURI:          apis.HTTP("reply.example.com"),
+					DeadLetterSinkURI: apis.HTTP("dlc.example.com"),
+				},
+			},
+		},
+	}}
+	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 := &Subscription{}
+				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)
+				}
+			})
+		}
+	}
+}