fix validate sensor test

argoproj · Oct 6, 2018 · c573229 · c573229
1 parent e5a82ec
commit c573229
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/controllers/sensor/controller.go b/controllers/sensor/controller.go
@@ -20,20 +20,18 @@ import (
 	"context"
 	"errors"
 	"time"
-
+	"fmt"
+	"log"
 
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
-
 	base "github.com/argoproj/argo-events"
 	"github.com/argoproj/argo-events/common"
 	"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
 	sensorclientset "github.com/argoproj/argo-events/pkg/client/sensor/clientset/versioned"
-	"fmt"
-	"log"
 )
 
 const (

diff --git a/controllers/sensor/signal-filter.go b/controllers/sensor/signal-filter.go
@@ -96,14 +96,14 @@ func (se *sensorExecutionCtx) filterTime(timeFilter *v1alpha1.TimeFilter, eventT
 		se.log.Info().Str("date", currentTStr).Msg("current date")
 		if timeFilter.Start != "" && timeFilter.Stop != "" {
 			se.log.Info().Str("start time format", currentTStr+" "+timeFilter.Start).Msg("start time format")
-			startTime, err := time.Parse(common.StandardTimeFormat, currentTStr + " " + timeFilter.Start)
+			startTime, err := time.Parse(common.StandardTimeFormat, currentTStr+" "+timeFilter.Start)
 			if err != nil {
 				return false, err
 			}
 			se.log.Info().Str("start time", startTime.String()).Msg("start time")
 			startTime = startTime.UTC()
 			se.log.Info().Str("stop time format", currentTStr+" "+timeFilter.Stop).Msg("stop time format")
-			stopTime, err := time.Parse(common.StandardTimeFormat, currentTStr + " " + timeFilter.Stop)
+			stopTime, err := time.Parse(common.StandardTimeFormat, currentTStr+" "+timeFilter.Stop)
 			if err != nil {
 				return false, err
 			}
@@ -113,7 +113,7 @@ func (se *sensorExecutionCtx) filterTime(timeFilter *v1alpha1.TimeFilter, eventT
 		}
 		if timeFilter.Start != "" {
 			// stop is nil - does not have an end
-			startTime, err := time.Parse(common.StandardTimeFormat, currentTStr + " " + timeFilter.Start)
+			startTime, err := time.Parse(common.StandardTimeFormat, currentTStr+" "+timeFilter.Start)
 			if err != nil {
 				return false, err
 			}
@@ -122,7 +122,7 @@ func (se *sensorExecutionCtx) filterTime(timeFilter *v1alpha1.TimeFilter, eventT
 			return startTime.Before(eventTime.Time) || startTime.Equal(eventTime.Time), nil
 		}
 		if timeFilter.Stop != "" {
-			stopTime, err := time.Parse(common.StandardTimeFormat, currentTStr + " " + timeFilter.Stop)
+			stopTime, err := time.Parse(common.StandardTimeFormat, currentTStr+" "+timeFilter.Stop)
 			if err != nil {
 				return false, err
 			}

diff --git a/controllers/sensor/validate.go b/controllers/sensor/validate.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/argoproj/argo-events/common"
 	"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // ValidateSensor accepts a sensor and performs validation against it
@@ -105,7 +104,7 @@ func validateSignalTimeFilter(tFilter *v1alpha1.TimeFilter) error {
 			return err
 		}
 		stopTime = stopTime.UTC()
-		if stopTime.Before(currentT.Time) {
+		if stopTime.Before(currentT.UTC()) {
 			return fmt.Errorf("invalid signal time filter: stop '%s' is before the current time '%s'", tFilter.Stop, currentT)
 		}
 	}