[tilo][resultstore] Fix codegen for go1.11.4

The previous `go:generate` commands result in invalid code when
run with the latest version of Go.  This switches from generating MockUploadClient
directly from the source file to generating from the Go package path.

(I don't know why this fixes the issue).

Change-Id: Icdf89e91d79da01eed5e714a3cd4e4db2caad661
diff --git a/go.mod b/go.mod
index f600a40..195d58f 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@
 	github.com/docker/go-connections v0.3.0
 	github.com/docker/go-units v0.3.3
 	github.com/gogo/protobuf v1.1.1
-	github.com/golang/mock v1.1.1
+	github.com/golang/mock v1.2.0
 	github.com/golang/protobuf v1.2.0
 	github.com/google/subcommands v0.0.0-20180618214453-5bae204cdfb2
 	github.com/google/uuid v1.0.0
diff --git a/go.sum b/go.sum
index 9253ef2..1540dae 100644
--- a/go.sum
+++ b/go.sum
@@ -17,6 +17,8 @@
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/subcommands v0.0.0-20180618214453-5bae204cdfb2 h1:xT8XvBDdhTRgh/lZ94y4WLPjbIMh4Gsxcho5SyBMIaM=
diff --git a/tilo/logger_test.go b/tilo/logger_test.go
index 9715ae1..1dc0529 100644
--- a/tilo/logger_test.go
+++ b/tilo/logger_test.go
@@ -13,6 +13,7 @@
 	"fuchsia.googlesource.com/infra/infra/fxtesting"
 	"fuchsia.googlesource.com/infra/infra/tilo"
 	"fuchsia.googlesource.com/infra/infra/tilo/resultstore"
+	mock_resultstore "fuchsia.googlesource.com/infra/infra/tilo/resultstore/mocks"
 	"github.com/golang/mock/gomock"
 )
 
@@ -29,7 +30,7 @@
 func (bed *testBed) Setup(t *testing.T) {
 	bed.ctrl = gomock.NewController(t)
 	bed.tester = &loggerTester{
-		MockUploadClient: resultstore.NewMockUploadClient(bed.ctrl),
+		MockUploadClient: mock_resultstore.NewMockUploadClient(bed.ctrl),
 		T:                fxtesting.T{t},
 		Context:          resultstore.NewContext(),
 	}
@@ -46,7 +47,7 @@
 type loggerTester struct {
 	fxtesting.T
 	resultstore.Context
-	*resultstore.MockUploadClient
+	*mock_resultstore.MockUploadClient
 }
 
 func test(t *testing.T, clientTest func(*loggerTester, tilo.Logger)) {
diff --git a/tilo/resultstore/doc.go b/tilo/resultstore/doc.go
index 225e18a..dae5d9a 100644
--- a/tilo/resultstore/doc.go
+++ b/tilo/resultstore/doc.go
@@ -13,8 +13,8 @@
 //
 // Run 'go generate ./...' to regenerate mock sources in this package.
 //
-//go:generate mockgen -destination=mocks/mocks.go google.golang.org/genproto/googleapis/devtools/resultstore/v2 ResultStoreUploadClient
-//go:generate mockgen -destination=mock_upload_client.go -source=upload_client.go -package=resultstore UploadClient
+//go:generate mockgen -destination=mocks/mocks.go -package=mock_resultstore google.golang.org/genproto/googleapis/devtools/resultstore/v2 ResultStoreUploadClient
+//go:generate mockgen -destination=mocks/mock_upload_client.go -package=mock_resultstore fuchsia.googlesource.com/infra/infra/tilo/resultstore UploadClient
 //
 // Do not forget to add the Fuchsia copyright header at the top of the generated file.
 package resultstore
diff --git a/tilo/resultstore/mock_upload_client.go b/tilo/resultstore/mocks/mock_upload_client.go
similarity index 79%
rename from tilo/resultstore/mock_upload_client.go
rename to tilo/resultstore/mocks/mock_upload_client.go
index 4b97d75..b9db5ba 100644
--- a/tilo/resultstore/mock_upload_client.go
+++ b/tilo/resultstore/mocks/mock_upload_client.go
@@ -3,15 +3,17 @@
 // found in the LICENSE file.
 
 // Code generated by MockGen. DO NOT EDIT.
-// Source: upload_client.go
+// Source: fuchsia.googlesource.com/infra/infra/tilo/resultstore (interfaces: UploadClient)
 
-// Package resultstore is a generated GoMock package.
-package resultstore
+// Package mock_resultstore is a generated GoMock package.
+package mock_resultstore
 
 import (
 	context "context"
-	gomock "github.com/golang/mock/gomock"
 	reflect "reflect"
+
+	resultstore "fuchsia.googlesource.com/infra/infra/tilo/resultstore"
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockUploadClient is a mock of UploadClient interface
@@ -37,125 +39,84 @@
 	return m.recorder
 }
 
-// CreateInvocation mocks base method
-func (m *MockUploadClient) CreateInvocation(arg0 context.Context, arg1 *Invocation) (*Invocation, error) {
-	ret := m.ctrl.Call(m, "CreateInvocation", arg0, arg1)
-	ret0, _ := ret[0].(*Invocation)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// CreateInvocation indicates an expected call of CreateInvocation
-func (mr *MockUploadClientMockRecorder) CreateInvocation(arg0, arg1 interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateInvocation", reflect.TypeOf((*MockUploadClient)(nil).CreateInvocation), arg0, arg1)
-}
-
 // CreateConfiguration mocks base method
-func (m *MockUploadClient) CreateConfiguration(arg0 context.Context, arg1 *Configuration, arg2 string) (*Configuration, error) {
+func (m *MockUploadClient) CreateConfiguration(arg0 context.Context, arg1 *resultstore.Configuration, arg2 string) (*resultstore.Configuration, error) {
+	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateConfiguration", arg0, arg1, arg2)
-	ret0, _ := ret[0].(*Configuration)
+	ret0, _ := ret[0].(*resultstore.Configuration)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // CreateConfiguration indicates an expected call of CreateConfiguration
 func (mr *MockUploadClientMockRecorder) CreateConfiguration(arg0, arg1, arg2 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateConfiguration", reflect.TypeOf((*MockUploadClient)(nil).CreateConfiguration), arg0, arg1, arg2)
 }
 
-// CreateTarget mocks base method
-func (m *MockUploadClient) CreateTarget(arg0 context.Context, arg1 *Target, arg2 string) (*Target, error) {
-	ret := m.ctrl.Call(m, "CreateTarget", arg0, arg1, arg2)
-	ret0, _ := ret[0].(*Target)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// CreateTarget indicates an expected call of CreateTarget
-func (mr *MockUploadClientMockRecorder) CreateTarget(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTarget", reflect.TypeOf((*MockUploadClient)(nil).CreateTarget), arg0, arg1, arg2)
-}
-
 // CreateConfiguredTarget mocks base method
-func (m *MockUploadClient) CreateConfiguredTarget(arg0 context.Context, arg1 *ConfiguredTarget, arg2 string) (*ConfiguredTarget, error) {
+func (m *MockUploadClient) CreateConfiguredTarget(arg0 context.Context, arg1 *resultstore.ConfiguredTarget, arg2 string) (*resultstore.ConfiguredTarget, error) {
+	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateConfiguredTarget", arg0, arg1, arg2)
-	ret0, _ := ret[0].(*ConfiguredTarget)
+	ret0, _ := ret[0].(*resultstore.ConfiguredTarget)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // CreateConfiguredTarget indicates an expected call of CreateConfiguredTarget
 func (mr *MockUploadClientMockRecorder) CreateConfiguredTarget(arg0, arg1, arg2 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateConfiguredTarget", reflect.TypeOf((*MockUploadClient)(nil).CreateConfiguredTarget), arg0, arg1, arg2)
 }
 
+// CreateInvocation mocks base method
+func (m *MockUploadClient) CreateInvocation(arg0 context.Context, arg1 *resultstore.Invocation) (*resultstore.Invocation, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "CreateInvocation", arg0, arg1)
+	ret0, _ := ret[0].(*resultstore.Invocation)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// CreateInvocation indicates an expected call of CreateInvocation
+func (mr *MockUploadClientMockRecorder) CreateInvocation(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateInvocation", reflect.TypeOf((*MockUploadClient)(nil).CreateInvocation), arg0, arg1)
+}
+
+// CreateTarget mocks base method
+func (m *MockUploadClient) CreateTarget(arg0 context.Context, arg1 *resultstore.Target, arg2 string) (*resultstore.Target, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "CreateTarget", arg0, arg1, arg2)
+	ret0, _ := ret[0].(*resultstore.Target)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// CreateTarget indicates an expected call of CreateTarget
+func (mr *MockUploadClientMockRecorder) CreateTarget(arg0, arg1, arg2 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTarget", reflect.TypeOf((*MockUploadClient)(nil).CreateTarget), arg0, arg1, arg2)
+}
+
 // CreateTestAction mocks base method
-func (m *MockUploadClient) CreateTestAction(arg0 context.Context, arg1 *TestAction, arg2 string) (*TestAction, error) {
+func (m *MockUploadClient) CreateTestAction(arg0 context.Context, arg1 *resultstore.TestAction, arg2 string) (*resultstore.TestAction, error) {
+	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateTestAction", arg0, arg1, arg2)
-	ret0, _ := ret[0].(*TestAction)
+	ret0, _ := ret[0].(*resultstore.TestAction)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // CreateTestAction indicates an expected call of CreateTestAction
 func (mr *MockUploadClientMockRecorder) CreateTestAction(arg0, arg1, arg2 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTestAction", reflect.TypeOf((*MockUploadClient)(nil).CreateTestAction), arg0, arg1, arg2)
 }
 
-// UpdateTestAction mocks base method
-func (m *MockUploadClient) UpdateTestAction(arg0 context.Context, arg1 *TestAction) (*TestAction, error) {
-	ret := m.ctrl.Call(m, "UpdateTestAction", arg0, arg1)
-	ret0, _ := ret[0].(*TestAction)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// UpdateTestAction indicates an expected call of UpdateTestAction
-func (mr *MockUploadClientMockRecorder) UpdateTestAction(arg0, arg1 interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTestAction", reflect.TypeOf((*MockUploadClient)(nil).UpdateTestAction), arg0, arg1)
-}
-
-// UpdateConfiguredTarget mocks base method
-func (m *MockUploadClient) UpdateConfiguredTarget(arg0 context.Context, arg1 *ConfiguredTarget) (*ConfiguredTarget, error) {
-	ret := m.ctrl.Call(m, "UpdateConfiguredTarget", arg0, arg1)
-	ret0, _ := ret[0].(*ConfiguredTarget)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// UpdateConfiguredTarget indicates an expected call of UpdateConfiguredTarget
-func (mr *MockUploadClientMockRecorder) UpdateConfiguredTarget(arg0, arg1 interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateConfiguredTarget", reflect.TypeOf((*MockUploadClient)(nil).UpdateConfiguredTarget), arg0, arg1)
-}
-
-// UpdateTarget mocks base method
-func (m *MockUploadClient) UpdateTarget(arg0 context.Context, arg1 *Target) (*Target, error) {
-	ret := m.ctrl.Call(m, "UpdateTarget", arg0, arg1)
-	ret0, _ := ret[0].(*Target)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// UpdateTarget indicates an expected call of UpdateTarget
-func (mr *MockUploadClientMockRecorder) UpdateTarget(arg0, arg1 interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTarget", reflect.TypeOf((*MockUploadClient)(nil).UpdateTarget), arg0, arg1)
-}
-
-// UpdateInvocation mocks base method
-func (m *MockUploadClient) UpdateInvocation(arg0 context.Context, arg1 *Invocation) (*Invocation, error) {
-	ret := m.ctrl.Call(m, "UpdateInvocation", arg0, arg1)
-	ret0, _ := ret[0].(*Invocation)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// UpdateInvocation indicates an expected call of UpdateInvocation
-func (mr *MockUploadClientMockRecorder) UpdateInvocation(arg0, arg1 interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateInvocation", reflect.TypeOf((*MockUploadClient)(nil).UpdateInvocation), arg0, arg1)
-}
-
 // FinishConfiguredTarget mocks base method
 func (m *MockUploadClient) FinishConfiguredTarget(arg0 context.Context, arg1 string) error {
+	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FinishConfiguredTarget", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
@@ -163,23 +124,13 @@
 
 // FinishConfiguredTarget indicates an expected call of FinishConfiguredTarget
 func (mr *MockUploadClientMockRecorder) FinishConfiguredTarget(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishConfiguredTarget", reflect.TypeOf((*MockUploadClient)(nil).FinishConfiguredTarget), arg0, arg1)
 }
 
-// FinishTarget mocks base method
-func (m *MockUploadClient) FinishTarget(arg0 context.Context, arg1 string) error {
-	ret := m.ctrl.Call(m, "FinishTarget", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// FinishTarget indicates an expected call of FinishTarget
-func (mr *MockUploadClientMockRecorder) FinishTarget(arg0, arg1 interface{}) *gomock.Call {
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishTarget", reflect.TypeOf((*MockUploadClient)(nil).FinishTarget), arg0, arg1)
-}
-
 // FinishInvocation mocks base method
 func (m *MockUploadClient) FinishInvocation(arg0 context.Context, arg1 string) error {
+	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "FinishInvocation", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
@@ -187,5 +138,80 @@
 
 // FinishInvocation indicates an expected call of FinishInvocation
 func (mr *MockUploadClientMockRecorder) FinishInvocation(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishInvocation", reflect.TypeOf((*MockUploadClient)(nil).FinishInvocation), arg0, arg1)
 }
+
+// FinishTarget mocks base method
+func (m *MockUploadClient) FinishTarget(arg0 context.Context, arg1 string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "FinishTarget", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// FinishTarget indicates an expected call of FinishTarget
+func (mr *MockUploadClientMockRecorder) FinishTarget(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishTarget", reflect.TypeOf((*MockUploadClient)(nil).FinishTarget), arg0, arg1)
+}
+
+// UpdateConfiguredTarget mocks base method
+func (m *MockUploadClient) UpdateConfiguredTarget(arg0 context.Context, arg1 *resultstore.ConfiguredTarget) (*resultstore.ConfiguredTarget, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateConfiguredTarget", arg0, arg1)
+	ret0, _ := ret[0].(*resultstore.ConfiguredTarget)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// UpdateConfiguredTarget indicates an expected call of UpdateConfiguredTarget
+func (mr *MockUploadClientMockRecorder) UpdateConfiguredTarget(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateConfiguredTarget", reflect.TypeOf((*MockUploadClient)(nil).UpdateConfiguredTarget), arg0, arg1)
+}
+
+// UpdateInvocation mocks base method
+func (m *MockUploadClient) UpdateInvocation(arg0 context.Context, arg1 *resultstore.Invocation) (*resultstore.Invocation, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateInvocation", arg0, arg1)
+	ret0, _ := ret[0].(*resultstore.Invocation)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// UpdateInvocation indicates an expected call of UpdateInvocation
+func (mr *MockUploadClientMockRecorder) UpdateInvocation(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateInvocation", reflect.TypeOf((*MockUploadClient)(nil).UpdateInvocation), arg0, arg1)
+}
+
+// UpdateTarget mocks base method
+func (m *MockUploadClient) UpdateTarget(arg0 context.Context, arg1 *resultstore.Target) (*resultstore.Target, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateTarget", arg0, arg1)
+	ret0, _ := ret[0].(*resultstore.Target)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// UpdateTarget indicates an expected call of UpdateTarget
+func (mr *MockUploadClientMockRecorder) UpdateTarget(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTarget", reflect.TypeOf((*MockUploadClient)(nil).UpdateTarget), arg0, arg1)
+}
+
+// UpdateTestAction mocks base method
+func (m *MockUploadClient) UpdateTestAction(arg0 context.Context, arg1 *resultstore.TestAction) (*resultstore.TestAction, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateTestAction", arg0, arg1)
+	ret0, _ := ret[0].(*resultstore.TestAction)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// UpdateTestAction indicates an expected call of UpdateTestAction
+func (mr *MockUploadClientMockRecorder) UpdateTestAction(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTestAction", reflect.TypeOf((*MockUploadClient)(nil).UpdateTestAction), arg0, arg1)
+}
diff --git a/tilo/resultstore/mocks/mocks.go b/tilo/resultstore/mocks/mocks.go
index ca894e8..e47c1e6 100644
--- a/tilo/resultstore/mocks/mocks.go
+++ b/tilo/resultstore/mocks/mocks.go
@@ -5,8 +5,8 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: google.golang.org/genproto/googleapis/devtools/resultstore/v2 (interfaces: ResultStoreUploadClient)
 
-// Package mock_v2 is a generated GoMock package.
-package mock_v2
+// Package mock_resultstore is a generated GoMock package.
+package mock_resultstore
 
 import (
 	context "context"
@@ -42,6 +42,7 @@
 
 // CreateAction mocks base method
 func (m *MockResultStoreUploadClient) CreateAction(arg0 context.Context, arg1 *v2.CreateActionRequest, arg2 ...grpc.CallOption) (*v2.Action, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -54,12 +55,14 @@
 
 // CreateAction indicates an expected call of CreateAction
 func (mr *MockResultStoreUploadClientMockRecorder) CreateAction(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAction", reflect.TypeOf((*MockResultStoreUploadClient)(nil).CreateAction), varargs...)
 }
 
 // CreateConfiguration mocks base method
 func (m *MockResultStoreUploadClient) CreateConfiguration(arg0 context.Context, arg1 *v2.CreateConfigurationRequest, arg2 ...grpc.CallOption) (*v2.Configuration, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -72,12 +75,14 @@
 
 // CreateConfiguration indicates an expected call of CreateConfiguration
 func (mr *MockResultStoreUploadClientMockRecorder) CreateConfiguration(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateConfiguration", reflect.TypeOf((*MockResultStoreUploadClient)(nil).CreateConfiguration), varargs...)
 }
 
 // CreateConfiguredTarget mocks base method
 func (m *MockResultStoreUploadClient) CreateConfiguredTarget(arg0 context.Context, arg1 *v2.CreateConfiguredTargetRequest, arg2 ...grpc.CallOption) (*v2.ConfiguredTarget, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -90,12 +95,14 @@
 
 // CreateConfiguredTarget indicates an expected call of CreateConfiguredTarget
 func (mr *MockResultStoreUploadClientMockRecorder) CreateConfiguredTarget(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateConfiguredTarget", reflect.TypeOf((*MockResultStoreUploadClient)(nil).CreateConfiguredTarget), varargs...)
 }
 
 // CreateFileSet mocks base method
 func (m *MockResultStoreUploadClient) CreateFileSet(arg0 context.Context, arg1 *v2.CreateFileSetRequest, arg2 ...grpc.CallOption) (*v2.FileSet, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -108,12 +115,14 @@
 
 // CreateFileSet indicates an expected call of CreateFileSet
 func (mr *MockResultStoreUploadClientMockRecorder) CreateFileSet(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFileSet", reflect.TypeOf((*MockResultStoreUploadClient)(nil).CreateFileSet), varargs...)
 }
 
 // CreateInvocation mocks base method
 func (m *MockResultStoreUploadClient) CreateInvocation(arg0 context.Context, arg1 *v2.CreateInvocationRequest, arg2 ...grpc.CallOption) (*v2.Invocation, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -126,12 +135,14 @@
 
 // CreateInvocation indicates an expected call of CreateInvocation
 func (mr *MockResultStoreUploadClientMockRecorder) CreateInvocation(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateInvocation", reflect.TypeOf((*MockResultStoreUploadClient)(nil).CreateInvocation), varargs...)
 }
 
 // CreateTarget mocks base method
 func (m *MockResultStoreUploadClient) CreateTarget(arg0 context.Context, arg1 *v2.CreateTargetRequest, arg2 ...grpc.CallOption) (*v2.Target, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -144,12 +155,14 @@
 
 // CreateTarget indicates an expected call of CreateTarget
 func (mr *MockResultStoreUploadClientMockRecorder) CreateTarget(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTarget", reflect.TypeOf((*MockResultStoreUploadClient)(nil).CreateTarget), varargs...)
 }
 
 // FinishConfiguredTarget mocks base method
 func (m *MockResultStoreUploadClient) FinishConfiguredTarget(arg0 context.Context, arg1 *v2.FinishConfiguredTargetRequest, arg2 ...grpc.CallOption) (*v2.FinishConfiguredTargetResponse, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -162,12 +175,14 @@
 
 // FinishConfiguredTarget indicates an expected call of FinishConfiguredTarget
 func (mr *MockResultStoreUploadClientMockRecorder) FinishConfiguredTarget(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishConfiguredTarget", reflect.TypeOf((*MockResultStoreUploadClient)(nil).FinishConfiguredTarget), varargs...)
 }
 
 // FinishInvocation mocks base method
 func (m *MockResultStoreUploadClient) FinishInvocation(arg0 context.Context, arg1 *v2.FinishInvocationRequest, arg2 ...grpc.CallOption) (*v2.FinishInvocationResponse, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -180,12 +195,14 @@
 
 // FinishInvocation indicates an expected call of FinishInvocation
 func (mr *MockResultStoreUploadClientMockRecorder) FinishInvocation(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishInvocation", reflect.TypeOf((*MockResultStoreUploadClient)(nil).FinishInvocation), varargs...)
 }
 
 // FinishTarget mocks base method
 func (m *MockResultStoreUploadClient) FinishTarget(arg0 context.Context, arg1 *v2.FinishTargetRequest, arg2 ...grpc.CallOption) (*v2.FinishTargetResponse, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -198,12 +215,14 @@
 
 // FinishTarget indicates an expected call of FinishTarget
 func (mr *MockResultStoreUploadClientMockRecorder) FinishTarget(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinishTarget", reflect.TypeOf((*MockResultStoreUploadClient)(nil).FinishTarget), varargs...)
 }
 
 // UpdateAction mocks base method
 func (m *MockResultStoreUploadClient) UpdateAction(arg0 context.Context, arg1 *v2.UpdateActionRequest, arg2 ...grpc.CallOption) (*v2.Action, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -216,12 +235,14 @@
 
 // UpdateAction indicates an expected call of UpdateAction
 func (mr *MockResultStoreUploadClientMockRecorder) UpdateAction(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateAction", reflect.TypeOf((*MockResultStoreUploadClient)(nil).UpdateAction), varargs...)
 }
 
 // UpdateConfiguration mocks base method
 func (m *MockResultStoreUploadClient) UpdateConfiguration(arg0 context.Context, arg1 *v2.UpdateConfigurationRequest, arg2 ...grpc.CallOption) (*v2.Configuration, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -234,12 +255,14 @@
 
 // UpdateConfiguration indicates an expected call of UpdateConfiguration
 func (mr *MockResultStoreUploadClientMockRecorder) UpdateConfiguration(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateConfiguration", reflect.TypeOf((*MockResultStoreUploadClient)(nil).UpdateConfiguration), varargs...)
 }
 
 // UpdateConfiguredTarget mocks base method
 func (m *MockResultStoreUploadClient) UpdateConfiguredTarget(arg0 context.Context, arg1 *v2.UpdateConfiguredTargetRequest, arg2 ...grpc.CallOption) (*v2.ConfiguredTarget, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -252,12 +275,14 @@
 
 // UpdateConfiguredTarget indicates an expected call of UpdateConfiguredTarget
 func (mr *MockResultStoreUploadClientMockRecorder) UpdateConfiguredTarget(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateConfiguredTarget", reflect.TypeOf((*MockResultStoreUploadClient)(nil).UpdateConfiguredTarget), varargs...)
 }
 
 // UpdateFileSet mocks base method
 func (m *MockResultStoreUploadClient) UpdateFileSet(arg0 context.Context, arg1 *v2.UpdateFileSetRequest, arg2 ...grpc.CallOption) (*v2.FileSet, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -270,12 +295,14 @@
 
 // UpdateFileSet indicates an expected call of UpdateFileSet
 func (mr *MockResultStoreUploadClientMockRecorder) UpdateFileSet(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFileSet", reflect.TypeOf((*MockResultStoreUploadClient)(nil).UpdateFileSet), varargs...)
 }
 
 // UpdateInvocation mocks base method
 func (m *MockResultStoreUploadClient) UpdateInvocation(arg0 context.Context, arg1 *v2.UpdateInvocationRequest, arg2 ...grpc.CallOption) (*v2.Invocation, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -288,12 +315,14 @@
 
 // UpdateInvocation indicates an expected call of UpdateInvocation
 func (mr *MockResultStoreUploadClientMockRecorder) UpdateInvocation(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateInvocation", reflect.TypeOf((*MockResultStoreUploadClient)(nil).UpdateInvocation), varargs...)
 }
 
 // UpdateTarget mocks base method
 func (m *MockResultStoreUploadClient) UpdateTarget(arg0 context.Context, arg1 *v2.UpdateTargetRequest, arg2 ...grpc.CallOption) (*v2.Target, error) {
+	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
@@ -306,6 +335,7 @@
 
 // UpdateTarget indicates an expected call of UpdateTarget
 func (mr *MockResultStoreUploadClientMockRecorder) UpdateTarget(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTarget", reflect.TypeOf((*MockResultStoreUploadClient)(nil).UpdateTarget), varargs...)
 }