Address linter and depedency injection issues

Author: awln-temporal

common/resource/fx.go

@@ -8,9 +8,11 @@ import (
 	"time"
 
 	"go.temporal.io/api/workflowservice/v1"
+	"go.temporal.io/server/api/adminservice/v1"
 	"go.temporal.io/server/api/historyservice/v1"
 	"go.temporal.io/server/api/matchingservice/v1"
 	"go.temporal.io/server/client"
+	"go.temporal.io/server/client/admin"
 	"go.temporal.io/server/client/frontend"
 	"go.temporal.io/server/client/history"
 	"go.temporal.io/server/client/matching"
@@ -59,6 +61,9 @@ type (
 	MatchingRawClient matchingservice.MatchingServiceClient
 	MatchingClient    matchingservice.MatchingServiceClient
 
+	AdminRawClient adminservice.AdminServiceClient
+	AdminClient    adminservice.AdminServiceClient
+
 	RuntimeMetricsReporterParams struct {
 		fx.In
 
@@ -90,6 +95,8 @@ var Module = fx.Options(
 	fx.Provide(ClientFactoryProvider),
 	fx.Provide(ClientBeanProvider),
 	fx.Provide(FrontendClientProvider),
+	fx.Provide(AdminRawClientProvider),
+	fx.Provide(AdminClientProvider),
 	fx.Provide(GrpcListenerProvider),
 	fx.Provide(RuntimeMetricsReporterProvider),
 	metrics.RuntimeMetricsReporterLifetimeHooksModule,
@@ -243,6 +250,18 @@ func FrontendClientProvider(clientBean client.Bean) workflowservice.WorkflowServ
 	)
 }
 
+func AdminRawClientProvider(clientBean client.Bean, clusterMetadata cluster.Metadata) (AdminRawClient, error) {
+	return clientBean.GetRemoteAdminClient(clusterMetadata.GetCurrentClusterName())
+}
+
+func AdminClientProvider(adminRawClient AdminRawClient) AdminClient {
+	return admin.NewRetryableClient(
+		adminRawClient,
+		common.CreateFrontendClientRetryPolicy(),
+		common.IsServiceClientTransientError,
+	)
+}
+
 func RuntimeMetricsReporterProvider(
 	params RuntimeMetricsReporterParams,
 ) *metrics.RuntimeMetricsReporter {

service/worker/batcher/activities_test.go

@@ -364,7 +364,7 @@ func (s *activitiesSuite) TestAdjustQueryAdminBatchType() {
 			},
 		}
 		adjustedQuery := a.adjustQueryAdminBatchType(adminReq)
-		s.Equal("", adjustedQuery)
+		s.Empty(adjustedQuery)
 	})
 
 	s.Run("RefreshWorkflowTasks adds running filter", func() {

service/worker/batcher/fx.go

@@ -4,11 +4,11 @@ import (
 	"go.temporal.io/api/workflowservice/v1"
 	sdkworker "go.temporal.io/sdk/worker"
 	"go.temporal.io/sdk/workflow"
-	"go.temporal.io/server/api/adminservice/v1"
 	"go.temporal.io/server/common/dynamicconfig"
 	"go.temporal.io/server/common/log"
 	"go.temporal.io/server/common/metrics"
 	"go.temporal.io/server/common/namespace"
+	"go.temporal.io/server/common/resource"
 	"go.temporal.io/server/common/sdk"
 	workercommon "go.temporal.io/server/service/worker/common"
 	"go.uber.org/fx"
@@ -34,7 +34,7 @@ type (
 		Logger         log.Logger
 		ClientFactory  sdk.ClientFactory
 		FrontendClient workflowservice.WorkflowServiceClient
-		AdminClient    adminservice.AdminServiceClient
+		AdminClient    resource.AdminClient
 	}
 
 	fxResult struct {

tools/tdbg/commands.go

@@ -718,7 +718,8 @@ func AdminBatchRefreshWorkflowTasks(c *cli.Context, clientFactory ClientFactory)
 		return fmt.Errorf("unable to start batch refresh workflow tasks: %w", err)
 	}
 
-	fmt.Fprintf(c.App.Writer, "Batch job %s started successfully.\n", color.MagentaString(jobID))
+	// nolint:errcheck // assuming that write will succeed.
+	fmt.Fprintln(c.App.Writer, "Batch Refresh Workflow Tasks started successfully.")
 	return nil
 }