Fix merge conflit (#2644)

temporalio · Mar 24, 2022 · 8a8f0aa · 8a8f0aa
1 parent d663e2c
commit 8a8f0aa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/service/worker/deletenamespace/deleteexecutions/activities.go b/service/worker/deletenamespace/deleteexecutions/activities.go
@@ -84,15 +84,15 @@ func NewActivities(
 	}
 }
 
-func (a *Activities) GetNextPageTokenActivity(_ context.Context, params GetNextPageTokenParams) ([]byte, error) {
+func (a *Activities) GetNextPageTokenActivity(ctx context.Context, params GetNextPageTokenParams) ([]byte, error) {
 	req := &manager.ListWorkflowExecutionsRequestV2{
 		NamespaceID:   params.NamespaceID,
 		Namespace:     params.Namespace,
 		PageSize:      params.PageSize,
 		NextPageToken: params.NextPageToken,
 	}
 
-	resp, err := a.visibilityManager.ListWorkflowExecutions(req)
+	resp, err := a.visibilityManager.ListWorkflowExecutions(ctx, req)
 	if err != nil {
 		a.metricsClient.IncCounter(metrics.DeleteExecutionsWorkflowScope, metrics.ListExecutionsFailuresCount)
 		a.logger.Error("Unable to list all workflows to get next page token.", tag.WorkflowNamespace(params.Namespace.String()), tag.Error(err))
@@ -113,7 +113,7 @@ func (a *Activities) DeleteExecutionsActivity(ctx context.Context, params Delete
 		PageSize:      params.ListPageSize,
 		NextPageToken: params.NextPageToken,
 	}
-	resp, err := a.visibilityManager.ListWorkflowExecutions(req)
+	resp, err := a.visibilityManager.ListWorkflowExecutions(ctx, req)
 	if err != nil {
 		a.metricsClient.IncCounter(metrics.DeleteExecutionsWorkflowScope, metrics.ListExecutionsFailuresCount)
 		a.logger.Error("Unable to list all workflows.", tag.WorkflowNamespace(params.Namespace.String()), tag.Error(err))

diff --git a/service/worker/deletenamespace/deleteexecutions/workflow_test.go b/service/worker/deletenamespace/deleteexecutions/workflow_test.go
@@ -90,7 +90,7 @@ func Test_DeleteExecutionsWorkflow_NoActivityMocks_NoExecutions(t *testing.T) {
 
 	ctrl := gomock.NewController(t)
 	visibilityManager := manager.NewMockVisibilityManager(ctrl)
-	visibilityManager.EXPECT().ListWorkflowExecutions(&manager.ListWorkflowExecutionsRequestV2{
+	visibilityManager.EXPECT().ListWorkflowExecutions(gomock.Any(), &manager.ListWorkflowExecutionsRequestV2{
 		NamespaceID:   "namespace-id",
 		Namespace:     "namespace",
 		PageSize:      1000,
@@ -240,7 +240,7 @@ func Test_DeleteExecutionsWorkflow_NoActivityMocks_ManyExecutions(t *testing.T)
 	ctrl := gomock.NewController(t)
 	visibilityManager := manager.NewMockVisibilityManager(ctrl)
 	// First page.
-	visibilityManager.EXPECT().ListWorkflowExecutions(&manager.ListWorkflowExecutionsRequestV2{
+	visibilityManager.EXPECT().ListWorkflowExecutions(gomock.Any(), &manager.ListWorkflowExecutionsRequestV2{
 		NamespaceID:   "namespace-id",
 		Namespace:     "namespace",
 		PageSize:      2,
@@ -266,7 +266,7 @@ func Test_DeleteExecutionsWorkflow_NoActivityMocks_ManyExecutions(t *testing.T)
 	}, nil).Times(2)
 
 	// Second page.
-	visibilityManager.EXPECT().ListWorkflowExecutions(&manager.ListWorkflowExecutionsRequestV2{
+	visibilityManager.EXPECT().ListWorkflowExecutions(gomock.Any(), &manager.ListWorkflowExecutionsRequestV2{
 		NamespaceID:   "namespace-id",
 		Namespace:     "namespace",
 		PageSize:      2,
@@ -332,7 +332,7 @@ func Test_DeleteExecutionsWorkflow_NoActivityMocks_HistoryClientError(t *testing
 	ctrl := gomock.NewController(t)
 	visibilityManager := manager.NewMockVisibilityManager(ctrl)
 	// First page.
-	visibilityManager.EXPECT().ListWorkflowExecutions(&manager.ListWorkflowExecutionsRequestV2{
+	visibilityManager.EXPECT().ListWorkflowExecutions(gomock.Any(), &manager.ListWorkflowExecutionsRequestV2{
 		NamespaceID:   "namespace-id",
 		Namespace:     "namespace",
 		PageSize:      2,
@@ -358,7 +358,7 @@ func Test_DeleteExecutionsWorkflow_NoActivityMocks_HistoryClientError(t *testing
 	}, nil).Times(2)
 
 	// Second page.
-	visibilityManager.EXPECT().ListWorkflowExecutions(&manager.ListWorkflowExecutionsRequestV2{
+	visibilityManager.EXPECT().ListWorkflowExecutions(gomock.Any(), &manager.ListWorkflowExecutionsRequestV2{
 		NamespaceID:   "namespace-id",
 		Namespace:     "namespace",
 		PageSize:      2,

diff --git a/service/worker/deletenamespace/reclaimresources/activities.go b/service/worker/deletenamespace/reclaimresources/activities.go
@@ -59,14 +59,14 @@ func NewActivities(
 	}
 }
 
-func (a *Activities) EnsureNoExecutionsActivity(_ context.Context, nsID namespace.ID, nsName namespace.Name) error {
+func (a *Activities) EnsureNoExecutionsActivity(ctx context.Context, nsID namespace.ID, nsName namespace.Name) error {
 	// TODO: remove this check after CountWorkflowExecutions is implemented in standard visibility.
 	if a.visibilityManager.GetName() == "elasticsearch" {
 		req := &manager.CountWorkflowExecutionsRequest{
 			NamespaceID: nsID,
 			Namespace:   nsName,
 		}
-		resp, err := a.visibilityManager.CountWorkflowExecutions(req)
+		resp, err := a.visibilityManager.CountWorkflowExecutions(ctx, req)
 		if err != nil {
 			a.metricsClient.IncCounter(metrics.ReclaimResourcesWorkflowScope, metrics.ListExecutionsFailuresCount)
 			a.logger.Error("Unable to count workflows.", tag.WorkflowNamespace(nsName.String()), tag.Error(err))
@@ -84,7 +84,7 @@ func (a *Activities) EnsureNoExecutionsActivity(_ context.Context, nsID namespac
 		Namespace:   nsName,
 		PageSize:    1,
 	}
-	resp, err := a.visibilityManager.ListWorkflowExecutions(req)
+	resp, err := a.visibilityManager.ListWorkflowExecutions(ctx, req)
 	if err != nil {
 		a.metricsClient.IncCounter(metrics.ReclaimResourcesWorkflowScope, metrics.ListExecutionsFailuresCount)
 		a.logger.Error("Unable to count workflows using list.", tag.WorkflowNamespace(nsName.String()), tag.Error(err))

diff --git a/service/worker/deletenamespace/reclaimresources/workflow_test.go b/service/worker/deletenamespace/reclaimresources/workflow_test.go
@@ -182,7 +182,7 @@ func Test_ReclaimResourcesWorkflow_NoActivityMocks_Success(t *testing.T) {
 	visibilityManager := manager.NewMockVisibilityManager(ctrl)
 	visibilityManager.EXPECT().GetName().Return("elasticsearch")
 
-	visibilityManager.EXPECT().CountWorkflowExecutions(&manager.CountWorkflowExecutionsRequest{
+	visibilityManager.EXPECT().CountWorkflowExecutions(gomock.Any(), &manager.CountWorkflowExecutionsRequest{
 		NamespaceID: "namespace-id",
 		Namespace:   "namespace",
 	}).Return(&manager.CountWorkflowExecutionsResponse{