Merge branch 'smh-remove-server-scope' into 'master'

Remove server scope from Praefect

Closes #3122

See merge request gitlab-org/gitaly!3015

19 files changed, 169 insertions, 498 deletions

diff --git a/Makefile b/Makefile
index 99fd0013d..75395eb8c 100644
--- a/Makefile
+++ b/Makefile
@@ -342,6 +342,7 @@ proto: ${PROTOC} ${PROTOC_GEN_GO} ${SOURCE_DIR}/.ruby-bundle
 	${SOURCE_DIR}/_support/generate-proto-ruby
 	${Q}# this part is related to the generation of sources from testing proto files
 	${PROTOC} --plugin=${PROTOC_GEN_GO} --go_out=plugins=grpc:. internal/praefect/grpc-proxy/testdata/test.proto
+	${PROTOC} -I proto -I internal --plugin=${PROTOC_GEN_GO} --go_out=paths=source_relative,plugins=grpc:internal internal/praefect/mock/mock.proto
 	${PROTOC} -I proto -I internal --plugin=${PROTOC_GEN_GO} --go_out=paths=source_relative,plugins=grpc:internal internal/middleware/cache/testdata/stream.proto
 	${PROTOC} -I proto --plugin=${PROTOC_GEN_GO} --go_out=paths=source_relative,plugins=grpc:proto proto/go/internal/linter/testdata/*.proto
 
diff --git a/internal/praefect/Makefile b/internal/praefect/Makefile
deleted file mode 100644
index 849369671..000000000
--- a/internal/praefect/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-mock/mock.pb.go: mock/mock.proto
-	protoc --go_out=paths=source_relative,plugins=grpc:./mock -I$(shell pwd)/../../proto -I$(shell pwd)/mock $(shell pwd)/mock/*.proto
-	goimports -w mock/mock.pb.go
diff --git a/internal/praefect/auth_test.go b/internal/praefect/auth_test.go
index 855cf2806..37d8b6e61 100644
--- a/internal/praefect/auth_test.go
+++ b/internal/praefect/auth_test.go
@@ -61,10 +61,7 @@ func TestAuthFailures(t *testing.T) {
 
 			cli := mock.NewSimpleServiceClient(conn)
 
-			_, err = cli.ServerAccessor(ctx, &mock.SimpleRequest{
-				Value: 1,
-			})
-
+			_, err = cli.RepoAccessorUnary(ctx, &mock.RepoRequest{})
 			testhelper.RequireGrpcError(t, err, tc.code)
 		})
 	}
@@ -134,14 +131,7 @@ func dial(serverSocketPath string, opts []grpc.DialOption) (*grpc.ClientConn, er
 
 func runServer(t *testing.T, token string, required bool) (*grpc.Server, string, func()) {
 	backendToken := "abcxyz"
-	mockServer := &mockSvc{
-		serverAccessor: func(_ context.Context, req *mock.SimpleRequest) (*mock.SimpleResponse, error) {
-			return &mock.SimpleResponse{
-				Value: req.Value + 1,
-			}, nil
-		},
-	}
-	backend, cleanup := newMockDownstream(t, backendToken, mockServer)
+	backend, cleanup := newMockDownstream(t, backendToken, &mockSvc{})
 
 	conf := config.Config{
 		Auth: auth.Config{Token: token, Transitioning: !required},
@@ -159,7 +149,7 @@ func runServer(t *testing.T, token string, required bool) (*grpc.Server, string,
 		},
 	}
 
-	gz := proto.FileDescriptor("mock.proto")
+	gz := proto.FileDescriptor("praefect/mock/mock.proto")
 	fd, err := protoregistry.ExtractFileDescriptor(gz)
 	if err != nil {
 		t.Fatal(err)
diff --git a/internal/praefect/helper_test.go b/internal/praefect/helper_test.go
index 9b11398f3..d5ffebf93 100644
--- a/internal/praefect/helper_test.go
+++ b/internal/praefect/helper_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
@@ -269,8 +270,7 @@ func runPraefectServer(t testing.TB, conf config.Config, opt buildOptions) (*grp
 }
 
 func mustLoadProtoReg(t testing.TB) *descriptor.FileDescriptorProto {
-	gz, _ := (*mock.SimpleRequest)(nil).Descriptor()
-	fd, err := protoregistry.ExtractFileDescriptor(gz)
+	fd, err := protoregistry.ExtractFileDescriptor(proto.FileDescriptor("praefect/mock/mock.proto"))
 	require.NoError(t, err)
 	return fd
 }
diff --git a/internal/praefect/middleware/errorhandler_test.go b/internal/praefect/middleware/errorhandler_test.go
index 773e55b92..e237db85a 100644
--- a/internal/praefect/middleware/errorhandler_test.go
+++ b/internal/praefect/middleware/errorhandler_test.go
@@ -37,10 +37,6 @@ func (s *simpleService) RepoMutatorUnary(ctx context.Context, in *mock.RepoReque
 	return &empty.Empty{}, nil
 }
 
-func (s *simpleService) ServerAccessor(ctx context.Context, in *mock.SimpleRequest) (*mock.SimpleResponse, error) {
-	return &mock.SimpleResponse{}, nil
-}
-
 func TestStreamInterceptor(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -57,7 +53,7 @@ func TestStreamInterceptor(t *testing.T) {
 	lis, err := net.Listen("unix", internalServerSocketPath)
 	require.NoError(t, err)
 
-	gz := proto.FileDescriptor("mock.proto")
+	gz := proto.FileDescriptor("praefect/mock/mock.proto")
 	fd, err := protoregistry.ExtractFileDescriptor(gz)
 	require.NoError(t, err)
 
diff --git a/internal/praefect/mock/mock.pb.go b/internal/praefect/mock/mock.pb.go
index 6f66b292b..0318d8f26 100644
--- a/internal/praefect/mock/mock.pb.go
+++ b/internal/praefect/mock/mock.pb.go
@@ -1,19 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: mock.proto
+// source: praefect/mock/mock.proto
 
 package mock
 
 import (
 	context "context"
 	fmt "fmt"
-	math "math"
-
 	proto "github.com/golang/protobuf/proto"
 	empty "github.com/golang/protobuf/ptypes/empty"
 	gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -27,84 +26,6 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
-type SimpleRequest struct {
-	Value                int32    `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *SimpleRequest) Reset()         { *m = SimpleRequest{} }
-func (m *SimpleRequest) String() string { return proto.CompactTextString(m) }
-func (*SimpleRequest) ProtoMessage()    {}
-func (*SimpleRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6fa4806c90f7156d, []int{0}
-}
-
-func (m *SimpleRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SimpleRequest.Unmarshal(m, b)
-}
-func (m *SimpleRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SimpleRequest.Marshal(b, m, deterministic)
-}
-func (m *SimpleRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SimpleRequest.Merge(m, src)
-}
-func (m *SimpleRequest) XXX_Size() int {
-	return xxx_messageInfo_SimpleRequest.Size(m)
-}
-func (m *SimpleRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_SimpleRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SimpleRequest proto.InternalMessageInfo
-
-func (m *SimpleRequest) GetValue() int32 {
-	if m != nil {
-		return m.Value
-	}
-	return 0
-}
-
-type SimpleResponse struct {
-	Value                int32    `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *SimpleResponse) Reset()         { *m = SimpleResponse{} }
-func (m *SimpleResponse) String() string { return proto.CompactTextString(m) }
-func (*SimpleResponse) ProtoMessage()    {}
-func (*SimpleResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6fa4806c90f7156d, []int{1}
-}
-
-func (m *SimpleResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SimpleResponse.Unmarshal(m, b)
-}
-func (m *SimpleResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SimpleResponse.Marshal(b, m, deterministic)
-}
-func (m *SimpleResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SimpleResponse.Merge(m, src)
-}
-func (m *SimpleResponse) XXX_Size() int {
-	return xxx_messageInfo_SimpleResponse.Size(m)
-}
-func (m *SimpleResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_SimpleResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SimpleResponse proto.InternalMessageInfo
-
-func (m *SimpleResponse) GetValue() int32 {
-	if m != nil {
-		return m.Value
-	}
-	return 0
-}
-
 type RepoRequest struct {
 	Repo                 *gitalypb.Repository `protobuf:"bytes,1,opt,name=repo,proto3" json:"repo,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
@@ -116,7 +37,7 @@ func (m *RepoRequest) Reset()         { *m = RepoRequest{} }
 func (m *RepoRequest) String() string { return proto.CompactTextString(m) }
 func (*RepoRequest) ProtoMessage()    {}
 func (*RepoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6fa4806c90f7156d, []int{2}
+	return fileDescriptor_d20d83172fd49eb0, []int{0}
 }
 
 func (m *RepoRequest) XXX_Unmarshal(b []byte) error {
@@ -145,33 +66,28 @@ func (m *RepoRequest) GetRepo() *gitalypb.Repository {
 }
 
 func init() {
-	proto.RegisterType((*SimpleRequest)(nil), "mock.SimpleRequest")
-	proto.RegisterType((*SimpleResponse)(nil), "mock.SimpleResponse")
 	proto.RegisterType((*RepoRequest)(nil), "mock.RepoRequest")
 }
 
-func init() { proto.RegisterFile("mock.proto", fileDescriptor_6fa4806c90f7156d) }
+func init() { proto.RegisterFile("praefect/mock/mock.proto", fileDescriptor_d20d83172fd49eb0) }
 
-var fileDescriptor_6fa4806c90f7156d = []byte{
-	// 279 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x90, 0x41, 0x4a, 0xc3, 0x40,
-	0x14, 0x86, 0x99, 0x90, 0x96, 0xf0, 0xaa, 0xa5, 0x1d, 0x8b, 0x48, 0xdc, 0x48, 0x40, 0xc9, 0xa2,
-	0x4c, 0xa1, 0x2e, 0x5d, 0x29, 0xc4, 0x9d, 0x9b, 0x14, 0x0f, 0x90, 0xc6, 0x67, 0x0c, 0x26, 0x7d,
-	0xe3, 0xcc, 0xa4, 0x90, 0x93, 0xd4, 0x13, 0x79, 0x13, 0x2f, 0xd1, 0x95, 0x4c, 0x86, 0x60, 0xbb,
-	0xed, 0xee, 0xbd, 0x7f, 0xbe, 0xf9, 0xe7, 0x9f, 0x1f, 0xa0, 0xa6, 0xfc, 0x53, 0x48, 0x45, 0x86,
-	0xb8, 0x6f, 0xe7, 0xf0, 0x4c, 0x7f, 0x64, 0x0a, 0xdf, 0x9c, 0x16, 0x5e, 0x17, 0x44, 0x45, 0x85,
-	0x8b, 0x6e, 0x5b, 0x37, 0xef, 0x0b, 0xac, 0xa5, 0x69, 0xdd, 0x61, 0x74, 0x0b, 0xe7, 0xab, 0xb2,
-	0x96, 0x15, 0xa6, 0xf8, 0xd5, 0xa0, 0x36, 0x7c, 0x06, 0x83, 0x6d, 0x56, 0x35, 0x78, 0xc5, 0x6e,
-	0x58, 0x3c, 0x48, 0xdd, 0x12, 0xdd, 0xc1, 0xb8, 0xc7, 0xb4, 0xa4, 0x8d, 0xc6, 0x7f, 0xce, 0x3b,
-	0xe4, 0x1e, 0x60, 0x94, 0xa2, 0xa4, 0xde, 0x6c, 0x0e, 0xbe, 0x42, 0x49, 0x9d, 0xd7, 0x68, 0xc9,
-	0x45, 0x51, 0x9a, 0xac, 0x6a, 0x85, 0x45, 0x74, 0x69, 0x48, 0xb5, 0x4f, 0xfe, 0xf7, 0xcf, 0x9c,
-	0xa5, 0x1d, 0xb5, 0xfc, 0x65, 0x7d, 0x98, 0x15, 0xaa, 0x6d, 0x99, 0x23, 0x4f, 0x60, 0x6c, 0x47,
-	0x54, 0x8f, 0x79, 0x8e, 0x5a, 0x93, 0xe2, 0x17, 0xa2, 0xfb, 0xed, 0x51, 0xe6, 0x70, 0x76, 0x2c,
-	0xba, 0x84, 0x51, 0xb0, 0xdf, 0xc5, 0x7e, 0xe0, 0x4d, 0x18, 0x7f, 0x86, 0xa9, 0x7d, 0xb2, 0x37,
-	0x79, 0xdd, 0x64, 0xaa, 0xe5, 0x53, 0x77, 0xe9, 0x20, 0x6e, 0x78, 0x29, 0x5c, 0x55, 0xa2, 0xaf,
-	0x4a, 0x24, 0xb6, 0xaa, 0x68, 0xb8, 0xdf, 0xc5, 0x5e, 0xe0, 0xf1, 0x04, 0x26, 0x16, 0x7f, 0x69,
-	0x4c, 0x66, 0x4e, 0xb6, 0x61, 0xeb, 0x61, 0xa7, 0xdf, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x6a,
-	0x35, 0x84, 0xac, 0xb9, 0x01, 0x00, 0x00,
+var fileDescriptor_d20d83172fd49eb0 = []byte{
+	// 230 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x28, 0x4a, 0x4c,
+	0x4d, 0x4b, 0x4d, 0x2e, 0xd1, 0xcf, 0xcd, 0x4f, 0xce, 0x06, 0x13, 0x7a, 0x05, 0x45, 0xf9, 0x25,
+	0xf9, 0x42, 0x2c, 0x20, 0xb6, 0x14, 0x4f, 0x71, 0x46, 0x62, 0x51, 0x6a, 0x0a, 0x44, 0x4c, 0x8a,
+	0x2b, 0x27, 0x33, 0xaf, 0x04, 0xca, 0x96, 0x4e, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0xf3,
+	0x92, 0x4a, 0xd3, 0xf4, 0x53, 0x73, 0x0b, 0x4a, 0x2a, 0x21, 0x92, 0x4a, 0xd6, 0x5c, 0xdc, 0x41,
+	0xa9, 0x05, 0xf9, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5, 0x25, 0x42, 0x3a, 0x5c, 0x2c, 0x45, 0xa9,
+	0x05, 0xf9, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x42, 0x7a, 0xe9, 0x99, 0x25, 0x89, 0x39,
+	0x95, 0x7a, 0x20, 0x25, 0xc5, 0x99, 0x25, 0xf9, 0x45, 0x95, 0x4e, 0x2c, 0x33, 0x8e, 0xe9, 0x30,
+	0x06, 0x81, 0x55, 0x19, 0xcd, 0x63, 0xe4, 0xe2, 0x0d, 0xce, 0xcc, 0x2d, 0xc8, 0x49, 0x0d, 0x4e,
+	0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0x15, 0x72, 0xe3, 0x12, 0x04, 0xa9, 0x75, 0x4c, 0x4e, 0x4e, 0x2d,
+	0x2e, 0xce, 0x2f, 0x0a, 0xcd, 0x4b, 0x2c, 0xaa, 0x14, 0x12, 0xd4, 0x03, 0xbb, 0x16, 0xc9, 0x1e,
+	0x29, 0x31, 0x3d, 0x88, 0xa3, 0xf4, 0x60, 0x8e, 0xd2, 0x73, 0x05, 0x39, 0x4a, 0x89, 0xed, 0xd7,
+	0x74, 0x0d, 0x26, 0x0e, 0x26, 0x21, 0x57, 0x2e, 0x01, 0x90, 0x72, 0xdf, 0xd2, 0x92, 0xc4, 0x12,
+	0xb2, 0x8d, 0x61, 0x4c, 0x62, 0x03, 0x8b, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x46, 0xa4,
+	0xc0, 0xce, 0x3d, 0x01, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -186,8 +102,6 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type SimpleServiceClient interface {
-	// ServerAccessor is a unary RPC that accesses a server
-	ServerAccessor(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error)
 	// RepoAccessorUnary is a unary RPC that accesses a repo
 	RepoAccessorUnary(ctx context.Context, in *RepoRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// RepoMutatorUnary is a unary RPC that mutates a repo
@@ -202,15 +116,6 @@ func NewSimpleServiceClient(cc *grpc.ClientConn) SimpleServiceClient {
 	return &simpleServiceClient{cc}
 }
 
-func (c *simpleServiceClient) ServerAccessor(ctx context.Context, in *SimpleRequest, opts ...grpc.CallOption) (*SimpleResponse, error) {
-	out := new(SimpleResponse)
-	err := c.cc.Invoke(ctx, "/mock.SimpleService/ServerAccessor", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *simpleServiceClient) RepoAccessorUnary(ctx context.Context, in *RepoRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
 	out := new(empty.Empty)
 	err := c.cc.Invoke(ctx, "/mock.SimpleService/RepoAccessorUnary", in, out, opts...)
@@ -231,8 +136,6 @@ func (c *simpleServiceClient) RepoMutatorUnary(ctx context.Context, in *RepoRequ
 
 // SimpleServiceServer is the server API for SimpleService service.
 type SimpleServiceServer interface {
-	// ServerAccessor is a unary RPC that accesses a server
-	ServerAccessor(context.Context, *SimpleRequest) (*SimpleResponse, error)
 	// RepoAccessorUnary is a unary RPC that accesses a repo
 	RepoAccessorUnary(context.Context, *RepoRequest) (*empty.Empty, error)
 	// RepoMutatorUnary is a unary RPC that mutates a repo
@@ -243,9 +146,6 @@ type SimpleServiceServer interface {
 type UnimplementedSimpleServiceServer struct {
 }
 
-func (*UnimplementedSimpleServiceServer) ServerAccessor(ctx context.Context, req *SimpleRequest) (*SimpleResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ServerAccessor not implemented")
-}
 func (*UnimplementedSimpleServiceServer) RepoAccessorUnary(ctx context.Context, req *RepoRequest) (*empty.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RepoAccessorUnary not implemented")
 }
@@ -257,24 +157,6 @@ func RegisterSimpleServiceServer(s *grpc.Server, srv SimpleServiceServer) {
 	s.RegisterService(&_SimpleService_serviceDesc, srv)
 }
 
-func _SimpleService_ServerAccessor_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SimpleRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(SimpleServiceServer).ServerAccessor(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/mock.SimpleService/ServerAccessor",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SimpleServiceServer).ServerAccessor(ctx, req.(*SimpleRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _SimpleService_RepoAccessorUnary_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(RepoRequest)
 	if err := dec(in); err != nil {
@@ -316,10 +198,6 @@ var _SimpleService_serviceDesc = grpc.ServiceDesc{
 	HandlerType: (*SimpleServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "ServerAccessor",
-			Handler:    _SimpleService_ServerAccessor_Handler,
-		},
-		{
 			MethodName: "RepoAccessorUnary",
 			Handler:    _SimpleService_RepoAccessorUnary_Handler,
 		},
@@ -329,5 +207,5 @@ var _SimpleService_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "mock.proto",
+	Metadata: "praefect/mock/mock.proto",
 }
diff --git a/internal/praefect/mock/mock.proto b/internal/praefect/mock/mock.proto
index 8aa159efa..282cba8e9 100644
--- a/internal/praefect/mock/mock.proto
+++ b/internal/praefect/mock/mock.proto
@@ -8,29 +8,14 @@ syntax = "proto3";
 package mock;
 
 import "shared.proto";
+import "lint.proto";
 import "google/protobuf/empty.proto";
 
-message SimpleRequest {
-	int32 value = 1;
-}
-
-message SimpleResponse {
-	int32 value = 2;
-}
-
 message RepoRequest {
 	gitaly.Repository repo = 1 [(gitaly.target_repository)=true];
 }
 
 service SimpleService {
-  // ServerAccessor is a unary RPC that accesses a server
-  rpc ServerAccessor(SimpleRequest) returns (SimpleResponse) {
-    option (gitaly.op_type) = {
-      op: ACCESSOR
-      scope_level: SERVER
-    };
-  }
-	
   // RepoAccessorUnary is a unary RPC that accesses a repo
   rpc RepoAccessorUnary(RepoRequest) returns (google.protobuf.Empty) {
     option (gitaly.op_type) = {
@@ -38,7 +23,7 @@ service SimpleService {
       scope_level: REPOSITORY
     };
   }
-	
+
   // RepoMutatorUnary is a unary RPC that mutates a repo
   rpc RepoMutatorUnary(RepoRequest) returns (google.protobuf.Empty) {
     option (gitaly.op_type) = {
diff --git a/internal/praefect/mocksvc_test.go b/internal/praefect/mocksvc_test.go
index e7b1c1257..0a7a4e091 100644
--- a/internal/praefect/mocksvc_test.go
+++ b/internal/praefect/mocksvc_test.go
@@ -8,26 +8,17 @@ import (
 )
 
 type (
-	serverAccessorFunc    func(context.Context, *mock.SimpleRequest) (*mock.SimpleResponse, error)
 	repoAccessorUnaryFunc func(context.Context, *mock.RepoRequest) (*empty.Empty, error)
 	repoMutatorUnaryFunc  func(context.Context, *mock.RepoRequest) (*empty.Empty, error)
 )
 
 // mockSvc is an implementation of mock.SimpleServer for testing purposes. The
-// gRPC stub can be updated via go generate:
-//
-//go:generate make mock/mock.pb.go
+// gRPC stub can be updated by running `make proto`.
 type mockSvc struct {
-	serverAccessor    serverAccessorFunc
 	repoAccessorUnary repoAccessorUnaryFunc
 	repoMutatorUnary  repoMutatorUnaryFunc
 }
 
-// ServerAccessor is implemented by a callback
-func (m *mockSvc) ServerAccessor(ctx context.Context, req *mock.SimpleRequest) (*mock.SimpleResponse, error) {
-	return m.serverAccessor(ctx, req)
-}
-
 // RepoAccessorUnary is implemented by a callback
 func (m *mockSvc) RepoAccessorUnary(ctx context.Context, req *mock.RepoRequest) (*empty.Empty, error) {
 	return m.repoAccessorUnary(ctx, req)
diff --git a/internal/praefect/protoregistry/protoregistry.go b/internal/praefect/protoregistry/protoregistry.go
index 2dd6870f4..3d6bf8699 100644
--- a/internal/praefect/protoregistry/protoregistry.go
+++ b/internal/praefect/protoregistry/protoregistry.go
@@ -64,14 +64,10 @@ const (
 	ScopeRepository Scope = iota
 	// ScopeStorage indicates an RPC is scoped to an entire storage location
 	ScopeStorage
-	// ScopeServer indicates an RPC is scoped to an entire server
-	ScopeServer
 )
 
 func (s Scope) String() string {
 	switch s {
-	case ScopeServer:
-		return "server"
 	case ScopeStorage:
 		return "storage"
 	case ScopeRepository:
@@ -82,7 +78,6 @@ func (s Scope) String() string {
 }
 
 var protoScope = map[gitalypb.OperationMsg_Scope]Scope{
-	gitalypb.OperationMsg_SERVER:     ScopeServer,
 	gitalypb.OperationMsg_REPOSITORY: ScopeRepository,
 	gitalypb.OperationMsg_STORAGE:    ScopeStorage,
 }
diff --git a/internal/praefect/server_test.go b/internal/praefect/server_test.go
index 2e3a1bf42..cad10cc6b 100644
--- a/internal/praefect/server_test.go
+++ b/internal/praefect/server_test.go
@@ -827,46 +827,34 @@ func TestProxyWrites(t *testing.T) {
 	assert.Equal(t, bytes.Repeat([]byte(payload), 10), receivedData.Bytes())
 }
 
-type errorSimpleService struct{}
-
-// ServerAccessor is implemented by a callback
-func (m *errorSimpleService) ServerAccessor(ctx context.Context, req *mock.SimpleRequest) (*mock.SimpleResponse, error) {
-	return nil, helper.ErrInternalf("something went wrong")
-}
-
-// RepoAccessorUnary is implemented by a callback
-func (m *errorSimpleService) RepoAccessorUnary(ctx context.Context, req *mock.RepoRequest) (*empty.Empty, error) {
-	md, ok := grpc_metadata.FromIncomingContext(ctx)
-	if !ok {
-		return &empty.Empty{}, errors.New("couldn't read metadata")
-	}
-
-	if md.Get("bad-header")[0] == "true" {
-		return &empty.Empty{}, helper.ErrInternalf("something went wrong")
-	}
-
-	return &empty.Empty{}, nil
-}
-
-// RepoMutatorUnary is implemented by a callback
-func (m *errorSimpleService) RepoMutatorUnary(ctx context.Context, req *mock.RepoRequest) (*empty.Empty, error) {
-	md, ok := grpc_metadata.FromIncomingContext(ctx)
-	if !ok {
-		return &empty.Empty{}, errors.New("couldn't read metadata")
-	}
+func TestErrorThreshold(t *testing.T) {
+	backendToken := ""
+	backend, cleanup := newMockDownstream(t, backendToken, &mockSvc{
+		repoMutatorUnary: func(ctx context.Context, req *mock.RepoRequest) (*empty.Empty, error) {
+			md, ok := grpc_metadata.FromIncomingContext(ctx)
+			if !ok {
+				return &empty.Empty{}, errors.New("couldn't read metadata")
+			}
 
-	if md.Get("bad-header")[0] == "true" {
-		return &empty.Empty{}, helper.ErrInternalf("something went wrong")
-	}
+			if md.Get("bad-header")[0] == "true" {
+				return &empty.Empty{}, helper.ErrInternalf("something went wrong")
+			}
 
-	return &empty.Empty{}, nil
-}
+			return &empty.Empty{}, nil
+		},
+		repoAccessorUnary: func(ctx context.Context, req *mock.RepoRequest) (*empty.Empty, error) {
+			md, ok := grpc_metadata.FromIncomingContext(ctx)
+			if !ok {
+				return &empty.Empty{}, errors.New("couldn't read metadata")
+			}
 
-func TestErrorThreshold(t *testing.T) {
-	simple := &errorSimpleService{}
+			if md.Get("bad-header")[0] == "true" {
+				return &empty.Empty{}, helper.ErrInternalf("something went wrong")
+			}
 
-	backendToken := ""
-	backend, cleanup := newMockDownstream(t, backendToken, simple)
+			return &empty.Empty{}, nil
+		},
+	})
 	defer cleanup()
 
 	conf := config.Config{
@@ -909,7 +897,7 @@ func TestErrorThreshold(t *testing.T) {
 		},
 	}
 
-	gz := proto.FileDescriptor("mock.proto")
+	gz := proto.FileDescriptor("praefect/mock/mock.proto")
 	fd, err := protoregistry.ExtractFileDescriptor(gz)
 	require.NoError(t, err)
 
diff --git a/proto/go/gitalypb/lint.pb.go b/proto/go/gitalypb/lint.pb.go
index 8b843cf22..a8748caee 100644
--- a/proto/go/gitalypb/lint.pb.go
+++ b/proto/go/gitalypb/lint.pb.go
@@ -53,19 +53,16 @@ type OperationMsg_Scope int32
 
 const (
 	OperationMsg_REPOSITORY OperationMsg_Scope = 0
-	OperationMsg_SERVER     OperationMsg_Scope = 1
 	OperationMsg_STORAGE    OperationMsg_Scope = 2
 )
 
 var OperationMsg_Scope_name = map[int32]string{
 	0: "REPOSITORY",
-	1: "SERVER",
 	2: "STORAGE",
 }
 
 var OperationMsg_Scope_value = map[string]int32{
 	"REPOSITORY": 0,
-	"SERVER":     1,
 	"STORAGE":    2,
 }
 
@@ -197,32 +194,32 @@ func init() {
 func init() { proto.RegisterFile("lint.proto", fileDescriptor_1612d42a10b555ca) }
 
 var fileDescriptor_1612d42a10b555ca = []byte{
-	// 425 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x41, 0x6b, 0xd4, 0x40,
-	0x14, 0xc7, 0x9b, 0x40, 0x77, 0xeb, 0x4b, 0x29, 0x71, 0xa8, 0xb0, 0x14, 0xac, 0xcb, 0x9e, 0x7a,
-	0x31, 0x29, 0xed, 0xc9, 0x78, 0x90, 0x75, 0x89, 0x22, 0x76, 0x77, 0x64, 0x92, 0x2a, 0x7a, 0x59,
-	0xb2, 0xc9, 0x33, 0x0e, 0xc4, 0x7d, 0xc3, 0x64, 0x2c, 0xec, 0xd5, 0x4f, 0xe7, 0xd7, 0xb0, 0xfa,
-	0x39, 0x54, 0x92, 0xd9, 0x6d, 0x16, 0x5a, 0x50, 0x6f, 0xf3, 0x1e, 0xff, 0xdf, 0x8f, 0xc7, 0x9f,
-	0x01, 0xa8, 0xe4, 0xd2, 0x04, 0x4a, 0x93, 0x21, 0xd6, 0x2b, 0xa5, 0xc9, 0xaa, 0xd5, 0xd1, 0xb0,
-	0x24, 0x2a, 0x2b, 0x0c, 0xdb, 0xed, 0xe2, 0xcb, 0xc7, 0xb0, 0xc0, 0x3a, 0xd7, 0x52, 0x19, 0xd2,
-	0x36, 0x39, 0xba, 0x76, 0x60, 0x9f, 0x2b, 0xd4, 0x99, 0x91, 0xb4, 0x9c, 0xd6, 0x25, 0x0b, 0xc0,
-	0x25, 0x35, 0x70, 0x86, 0xce, 0xc9, 0xc1, 0xd9, 0x71, 0x60, 0x3d, 0xc1, 0x76, 0xa2, 0x1b, 0x84,
-	0x4b, 0x8a, 0x3d, 0x05, 0xaf, 0xce, 0x49, 0xe1, 0xbc, 0xc2, 0x2b, 0xac, 0x06, 0x6e, 0x0b, 0x1e,
-	0xdd, 0x09, 0x26, 0x4d, 0x4e, 0x40, 0x1b, 0xbf, 0x68, 0xd2, 0xa3, 0x73, 0xb8, 0x77, 0x93, 0x60,
-	0x1e, 0xf4, 0x2f, 0x67, 0xaf, 0x67, 0xfc, 0xdd, 0xcc, 0xdf, 0x69, 0x86, 0xe9, 0x65, 0x3a, 0x4e,
-	0xb9, 0xf0, 0x1d, 0xb6, 0x0f, 0x7b, 0xe3, 0xc9, 0x24, 0x4e, 0x12, 0x2e, 0x7c, 0x77, 0x74, 0x0a,
-	0xbb, 0xad, 0x89, 0x1d, 0x00, 0x88, 0xf8, 0x0d, 0x4f, 0x5e, 0xa5, 0x5c, 0xbc, 0xf7, 0x77, 0x18,
-	0x40, 0x2f, 0x89, 0xc5, 0xdb, 0xb8, 0x41, 0x3c, 0xe8, 0x27, 0x29, 0x17, 0xe3, 0x97, 0xb1, 0xef,
-	0x46, 0x13, 0xf0, 0xe4, 0xd2, 0xa0, 0xce, 0x51, 0x19, 0x2c, 0xd8, 0xa3, 0xc0, 0xd6, 0x12, 0x6c,
-	0x6a, 0x09, 0x12, 0xd4, 0x57, 0x32, 0x47, 0xae, 0x9a, 0x43, 0xea, 0xc1, 0xaf, 0xaf, 0xbb, 0x43,
-	0xe7, 0x64, 0x4f, 0x6c, 0x53, 0x11, 0x87, 0x3e, 0xa9, 0xb9, 0x59, 0x29, 0x64, 0xc7, 0xb7, 0x04,
-	0x53, 0x34, 0x9f, 0xa8, 0xd8, 0xf0, 0xbf, 0x5b, 0xde, 0x3b, 0x3b, 0xbc, 0xab, 0x06, 0xd1, 0x23,
-	0x95, 0xae, 0x14, 0x46, 0x4f, 0xa0, 0x5f, 0x1b, 0xd2, 0x59, 0x89, 0xec, 0xe1, 0x2d, 0xe1, 0x0b,
-	0x89, 0xd5, 0x8d, 0xef, 0xfb, 0x37, 0x7b, 0xcf, 0x26, 0x1f, 0x3d, 0x03, 0xd0, 0xa8, 0xa8, 0x96,
-	0x86, 0xf4, 0xea, 0x6f, 0xf4, 0xf5, 0x9a, 0xde, 0x42, 0xa2, 0x0b, 0xb8, 0x6f, 0x32, 0x5d, 0xa2,
-	0x99, 0xff, 0xbb, 0xe7, 0xc7, 0xda, 0xe3, 0x5b, 0x52, 0x74, 0xb6, 0x14, 0x1e, 0x64, 0x45, 0x21,
-	0x9b, 0x58, 0x56, 0xfd, 0x87, 0xf1, 0xe7, 0xda, 0x78, 0xd8, 0xd1, 0x9d, 0xf5, 0xf9, 0xe9, 0x87,
-	0xa6, 0xbe, 0x2a, 0x5b, 0x04, 0x39, 0x7d, 0x0e, 0xed, 0xf3, 0x31, 0xe9, 0x32, 0xb4, 0xa5, 0xda,
-	0x4f, 0x1d, 0x96, 0xb4, 0x9e, 0xd5, 0x62, 0xd1, 0x6b, 0x57, 0xe7, 0x7f, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0xb2, 0x98, 0xf0, 0x1b, 0x0b, 0x03, 0x00, 0x00,
+	// 426 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xd1, 0x8a, 0xd3, 0x40,
+	0x14, 0x86, 0x4d, 0x70, 0xdb, 0x7a, 0xba, 0x2c, 0x71, 0x58, 0xa1, 0x2c, 0xb8, 0x96, 0x5e, 0x2d,
+	0x82, 0x89, 0x74, 0xaf, 0x8c, 0x17, 0x52, 0x4b, 0x14, 0x71, 0xdb, 0x91, 0x49, 0x56, 0xd1, 0x9b,
+	0x92, 0x26, 0xc7, 0x38, 0x10, 0x7b, 0x86, 0xc9, 0xb8, 0xd0, 0x5b, 0x9f, 0xce, 0xd7, 0x50, 0xf7,
+	0x39, 0x54, 0x92, 0x69, 0x37, 0x85, 0x5d, 0x50, 0xef, 0xe6, 0x1c, 0xfe, 0xef, 0xe3, 0xf0, 0x33,
+	0x00, 0xa5, 0x5c, 0x19, 0x5f, 0x69, 0x32, 0xc4, 0x3a, 0x85, 0x34, 0x69, 0xb9, 0x3e, 0x1a, 0x16,
+	0x44, 0x45, 0x89, 0x41, 0xb3, 0x5d, 0x7e, 0xf9, 0x18, 0xe4, 0x58, 0x65, 0x5a, 0x2a, 0x43, 0xda,
+	0x26, 0x47, 0x97, 0x0e, 0xec, 0x73, 0x85, 0x3a, 0x35, 0x92, 0x56, 0xb3, 0xaa, 0x60, 0x3e, 0xb8,
+	0xa4, 0x06, 0xce, 0xd0, 0x39, 0x39, 0x18, 0x1f, 0xfb, 0xd6, 0xe3, 0xef, 0x26, 0xda, 0x41, 0xb8,
+	0xa4, 0xd8, 0x53, 0xe8, 0x57, 0x19, 0x29, 0x5c, 0x94, 0x78, 0x81, 0xe5, 0xc0, 0x6d, 0xc0, 0xa3,
+	0x1b, 0xc1, 0xb8, 0xce, 0x09, 0x68, 0xe2, 0x67, 0x75, 0x7a, 0x74, 0x0a, 0x77, 0xae, 0x12, 0xac,
+	0x0f, 0xdd, 0xf3, 0xf9, 0xeb, 0x39, 0x7f, 0x37, 0xf7, 0x6e, 0xd5, 0xc3, 0xec, 0x3c, 0x99, 0x24,
+	0x5c, 0x78, 0x0e, 0xdb, 0x87, 0xde, 0x64, 0x3a, 0x8d, 0xe2, 0x98, 0x0b, 0xcf, 0x1d, 0x8d, 0x61,
+	0xaf, 0x31, 0xb1, 0x03, 0x00, 0x11, 0xbd, 0xe1, 0xf1, 0xab, 0x84, 0x8b, 0xf7, 0x96, 0x89, 0x13,
+	0x2e, 0x26, 0x2f, 0x23, 0xcf, 0x1d, 0xdd, 0xee, 0x39, 0x9e, 0xf3, 0xb0, 0x13, 0x47, 0xe2, 0x6d,
+	0x24, 0xc2, 0x29, 0xf4, 0xe5, 0xca, 0xa0, 0xce, 0x50, 0x19, 0xcc, 0xd9, 0x03, 0xdf, 0x16, 0xe3,
+	0x6f, 0x8b, 0xf1, 0x63, 0xd4, 0x17, 0x32, 0x43, 0xae, 0xea, 0x53, 0xaa, 0xc1, 0xaf, 0xaf, 0x7b,
+	0x43, 0xe7, 0xa4, 0x27, 0x76, 0xa9, 0x90, 0x43, 0x97, 0xd4, 0xc2, 0xac, 0x15, 0xb2, 0xe3, 0x6b,
+	0x82, 0x19, 0x9a, 0x4f, 0x94, 0x6f, 0xf9, 0xdf, 0x0d, 0xdf, 0x1f, 0x1f, 0xde, 0x54, 0x84, 0xe8,
+	0x90, 0x4a, 0xd6, 0x0a, 0xc3, 0x27, 0xd0, 0xad, 0x0c, 0xe9, 0xb4, 0x40, 0x76, 0xff, 0x9a, 0xf0,
+	0x85, 0xc4, 0xf2, 0xca, 0xf7, 0xfd, 0x9b, 0xbd, 0x67, 0x9b, 0x0f, 0x9f, 0x01, 0x68, 0x54, 0x54,
+	0x49, 0x43, 0x7a, 0xfd, 0x37, 0xfa, 0xc7, 0x86, 0xde, 0x41, 0xc2, 0x33, 0xb8, 0x6b, 0x52, 0x5d,
+	0xa0, 0x59, 0xfc, 0xbb, 0xe7, 0xe7, 0xc6, 0xe3, 0x59, 0x52, 0xb4, 0xb6, 0x04, 0xee, 0xa5, 0x79,
+	0x2e, 0xeb, 0x58, 0x5a, 0xfe, 0x87, 0xf1, 0x72, 0x63, 0x3c, 0x6c, 0xe9, 0xd6, 0xfa, 0xfc, 0xf1,
+	0x87, 0xba, 0xbe, 0x32, 0x5d, 0xfa, 0x19, 0x7d, 0x0e, 0xec, 0xf3, 0x11, 0xe9, 0x22, 0xb0, 0xa5,
+	0xda, 0x6f, 0x1d, 0x14, 0xb4, 0x99, 0xd5, 0x72, 0xd9, 0x69, 0x56, 0xa7, 0x7f, 0x02, 0x00, 0x00,
+	0xff, 0xff, 0x80, 0x8b, 0x42, 0x14, 0x0d, 0x03, 0x00, 0x00,
 }
diff --git a/proto/go/internal/linter/lint_test.go b/proto/go/internal/linter/lint_test.go
index 16fab1c4e..0d4e0a129 100644
--- a/proto/go/internal/linter/lint_test.go
+++ b/proto/go/internal/linter/lint_test.go
@@ -28,7 +28,6 @@ func TestLintFile(t *testing.T) {
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod0", errors.New("missing op_type extension")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod1", errors.New("op set to UNKNOWN")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod2", errors.New("unexpected count of target_repository fields 0, expected 1, found target_repository label at: []")),
-				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod3", errors.New("unexpected count of target_repository fields 1, expected 0, found target_repository label at: [InvalidMethodRequestWithRepo.destination]")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod4", errors.New("unexpected count of target_repository fields 0, expected 1, found target_repository label at: []")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod5", errors.New("wrong type of field RequestWithWrongTypeRepository.header.repository, expected .gitaly.Repository, got .test.InvalidMethodResponse")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod6", errors.New("unexpected count of target_repository fields 0, expected 1, found target_repository label at: []")),
@@ -37,7 +36,6 @@ func TestLintFile(t *testing.T) {
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod9", errors.New("unexpected count of target_repository fields 1, expected 0, found target_repository label at: [InvalidMethodRequestWithRepo.destination]")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod10", errors.New("unexpected count of storage field 1, expected 0, found storage label at: [RequestWithStorageAndRepo.storage_name]")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod11", errors.New("unexpected count of storage field 1, expected 0, found storage label at: [RequestWithNestedStorageAndRepo.inner_message.storage_name]")),
-				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod12", errors.New("unexpected count of storage field 1, expected 0, found storage label at: [RequestWithInnerNestedStorage.header.storage_name]")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod13", errors.New("unexpected count of storage field 0, expected 1, found storage label at: []")),
 				formatError("go/internal/linter/testdata/invalid.proto", "InvalidService", "InvalidMethod14", errors.New("unexpected count of storage field 2, expected 1, found storage label at: [RequestWithMultipleNestedStorage.inner_message.storage_name RequestWithMultipleNestedStorage.storage_name]")),
 			},
diff --git a/proto/go/internal/linter/method.go b/proto/go/internal/linter/method.go
index 30f78e1b3..ae8b727f1 100644
--- a/proto/go/internal/linter/method.go
+++ b/proto/go/internal/linter/method.go
@@ -40,9 +40,6 @@ func (ml methodLinter) validateMutator() error {
 	case gitalypb.OperationMsg_REPOSITORY:
 		return ml.ensureValidRepoScope()
 
-	case gitalypb.OperationMsg_SERVER:
-		return ml.ensureValidServerScope()
-
 	case gitalypb.OperationMsg_STORAGE:
 		return ml.ensureValidStorageScope()
 
@@ -60,13 +57,6 @@ func (ml methodLinter) ensureValidStorageScope() error {
 	return ml.ensureValidStorage(1)
 }
 
-func (ml methodLinter) ensureValidServerScope() error {
-	if err := ml.ensureValidTargetRepository(0); err != nil {
-		return err
-	}
-	return ml.ensureValidStorage(0)
-}
-
 func (ml methodLinter) ensureValidRepoScope() error {
 	if err := ml.ensureValidTargetRepository(1); err != nil {
 		return err
diff --git a/proto/go/internal/linter/testdata/invalid.pb.go b/proto/go/internal/linter/testdata/invalid.pb.go
index 5a0b4a515..ae2144b29 100644
--- a/proto/go/internal/linter/testdata/invalid.pb.go
+++ b/proto/go/internal/linter/testdata/invalid.pb.go
@@ -643,53 +643,52 @@ func init() {
 }
 
 var fileDescriptor_506a53e91b227711 = []byte{
-	// 726 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x5b, 0x4f, 0xd4, 0x40,
-	0x14, 0xc7, 0x9d, 0xcd, 0xba, 0x81, 0x03, 0x78, 0x99, 0xa8, 0xe0, 0x7a, 0x81, 0x14, 0x2f, 0xab,
-	0x92, 0x5d, 0x28, 0xa8, 0x48, 0xf0, 0x81, 0x8d, 0x31, 0x22, 0x61, 0xd5, 0x85, 0x84, 0xc4, 0x4b,
-	0x70, 0xa4, 0x27, 0xdd, 0x26, 0xa5, 0xad, 0xd3, 0x01, 0xb3, 0x6f, 0x3e, 0x1a, 0x9f, 0x7c, 0x12,
-	0xbf, 0x83, 0x5f, 0xc0, 0xf8, 0x01, 0xfc, 0x3c, 0x3e, 0xf3, 0x64, 0x7a, 0xd9, 0xa5, 0x9d, 0xb6,
-	0x38, 0x82, 0x6f, 0xcd, 0xf4, 0x9c, 0xff, 0xf9, 0xcd, 0x7f, 0xe6, 0xf4, 0x14, 0x6e, 0x99, 0x6e,
-	0xc3, 0x72, 0x04, 0x72, 0x87, 0xd9, 0x0d, 0x3b, 0x7c, 0x6a, 0x08, 0xf4, 0x85, 0xc1, 0x04, 0x6b,
-	0x58, 0xce, 0x2e, 0xb3, 0x2d, 0xa3, 0xee, 0x71, 0x57, 0xb8, 0xb4, 0x1c, 0xac, 0x57, 0x21, 0x08,
-	0x8a, 0x56, 0xaa, 0xc3, 0x7e, 0x87, 0x71, 0x8c, 0xdf, 0x6b, 0x17, 0xe0, 0xdc, 0x72, 0x94, 0xb0,
-	0x8a, 0xa2, 0xe3, 0x1a, 0x6d, 0x7c, 0xbf, 0x83, 0xbe, 0xd0, 0x5e, 0xc2, 0xe5, 0xbc, 0xf5, 0x0d,
-	0x4b, 0x74, 0xda, 0xe8, 0xb9, 0x74, 0x01, 0x86, 0x0c, 0xf4, 0x85, 0xe5, 0x30, 0x61, 0xb9, 0xce,
-	0x18, 0x99, 0x20, 0xb5, 0x21, 0x9d, 0xd6, 0x4d, 0x4b, 0x30, 0xbb, 0x5b, 0x0f, 0x42, 0x7c, 0x4b,
-	0xb8, 0xbc, 0xdb, 0x2c, 0x7f, 0xfb, 0x35, 0x45, 0xda, 0xc9, 0x60, 0x6d, 0x1e, 0xce, 0xc6, 0xda,
-	0xeb, 0x8c, 0x9b, 0x28, 0xd6, 0xbb, 0x1e, 0xd2, 0x49, 0x80, 0x0f, 0xdc, 0x75, 0xcc, 0x4d, 0xd1,
-	0xf5, 0x30, 0xd4, 0x3b, 0x19, 0xe7, 0x0e, 0x86, 0xeb, 0x41, 0x90, 0x36, 0x0a, 0xe7, 0x25, 0x2a,
-	0xdf, 0x73, 0x1d, 0x1f, 0xb5, 0xf5, 0xfe, 0x36, 0x5a, 0xe8, 0x0b, 0xec, 0xe1, 0xd2, 0x45, 0x18,
-	0xb1, 0x1c, 0x07, 0xf9, 0xe6, 0x36, 0xfa, 0x3e, 0x33, 0x31, 0x06, 0x1d, 0xad, 0x07, 0xb6, 0xd4,
-	0x33, 0x14, 0xed, 0xe1, 0x30, 0x7a, 0x35, 0x0a, 0xd6, 0x7c, 0xa0, 0x89, 0x7d, 0xaf, 0x09, 0x97,
-	0x33, 0x13, 0xe9, 0x4d, 0x18, 0xf6, 0xa3, 0xc7, 0x4d, 0x87, 0x6d, 0x47, 0x92, 0x83, 0xcd, 0xf2,
-	0xa7, 0x70, 0x9f, 0xf1, 0x9b, 0x16, 0xdb, 0x46, 0x3a, 0x97, 0xf6, 0xa8, 0x54, 0xe4, 0x51, 0xda,
-	0x9d, 0x8f, 0x04, 0x2e, 0x66, 0xab, 0x2e, 0x39, 0x46, 0xe8, 0xbb, 0x72, 0xf1, 0x05, 0xc5, 0xe2,
-	0x79, 0x07, 0x64, 0xc2, 0x78, 0x82, 0x20, 0x72, 0x54, 0xe2, 0x78, 0x94, 0x6f, 0xec, 0x78, 0x64,
-	0x6c, 0x21, 0xbf, 0x64, 0xf0, 0x67, 0x02, 0x13, 0x89, 0xd8, 0xd5, 0x1d, 0x5b, 0x58, 0x9e, 0x8d,
-	0xa9, 0x8a, 0xf4, 0x61, 0x7e, 0xa9, 0xb1, 0xa2, 0x52, 0xe9, 0x1a, 0x19, 0xc7, 0x4a, 0x05, 0x8e,
-	0x69, 0x5f, 0x09, 0x5c, 0x49, 0xa8, 0x2d, 0x07, 0x22, 0x69, 0x92, 0x26, 0x54, 0x3a, 0xc8, 0x0c,
-	0xe4, 0x31, 0xc2, 0xed, 0x0c, 0x42, 0x36, 0xa9, 0xfe, 0x24, 0xcc, 0x68, 0xc7, 0x99, 0xd5, 0x19,
-	0xa8, 0x44, 0x2b, 0xca, 0x47, 0xa9, 0xfd, 0x20, 0x70, 0x35, 0x51, 0x63, 0xa3, 0xd7, 0x0e, 0x07,
-	0x87, 0x48, 0x97, 0x25, 0xb2, 0x3b, 0x19, 0xb2, 0x9c, 0xac, 0x18, 0x2d, 0xbe, 0x01, 0x3d, 0xc0,
-	0x95, 0x3e, 0xe0, 0x12, 0x00, 0xef, 0x07, 0xc7, 0xc2, 0x97, 0x52, 0x9d, 0x93, 0xee, 0xc2, 0x66,
-	0xf9, 0x4b, 0x20, 0x94, 0x48, 0xd2, 0xbe, 0x93, 0x9c, 0xab, 0x14, 0x10, 0xb4, 0x5c, 0xf1, 0xd8,
-	0x66, 0xa6, 0x89, 0x06, 0x7d, 0x2a, 0xb1, 0x4f, 0x65, 0xd8, 0xf3, 0xd2, 0xf2, 0xe1, 0x17, 0xfb,
-	0xf0, 0x7a, 0x0e, 0x7c, 0x5e, 0xef, 0x25, 0xa2, 0xf4, 0xdd, 0xe0, 0xa3, 0x27, 0x90, 0x6f, 0xa1,
-	0x27, 0xd0, 0x08, 0x2a, 0x3f, 0xf3, 0x90, 0x87, 0x3d, 0x11, 0x7e, 0xa3, 0x9e, 0xc3, 0x48, 0x6a,
-	0xe3, 0xb4, 0x9a, 0xeb, 0x46, 0xc8, 0x5d, 0x3d, 0xcc, 0x29, 0xad, 0xb2, 0xbf, 0x57, 0x2b, 0x0d,
-	0x94, 0xaa, 0xe5, 0xdf, 0x7b, 0x35, 0xa2, 0xff, 0x04, 0x38, 0x15, 0xc7, 0xad, 0x21, 0xdf, 0xb5,
-	0xb6, 0x90, 0xae, 0xf4, 0x57, 0xa2, 0xcc, 0xe9, 0xa3, 0xd7, 0x3a, 0x41, 0x5f, 0x48, 0x62, 0x33,
-	0xc7, 0x05, 0xcf, 0x4a, 0xea, 0xc7, 0xf6, 0x82, 0xbe, 0x92, 0x24, 0x67, 0xa9, 0x56, 0x2c, 0xd9,
-	0x1b, 0x44, 0x87, 0x4b, 0x0f, 0xec, 0xef, 0xd5, 0xca, 0x03, 0xe4, 0x0c, 0xc9, 0xf0, 0xce, 0x1d,
-	0x97, 0x97, 0x64, 0x78, 0xef, 0xd2, 0x6b, 0x2a, 0x5d, 0xa7, 0x26, 0xfe, 0x5a, 0x12, 0xbf, 0x47,
-	0xaf, 0x2b, 0xb5, 0x85, 0x9a, 0x7a, 0x4b, 0x52, 0xbf, 0x4f, 0x8b, 0x26, 0xa2, 0x9a, 0x9e, 0xec,
-	0xee, 0xbc, 0xe4, 0x6e, 0x6a, 0x28, 0x1f, 0xcd, 0xdd, 0x07, 0xff, 0xef, 0x36, 0x94, 0xe8, 0x06,
-	0x9c, 0x4e, 0x37, 0xc4, 0x34, 0xfd, 0xdb, 0xe4, 0x52, 0xbb, 0xc3, 0x6f, 0x64, 0xe1, 0x99, 0xc2,
-	0x73, 0xfb, 0x77, 0x79, 0x92, 0x95, 0xd7, 0xe9, 0xa4, 0xc2, 0x0c, 0x52, 0x6f, 0x12, 0x49, 0x7e,
-	0xf6, 0x88, 0xf7, 0xe2, 0xc0, 0xe9, 0xb7, 0xb2, 0xe4, 0x1c, 0xbd, 0x91, 0x21, 0xce, 0x9d, 0xfb,
-	0x8a, 0x15, 0xde, 0x55, 0xc2, 0x1f, 0xd9, 0xd9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x88,
-	0xa5, 0x4d, 0x15, 0x0b, 0x00, 0x00,
+	// 711 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x5b, 0x4f, 0xd4, 0x40,
+	0x14, 0xc7, 0xed, 0x66, 0xdd, 0x2c, 0x07, 0xf0, 0x32, 0x51, 0xc1, 0xf5, 0x02, 0xa9, 0xb7, 0x55,
+	0x49, 0x17, 0x16, 0x54, 0x24, 0xf8, 0xc0, 0xc6, 0x18, 0x91, 0xb0, 0xea, 0x42, 0x42, 0xe2, 0x25,
+	0x38, 0xd2, 0x93, 0x6e, 0x93, 0xd2, 0xd6, 0x99, 0x01, 0xb3, 0x6f, 0x3e, 0x1a, 0x9f, 0x7c, 0x12,
+	0xbf, 0x83, 0x5f, 0xc0, 0x4f, 0xe0, 0xe7, 0xf1, 0x99, 0x07, 0x63, 0x7a, 0xd9, 0xa5, 0x9d, 0x4e,
+	0xb1, 0xc2, 0x5b, 0x33, 0x3d, 0xe7, 0x7f, 0x7e, 0xf3, 0x3f, 0x73, 0x3a, 0x85, 0xdb, 0x96, 0xd7,
+	0xb0, 0x5d, 0x81, 0xcc, 0xa5, 0x4e, 0xc3, 0x09, 0x9f, 0x1a, 0x02, 0xb9, 0x30, 0xa9, 0xa0, 0x0d,
+	0xdb, 0xdd, 0xa5, 0x8e, 0x6d, 0x1a, 0x3e, 0xf3, 0x84, 0x47, 0xca, 0xc1, 0x7a, 0x0d, 0x82, 0xa0,
+	0x68, 0xa5, 0x36, 0xc2, 0xbb, 0x94, 0x61, 0xfc, 0x5e, 0xbf, 0x00, 0xe7, 0x96, 0xa3, 0x84, 0x55,
+	0x14, 0x5d, 0xcf, 0xec, 0xe0, 0x87, 0x1d, 0xe4, 0x42, 0x7f, 0x05, 0x97, 0x55, 0xeb, 0x1b, 0xb6,
+	0xe8, 0x76, 0xd0, 0xf7, 0xc8, 0x02, 0x0c, 0x9b, 0xc8, 0x85, 0xed, 0x52, 0x61, 0x7b, 0xee, 0xb8,
+	0x36, 0xa9, 0xd5, 0x87, 0x9b, 0xc4, 0xb0, 0x6c, 0x41, 0x9d, 0x9e, 0x11, 0x84, 0x70, 0x5b, 0x78,
+	0xac, 0xd7, 0x2a, 0x7f, 0xff, 0x35, 0xa5, 0x75, 0x92, 0xc1, 0xfa, 0x3c, 0x9c, 0x8d, 0xb5, 0xd7,
+	0x29, 0xb3, 0x50, 0xac, 0xf7, 0x7c, 0x24, 0xd7, 0x00, 0x3e, 0x32, 0xcf, 0xb5, 0x36, 0x45, 0xcf,
+	0xc7, 0x50, 0xef, 0x64, 0x9c, 0x3b, 0x14, 0xae, 0x07, 0x41, 0xfa, 0x18, 0x9c, 0x97, 0xa8, 0xb8,
+	0xef, 0xb9, 0x1c, 0xf5, 0xf5, 0xc1, 0x36, 0xda, 0xc8, 0x05, 0xf6, 0x71, 0xc9, 0x22, 0x8c, 0xda,
+	0xae, 0x8b, 0x6c, 0x73, 0x1b, 0x39, 0xa7, 0x16, 0xc6, 0xa0, 0x63, 0x46, 0x60, 0x8b, 0x91, 0xa1,
+	0xe8, 0x8c, 0x84, 0xd1, 0xab, 0x51, 0xb0, 0xce, 0x81, 0x24, 0xf6, 0xbd, 0x26, 0x3c, 0x46, 0x2d,
+	0x24, 0xb7, 0x60, 0x84, 0x47, 0x8f, 0x9b, 0x2e, 0xdd, 0x8e, 0x24, 0x87, 0x5a, 0xe5, 0xcf, 0xe1,
+	0x3e, 0xe3, 0x37, 0x6d, 0xba, 0x8d, 0x64, 0x2e, 0xed, 0x51, 0x29, 0xcf, 0xa3, 0xb4, 0x3b, 0x9f,
+	0x34, 0xb8, 0x98, 0xad, 0xba, 0xe4, 0x9a, 0xa1, 0xef, 0x85, 0x8b, 0x2f, 0x14, 0x2c, 0xae, 0x6a,
+	0x90, 0x05, 0x13, 0x09, 0x82, 0xc8, 0x51, 0x89, 0xe3, 0xb1, 0xda, 0xd8, 0x89, 0xc8, 0xd8, 0x5c,
+	0x7e, 0xc9, 0xe0, 0x2f, 0x1a, 0x4c, 0x26, 0x62, 0x57, 0x77, 0x1c, 0x61, 0xfb, 0x0e, 0xa6, 0x2a,
+	0x92, 0x47, 0xea, 0x52, 0xe3, 0x79, 0xa5, 0xd2, 0x35, 0x32, 0x8e, 0x95, 0x72, 0x1c, 0xd3, 0xbf,
+	0x69, 0x70, 0x25, 0xa1, 0xb6, 0x1c, 0x88, 0xa4, 0x49, 0x5a, 0x50, 0xe9, 0x22, 0x35, 0x91, 0xc5,
+	0x08, 0x77, 0x32, 0x08, 0xd9, 0x24, 0xe3, 0x69, 0x98, 0xd1, 0x89, 0x33, 0x6b, 0x33, 0x50, 0x89,
+	0x56, 0x0a, 0xb7, 0x52, 0xff, 0xa9, 0xc1, 0xd5, 0x44, 0x8d, 0x8d, 0xfe, 0x38, 0x1c, 0x34, 0x91,
+	0x2c, 0x4b, 0x64, 0x77, 0x33, 0x64, 0x8a, 0xac, 0x18, 0x2d, 0x3e, 0x01, 0x7d, 0xc0, 0x95, 0x01,
+	0xe0, 0x12, 0x00, 0x1b, 0x04, 0xc7, 0xc2, 0x97, 0x52, 0x93, 0x93, 0x9e, 0xc2, 0x56, 0xf9, 0x6b,
+	0x20, 0x94, 0x48, 0xd2, 0x7f, 0x68, 0x8a, 0xa3, 0x14, 0x10, 0xb4, 0x3d, 0xf1, 0xc4, 0xa1, 0x96,
+	0x85, 0x26, 0x79, 0x26, 0xb1, 0x4f, 0x65, 0xd8, 0x55, 0x69, 0x6a, 0xf8, 0xc5, 0x01, 0x7c, 0x53,
+	0x01, 0xaf, 0x9a, 0xbd, 0x44, 0x54, 0x73, 0x37, 0xf8, 0xe8, 0x09, 0x64, 0x5b, 0xe8, 0x0b, 0x34,
+	0x83, 0xca, 0xcf, 0x7d, 0x64, 0xe1, 0x4c, 0x84, 0xdf, 0xa8, 0x17, 0x30, 0x9a, 0xda, 0x38, 0xa9,
+	0x29, 0xdd, 0x08, 0xb9, 0x6b, 0x87, 0x39, 0xa5, 0x57, 0xf6, 0xf7, 0xea, 0xa5, 0x6a, 0xa9, 0x56,
+	0xfe, 0xbd, 0x57, 0xd7, 0x9a, 0x7f, 0xaa, 0x70, 0x2a, 0x8e, 0x5b, 0x43, 0xb6, 0x6b, 0x6f, 0x21,
+	0x59, 0x19, 0xac, 0x44, 0x99, 0xd3, 0x47, 0xaf, 0x75, 0x82, 0xbc, 0x94, 0xc4, 0x66, 0x8e, 0x0b,
+	0x9e, 0x95, 0x6c, 0x1e, 0xdb, 0x8b, 0x8c, 0xe4, 0xdc, 0x71, 0x25, 0x35, 0xf2, 0x5a, 0x92, 0xbc,
+	0x47, 0xae, 0x17, 0x19, 0x8c, 0x62, 0xe2, 0x6f, 0x24, 0xf1, 0xfb, 0xe4, 0x46, 0xa1, 0x93, 0x5b,
+	0x4c, 0xbd, 0x2d, 0xa9, 0x3f, 0x20, 0x79, 0x97, 0x56, 0x31, 0x3d, 0xd9, 0xdd, 0x79, 0xc9, 0xdd,
+	0xd4, 0xbd, 0x79, 0x34, 0x77, 0x1f, 0x12, 0x3d, 0xbf, 0x61, 0xfd, 0x3f, 0x87, 0xc3, 0xa5, 0xab,
+	0xfb, 0x7b, 0xf5, 0x72, 0x55, 0x3b, 0x53, 0x22, 0x1b, 0x70, 0x3a, 0x7d, 0x66, 0xa7, 0xc9, 0xbf,
+	0x2e, 0x97, 0x62, 0xc7, 0xec, 0xad, 0x2c, 0x3c, 0x93, 0xdb, 0xb7, 0xff, 0x97, 0x0f, 0x7c, 0x96,
+	0xe4, 0x67, 0x8f, 0xd8, 0xb8, 0x03, 0x2b, 0xde, 0xc9, 0x92, 0x73, 0xe4, 0x66, 0x86, 0x58, 0x79,
+	0x77, 0x16, 0xac, 0xf0, 0xbe, 0x12, 0xfe, 0x0c, 0xce, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x76,
+	0x6b, 0x7b, 0x04, 0x59, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -784,8 +783,6 @@ type InvalidServiceClient interface {
 	InvalidMethod1(ctx context.Context, in *InvalidMethodRequest, opts ...grpc.CallOption) (*InvalidMethodResponse, error)
 	// should fail if target repo is not provided for accessor
 	InvalidMethod2(ctx context.Context, in *InvalidMethodRequest, opts ...grpc.CallOption) (*InvalidMethodResponse, error)
-	// should fail if target repo is provided for server-scoped mutator
-	InvalidMethod3(ctx context.Context, in *InvalidMethodRequestWithRepo, opts ...grpc.CallOption) (*InvalidMethodResponse, error)
 	// should fail if missing either target repo or non-repo-scope for mutator
 	InvalidMethod4(ctx context.Context, in *InvalidMethodRequest, opts ...grpc.CallOption) (*InvalidMethodResponse, error)
 	// should fail if repository is not of type Repository
@@ -802,8 +799,6 @@ type InvalidServiceClient interface {
 	InvalidMethod10(ctx context.Context, in *RequestWithStorageAndRepo, opts ...grpc.CallOption) (*InvalidMethodResponse, error)
 	// should fail if storage is specified for repository scoped RPC
 	InvalidMethod11(ctx context.Context, in *RequestWithNestedStorageAndRepo, opts ...grpc.CallOption) (*InvalidMethodResponse, error)
-	// should fail if storage is specified for server scoped RPC
-	InvalidMethod12(ctx context.Context, in *RequestWithInnerNestedStorage, opts ...grpc.CallOption) (*InvalidMethodResponse, error)
 	// should fail if storage isn't specified for storage scoped RPC
 	InvalidMethod13(ctx context.Context, in *InvalidTargetType, opts ...grpc.CallOption) (*InvalidMethodResponse, error)
 	// should fail if multiple storage is specified for storage scoped RPC
@@ -845,15 +840,6 @@ func (c *invalidServiceClient) InvalidMethod2(ctx context.Context, in *InvalidMe
 	return out, nil
 }
 
-func (c *invalidServiceClient) InvalidMethod3(ctx context.Context, in *InvalidMethodRequestWithRepo, opts ...grpc.CallOption) (*InvalidMethodResponse, error) {
-	out := new(InvalidMethodResponse)
-	err := c.cc.Invoke(ctx, "/test.InvalidService/InvalidMethod3", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *invalidServiceClient) InvalidMethod4(ctx context.Context, in *InvalidMethodRequest, opts ...grpc.CallOption) (*InvalidMethodResponse, error) {
 	out := new(InvalidMethodResponse)
 	err := c.cc.Invoke(ctx, "/test.InvalidService/InvalidMethod4", in, out, opts...)
@@ -926,15 +912,6 @@ func (c *invalidServiceClient) InvalidMethod11(ctx context.Context, in *RequestW
 	return out, nil
 }
 
-func (c *invalidServiceClient) InvalidMethod12(ctx context.Context, in *RequestWithInnerNestedStorage, opts ...grpc.CallOption) (*InvalidMethodResponse, error) {
-	out := new(InvalidMethodResponse)
-	err := c.cc.Invoke(ctx, "/test.InvalidService/InvalidMethod12", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *invalidServiceClient) InvalidMethod13(ctx context.Context, in *InvalidTargetType, opts ...grpc.CallOption) (*InvalidMethodResponse, error) {
 	out := new(InvalidMethodResponse)
 	err := c.cc.Invoke(ctx, "/test.InvalidService/InvalidMethod13", in, out, opts...)
@@ -961,8 +938,6 @@ type InvalidServiceServer interface {
 	InvalidMethod1(context.Context, *InvalidMethodRequest) (*InvalidMethodResponse, error)
 	// should fail if target repo is not provided for accessor
 	InvalidMethod2(context.Context, *InvalidMethodRequest) (*InvalidMethodResponse, error)
-	// should fail if target repo is provided for server-scoped mutator
-	InvalidMethod3(context.Context, *InvalidMethodRequestWithRepo) (*InvalidMethodResponse, error)
 	// should fail if missing either target repo or non-repo-scope for mutator
 	InvalidMethod4(context.Context, *InvalidMethodRequest) (*InvalidMethodResponse, error)
 	// should fail if repository is not of type Repository
@@ -979,8 +954,6 @@ type InvalidServiceServer interface {
 	InvalidMethod10(context.Context, *RequestWithStorageAndRepo) (*InvalidMethodResponse, error)
 	// should fail if storage is specified for repository scoped RPC
 	InvalidMethod11(context.Context, *RequestWithNestedStorageAndRepo) (*InvalidMethodResponse, error)
-	// should fail if storage is specified for server scoped RPC
-	InvalidMethod12(context.Context, *RequestWithInnerNestedStorage) (*InvalidMethodResponse, error)
 	// should fail if storage isn't specified for storage scoped RPC
 	InvalidMethod13(context.Context, *InvalidTargetType) (*InvalidMethodResponse, error)
 	// should fail if multiple storage is specified for storage scoped RPC
@@ -1000,9 +973,6 @@ func (*UnimplementedInvalidServiceServer) InvalidMethod1(ctx context.Context, re
 func (*UnimplementedInvalidServiceServer) InvalidMethod2(ctx context.Context, req *InvalidMethodRequest) (*InvalidMethodResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method InvalidMethod2 not implemented")
 }
-func (*UnimplementedInvalidServiceServer) InvalidMethod3(ctx context.Context, req *InvalidMethodRequestWithRepo) (*InvalidMethodResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method InvalidMethod3 not implemented")
-}
 func (*UnimplementedInvalidServiceServer) InvalidMethod4(ctx context.Context, req *InvalidMethodRequest) (*InvalidMethodResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method InvalidMethod4 not implemented")
 }
@@ -1027,9 +997,6 @@ func (*UnimplementedInvalidServiceServer) InvalidMethod10(ctx context.Context, r
 func (*UnimplementedInvalidServiceServer) InvalidMethod11(ctx context.Context, req *RequestWithNestedStorageAndRepo) (*InvalidMethodResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method InvalidMethod11 not implemented")
 }
-func (*UnimplementedInvalidServiceServer) InvalidMethod12(ctx context.Context, req *RequestWithInnerNestedStorage) (*InvalidMethodResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method InvalidMethod12 not implemented")
-}
 func (*UnimplementedInvalidServiceServer) InvalidMethod13(ctx context.Context, req *InvalidTargetType) (*InvalidMethodResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method InvalidMethod13 not implemented")
 }
@@ -1095,24 +1062,6 @@ func _InvalidService_InvalidMethod2_Handler(srv interface{}, ctx context.Context
 	return interceptor(ctx, in, info, handler)
 }
 
-func _InvalidService_InvalidMethod3_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(InvalidMethodRequestWithRepo)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(InvalidServiceServer).InvalidMethod3(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/test.InvalidService/InvalidMethod3",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(InvalidServiceServer).InvalidMethod3(ctx, req.(*InvalidMethodRequestWithRepo))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _InvalidService_InvalidMethod4_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(InvalidMethodRequest)
 	if err := dec(in); err != nil {
@@ -1257,24 +1206,6 @@ func _InvalidService_InvalidMethod11_Handler(srv interface{}, ctx context.Contex
 	return interceptor(ctx, in, info, handler)
 }
 
-func _InvalidService_InvalidMethod12_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RequestWithInnerNestedStorage)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(InvalidServiceServer).InvalidMethod12(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/test.InvalidService/InvalidMethod12",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(InvalidServiceServer).InvalidMethod12(ctx, req.(*RequestWithInnerNestedStorage))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _InvalidService_InvalidMethod13_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(InvalidTargetType)
 	if err := dec(in); err != nil {
@@ -1328,10 +1259,6 @@ var _InvalidService_serviceDesc = grpc.ServiceDesc{
 			Handler:    _InvalidService_InvalidMethod2_Handler,
 		},
 		{
-			MethodName: "InvalidMethod3",
-			Handler:    _InvalidService_InvalidMethod3_Handler,
-		},
-		{
 			MethodName: "InvalidMethod4",
 			Handler:    _InvalidService_InvalidMethod4_Handler,
 		},
@@ -1364,10 +1291,6 @@ var _InvalidService_serviceDesc = grpc.ServiceDesc{
 			Handler:    _InvalidService_InvalidMethod11_Handler,
 		},
 		{
-			MethodName: "InvalidMethod12",
-			Handler:    _InvalidService_InvalidMethod12_Handler,
-		},
-		{
 			MethodName: "InvalidMethod13",
 			Handler:    _InvalidService_InvalidMethod13_Handler,
 		},
diff --git a/proto/go/internal/linter/testdata/invalid.proto b/proto/go/internal/linter/testdata/invalid.proto
index 9647b00f3..fb3658540 100644
--- a/proto/go/internal/linter/testdata/invalid.proto
+++ b/proto/go/internal/linter/testdata/invalid.proto
@@ -89,13 +89,6 @@ service InvalidService {
       op: ACCESSOR
     };
   }
-  // should fail if target repo is provided for server-scoped mutator
-  rpc InvalidMethod3(InvalidMethodRequestWithRepo) returns (InvalidMethodResponse) {
-    option (gitaly.op_type) = {
-      op: MUTATOR
-      scope_level: SERVER
-    };
-  }
   // should fail if missing either target repo or non-repo-scope for mutator
   rpc InvalidMethod4(InvalidMethodRequest) returns (InvalidMethodResponse) {
     option (gitaly.op_type).op = MUTATOR;
@@ -146,14 +139,6 @@ service InvalidService {
     };
   }
 
-  // should fail if storage is specified for server scoped RPC
-  rpc InvalidMethod12(RequestWithInnerNestedStorage) returns (InvalidMethodResponse) {
-    option (gitaly.op_type) = {
-      op: MUTATOR
-      scope_level: SERVER
-    };
-  }
-
   // should fail if storage isn't specified for storage scoped RPC
   rpc InvalidMethod13(InvalidTargetType) returns (InvalidMethodResponse) {
     option (gitaly.op_type) = {
diff --git a/proto/go/internal/linter/testdata/valid.pb.go b/proto/go/internal/linter/testdata/valid.pb.go
index 2402fa89f..371b007b2 100644
--- a/proto/go/internal/linter/testdata/valid.pb.go
+++ b/proto/go/internal/linter/testdata/valid.pb.go
@@ -457,42 +457,41 @@ func init() {
 }
 
 var fileDescriptor_7058768ff0db2cf7 = []byte{
-	// 545 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x86, 0xe5, 0x28, 0x44, 0x61, 0x92, 0x8a, 0x6a, 0x7b, 0x20, 0x89, 0x44, 0x41, 0x16, 0x52,
-	0x23, 0x81, 0x12, 0x91, 0x52, 0x0a, 0x08, 0x72, 0x28, 0x15, 0x90, 0xa2, 0x14, 0x70, 0x2b, 0x38,
-	0x70, 0x88, 0x36, 0xf1, 0xc8, 0x31, 0x72, 0xbc, 0x66, 0x77, 0x5a, 0xa9, 0x6f, 0xc0, 0x8d, 0x63,
-	0x7a, 0xe1, 0x75, 0x78, 0x1e, 0xce, 0x3d, 0x21, 0xaf, 0x9d, 0xb0, 0x8e, 0x43, 0x68, 0xe1, 0x66,
-	0xcd, 0xce, 0xff, 0xed, 0xef, 0xdf, 0x33, 0x86, 0x2d, 0x4f, 0xb4, 0xfd, 0x90, 0x50, 0x86, 0x3c,
-	0x68, 0x07, 0xfa, 0xa9, 0x4d, 0xa8, 0xc8, 0xe5, 0xc4, 0xdb, 0xa7, 0x3c, 0xf0, 0xdd, 0x56, 0x24,
-	0x05, 0x09, 0x56, 0x8c, 0xab, 0x0d, 0x88, 0x5b, 0x92, 0x4a, 0xa3, 0xaa, 0xc6, 0x5c, 0x62, 0x7a,
-	0x6e, 0x1f, 0x40, 0xf5, 0x43, 0xdc, 0xee, 0xe0, 0x97, 0x13, 0x54, 0xc4, 0x9e, 0x42, 0xc5, 0x45,
-	0x45, 0x7e, 0xc8, 0xc9, 0x17, 0x61, 0xcd, 0xba, 0x63, 0x35, 0x2b, 0x1d, 0xd6, 0xf2, 0x7c, 0xe2,
-	0xc1, 0x59, 0xcb, 0xc1, 0x48, 0x28, 0x9f, 0x84, 0x3c, 0xdb, 0x2b, 0x9e, 0xff, 0xb8, 0x6f, 0x39,
-	0x66, 0xb3, 0x5d, 0x87, 0x9b, 0x26, 0xeb, 0xa3, 0x4f, 0x63, 0x71, 0x42, 0xb1, 0xc6, 0xee, 0xc2,
-	0x86, 0x3e, 0x3a, 0x22, 0x21, 0xb9, 0x87, 0xb3, 0xdb, 0xb6, 0xa0, 0xaa, 0x92, 0xca, 0x20, 0xe4,
-	0x13, 0xd4, 0xd7, 0x5d, 0xdf, 0x2b, 0x7e, 0xd5, 0xe8, 0xf4, 0xe4, 0x90, 0x4f, 0xd0, 0xbe, 0x01,
-	0x6b, 0x29, 0x5a, 0x45, 0x22, 0x54, 0x68, 0xf7, 0x81, 0xe9, 0xc2, 0x21, 0x2a, 0xc2, 0xb9, 0xfb,
-	0x5d, 0x58, 0xf3, 0xc3, 0x10, 0xe5, 0x60, 0x82, 0x4a, 0x71, 0x0f, 0xe7, 0xfe, 0xe3, 0x14, 0x5a,
-	0xa6, 0x39, 0xa7, 0xaa, 0x1b, 0xfb, 0x49, 0x9f, 0xfd, 0x09, 0xea, 0xa6, 0xbf, 0x2c, 0xb5, 0xbb,
-	0x9c, 0x5a, 0x37, 0xa8, 0xd9, 0xf7, 0x5a, 0x80, 0x0f, 0xa1, 0x66, 0x78, 0x3d, 0xd2, 0xf1, 0xcf,
-	0xd8, 0x2f, 0x81, 0x85, 0xba, 0x3c, 0x20, 0x2e, 0x3d, 0xa4, 0x81, 0xc4, 0x48, 0x2c, 0xc6, 0xfe,
-	0x76, 0xf8, 0x19, 0x47, 0xf4, 0x4e, 0x88, 0x20, 0x8d, 0x7d, 0x3d, 0xd1, 0x1c, 0x6b, 0x89, 0x0e,
-	0xf8, 0xbb, 0x95, 0x86, 0xdf, 0x8b, 0x6f, 0xce, 0xfa, 0x7f, 0x06, 0xa5, 0x31, 0x72, 0x17, 0x65,
-	0xca, 0xbd, 0x6b, 0x18, 0xcf, 0xb7, 0xb7, 0x5e, 0xeb, 0x5e, 0x27, 0xd5, 0x34, 0xf6, 0xa1, 0x94,
-	0x54, 0xfe, 0x6b, 0x36, 0xce, 0x2d, 0xd8, 0x34, 0x93, 0x5a, 0x62, 0xf3, 0xc5, 0x82, 0xcd, 0x7b,
-	0xf9, 0x7c, 0xff, 0xee, 0xf6, 0xc1, 0xdc, 0xed, 0x65, 0x67, 0xab, 0xf3, 0x1e, 0x58, 0x2f, 0x5e,
-	0xa0, 0x11, 0x46, 0xf1, 0xe7, 0x41, 0x79, 0xea, 0x8f, 0x90, 0xed, 0x00, 0x1c, 0xa3, 0xa2, 0x3e,
-	0xd2, 0x58, 0xb8, 0x6c, 0xc9, 0x04, 0x35, 0x36, 0x32, 0xb5, 0x64, 0x2e, 0x1b, 0xc5, 0x9f, 0xd3,
-	0xa6, 0xd5, 0xf9, 0x76, 0x2d, 0x5d, 0xab, 0x19, 0xed, 0xf9, 0x3f, 0xd1, 0xec, 0xd2, 0xc5, 0xb4,
-	0x59, 0x28, 0x17, 0x58, 0x17, 0x2a, 0xbf, 0xe5, 0x9d, 0xab, 0xea, 0xad, 0xac, 0x7e, 0xfb, 0xea,
-	0xfa, 0x37, 0xa6, 0xfe, 0x21, 0xbb, 0x95, 0xd7, 0x1b, 0xcb, 0xbe, 0x1c, 0x55, 0xbe, 0x98, 0x36,
-	0x8b, 0x65, 0x6b, 0xdd, 0x62, 0xfb, 0x26, 0x6c, 0x87, 0xd5, 0x8c, 0xee, 0xcc, 0xa7, 0x5d, 0x6d,
-	0xe9, 0xc0, 0xa4, 0x3c, 0x62, 0x9b, 0x39, 0x4a, 0x66, 0xcf, 0x56, 0xb3, 0x7a, 0x26, 0x6b, 0x37,
-	0xf3, 0x7a, 0xf9, 0x89, 0x5b, 0x8d, 0x7a, 0x65, 0xa2, 0x1e, 0xb3, 0x3f, 0xff, 0x23, 0x56, 0xa7,
-	0x54, 0x60, 0x7d, 0x13, 0xf4, 0x84, 0xdd, 0xce, 0x83, 0x2e, 0xe1, 0x6a, 0x8e, 0x1b, 0x96, 0xf4,
-	0xef, 0x7e, 0xfb, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3f, 0x24, 0x44, 0x9b, 0x39, 0x06, 0x00,
-	0x00,
+	// 532 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xc1, 0x6e, 0xd3, 0x4e,
+	0x10, 0xc6, 0xe5, 0xc8, 0x8a, 0xf2, 0x9f, 0xa4, 0xfa, 0x57, 0xdb, 0x03, 0x49, 0x24, 0x0a, 0xb2,
+	0x90, 0x1a, 0x09, 0xe4, 0x88, 0x54, 0xa5, 0x80, 0x20, 0x87, 0x52, 0x01, 0xa9, 0x94, 0x02, 0x6e,
+	0x05, 0x07, 0x0e, 0xd1, 0x26, 0x1e, 0x39, 0x46, 0x8e, 0xd7, 0xec, 0x4e, 0x2b, 0xf5, 0x0d, 0x78,
+	0x83, 0xf4, 0xc2, 0xcb, 0x70, 0xe0, 0x79, 0x38, 0xf7, 0x84, 0xbc, 0x76, 0xc2, 0x3a, 0x09, 0xa1,
+	0x85, 0x5b, 0x34, 0x3b, 0xdf, 0x6f, 0xbf, 0x7c, 0x3b, 0x63, 0xd8, 0x09, 0x44, 0x3b, 0x8c, 0x09,
+	0x65, 0xcc, 0xa3, 0x76, 0xa4, 0x7f, 0xb5, 0x09, 0x15, 0xf9, 0x9c, 0x78, 0xfb, 0x9c, 0x47, 0xa1,
+	0xef, 0x26, 0x52, 0x90, 0x60, 0x76, 0x5a, 0x6d, 0x42, 0xda, 0x92, 0x55, 0x9a, 0x35, 0x35, 0xe6,
+	0x12, 0xf3, 0x73, 0xe7, 0x08, 0x6a, 0xef, 0xd3, 0x76, 0x0f, 0x3f, 0x9f, 0xa1, 0x22, 0xf6, 0x14,
+	0xaa, 0x3e, 0x2a, 0x0a, 0x63, 0x4e, 0xa1, 0x88, 0xeb, 0xd6, 0x5d, 0xab, 0x55, 0xed, 0x30, 0x37,
+	0x08, 0x89, 0x47, 0x17, 0xae, 0x87, 0x89, 0x50, 0x21, 0x09, 0x79, 0x71, 0x60, 0x5f, 0x7e, 0x7f,
+	0x60, 0x79, 0x66, 0xb3, 0xd3, 0x80, 0x5b, 0x26, 0xeb, 0x43, 0x48, 0x63, 0x71, 0x46, 0xa9, 0xc6,
+	0xe9, 0xc2, 0x96, 0x3e, 0x3a, 0x21, 0x21, 0x79, 0x80, 0xb3, 0xdb, 0x76, 0xa0, 0xa6, 0xb2, 0xca,
+	0x20, 0xe6, 0x13, 0xd4, 0xd7, 0xfd, 0x77, 0x60, 0x7f, 0xd1, 0xe8, 0xfc, 0xe4, 0x98, 0x4f, 0xd0,
+	0xf9, 0x1f, 0x36, 0x72, 0xb4, 0x4a, 0x44, 0xac, 0xd0, 0xe9, 0x03, 0xd3, 0x85, 0x63, 0x54, 0x84,
+	0x73, 0xf7, 0xfb, 0xb0, 0x11, 0xc6, 0x31, 0xca, 0xc1, 0x04, 0x95, 0xe2, 0x01, 0xce, 0xfd, 0xa7,
+	0x29, 0xb8, 0xa6, 0x39, 0xaf, 0xa6, 0x1b, 0xfb, 0x59, 0x9f, 0xf3, 0x11, 0x1a, 0xa6, 0xbf, 0x22,
+	0xb5, 0xbb, 0x9a, 0xda, 0x30, 0xa8, 0xc5, 0xff, 0xb5, 0x00, 0x1f, 0x42, 0xdd, 0xf0, 0x7a, 0xa2,
+	0xe3, 0x9f, 0xb1, 0x5f, 0x02, 0x8b, 0x75, 0x79, 0x40, 0x5c, 0x06, 0x48, 0x03, 0x89, 0x89, 0x58,
+	0x8c, 0xfd, 0xcd, 0xf0, 0x13, 0x8e, 0xe8, 0xad, 0x10, 0x51, 0x1e, 0xfb, 0x66, 0xa6, 0x39, 0xd5,
+	0x12, 0x1d, 0xf0, 0x57, 0x2b, 0x0f, 0xbf, 0x97, 0xde, 0x5c, 0xf4, 0xff, 0x0c, 0xca, 0x63, 0xe4,
+	0x3e, 0xca, 0x9c, 0x7b, 0xcf, 0x30, 0xbe, 0xdc, 0xee, 0xbe, 0xd6, 0xbd, 0x5e, 0xae, 0x69, 0x1e,
+	0x42, 0x39, 0xab, 0xfc, 0xd3, 0x6c, 0x5c, 0x5a, 0xb0, 0x6d, 0x26, 0xb5, 0xc2, 0xe6, 0x8b, 0x05,
+	0x9b, 0xf7, 0x97, 0xf3, 0xfd, 0xb3, 0xdb, 0x87, 0x73, 0xb7, 0xd7, 0x9d, 0xad, 0xce, 0x3b, 0x60,
+	0xbd, 0x74, 0x81, 0x46, 0x98, 0xa4, 0xcf, 0x83, 0xf2, 0x3c, 0x1c, 0x21, 0xdb, 0x03, 0x38, 0x45,
+	0x45, 0x7d, 0xa4, 0xb1, 0xf0, 0xd9, 0x8a, 0x09, 0x6a, 0x6e, 0x15, 0x6a, 0xd9, 0x5c, 0x36, 0xed,
+	0x1f, 0xd3, 0x96, 0xd5, 0xf9, 0x66, 0xe7, 0x6b, 0x35, 0xa3, 0x3d, 0xff, 0x2b, 0x9a, 0x53, 0xbe,
+	0x9a, 0xb6, 0x4a, 0x95, 0x12, 0xeb, 0x42, 0xf5, 0x97, 0xbc, 0x73, 0x53, 0xbd, 0x55, 0xd4, 0xef,
+	0xde, 0x5c, 0x7f, 0x68, 0xea, 0xf7, 0x58, 0xdd, 0xe8, 0x2d, 0xbc, 0xc6, 0x7a, 0xca, 0x91, 0x49,
+	0x79, 0xc4, 0xb6, 0x97, 0x28, 0x85, 0xd5, 0x58, 0xcf, 0xea, 0x99, 0xac, 0x7d, 0x76, 0x7b, 0xed,
+	0x48, 0xaf, 0x47, 0xbd, 0x32, 0x51, 0x8f, 0xd9, 0xef, 0xd7, 0x7a, 0x35, 0xa6, 0x72, 0x35, 0x6d,
+	0xd9, 0x15, 0x6b, 0xb3, 0xc4, 0xfa, 0x26, 0xe8, 0x09, 0xbb, 0xb3, 0x0c, 0xba, 0x86, 0xab, 0x39,
+	0x6e, 0x58, 0xd6, 0x5f, 0xe8, 0xdd, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x23, 0x7b, 0xb9, 0x87,
+	0xec, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -582,7 +581,6 @@ type ValidServiceClient interface {
 	TestMethod(ctx context.Context, in *ValidRequest, opts ...grpc.CallOption) (*ValidResponse, error)
 	TestMethod2(ctx context.Context, in *ValidRequest, opts ...grpc.CallOption) (*ValidResponse, error)
 	TestMethod3(ctx context.Context, in *ValidRequest, opts ...grpc.CallOption) (*ValidResponse, error)
-	TestMethod4(ctx context.Context, in *ValidRequestWithoutRepo, opts ...grpc.CallOption) (*ValidResponse, error)
 	TestMethod5(ctx context.Context, in *ValidNestedRequest, opts ...grpc.CallOption) (*ValidResponse, error)
 	TestMethod6(ctx context.Context, in *ValidNestedSharedRequest, opts ...grpc.CallOption) (*ValidResponse, error)
 	TestMethod7(ctx context.Context, in *ValidInnerNestedRequest, opts ...grpc.CallOption) (*ValidResponse, error)
@@ -625,15 +623,6 @@ func (c *validServiceClient) TestMethod3(ctx context.Context, in *ValidRequest,
 	return out, nil
 }
 
-func (c *validServiceClient) TestMethod4(ctx context.Context, in *ValidRequestWithoutRepo, opts ...grpc.CallOption) (*ValidResponse, error) {
-	out := new(ValidResponse)
-	err := c.cc.Invoke(ctx, "/test.ValidService/TestMethod4", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *validServiceClient) TestMethod5(ctx context.Context, in *ValidNestedRequest, opts ...grpc.CallOption) (*ValidResponse, error) {
 	out := new(ValidResponse)
 	err := c.cc.Invoke(ctx, "/test.ValidService/TestMethod5", in, out, opts...)
@@ -684,7 +673,6 @@ type ValidServiceServer interface {
 	TestMethod(context.Context, *ValidRequest) (*ValidResponse, error)
 	TestMethod2(context.Context, *ValidRequest) (*ValidResponse, error)
 	TestMethod3(context.Context, *ValidRequest) (*ValidResponse, error)
-	TestMethod4(context.Context, *ValidRequestWithoutRepo) (*ValidResponse, error)
 	TestMethod5(context.Context, *ValidNestedRequest) (*ValidResponse, error)
 	TestMethod6(context.Context, *ValidNestedSharedRequest) (*ValidResponse, error)
 	TestMethod7(context.Context, *ValidInnerNestedRequest) (*ValidResponse, error)
@@ -705,9 +693,6 @@ func (*UnimplementedValidServiceServer) TestMethod2(ctx context.Context, req *Va
 func (*UnimplementedValidServiceServer) TestMethod3(ctx context.Context, req *ValidRequest) (*ValidResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method TestMethod3 not implemented")
 }
-func (*UnimplementedValidServiceServer) TestMethod4(ctx context.Context, req *ValidRequestWithoutRepo) (*ValidResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method TestMethod4 not implemented")
-}
 func (*UnimplementedValidServiceServer) TestMethod5(ctx context.Context, req *ValidNestedRequest) (*ValidResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method TestMethod5 not implemented")
 }
@@ -782,24 +767,6 @@ func _ValidService_TestMethod3_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
-func _ValidService_TestMethod4_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ValidRequestWithoutRepo)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ValidServiceServer).TestMethod4(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/test.ValidService/TestMethod4",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ValidServiceServer).TestMethod4(ctx, req.(*ValidRequestWithoutRepo))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _ValidService_TestMethod5_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ValidNestedRequest)
 	if err := dec(in); err != nil {
@@ -907,10 +874,6 @@ var _ValidService_serviceDesc = grpc.ServiceDesc{
 			Handler:    _ValidService_TestMethod3_Handler,
 		},
 		{
-			MethodName: "TestMethod4",
-			Handler:    _ValidService_TestMethod4_Handler,
-		},
-		{
 			MethodName: "TestMethod5",
 			Handler:    _ValidService_TestMethod5_Handler,
 		},
diff --git a/proto/go/internal/linter/testdata/valid.proto b/proto/go/internal/linter/testdata/valid.proto
index 05ac3bcb0..0845fe159 100644
--- a/proto/go/internal/linter/testdata/valid.proto
+++ b/proto/go/internal/linter/testdata/valid.proto
@@ -74,13 +74,6 @@ service ValidService {
     };
   }
 
-  rpc TestMethod4(ValidRequestWithoutRepo) returns (ValidResponse) {
-    option (gitaly.op_type) = {
-      op: MUTATOR
-      scope_level: SERVER
-    };
-  }
-
   rpc TestMethod5(ValidNestedRequest) returns (ValidResponse) {
     option (gitaly.op_type) = {
       op: MUTATOR
diff --git a/proto/lint.proto b/proto/lint.proto
index 94395a94c..66d851ad5 100644
--- a/proto/lint.proto
+++ b/proto/lint.proto
@@ -17,8 +17,10 @@ message OperationMsg {
 
   enum Scope {
     REPOSITORY = 0;
-    SERVER = 1;
     STORAGE = 2;
+
+    reserved 1;
+    reserved "SERVER";
   }
 
   // Scope level indicates what level an RPC interacts with a server:
diff --git a/ruby/proto/gitaly/lint_pb.rb b/ruby/proto/gitaly/lint_pb.rb
index 3d922340d..8963e5340 100644
--- a/ruby/proto/gitaly/lint_pb.rb
+++ b/ruby/proto/gitaly/lint_pb.rb
@@ -16,7 +16,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     end
     add_enum "gitaly.OperationMsg.Scope" do
       value :REPOSITORY, 0
-      value :SERVER, 1
       value :STORAGE, 2
     end
   end