fix and enforce lint (#1429)

What changed?

Fix lint
Makefile build rule will depend on lint rather than fmt
Why?

introduce best practice

How did you test it?

unit test

Potential risks

This is NOT a breaking change. Some files are touched but no API changes.

internal/worker.go added new Worker interface (copied from top level) and changed NewWorker() return. This NewWorker API is used in the top level and there is NO change in the API
internal/workflow.go only comment change to ignore the linter

Author: shijiesheng

Makefile

@@ -252,7 +252,7 @@ $Q +$(MAKE) --no-print-directory $(addprefix $(BUILD)/,$(1))
 endef
 
 .PHONY: build
-build: $(BUILD)/fmt ## ensure all packages build
+build: $(BUILD)/lint ## ensure all packages build
 	go build ./...
 	$Q # caution: some errors are reported on stdout for some reason
 	go test -exec true ./... >/dev/null

internal/compatibility/adapter.go

@@ -145,8 +145,8 @@ func (a thrift2protoAdapter) RecordActivityTaskHeartbeat(ctx context.Context, re
 }
 
 func (a thrift2protoAdapter) RecordActivityTaskHeartbeatByID(ctx context.Context, request *shared.RecordActivityTaskHeartbeatByIDRequest, opts ...yarpc.CallOption) (*shared.RecordActivityTaskHeartbeatResponse, error) {
-	response, err := a.worker.RecordActivityTaskHeartbeatByID(ctx, proto.RecordActivityTaskHeartbeatByIdRequest(request), opts...)
-	return thrift.RecordActivityTaskHeartbeatByIdResponse(response), thrift.Error(err)
+	response, err := a.worker.RecordActivityTaskHeartbeatByID(ctx, proto.RecordActivityTaskHeartbeatByIDRequest(request), opts...)
+	return thrift.RecordActivityTaskHeartbeatByIDResponse(response), thrift.Error(err)
 }
 
 func (a thrift2protoAdapter) RegisterDomain(ctx context.Context, request *shared.RegisterDomainRequest, opts ...yarpc.CallOption) error {
@@ -175,7 +175,7 @@ func (a thrift2protoAdapter) RespondActivityTaskCanceled(ctx context.Context, re
 }
 
 func (a thrift2protoAdapter) RespondActivityTaskCanceledByID(ctx context.Context, request *shared.RespondActivityTaskCanceledByIDRequest, opts ...yarpc.CallOption) error {
-	_, err := a.worker.RespondActivityTaskCanceledByID(ctx, proto.RespondActivityTaskCanceledByIdRequest(request), opts...)
+	_, err := a.worker.RespondActivityTaskCanceledByID(ctx, proto.RespondActivityTaskCanceledByIDRequest(request), opts...)
 	return thrift.Error(err)
 }
 
@@ -185,7 +185,7 @@ func (a thrift2protoAdapter) RespondActivityTaskCompleted(ctx context.Context, r
 }
 
 func (a thrift2protoAdapter) RespondActivityTaskCompletedByID(ctx context.Context, request *shared.RespondActivityTaskCompletedByIDRequest, opts ...yarpc.CallOption) error {
-	_, err := a.worker.RespondActivityTaskCompletedByID(ctx, proto.RespondActivityTaskCompletedByIdRequest(request), opts...)
+	_, err := a.worker.RespondActivityTaskCompletedByID(ctx, proto.RespondActivityTaskCompletedByIDRequest(request), opts...)
 	return thrift.Error(err)
 }
 
@@ -195,7 +195,7 @@ func (a thrift2protoAdapter) RespondActivityTaskFailed(ctx context.Context, requ
 }
 
 func (a thrift2protoAdapter) RespondActivityTaskFailedByID(ctx context.Context, request *shared.RespondActivityTaskFailedByIDRequest, opts ...yarpc.CallOption) error {
-	_, err := a.worker.RespondActivityTaskFailedByID(ctx, proto.RespondActivityTaskFailedByIdRequest(request), opts...)
+	_, err := a.worker.RespondActivityTaskFailedByID(ctx, proto.RespondActivityTaskFailedByIDRequest(request), opts...)
 	return thrift.Error(err)
 }
 
@@ -272,7 +272,7 @@ type domainAPIthriftAdapter struct {
 	service workflowserviceclient.Interface
 }
 
-func NewDomainAPITriftAdapter(thrift workflowserviceclient.Interface) domainAPIthriftAdapter {
+func NewDomainAPITriftAdapter(thrift workflowserviceclient.Interface) domainAPIthriftAdapter { //revive:disable-line:unexported-return this is not used at all, consider removing
 	return domainAPIthriftAdapter{thrift}
 }
 
@@ -301,7 +301,7 @@ type workflowAPIthriftAdapter struct {
 	service workflowserviceclient.Interface
 }
 
-func NewWorkflowAPITriftAdapter(thrift workflowserviceclient.Interface) workflowAPIthriftAdapter {
+func NewWorkflowAPITriftAdapter(thrift workflowserviceclient.Interface) workflowAPIthriftAdapter { //revive:disable-line:unexported-return this is not used at all, consider removing
 	return workflowAPIthriftAdapter{thrift}
 }
 
@@ -362,7 +362,7 @@ type workerAPIthriftAdapter struct {
 	service workflowserviceclient.Interface
 }
 
-func NewWorkerAPITriftAdapter(thrift workflowserviceclient.Interface) workerAPIthriftAdapter {
+func NewWorkerAPITriftAdapter(thrift workflowserviceclient.Interface) workerAPIthriftAdapter { //revive:disable-line:unexported-return this is not used at all, consider removing
 	return workerAPIthriftAdapter{thrift}
 }
 
@@ -387,32 +387,32 @@ func (a workerAPIthriftAdapter) RespondActivityTaskCompleted(ctx context.Context
 	return &apiv1.RespondActivityTaskCompletedResponse{}, proto.Error(err)
 }
 func (a workerAPIthriftAdapter) RespondActivityTaskCompletedByID(ctx context.Context, request *apiv1.RespondActivityTaskCompletedByIDRequest, opts ...yarpc.CallOption) (*apiv1.RespondActivityTaskCompletedByIDResponse, error) {
-	err := a.service.RespondActivityTaskCompletedByID(ctx, thrift.RespondActivityTaskCompletedByIdRequest(request), opts...)
+	err := a.service.RespondActivityTaskCompletedByID(ctx, thrift.RespondActivityTaskCompletedByIDRequest(request), opts...)
 	return &apiv1.RespondActivityTaskCompletedByIDResponse{}, proto.Error(err)
 }
 func (a workerAPIthriftAdapter) RespondActivityTaskFailed(ctx context.Context, request *apiv1.RespondActivityTaskFailedRequest, opts ...yarpc.CallOption) (*apiv1.RespondActivityTaskFailedResponse, error) {
 	err := a.service.RespondActivityTaskFailed(ctx, thrift.RespondActivityTaskFailedRequest(request), opts...)
 	return &apiv1.RespondActivityTaskFailedResponse{}, proto.Error(err)
 }
 func (a workerAPIthriftAdapter) RespondActivityTaskFailedByID(ctx context.Context, request *apiv1.RespondActivityTaskFailedByIDRequest, opts ...yarpc.CallOption) (*apiv1.RespondActivityTaskFailedByIDResponse, error) {
-	err := a.service.RespondActivityTaskFailedByID(ctx, thrift.RespondActivityTaskFailedByIdRequest(request), opts...)
+	err := a.service.RespondActivityTaskFailedByID(ctx, thrift.RespondActivityTaskFailedByIDRequest(request), opts...)
 	return &apiv1.RespondActivityTaskFailedByIDResponse{}, proto.Error(err)
 }
 func (a workerAPIthriftAdapter) RespondActivityTaskCanceled(ctx context.Context, request *apiv1.RespondActivityTaskCanceledRequest, opts ...yarpc.CallOption) (*apiv1.RespondActivityTaskCanceledResponse, error) {
 	err := a.service.RespondActivityTaskCanceled(ctx, thrift.RespondActivityTaskCanceledRequest(request), opts...)
 	return &apiv1.RespondActivityTaskCanceledResponse{}, proto.Error(err)
 }
 func (a workerAPIthriftAdapter) RespondActivityTaskCanceledByID(ctx context.Context, request *apiv1.RespondActivityTaskCanceledByIDRequest, opts ...yarpc.CallOption) (*apiv1.RespondActivityTaskCanceledByIDResponse, error) {
-	err := a.service.RespondActivityTaskCanceledByID(ctx, thrift.RespondActivityTaskCanceledByIdRequest(request), opts...)
+	err := a.service.RespondActivityTaskCanceledByID(ctx, thrift.RespondActivityTaskCanceledByIDRequest(request), opts...)
 	return &apiv1.RespondActivityTaskCanceledByIDResponse{}, proto.Error(err)
 }
 func (a workerAPIthriftAdapter) RecordActivityTaskHeartbeat(ctx context.Context, request *apiv1.RecordActivityTaskHeartbeatRequest, opts ...yarpc.CallOption) (*apiv1.RecordActivityTaskHeartbeatResponse, error) {
 	response, err := a.service.RecordActivityTaskHeartbeat(ctx, thrift.RecordActivityTaskHeartbeatRequest(request), opts...)
 	return proto.RecordActivityTaskHeartbeatResponse(response), proto.Error(err)
 }
 func (a workerAPIthriftAdapter) RecordActivityTaskHeartbeatByID(ctx context.Context, request *apiv1.RecordActivityTaskHeartbeatByIDRequest, opts ...yarpc.CallOption) (*apiv1.RecordActivityTaskHeartbeatByIDResponse, error) {
-	response, err := a.service.RecordActivityTaskHeartbeatByID(ctx, thrift.RecordActivityTaskHeartbeatByIdRequest(request), opts...)
-	return proto.RecordActivityTaskHeartbeatByIdResponse(response), proto.Error(err)
+	response, err := a.service.RecordActivityTaskHeartbeatByID(ctx, thrift.RecordActivityTaskHeartbeatByIDRequest(request), opts...)
+	return proto.RecordActivityTaskHeartbeatByIDResponse(response), proto.Error(err)
 }
 func (a workerAPIthriftAdapter) RespondQueryTaskCompleted(ctx context.Context, request *apiv1.RespondQueryTaskCompletedRequest, opts ...yarpc.CallOption) (*apiv1.RespondQueryTaskCompletedResponse, error) {
 	err := a.service.RespondQueryTaskCompleted(ctx, thrift.RespondQueryTaskCompletedRequest(request), opts...)
@@ -427,7 +427,7 @@ type visibilityAPIthriftAdapter struct {
 	service workflowserviceclient.Interface
 }
 
-func NewVisibilityAPITriftAdapter(thrift workflowserviceclient.Interface) visibilityAPIthriftAdapter {
+func NewVisibilityAPITriftAdapter(thrift workflowserviceclient.Interface) visibilityAPIthriftAdapter { //revive:disable-line:unexported-return this is not used at all, consider removing
 	return visibilityAPIthriftAdapter{thrift}
 }
 

internal/compatibility/api_test.go

@@ -384,12 +384,12 @@ func TestQueryWorkflowResponse(t *testing.T) {
 }
 func TestRecordActivityTaskHeartbeatByIDRequest(t *testing.T) {
 	for _, item := range []*apiv1.RecordActivityTaskHeartbeatByIDRequest{nil, {}, &testdata.RecordActivityTaskHeartbeatByIDRequest} {
-		assert.Equal(t, item, proto.RecordActivityTaskHeartbeatByIdRequest(thrift.RecordActivityTaskHeartbeatByIdRequest(item)))
+		assert.Equal(t, item, proto.RecordActivityTaskHeartbeatByIDRequest(thrift.RecordActivityTaskHeartbeatByIDRequest(item)))
 	}
 }
 func TestRecordActivityTaskHeartbeatByIDResponse(t *testing.T) {
 	for _, item := range []*apiv1.RecordActivityTaskHeartbeatByIDResponse{nil, {}, &testdata.RecordActivityTaskHeartbeatByIDResponse} {
-		assert.Equal(t, item, proto.RecordActivityTaskHeartbeatByIdResponse(thrift.RecordActivityTaskHeartbeatByIdResponse(item)))
+		assert.Equal(t, item, proto.RecordActivityTaskHeartbeatByIDResponse(thrift.RecordActivityTaskHeartbeatByIDResponse(item)))
 	}
 }
 func TestRecordActivityTaskHeartbeatRequest(t *testing.T) {
@@ -454,7 +454,7 @@ func TestResetWorkflowExecutionResponse(t *testing.T) {
 }
 func TestRespondActivityTaskCanceledByIDRequest(t *testing.T) {
 	for _, item := range []*apiv1.RespondActivityTaskCanceledByIDRequest{nil, {}, &testdata.RespondActivityTaskCanceledByIDRequest} {
-		assert.Equal(t, item, proto.RespondActivityTaskCanceledByIdRequest(thrift.RespondActivityTaskCanceledByIdRequest(item)))
+		assert.Equal(t, item, proto.RespondActivityTaskCanceledByIDRequest(thrift.RespondActivityTaskCanceledByIDRequest(item)))
 	}
 }
 func TestRespondActivityTaskCanceledRequest(t *testing.T) {
@@ -464,7 +464,7 @@ func TestRespondActivityTaskCanceledRequest(t *testing.T) {
 }
 func TestRespondActivityTaskCompletedByIDRequest(t *testing.T) {
 	for _, item := range []*apiv1.RespondActivityTaskCompletedByIDRequest{nil, {}, &testdata.RespondActivityTaskCompletedByIDRequest} {
-		assert.Equal(t, item, proto.RespondActivityTaskCompletedByIdRequest(thrift.RespondActivityTaskCompletedByIdRequest(item)))
+		assert.Equal(t, item, proto.RespondActivityTaskCompletedByIDRequest(thrift.RespondActivityTaskCompletedByIDRequest(item)))
 	}
 }
 func TestRespondActivityTaskCompletedRequest(t *testing.T) {
@@ -474,7 +474,7 @@ func TestRespondActivityTaskCompletedRequest(t *testing.T) {
 }
 func TestRespondActivityTaskFailedByIDRequest(t *testing.T) {
 	for _, item := range []*apiv1.RespondActivityTaskFailedByIDRequest{nil, {}, &testdata.RespondActivityTaskFailedByIDRequest} {
-		assert.Equal(t, item, proto.RespondActivityTaskFailedByIdRequest(thrift.RespondActivityTaskFailedByIdRequest(item)))
+		assert.Equal(t, item, proto.RespondActivityTaskFailedByIDRequest(thrift.RespondActivityTaskFailedByIDRequest(item)))
 	}
 }
 func TestRespondActivityTaskFailedRequest(t *testing.T) {
@@ -589,7 +589,7 @@ func TestSupportedClientVersions(t *testing.T) {
 }
 func TestTaskIDBlock(t *testing.T) {
 	for _, item := range []*apiv1.TaskIDBlock{nil, {}, &testdata.TaskIDBlock} {
-		assert.Equal(t, item, proto.TaskIdBlock(thrift.TaskIdBlock(item)))
+		assert.Equal(t, item, proto.TaskIDBlock(thrift.TaskIDBlock(item)))
 	}
 }
 func TestTaskList(t *testing.T) {
@@ -656,13 +656,13 @@ func TestWorkflowExecution(t *testing.T) {
 	for _, item := range []*apiv1.WorkflowExecution{nil, {}, &testdata.WorkflowExecution} {
 		assert.Equal(t, item, proto.WorkflowExecution(thrift.WorkflowExecution(item)))
 	}
-	assert.Empty(t, thrift.WorkflowId(nil))
-	assert.Empty(t, thrift.RunId(nil))
+	assert.Empty(t, thrift.WorkflowID(nil))
+	assert.Empty(t, thrift.RunID(nil))
 }
 func TestExternalExecutionInfo(t *testing.T) {
 	assert.Nil(t, proto.ExternalExecutionInfo(nil, nil))
 	assert.Nil(t, thrift.ExternalWorkflowExecution(nil))
-	assert.Nil(t, thrift.ExternalInitiatedId(nil))
+	assert.Nil(t, thrift.ExternalInitiatedID(nil))
 	assert.Panics(t, func() { proto.ExternalExecutionInfo(nil, common.Int64Ptr(testdata.EventID1)) })
 	assert.Panics(t, func() { proto.ExternalExecutionInfo(thrift.WorkflowExecution(&testdata.WorkflowExecution), nil) })
 	info := proto.ExternalExecutionInfo(thrift.WorkflowExecution(&testdata.WorkflowExecution), common.Int64Ptr(testdata.EventID1))

internal/compatibility/enum_test.go

@@ -330,8 +330,8 @@ func TestWorkflowIDReusePolicy(t *testing.T) {
 		apiv1.WorkflowIdReusePolicy_WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE,
 		apiv1.WorkflowIdReusePolicy_WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING,
 	} {
-		assert.Equal(t, item, proto.WorkflowIdReusePolicy(thrift.WorkflowIdReusePolicy(item)))
+		assert.Equal(t, item, proto.WorkflowIDReusePolicy(thrift.WorkflowIDReusePolicy(item)))
 	}
-	assert.Panics(t, func() { proto.WorkflowIdReusePolicy(shared.WorkflowIdReusePolicy(UnknownValue).Ptr()) })
-	assert.Panics(t, func() { thrift.WorkflowIdReusePolicy(apiv1.WorkflowIdReusePolicy(UnknownValue)) })
+	assert.Panics(t, func() { proto.WorkflowIDReusePolicy(shared.WorkflowIdReusePolicy(UnknownValue).Ptr()) })
+	assert.Panics(t, func() { thrift.WorkflowIDReusePolicy(apiv1.WorkflowIdReusePolicy(UnknownValue)) })
 }

internal/compatibility/proto/decision.go

@@ -157,7 +157,7 @@ func Decision(d *shared.Decision) *apiv1.Decision {
 				TaskStartToCloseTimeout:      secondsToDuration(attr.TaskStartToCloseTimeoutSeconds),
 				ParentClosePolicy:            ParentClosePolicy(attr.ParentClosePolicy),
 				Control:                      attr.Control,
-				WorkflowIdReusePolicy:        WorkflowIdReusePolicy(attr.WorkflowIdReusePolicy),
+				WorkflowIdReusePolicy:        WorkflowIDReusePolicy(attr.WorkflowIdReusePolicy),
 				RetryPolicy:                  RetryPolicy(attr.RetryPolicy),
 				CronSchedule:                 attr.GetCronSchedule(),
 				Header:                       Header(attr.Header),

internal/compatibility/proto/enum.go

@@ -106,7 +106,7 @@ func ContinueAsNewInitiator(t *shared.ContinueAsNewInitiator) apiv1.ContinueAsNe
 	panic("unexpected enum value")
 }
 
-func WorkflowIdReusePolicy(t *shared.WorkflowIdReusePolicy) apiv1.WorkflowIdReusePolicy {
+func WorkflowIDReusePolicy(t *shared.WorkflowIdReusePolicy) apiv1.WorkflowIdReusePolicy {
 	if t == nil {
 		return apiv1.WorkflowIdReusePolicy_WORKFLOW_ID_REUSE_POLICY_INVALID
 	}

internal/compatibility/proto/history.go

@@ -534,7 +534,7 @@ func StartChildWorkflowExecutionInitiatedEventAttributes(t *shared.StartChildWor
 		ParentClosePolicy:            ParentClosePolicy(t.ParentClosePolicy),
 		Control:                      t.Control,
 		DecisionTaskCompletedEventId: t.GetDecisionTaskCompletedEventId(),
-		WorkflowIdReusePolicy:        WorkflowIdReusePolicy(t.WorkflowIdReusePolicy),
+		WorkflowIdReusePolicy:        WorkflowIDReusePolicy(t.WorkflowIdReusePolicy),
 		RetryPolicy:                  RetryPolicy(t.RetryPolicy),
 		CronSchedule:                 t.GetCronSchedule(),
 		Header:                       Header(t.Header),

internal/compatibility/proto/request.go

@@ -188,7 +188,7 @@ func QueryWorkflowRequest(t *shared.QueryWorkflowRequest) *apiv1.QueryWorkflowRe
 	}
 }
 
-func RecordActivityTaskHeartbeatByIdRequest(t *shared.RecordActivityTaskHeartbeatByIDRequest) *apiv1.RecordActivityTaskHeartbeatByIDRequest {
+func RecordActivityTaskHeartbeatByIDRequest(t *shared.RecordActivityTaskHeartbeatByIDRequest) *apiv1.RecordActivityTaskHeartbeatByIDRequest {
 	if t == nil {
 		return nil
 	}
@@ -269,7 +269,7 @@ func ResetWorkflowExecutionRequest(t *shared.ResetWorkflowExecutionRequest) *api
 	}
 }
 
-func RespondActivityTaskCanceledByIdRequest(t *shared.RespondActivityTaskCanceledByIDRequest) *apiv1.RespondActivityTaskCanceledByIDRequest {
+func RespondActivityTaskCanceledByIDRequest(t *shared.RespondActivityTaskCanceledByIDRequest) *apiv1.RespondActivityTaskCanceledByIDRequest {
 	if t == nil {
 		return nil
 	}
@@ -293,7 +293,7 @@ func RespondActivityTaskCanceledRequest(t *shared.RespondActivityTaskCanceledReq
 	}
 }
 
-func RespondActivityTaskCompletedByIdRequest(t *shared.RespondActivityTaskCompletedByIDRequest) *apiv1.RespondActivityTaskCompletedByIDRequest {
+func RespondActivityTaskCompletedByIDRequest(t *shared.RespondActivityTaskCompletedByIDRequest) *apiv1.RespondActivityTaskCompletedByIDRequest {
 	if t == nil {
 		return nil
 	}
@@ -317,7 +317,7 @@ func RespondActivityTaskCompletedRequest(t *shared.RespondActivityTaskCompletedR
 	}
 }
 
-func RespondActivityTaskFailedByIdRequest(t *shared.RespondActivityTaskFailedByIDRequest) *apiv1.RespondActivityTaskFailedByIDRequest {
+func RespondActivityTaskFailedByIDRequest(t *shared.RespondActivityTaskFailedByIDRequest) *apiv1.RespondActivityTaskFailedByIDRequest {
 	if t == nil {
 		return nil
 	}
@@ -413,7 +413,7 @@ func SignalWithStartWorkflowExecutionRequest(t *shared.SignalWithStartWorkflowEx
 			TaskStartToCloseTimeout:      secondsToDuration(t.TaskStartToCloseTimeoutSeconds),
 			Identity:                     t.GetIdentity(),
 			RequestId:                    t.GetRequestId(),
-			WorkflowIdReusePolicy:        WorkflowIdReusePolicy(t.WorkflowIdReusePolicy),
+			WorkflowIdReusePolicy:        WorkflowIDReusePolicy(t.WorkflowIdReusePolicy),
 			RetryPolicy:                  RetryPolicy(t.RetryPolicy),
 			CronSchedule:                 t.GetCronSchedule(),
 			Memo:                         Memo(t.Memo),
@@ -468,7 +468,7 @@ func StartWorkflowExecutionRequest(t *shared.StartWorkflowExecutionRequest) *api
 		TaskStartToCloseTimeout:      secondsToDuration(t.TaskStartToCloseTimeoutSeconds),
 		Identity:                     t.GetIdentity(),
 		RequestId:                    t.GetRequestId(),
-		WorkflowIdReusePolicy:        WorkflowIdReusePolicy(t.WorkflowIdReusePolicy),
+		WorkflowIdReusePolicy:        WorkflowIDReusePolicy(t.WorkflowIdReusePolicy),
 		RetryPolicy:                  RetryPolicy(t.RetryPolicy),
 		CronSchedule:                 t.GetCronSchedule(),
 		Memo:                         Memo(t.Memo),

internal/compatibility/proto/response.go

@@ -249,7 +249,7 @@ func QueryWorkflowResponse(t *shared.QueryWorkflowResponse) *apiv1.QueryWorkflow
 	}
 }
 
-func RecordActivityTaskHeartbeatByIdResponse(t *shared.RecordActivityTaskHeartbeatResponse) *apiv1.RecordActivityTaskHeartbeatByIDResponse {
+func RecordActivityTaskHeartbeatByIDResponse(t *shared.RecordActivityTaskHeartbeatResponse) *apiv1.RecordActivityTaskHeartbeatByIDResponse {
 	if t == nil {
 		return nil
 	}

internal/compatibility/proto/types.go

@@ -58,13 +58,13 @@ func WorkflowExecution(t *shared.WorkflowExecution) *apiv1.WorkflowExecution {
 	}
 }
 
-func WorkflowRunPair(workflowId, runId string) *apiv1.WorkflowExecution {
-	if workflowId == "" && runId == "" {
+func WorkflowRunPair(workflowID, runID string) *apiv1.WorkflowExecution {
+	if workflowID == "" && runID == "" {
 		return nil
 	}
 	return &apiv1.WorkflowExecution{
-		WorkflowId: workflowId,
-		RunId:      runId,
+		WorkflowId: workflowID,
+		RunId:      runID,
 	}
 }
 
@@ -374,11 +374,11 @@ func TaskListStatus(t *shared.TaskListStatus) *apiv1.TaskListStatus {
 		ReadLevel:        t.GetReadLevel(),
 		AckLevel:         t.GetAckLevel(),
 		RatePerSecond:    t.GetRatePerSecond(),
-		TaskIdBlock:      TaskIdBlock(t.TaskIDBlock),
+		TaskIdBlock:      TaskIDBlock(t.TaskIDBlock),
 	}
 }
 
-func TaskIdBlock(t *shared.TaskIDBlock) *apiv1.TaskIDBlock {
+func TaskIDBlock(t *shared.TaskIDBlock) *apiv1.TaskIDBlock {
 	if t == nil {
 		return nil
 	}