Fix scanner start dep (#3513)

temporalio · Oct 20, 2022 · e668892 · e668892
1 parent a0ea177
commit e668892
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/service/worker/scanner/scanner.go b/service/worker/scanner/scanner.go
@@ -83,7 +83,7 @@ type (
 	scannerContext struct {
 		cfg               *Config
 		logger            log.Logger
-		sdkSystemClient   sdkclient.Client
+		sdkClientFactory  sdk.ClientFactory
 		metricsClient     metrics.Client
 		executionManager  persistence.ExecutionManager
 		taskManager       persistence.TaskManager
@@ -109,7 +109,7 @@ type (
 func New(
 	logger log.Logger,
 	cfg *Config,
-	sdkSystemClient sdkclient.Client,
+	sdkClientFactory sdk.ClientFactory,
 	metricsClient metrics.Client,
 	executionManager persistence.ExecutionManager,
 	taskManager persistence.TaskManager,
@@ -120,7 +120,7 @@ func New(
 	return &Scanner{
 		context: scannerContext{
 			cfg:               cfg,
-			sdkSystemClient:   sdkSystemClient,
+			sdkClientFactory:  sdkClientFactory,
 			logger:            logger,
 			metricsClient:     metricsClient,
 			executionManager:  executionManager,
@@ -166,7 +166,7 @@ func (s *Scanner) Start() error {
 	}
 
 	for _, tl := range workerTaskQueueNames {
-		work := s.context.workerFactory.New(s.context.sdkSystemClient, tl, workerOpts)
+		work := s.context.workerFactory.New(s.context.sdkClientFactory.GetSystemClient(), tl, workerOpts)
 
 		work.RegisterWorkflowWithOptions(TaskQueueScannerWorkflow, workflow.RegisterOptions{Name: tqScannerWFTypeName})
 		work.RegisterWorkflowWithOptions(HistoryScannerWorkflow, workflow.RegisterOptions{Name: historyScannerWFTypeName})
@@ -198,7 +198,7 @@ func (s *Scanner) startWorkflowWithRetry(
 		WithMaximumInterval(time.Minute).
 		WithExpirationInterval(backoff.NoInterval)
 	err := backoff.ThrottleRetry(func() error {
-		return s.startWorkflow(s.context.sdkSystemClient, options, workflowType, workflowArgs...)
+		return s.startWorkflow(s.context.sdkClientFactory.GetSystemClient(), options, workflowType, workflowArgs...)
 	}, policy, func(err error) bool {
 		return true
 	})

diff --git a/service/worker/scanner/scanner_test.go b/service/worker/scanner/scanner_test.go
@@ -153,6 +153,7 @@ func (s *scannerTestSuite) TestScannerEnabled() {
 		s.Run(c.Name, func() {
 			ctrl := gomock.NewController(s.T())
 			mockWorkerFactory := sdk.NewMockWorkerFactory(ctrl)
+			mockSdkClientFactory := sdk.NewMockClientFactory(ctrl)
 			mockSdkClient := mocksdk.NewMockClient(ctrl)
 			mockNamespaceRegistry := namespace.NewMockRegistry(ctrl)
 			scanner := New(
@@ -189,7 +190,7 @@ func (s *scannerTestSuite) TestScannerEnabled() {
 						},
 					},
 				},
-				mockSdkClient,
+				mockSdkClientFactory,
 				metrics.NoopClient,
 				p.NewMockExecutionManager(ctrl),
 				p.NewMockTaskManager(ctrl),
@@ -203,6 +204,7 @@ func (s *scannerTestSuite) TestScannerEnabled() {
 				worker.EXPECT().RegisterWorkflowWithOptions(gomock.Any(), gomock.Any()).AnyTimes()
 				worker.EXPECT().Start()
 				mockWorkerFactory.EXPECT().New(gomock.Any(), sc.TaskQueueName, gomock.Any()).Return(worker)
+				mockSdkClientFactory.EXPECT().GetSystemClient().Return(mockSdkClient).AnyTimes()
 				mockSdkClient.EXPECT().ExecuteWorkflow(gomock.Any(), gomock.Any(), sc.WFTypeName, gomock.Any())
 			}
 			err := scanner.Start()

diff --git a/service/worker/service.go b/service/worker/service.go
@@ -472,7 +472,7 @@ func (s *Service) initScanner() {
 	s.scanner = scanner.New(
 		s.logger,
 		s.config.ScannerCfg,
-		s.sdkClientFactory.GetSystemClient(),
+		s.sdkClientFactory,
 		s.metricsClient,
 		s.executionManager,
 		s.taskManager,