From e3ca9b2f057e7a1135c266a16cb794dba6a457d2 Mon Sep 17 00:00:00 2001 From: Scott Nichols Date: Tue, 28 Aug 2018 07:19:47 -0700 Subject: [PATCH 1/2] Nothing to validate with event sources. removing todos. --- .../feeds/v1alpha1/cluster_event_source_types.go | 1 - .../v1alpha1/cluster_event_source_validation.go | 15 +-------------- .../v1alpha1/common_event_source_defaults.go | 2 +- .../v1alpha1/common_event_source_validation.go | 2 +- pkg/apis/feeds/v1alpha1/event_source_types.go | 1 - .../feeds/v1alpha1/event_source_validation.go | 15 +-------------- 6 files changed, 4 insertions(+), 32 deletions(-) diff --git a/pkg/apis/feeds/v1alpha1/cluster_event_source_types.go b/pkg/apis/feeds/v1alpha1/cluster_event_source_types.go index 72dcf93bb65..08fd3f98539 100644 --- a/pkg/apis/feeds/v1alpha1/cluster_event_source_types.go +++ b/pkg/apis/feeds/v1alpha1/cluster_event_source_types.go @@ -44,7 +44,6 @@ type ClusterEventSource struct { // Check that ClusterEventSource can be validated, can be defaulted, and has immutable fields. var _ apis.Validatable = (*ClusterEventSource)(nil) var _ apis.Defaultable = (*ClusterEventSource)(nil) -var _ apis.Immutable = (*ClusterEventSource)(nil) var _ runtime.Object = (*ClusterEventSource)(nil) var _ webhook.GenericCRD = (*ClusterEventSource)(nil) diff --git a/pkg/apis/feeds/v1alpha1/cluster_event_source_validation.go b/pkg/apis/feeds/v1alpha1/cluster_event_source_validation.go index fbb531b689f..baab9831c1e 100644 --- a/pkg/apis/feeds/v1alpha1/cluster_event_source_validation.go +++ b/pkg/apis/feeds/v1alpha1/cluster_event_source_validation.go @@ -25,19 +25,6 @@ func (ces *ClusterEventSource) Validate() *apis.FieldError { } func (cess *ClusterEventSourceSpec) Validate() *apis.FieldError { + // nothing to validate return cess.CommonEventSourceSpec.Validate() } - -func (current *ClusterEventSource) CheckImmutableFields(og apis.Immutable) *apis.FieldError { - original, ok := og.(*ClusterEventSource) - if !ok { - return &apis.FieldError{Message: "The provided original was not a ClusterEventSource"} - } - if original == nil { - return nil - } - - // TODO - - return nil -} diff --git a/pkg/apis/feeds/v1alpha1/common_event_source_defaults.go b/pkg/apis/feeds/v1alpha1/common_event_source_defaults.go index dcc86c58bcb..fc51100a254 100644 --- a/pkg/apis/feeds/v1alpha1/common_event_source_defaults.go +++ b/pkg/apis/feeds/v1alpha1/common_event_source_defaults.go @@ -17,5 +17,5 @@ limitations under the License. package v1alpha1 func (cess *CommonEventSourceSpec) SetDefaults() { - // TODO anything? + // nothing to default } diff --git a/pkg/apis/feeds/v1alpha1/common_event_source_validation.go b/pkg/apis/feeds/v1alpha1/common_event_source_validation.go index bb665284c32..8499e9f879c 100644 --- a/pkg/apis/feeds/v1alpha1/common_event_source_validation.go +++ b/pkg/apis/feeds/v1alpha1/common_event_source_validation.go @@ -21,6 +21,6 @@ import ( ) func (cess *CommonEventSourceSpec) Validate() *apis.FieldError { - // TODO + // nothing to validate return nil } diff --git a/pkg/apis/feeds/v1alpha1/event_source_types.go b/pkg/apis/feeds/v1alpha1/event_source_types.go index 6c1d800412e..84776c4c381 100644 --- a/pkg/apis/feeds/v1alpha1/event_source_types.go +++ b/pkg/apis/feeds/v1alpha1/event_source_types.go @@ -42,7 +42,6 @@ type EventSource struct { // Check that EventSource can be validated, can be defaulted, and has immutable fields. var _ apis.Validatable = (*EventSource)(nil) var _ apis.Defaultable = (*EventSource)(nil) -var _ apis.Immutable = (*EventSource)(nil) var _ runtime.Object = (*EventSource)(nil) var _ webhook.GenericCRD = (*EventSource)(nil) diff --git a/pkg/apis/feeds/v1alpha1/event_source_validation.go b/pkg/apis/feeds/v1alpha1/event_source_validation.go index b0c7c0e3be1..4886dedd900 100644 --- a/pkg/apis/feeds/v1alpha1/event_source_validation.go +++ b/pkg/apis/feeds/v1alpha1/event_source_validation.go @@ -25,19 +25,6 @@ func (es *EventSource) Validate() *apis.FieldError { } func (ess *EventSourceSpec) Validate() *apis.FieldError { + // nothing to validate return ess.CommonEventSourceSpec.Validate() } - -func (current *EventSource) CheckImmutableFields(og apis.Immutable) *apis.FieldError { - original, ok := og.(*EventSource) - if !ok { - return &apis.FieldError{Message: "The provided original was not a EventSource"} - } - if original == nil { - return nil - } - - // TODO - - return nil -} From 14da86d8c437a5aaa6e5fc30578ef1f41821c42f Mon Sep 17 00:00:00 2001 From: Scott Nichols Date: Wed, 29 Aug 2018 12:12:13 -0700 Subject: [PATCH 2/2] Remove comments for noting to validate. --- pkg/apis/feeds/v1alpha1/cluster_event_source_defaults.go | 9 ++++----- .../feeds/v1alpha1/cluster_event_source_validation.go | 9 ++++----- pkg/apis/feeds/v1alpha1/event_source_defaults.go | 1 - pkg/apis/feeds/v1alpha1/event_source_validation.go | 1 - 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkg/apis/feeds/v1alpha1/cluster_event_source_defaults.go b/pkg/apis/feeds/v1alpha1/cluster_event_source_defaults.go index 3baae562883..ba86a0d2894 100644 --- a/pkg/apis/feeds/v1alpha1/cluster_event_source_defaults.go +++ b/pkg/apis/feeds/v1alpha1/cluster_event_source_defaults.go @@ -16,11 +16,10 @@ limitations under the License. package v1alpha1 -func (ces *ClusterEventSource) SetDefaults() { - ces.Spec.SetDefaults() +func (es *ClusterEventSource) SetDefaults() { + es.Spec.SetDefaults() } -func (cess *ClusterEventSourceSpec) SetDefaults() { - cess.CommonEventSourceSpec.SetDefaults() - // TODO anything? +func (ess *ClusterEventSourceSpec) SetDefaults() { + ess.CommonEventSourceSpec.SetDefaults() } diff --git a/pkg/apis/feeds/v1alpha1/cluster_event_source_validation.go b/pkg/apis/feeds/v1alpha1/cluster_event_source_validation.go index baab9831c1e..96451fc1d5d 100644 --- a/pkg/apis/feeds/v1alpha1/cluster_event_source_validation.go +++ b/pkg/apis/feeds/v1alpha1/cluster_event_source_validation.go @@ -20,11 +20,10 @@ import ( "github.com/knative/pkg/apis" ) -func (ces *ClusterEventSource) Validate() *apis.FieldError { - return ces.Spec.Validate().ViaField("spec") +func (es *ClusterEventSource) Validate() *apis.FieldError { + return es.Spec.Validate().ViaField("spec") } -func (cess *ClusterEventSourceSpec) Validate() *apis.FieldError { - // nothing to validate - return cess.CommonEventSourceSpec.Validate() +func (ess *ClusterEventSourceSpec) Validate() *apis.FieldError { + return ess.CommonEventSourceSpec.Validate() } diff --git a/pkg/apis/feeds/v1alpha1/event_source_defaults.go b/pkg/apis/feeds/v1alpha1/event_source_defaults.go index 80de3610b94..b49b8b0f0b0 100644 --- a/pkg/apis/feeds/v1alpha1/event_source_defaults.go +++ b/pkg/apis/feeds/v1alpha1/event_source_defaults.go @@ -22,5 +22,4 @@ func (es *EventSource) SetDefaults() { func (ess *EventSourceSpec) SetDefaults() { ess.CommonEventSourceSpec.SetDefaults() - // TODO anything? } diff --git a/pkg/apis/feeds/v1alpha1/event_source_validation.go b/pkg/apis/feeds/v1alpha1/event_source_validation.go index 4886dedd900..277babf6ea3 100644 --- a/pkg/apis/feeds/v1alpha1/event_source_validation.go +++ b/pkg/apis/feeds/v1alpha1/event_source_validation.go @@ -25,6 +25,5 @@ func (es *EventSource) Validate() *apis.FieldError { } func (ess *EventSourceSpec) Validate() *apis.FieldError { - // nothing to validate return ess.CommonEventSourceSpec.Validate() }