Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/workflow_shadower_activities.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func scanWorkflowExecutionsHelper(
tchCtx, cancel, opt := newChannelContext(ctx, FeatureFlags{})

var err error
resp, err = service.ScanWorkflowExecutions(tchCtx, request, opt...)
resp, err = service.ListWorkflowExecutions(tchCtx, request, opt...)
cancel()

return err
Expand Down
8 changes: 4 additions & 4 deletions internal/workflow_shadower_activities_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (s *workflowShadowerActivitiesSuite) TearDownTest() {

func (s *workflowShadowerActivitiesSuite) TestScanWorkflowActivity_Succeed() {
numExecutions := 1000
s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
Executions: newTestWorkflowExecutions(numExecutions),
NextPageToken: []byte{1, 2, 3},
}, nil).Times(1)
Expand All @@ -113,7 +113,7 @@ func (s *workflowShadowerActivitiesSuite) TestScanWorkflowActivity_Succeed() {

func (s *workflowShadowerActivitiesSuite) TestScanWorkflowActivity_MinResultSize() {
numExecutionsPerScan := 3
s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
Executions: newTestWorkflowExecutions(numExecutionsPerScan),
NextPageToken: []byte{1, 2, 3},
}, nil).Times(int(math.Ceil(float64(minScanWorkflowResultSize) / float64(numExecutionsPerScan))))
Expand All @@ -135,7 +135,7 @@ func (s *workflowShadowerActivitiesSuite) TestScanWorkflowActivity_MinResultSize

func (s *workflowShadowerActivitiesSuite) TestScanWorkflowActivity_CompletionTime() {
activityTimeoutSeconds := int32(1)
s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
Executions: newTestWorkflowExecutions(1),
NextPageToken: []byte{1, 2, 3},
}, nil).MaxTimes(int(time.Duration(activityTimeoutSeconds) * time.Second / scanWorkflowWaitPeriod))
Expand Down Expand Up @@ -163,7 +163,7 @@ func (s *workflowShadowerActivitiesSuite) TestScanWorkflowActivity_CompletionTim
}

func (s *workflowShadowerActivitiesSuite) TestScanWorkflowActivity_InvalidQuery() {
s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(nil, &shared.BadRequestError{
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(nil, &shared.BadRequestError{
Message: "invalid query",
}).Times(1)

Expand Down
14 changes: 7 additions & 7 deletions internal/workflow_shadower_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func (s *workflowShadowerSuite) TestShadowOptionsWithExcludeTypes() {
shadower, err := NewWorkflowShadower(s.mockService, "testDomain", options, ReplayOptions{}, nil)
s.NoError(err)
s.mockService.EXPECT().
ScanWorkflowExecutions(gomock.Any(), gomock.Any(), gomock.Any()).
ListWorkflowExecutions(gomock.Any(), gomock.Any(), gomock.Any()).
DoAndReturn(func(ctx context.Context, request *shared.ListWorkflowExecutionsRequest, opts ...interface{}) (*shared.ListWorkflowExecutionsResponse, error) {
s.Equal(expectedQuery, *request.Query)
return &shared.ListWorkflowExecutionsResponse{
Expand All @@ -280,7 +280,7 @@ func (s *workflowShadowerSuite) TestShadowWorkerExitCondition_ExpirationTime() {
ExpirationInterval: expirationTime,
}

s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
Executions: newTestWorkflowExecutions(totalWorkflows),
NextPageToken: nil,
}, nil).Times(1)
Expand All @@ -301,7 +301,7 @@ func (s *workflowShadowerSuite) TestShadowWorkerExitCondition_MaxShadowingCount(
ShadowCount: maxShadowCount,
}

s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
Executions: newTestWorkflowExecutions(maxShadowCount * 2),
NextPageToken: []byte{1, 2, 3},
}, nil).Times(1)
Expand All @@ -325,7 +325,7 @@ func (s *workflowShadowerSuite) TestShadowWorker_NormalMode() {
if i == numScan-1 {
scanResp.NextPageToken = nil
}
s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(scanResp, nil).Times(1)
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(scanResp, nil).Times(1)
}

s.mockService.EXPECT().GetWorkflowExecutionHistory(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.GetWorkflowExecutionHistoryResponse{
Expand All @@ -349,7 +349,7 @@ func (s *workflowShadowerSuite) TestShadowWorker_ContinuousMode() {
scanResp := &shared.ListWorkflowExecutionsResponse{
Executions: workflowExecutions,
}
s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(scanResp, nil).Times(1)
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(scanResp, nil).Times(1)
}

s.mockService.EXPECT().GetWorkflowExecutionHistory(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.GetWorkflowExecutionHistoryResponse{
Expand Down Expand Up @@ -379,7 +379,7 @@ func (s *workflowShadowerSuite) TestShadowWorker_ContinuousMode() {

func (s *workflowShadowerSuite) TestShadowWorker_ReplayFailed() {
successfullyReplayed := 5
s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
Executions: newTestWorkflowExecutions(successfullyReplayed * 2),
NextPageToken: []byte{1, 2, 3},
}, nil).Times(1)
Expand Down Expand Up @@ -428,7 +428,7 @@ func (s *workflowShadowerSuite) TestShadowWorker_ExpectedReplayError() {

for _, test := range testCases {
s.T().Run(test.msg, func(t *testing.T) {
s.mockService.EXPECT().ScanWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
s.mockService.EXPECT().ListWorkflowExecutions(gomock.Any(), gomock.Any(), callOptions()...).Return(&shared.ListWorkflowExecutionsResponse{
Executions: newTestWorkflowExecutions(1),
NextPageToken: nil,
}, nil).Times(1)
Expand Down