IWF-163: Add nil check

indeedeng · Nov 25, 2024 · b42805b · b42805b
1 parent fc4f2d6
commit b42805b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/service/client/temporal/client.go b/service/client/temporal/client.go
@@ -42,13 +42,13 @@ func NewTemporalClient(
 ) uclient.UnifiedClient {
 	var rp QueryWorkflowFailedRetryPolicy
 
-	if retryPolicy.InitialIntervalSeconds == 0 {
+	if retryPolicy == nil || &retryPolicy.InitialIntervalSeconds == nil || retryPolicy.InitialIntervalSeconds == 0 {
 		rp.InitialIntervalSeconds = 1
 	} else {
 		rp.InitialIntervalSeconds = retryPolicy.InitialIntervalSeconds
 	}
 
-	if retryPolicy.MaximumAttempts == 0 {
+	if retryPolicy == nil || &retryPolicy.MaximumAttempts == nil || retryPolicy.MaximumAttempts == 0 {
 		rp.MaximumAttempts = 5
 	} else {
 		rp.MaximumAttempts = retryPolicy.MaximumAttempts

diff --git a/service/client/temporal/client_test.go b/service/client/temporal/client_test.go
@@ -3,7 +3,6 @@ package temporal
 import (
 	"errors"
 	"github.com/golang/mock/gomock"
-	"github.com/indeedeng/iwf/config"
 	"github.com/stretchr/testify/assert"
 	"go.temporal.io/api/serviceerror"
 	"testing"
@@ -14,10 +13,7 @@ func TestAlreadyStartedErrorForWorkflow(t *testing.T) {
 	mockRealTemporalClient := NewMockClient(ctrl)
 	mockDataConverter := NewMockDataConverter(ctrl)
 
-	client := NewTemporalClient(mockRealTemporalClient, "test-ns", mockDataConverter, false, &config.QueryWorkflowFailedRetryPolicy{
-		InitialIntervalSeconds: 0,
-		MaximumAttempts:        0,
-	})
+	client := NewTemporalClient(mockRealTemporalClient, "test-ns", mockDataConverter, false, nil)
 
 	err := &serviceerror.WorkflowExecutionAlreadyStarted{}
 	assert.Equal(t, true, client.IsWorkflowAlreadyStartedError(err))
@@ -28,10 +24,7 @@ func TestAlreadyStartedErrorForCronWorkflow(t *testing.T) {
 	mockRealTemporalClient := NewMockClient(ctrl)
 	mockDataConverter := NewMockDataConverter(ctrl)
 
-	client := NewTemporalClient(mockRealTemporalClient, "test-ns", mockDataConverter, false, &config.QueryWorkflowFailedRetryPolicy{
-		InitialIntervalSeconds: 0,
-		MaximumAttempts:        0,
-	})
+	client := NewTemporalClient(mockRealTemporalClient, "test-ns", mockDataConverter, false, nil)
 
 	err := errors.New("schedule with this ID is already registered")