Skip to content

Rename ConvertUp/Down to ConvertTo/From #2632

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 2 commits into from
Feb 24, 2020
Merged

Rename ConvertUp/Down to ConvertTo/From #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21d3705
bump knative.dev/pkg
dprotaso Feb 24, 2020
9eb2371
Rename ConvertUp/Down to ConvertTo/From
dprotaso Feb 24, 2020
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
4 changes: 2 additions & 2 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/webhook/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func NewConversionController(ctx context.Context, cmw configmap.Watcher) *contro
},
},

// A function that infuses the context passed to ConvertUp/ConvertDown/SetDefaults with custom metadata.
// A function that infuses the context passed to ConvertTo/ConvertFrom/SetDefaults with custom metadata.
func(ctx context.Context) context.Context {
return ctx
},
Expand Down
16 changes: 8 additions & 8 deletions pkg/apis/duck/v1beta1/delivery_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ import (
"knative.dev/pkg/apis"
)

// ConvertUp implements apis.Convertible
func (source *DeliverySpec) ConvertUp(ctx context.Context, sink apis.Convertible) error {
// ConvertTo implements apis.Convertible
func (source *DeliverySpec) ConvertTo(ctx context.Context, sink apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", sink)
}

// ConvertDown implements apis.Convertible
func (sink *DeliverySpec) ConvertDown(ctx context.Context, source apis.Convertible) error {
// ConvertFrom implements apis.Convertible
func (sink *DeliverySpec) ConvertFrom(ctx context.Context, source apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", source)
}

// ConvertUp implements apis.Convertible
func (source *DeliveryStatus) ConvertUp(ctx context.Context, sink apis.Convertible) error {
// ConvertTo implements apis.Convertible
func (source *DeliveryStatus) ConvertTo(ctx context.Context, sink apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", sink)
}

// ConvertDown implements apis.Convertible
func (sink *DeliveryStatus) ConvertDown(ctx context.Context, source apis.Convertible) error {
// ConvertFrom implements apis.Convertible
func (sink *DeliveryStatus) ConvertFrom(ctx context.Context, source apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", source)
}
16 changes: 8 additions & 8 deletions pkg/apis/duck/v1beta1/delivery_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ import (
func TestDeliverySpecConversionBadType(t *testing.T) {
good, bad := &DeliverySpec{}, &DeliverySpec{}

if err := good.ConvertUp(context.Background(), bad); err == nil {
t.Errorf("ConvertUp() = %#v, wanted error", bad)
if err := good.ConvertTo(context.Background(), bad); err == nil {
t.Errorf("ConvertTo() = %#v, wanted error", bad)
}

if err := good.ConvertDown(context.Background(), bad); err == nil {
t.Errorf("ConvertDown() = %#v, wanted error", good)
if err := good.ConvertFrom(context.Background(), bad); err == nil {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}

func TestDeliveryStatusConversionBadType(t *testing.T) {
good, bad := &DeliveryStatus{}, &DeliveryStatus{}

if err := good.ConvertUp(context.Background(), bad); err == nil {
t.Errorf("ConvertUp() = %#v, wanted error", bad)
if err := good.ConvertTo(context.Background(), bad); err == nil {
t.Errorf("ConvertTo() = %#v, wanted error", bad)
}

if err := good.ConvertDown(context.Background(), bad); err == nil {
t.Errorf("ConvertDown() = %#v, wanted error", good)
if err := good.ConvertFrom(context.Background(), bad); err == nil {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}
12 changes: 6 additions & 6 deletions pkg/apis/eventing/v1alpha1/broker_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ import (
"knative.dev/pkg/apis"
)

// ConvertUp implements apis.Convertible.
// ConvertTo implements apis.Convertible.
// Converts source (from v1alpha1.Broker) into v1beta1.Broker
func (source *Broker) ConvertUp(ctx context.Context, obj apis.Convertible) error {
func (source *Broker) ConvertTo(ctx context.Context, obj apis.Convertible) error {
switch sink := obj.(type) {
case *v1beta1.Broker:
sink.ObjectMeta = source.ObjectMeta
sink.Spec.Config = source.Spec.Config
sink.Spec.Delivery = source.Spec.Delivery
sink.Status.Status = source.Status.Status
if err := source.Status.Address.ConvertUp(ctx, &sink.Status.Address); err != nil {
if err := source.Status.Address.ConvertTo(ctx, &sink.Status.Address); err != nil {
return err
}
return nil
Expand All @@ -43,15 +43,15 @@ func (source *Broker) ConvertUp(ctx context.Context, obj apis.Convertible) error
}
}

// ConvertDown implements apis.Convertible.
// ConvertFrom implements apis.Convertible.
// Converts obj from v1beta1.Broker into v1alpha1.Broker
func (sink *Broker) ConvertDown(ctx context.Context, obj apis.Convertible) error {
func (sink *Broker) ConvertFrom(ctx context.Context, obj apis.Convertible) error {
switch source := obj.(type) {
case *v1beta1.Broker:
sink.ObjectMeta = source.ObjectMeta
sink.Spec.Delivery = source.Spec.Delivery
sink.Status.Status = source.Status.Status
if err := sink.Status.Address.ConvertDown(ctx, &source.Status.Address); err != nil {
if err := sink.Status.Address.ConvertFrom(ctx, &source.Status.Address); err != nil {
return err
}
sink.Spec.Config = source.Spec.Config
Expand Down
16 changes: 8 additions & 8 deletions pkg/apis/eventing/v1alpha1/broker_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ import (
func TestBrokerConversionBadType(t *testing.T) {
good, bad := &Broker{}, &dummy{}

if err := good.ConvertUp(context.Background(), bad); err == nil {
t.Errorf("ConvertUp() = %#v, wanted error", bad)
if err := good.ConvertTo(context.Background(), bad); err == nil {
t.Errorf("ConvertTo() = %#v, wanted error", bad)
}

if err := good.ConvertDown(context.Background(), bad); err == nil {
t.Errorf("ConvertDown() = %#v, wanted error", good)
if err := good.ConvertFrom(context.Background(), bad); err == nil {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}

Expand Down Expand Up @@ -129,12 +129,12 @@ func TestBrokerConversion(t *testing.T) {
for _, version := range versions {
t.Run(test.name, func(t *testing.T) {
ver := version
if err := test.in.ConvertUp(context.Background(), ver); err != nil {
t.Errorf("ConvertUp() = %v", err)
if err := test.in.ConvertTo(context.Background(), ver); err != nil {
t.Errorf("ConvertTo() = %v", err)
}
got := &Broker{}
if err := got.ConvertDown(context.Background(), ver); err != nil {
t.Errorf("ConvertDown() = %v", err)
if err := got.ConvertFrom(context.Background(), ver); err != nil {
t.Errorf("ConvertFrom() = %v", err)
}
// Since on the way down, we lose the DeprecatedSourceAndType,
// convert the in to equivalent out.
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/eventing/v1alpha1/eventtype_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"knative.dev/pkg/apis"
)

// ConvertUp implements apis.Convertible.
// ConvertTo implements apis.Convertible.
// Converts source (from v1alpha1.EventType) into v1beta1.EventType
func (source *EventType) ConvertUp(ctx context.Context, obj apis.Convertible) error {
func (source *EventType) ConvertTo(ctx context.Context, obj apis.Convertible) error {
switch sink := obj.(type) {
case *v1beta1.EventType:
b, err := json.Marshal(source)
Expand All @@ -41,9 +41,9 @@ func (source *EventType) ConvertUp(ctx context.Context, obj apis.Convertible) er
}
}

// ConvertDown implements apis.Convertible.
// ConvertFrom implements apis.Convertible.
// Converts obj from v1beta1.EventType into v1alpha1.EventType
func (sink *EventType) ConvertDown(ctx context.Context, obj apis.Convertible) error {
func (sink *EventType) ConvertFrom(ctx context.Context, obj apis.Convertible) error {
switch source := obj.(type) {
case *v1beta1.EventType:
b, err := json.Marshal(source)
Expand Down
16 changes: 8 additions & 8 deletions pkg/apis/eventing/v1alpha1/eventtype_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import (
func TestEventTypeConversionBadType(t *testing.T) {
good, bad := &EventType{}, &dummy{}

if err := good.ConvertUp(context.Background(), bad); err == nil {
t.Errorf("ConvertUp() = %#v, wanted error", bad)
if err := good.ConvertTo(context.Background(), bad); err == nil {
t.Errorf("ConvertTo() = %#v, wanted error", bad)
}

if err := good.ConvertDown(context.Background(), bad); err == nil {
t.Errorf("ConvertDown() = %#v, wanted error", good)
if err := good.ConvertFrom(context.Background(), bad); err == nil {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}

Expand Down Expand Up @@ -93,12 +93,12 @@ func TestEventTypeConversion(t *testing.T) {
for _, version := range versions {
t.Run(test.name, func(t *testing.T) {
ver := version
if err := test.in.ConvertUp(context.Background(), ver); err != nil {
t.Errorf("ConvertUp() = %v", err)
if err := test.in.ConvertTo(context.Background(), ver); err != nil {
t.Errorf("ConvertTo() = %v", err)
}
got := &EventType{}
if err := got.ConvertDown(context.Background(), ver); err != nil {
t.Errorf("ConvertDown() = %v", err)
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)
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/eventing/v1alpha1/trigger_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"knative.dev/pkg/apis"
)

// ConvertUp implements apis.Convertible.
// ConvertTo implements apis.Convertible.
// Converts source (from v1alpha1.Trigger) into v1beta1.Trigger
func (source *Trigger) ConvertUp(ctx context.Context, obj apis.Convertible) error {
func (source *Trigger) ConvertTo(ctx context.Context, obj apis.Convertible) error {
switch sink := obj.(type) {
case *v1beta1.Trigger:
sink.ObjectMeta = source.ObjectMeta
Expand Down Expand Up @@ -55,9 +55,9 @@ func (source *Trigger) ConvertUp(ctx context.Context, obj apis.Convertible) erro
}
}

// ConvertDown implements apis.Convertible.
// ConvertFrom implements apis.Convertible.
// Converts obj from v1beta1.Trigger into v1alpha1.Trigger
func (sink *Trigger) ConvertDown(ctx context.Context, obj apis.Convertible) error {
func (sink *Trigger) ConvertFrom(ctx context.Context, obj apis.Convertible) error {
switch source := obj.(type) {
case *v1beta1.Trigger:
sink.ObjectMeta = source.ObjectMeta
Expand Down
20 changes: 10 additions & 10 deletions pkg/apis/eventing/v1alpha1/trigger_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@ import (
// implement apis.Convertible
type dummy struct{}

func (*dummy) ConvertUp(ctx context.Context, obj apis.Convertible) error {
func (*dummy) ConvertTo(ctx context.Context, obj apis.Convertible) error {
return errors.New("Won't go")
}

func (*dummy) ConvertDown(ctx context.Context, obj apis.Convertible) error {
func (*dummy) ConvertFrom(ctx context.Context, obj apis.Convertible) error {
return errors.New("Won't go")
}

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

if err := good.ConvertUp(context.Background(), bad); err == nil {
t.Errorf("ConvertUp() = %#v, wanted error", bad)
if err := good.ConvertTo(context.Background(), bad); err == nil {
t.Errorf("ConvertTo() = %#v, wanted error", bad)
}

if err := good.ConvertDown(context.Background(), bad); err == nil {
t.Errorf("ConvertDown() = %#v, wanted error", good)
if err := good.ConvertFrom(context.Background(), bad); err == nil {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}

Expand Down Expand Up @@ -156,12 +156,12 @@ func TestTriggerConversion(t *testing.T) {
for _, version := range versions {
t.Run(test.name, func(t *testing.T) {
ver := version
if err := test.in.ConvertUp(context.Background(), ver); err != nil {
t.Errorf("ConvertUp() = %v", err)
if err := test.in.ConvertTo(context.Background(), ver); err != nil {
t.Errorf("ConvertTo() = %v", err)
}
got := &Trigger{}
if err := got.ConvertDown(context.Background(), ver); err != nil {
t.Errorf("ConvertDown() = %v", err)
if err := got.ConvertFrom(context.Background(), ver); err != nil {
t.Errorf("ConvertFrom() = %v", err)
}
// Since on the way down, we lose the DeprecatedSourceAndType,
// convert the in to equivalent out.
Expand Down
8 changes: 4 additions & 4 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 @@ -23,12 +23,12 @@ import (
"knative.dev/pkg/apis"
)

// ConvertUp implements apis.Convertible
func (source *Broker) ConvertUp(ctx context.Context, sink apis.Convertible) error {
// ConvertTo implements apis.Convertible
func (source *Broker) ConvertTo(ctx context.Context, sink apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", sink)
}

// ConvertDown implements apis.Convertible
func (sink *Broker) ConvertDown(ctx context.Context, source apis.Convertible) error {
// ConvertFrom implements apis.Convertible
func (sink *Broker) ConvertFrom(ctx context.Context, source apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", source)
}
8 changes: 4 additions & 4 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 @@ -24,11 +24,11 @@ import (
func TestBrokerConversionBadType(t *testing.T) {
good, bad := &Broker{}, &Broker{}

if err := good.ConvertUp(context.Background(), bad); err == nil {
t.Errorf("ConvertUp() = %#v, wanted error", bad)
if err := good.ConvertTo(context.Background(), bad); err == nil {
t.Errorf("ConvertTo() = %#v, wanted error", bad)
}

if err := good.ConvertDown(context.Background(), bad); err == nil {
t.Errorf("ConvertDown() = %#v, wanted error", good)
if err := good.ConvertFrom(context.Background(), bad); err == nil {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}
8 changes: 4 additions & 4 deletions pkg/apis/eventing/v1beta1/eventtype_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import (
"knative.dev/pkg/apis"
)

// ConvertUp implements apis.Convertible
func (source *EventType) ConvertUp(ctx context.Context, sink apis.Convertible) error {
// ConvertTo implements apis.Convertible
func (source *EventType) ConvertTo(ctx context.Context, sink apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", sink)
}

// ConvertDown implements apis.Convertible
func (sink *EventType) ConvertDown(ctx context.Context, source apis.Convertible) error {
// ConvertFrom implements apis.Convertible
func (sink *EventType) ConvertFrom(ctx context.Context, source apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", source)
}
8 changes: 4 additions & 4 deletions pkg/apis/eventing/v1beta1/eventtype_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
func TestEventTypeConversionBadType(t *testing.T) {
good, bad := &EventType{}, &EventType{}

if err := good.ConvertUp(context.Background(), bad); err == nil {
t.Errorf("ConvertUp() = %#v, wanted error", bad)
if err := good.ConvertTo(context.Background(), bad); err == nil {
t.Errorf("ConvertTo() = %#v, wanted error", bad)
}

if err := good.ConvertDown(context.Background(), bad); err == nil {
t.Errorf("ConvertDown() = %#v, wanted error", good)
if err := good.ConvertFrom(context.Background(), bad); err == nil {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}
8 changes: 4 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 @@ -23,12 +23,12 @@ import (
"knative.dev/pkg/apis"
)

// ConvertUp implements apis.Convertible
func (source *Trigger) ConvertUp(ctx context.Context, sink apis.Convertible) error {
// ConvertTo implements apis.Convertible
func (source *Trigger) ConvertTo(ctx context.Context, sink apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", sink)
}

// ConvertDown implements apis.Convertible
func (sink *Trigger) ConvertDown(ctx context.Context, source apis.Convertible) error {
// ConvertFrom implements apis.Convertible
func (sink *Trigger) ConvertFrom(ctx context.Context, source apis.Convertible) error {
return fmt.Errorf("v1beta1 is the highest known version, got: %T", source)
}
8 changes: 4 additions & 4 deletions pkg/apis/eventing/v1beta1/trigger_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
func TestTriggerConversionBadType(t *testing.T) {
good, bad := &Trigger{}, &Trigger{}

if err := good.ConvertUp(context.Background(), bad); err == nil {
t.Errorf("ConvertUp() = %#v, wanted error", bad)
if err := good.ConvertTo(context.Background(), bad); err == nil {
t.Errorf("ConvertTo() = %#v, wanted error", bad)
}

if err := good.ConvertDown(context.Background(), bad); err == nil {
t.Errorf("ConvertDown() = %#v, wanted error", good)
if err := good.ConvertFrom(context.Background(), bad); err == nil {
t.Errorf("ConvertFrom() = %#v, wanted error", good)
}
}
Loading