chore: Remove unused filter name. Closes argoproj#872 (argoproj#888)

* chore: Remove unused filter name. Closes argoproj#872 * fix test case
icecoffee531 · Sep 25, 2020 · 0043769 · 0043769
1 parent 8298cea
commit 0043769
Show file tree

Hide file tree

Showing 13 changed files with 231 additions and 328 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/sensor.html b/api/sensor.html
diff --git a/api/sensor.md b/api/sensor.md
diff --git a/docs/tutorials/07-filters.md b/docs/tutorials/07-filters.md
@@ -55,7 +55,6 @@ The data filter offers `comparator` “>=”, “>”, “=”, “!=”, “<
 e.g.,
 
               filters:
-                name: data-filter
                 data:
                   - path: body.value
                     type: number

diff --git a/examples/sensors/data-filter-comparator-webhook.yaml b/examples/sensors/data-filter-comparator-webhook.yaml
@@ -10,7 +10,6 @@ spec:
       eventSourceName: webhook
       eventName: example
       filters:
-        name: data-filter
         data:
           - path: body.value
             type: number

diff --git a/examples/sensors/data-filter-value-webhook.yaml b/examples/sensors/data-filter-value-webhook.yaml
@@ -10,7 +10,6 @@ spec:
       eventSourceName: webhook
       eventName: example
       filters:
-        name: data-filter
         data:
           - path: body.value
             type: number

diff --git a/examples/sensors/data-filter-webhook.yaml b/examples/sensors/data-filter-webhook.yaml
@@ -10,7 +10,6 @@ spec:
       eventSourceName: webhook
       eventName: example
       filters:
-        name: data-filter
         data:
           - path: bucket
             type: string

diff --git a/examples/tutorials/07-filters/sensor-data-filters.yaml b/examples/tutorials/07-filters/sensor-data-filters.yaml
@@ -10,7 +10,6 @@ spec:
       eventSourceName: webhook
       eventName: example
       filters:
-        name: data-filter
         data:
           - path: body.message
             type: string

diff --git a/pkg/apis/sensor/v1alpha1/generated.pb.go b/pkg/apis/sensor/v1alpha1/generated.pb.go
diff --git a/pkg/apis/sensor/v1alpha1/generated.proto b/pkg/apis/sensor/v1alpha1/generated.proto
diff --git a/pkg/apis/sensor/v1alpha1/openapi_generated.go b/pkg/apis/sensor/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/sensor/v1alpha1/types.go b/pkg/apis/sensor/v1alpha1/types.go
@@ -158,15 +158,13 @@ type DependencyGroup struct {
 
 // EventDependencyFilter defines filters and constraints for a event.
 type EventDependencyFilter struct {
-	// Name is the name of event filter
-	Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
 	// Time filter on the event with escalation
-	Time *TimeFilter `json:"time,omitempty" protobuf:"bytes,2,opt,name=time"`
+	Time *TimeFilter `json:"time,omitempty" protobuf:"bytes,1,opt,name=time"`
 	// Context filter constraints
-	Context *EventContext `json:"context,omitempty" protobuf:"bytes,3,opt,name=context"`
+	Context *EventContext `json:"context,omitempty" protobuf:"bytes,2,opt,name=context"`
 
 	// Data filter constraints with escalation
-	Data []DataFilter `json:"data,omitempty" protobuf:"bytes,4,rep,name=data"`
+	Data []DataFilter `json:"data,omitempty" protobuf:"bytes,3,rep,name=data"`
 }
 
 // TimeFilter describes a window in time.

diff --git a/sensors/dependencies/filter_test.go b/sensors/dependencies/filter_test.go
@@ -374,7 +374,6 @@ func TestFilterEvent(t *testing.T) {
 	eventTime := time.Date(now.Year(), now.Month(), now.Day(), 16, 36, 34, 0, time.UTC)
 
 	filter := v1alpha1.EventDependencyFilter{
-		Name: "test-filter",
 		Time: &v1alpha1.TimeFilter{
 			Start: "09:09:09",
 			Stop:  "19:19:19",