Update retry policy validation with additional conditions (cadence-wo…

…rkflow#6525)
sankari165 · Nov 27, 2024 · 1fcd7d5 · 1fcd7d5
1 parent f799577
commit 1fcd7d5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/common/util.go b/common/util.go
@@ -547,6 +547,12 @@ func ValidateRetryPolicy(policy *types.RetryPolicy) error {
 	if policy.GetMaximumAttempts() == 0 && policy.GetExpirationIntervalInSeconds() == 0 {
 		return &types.BadRequestError{Message: "MaximumAttempts and ExpirationIntervalInSeconds are both 0. At least one of them must be specified."}
 	}
+	if policy.GetExpirationIntervalInSeconds() == 0 && policy.GetMaximumAttempts() == 1 {
+		return &types.BadRequestError{Message: "MaximumAttempts set to 1 will not retry since maximum attempts includes the first attempt."}
+	}
+	if policy.GetMaximumAttempts() == 0 && policy.GetExpirationIntervalInSeconds() < policy.GetInitialIntervalInSeconds() {
+		return &types.BadRequestError{Message: "ExpirationIntervalInSeconds less than  InitialIntervalInSeconds  will not retry."}
+	}
 	return nil
 }
 

diff --git a/common/util_test.go b/common/util_test.go
@@ -718,29 +718,22 @@ func TestValidateRetryPolicy_Success(t *testing.T) {
 			InitialIntervalInSeconds:    2,
 			BackoffCoefficient:          1,
 			MaximumIntervalInSeconds:    0,
-			MaximumAttempts:             1,
+			MaximumAttempts:             2,
 			ExpirationIntervalInSeconds: 0,
 		},
 		"ExpirationIntervalInSeconds is no zero": &types.RetryPolicy{
 			InitialIntervalInSeconds:    2,
 			BackoffCoefficient:          1,
 			MaximumIntervalInSeconds:    0,
 			MaximumAttempts:             0,
-			ExpirationIntervalInSeconds: 1,
+			ExpirationIntervalInSeconds: 3,
 		},
 		"MaximumIntervalInSeconds is greater than InitialIntervalInSeconds": &types.RetryPolicy{
 			InitialIntervalInSeconds:    2,
 			BackoffCoefficient:          1,
 			MaximumIntervalInSeconds:    0,
 			MaximumAttempts:             0,
-			ExpirationIntervalInSeconds: 1,
-		},
-		"MaximumIntervalInSeconds equals InitialIntervalInSeconds": &types.RetryPolicy{
-			InitialIntervalInSeconds:    2,
-			BackoffCoefficient:          1,
-			MaximumIntervalInSeconds:    2,
-			MaximumAttempts:             0,
-			ExpirationIntervalInSeconds: 1,
+			ExpirationIntervalInSeconds: 3,
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
@@ -798,6 +791,25 @@ func TestValidateRetryPolicy_Error(t *testing.T) {
 			},
 			wantErr: &types.BadRequestError{Message: "MaximumAttempts cannot be less than 0 on retry policy."},
 		},
+		"MaximumAttempts equals 1": {
+			policy: &types.RetryPolicy{
+				InitialIntervalInSeconds: 2,
+				BackoffCoefficient:       1,
+				MaximumIntervalInSeconds: 0,
+				MaximumAttempts:          1,
+			},
+			wantErr: &types.BadRequestError{Message: "MaximumAttempts set to 1 will not retry since maximum attempts includes the first attempt."},
+		},
+		"ExpirationIntervalInSeconds less than InitialIntervalInSeconds": {
+			policy: &types.RetryPolicy{
+				InitialIntervalInSeconds:    2,
+				BackoffCoefficient:          1,
+				MaximumIntervalInSeconds:    0,
+				MaximumAttempts:             0,
+				ExpirationIntervalInSeconds: 1,
+			},
+			wantErr: &types.BadRequestError{Message: "ExpirationIntervalInSeconds less than  InitialIntervalInSeconds  will not retry."},
+		},
 		"ExpirationIntervalInSeconds equals -1": {
 			policy: &types.RetryPolicy{
 				InitialIntervalInSeconds:    2,