fix: retry duration recognize strings. Fixes #1200 (#1201)

Signed-off-by: Derek Wang <[email protected]>

common/retry.go

@@ -30,7 +30,7 @@ import (
 var (
 	defaultFactor   = apicommon.NewAmount("1.0")
 	defaultJitter   = apicommon.NewAmount("1")
-	defaultDuration = apicommon.FromString("5s")
+	defaultDuration = apicommon.FromString("1s")
 
 	DefaultBackoff = apicommon.Backoff{
 		Steps:    5,
@@ -53,10 +53,18 @@ func IsRetryableKubeAPIError(err error) bool {
 func Convert2WaitBackoff(backoff *apicommon.Backoff) (*wait.Backoff, error) {
 	result := wait.Backoff{}
 
-	if backoff.Duration != nil {
-		result.Duration = time.Duration(backoff.Duration.Int64Value())
+	d := backoff.Duration
+	if d == nil {
+		d = &defaultDuration
+	}
+	if d.Type == apicommon.Int64 {
+		result.Duration = time.Duration(d.Int64Value())
 	} else {
-		result.Duration = time.Duration(defaultDuration.Int64Value())
+		parsedDuration, err := time.ParseDuration(d.StrVal)
+		if err != nil {
+			return nil, err
+		}
+		result.Duration = parsedDuration
 	}
 
 	factor := backoff.Factor

common/retry_test.go

@@ -19,10 +19,13 @@ import (
 	"fmt"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/api/errors"
+
+	apicommon "github.com/argoproj/argo-events/pkg/apis/common"
 )
 
 func TestRetryableKubeAPIError(t *testing.T) {
@@ -51,3 +54,50 @@ func TestConnect(t *testing.T) {
 	})
 	assert.Nil(t, err)
 }
+
+func TestConnectDurationString(t *testing.T) {
+
+	start := time.Now()
+	count := 2
+	err := Connect(nil, func() error {
+		if count == 0 {
+			return nil
+		} else {
+			count--
+			return fmt.Errorf("new error")
+		}
+	})
+	end := time.Now()
+	elapsed := end.Sub(start)
+	assert.NoError(t, err)
+	assert.Equal(t, 0, count)
+	assert.True(t, elapsed >= 2*time.Second)
+}
+
+func TestConnectRetry(t *testing.T) {
+
+	factor := apicommon.NewAmount("1.0")
+	jitter := apicommon.NewAmount("1")
+	duration := apicommon.FromInt64(1000000000)
+	backoff := apicommon.Backoff{
+		Duration: &duration,
+		Factor:   &factor,
+		Jitter:   &jitter,
+		Steps:    5,
+	}
+	count := 2
+	start := time.Now()
+	err := Connect(&backoff, func() error {
+		if count == 0 {
+			return nil
+		} else {
+			count--
+			return fmt.Errorf("new error")
+		}
+	})
+	end := time.Now()
+	elapsed := end.Sub(start)
+	assert.NoError(t, err)
+	assert.Equal(t, 0, count)
+	assert.True(t, elapsed >= 2*time.Second)
+}

pkg/apis/common/int64str.go

@@ -12,7 +12,7 @@ type Int64OrString struct {
 	StrVal   string `json:"strVal,omitempty" protobuf:"bytes,3,opt,name=strVal"`
 }
 
-// Type represents the stored type of IntOrString.
+// Type represents the stored type of Int64OrString.
 type Type int64
 
 const (