Parse target storage for storage scoped messagesjc-parse-target-storage

7 files changed, 159 insertions, 103 deletions

diff --git a/internal/praefect/protoregistry/protoregistry.go b/internal/praefect/protoregistry/protoregistry.go
index 21c5254ff..f0e29a5cd 100644
--- a/internal/praefect/protoregistry/protoregistry.go
+++ b/internal/praefect/protoregistry/protoregistry.go
@@ -81,7 +81,7 @@ var protoScope = map[gitalypb.OperationMsg_Scope]Scope{
 type MethodInfo struct {
 	Operation      OpType
 	Scope          Scope
-	targetRepo     []int
+	targetField    []int
 	requestName    string // protobuf message name for input type
 	requestFactory protoFactory
 }
@@ -95,7 +95,16 @@ func (mi MethodInfo) TargetRepo(msg proto.Message) (*gitalypb.Repository, error)
 		)
 	}
 
-	return reflectFindRepoTarget(msg, mi.targetRepo)
+	return reflectFindRepoTarget(msg, mi.targetField)
+}
+
+// TargetStorage returns the target storage for a protobuf message if it exists
+func (mi MethodInfo) TargetStorage(msg proto.Message) (string, error) {
+	if mi.Scope != ScopeStorage {
+		return "", fmt.Errorf("proto message %s is not storage scoped", proto.MessageName(msg))
+	}
+
+	return reflectFindStringTarget(msg, mi.targetField)
 }
 
 // UnmarshalRequestProto will unmarshal the bytes into the method's request
@@ -229,12 +238,19 @@ func parseMethodInfo(methodDesc *descriptor.MethodDescriptorProto) (MethodInfo,
 		requestFactory: reqFactory,
 	}
 
-	if scope == ScopeRepository {
-		targetRepo, err := parseOID(opMsg.GetTargetRepositoryField())
+	switch scope {
+	case ScopeRepository:
+		targetField, err := parseOID(opMsg.GetTargetRepositoryField())
+		if err != nil {
+			return MethodInfo{}, err
+		}
+		mi.targetField = targetField
+	case ScopeStorage:
+		targetField, err := parseOID(opMsg.GetTargetStorageField())
 		if err != nil {
 			return MethodInfo{}, err
 		}
-		mi.targetRepo = targetRepo
+		mi.targetField = targetField
 	}
 
 	return mi, nil
diff --git a/internal/praefect/protoregistry/targetrepo.go b/internal/praefect/protoregistry/targetrepo.go
index 16afe395c..fa2a5aab0 100644
--- a/internal/praefect/protoregistry/targetrepo.go
+++ b/internal/praefect/protoregistry/targetrepo.go
@@ -21,6 +21,39 @@ const (
 func reflectFindRepoTarget(pbMsg proto.Message, targetOID []int) (*gitalypb.Repository, error) {
 	var targetRepo *gitalypb.Repository
 
+	msgV, err := traverseProtoMessage(pbMsg, targetOID)
+	if err != nil {
+		return nil, err
+	}
+
+	targetRepo, ok := msgV.Interface().(*gitalypb.Repository)
+	if !ok {
+		return nil, fmt.Errorf("repo target OID %v points to non-Repo type %+v", targetOID, msgV.Interface())
+	}
+
+	return targetRepo, nil
+}
+
+// reflectFindStringTarget finds the target string field by using the OID to
+// navigate the struct tags
+func reflectFindStringTarget(pbMsg proto.Message, targetOID []int) (string, error) {
+	var targetStorage string
+
+	msgV, err := traverseProtoMessage(pbMsg, targetOID)
+	if err != nil {
+		return "", err
+	}
+
+	targetStorage, ok := msgV.Interface().(string)
+	if !ok {
+		return "", fmt.Errorf("storage target OID 1 points to non-storage type %+v", msgV.Interface())
+	}
+
+	return targetStorage, nil
+}
+
+func traverseProtoMessage(pbMsg proto.Message, targetOID []int) (reflect.Value, error) {
+
 	msgV := reflect.ValueOf(pbMsg)
 
 	for _, fieldNo := range targetOID {
@@ -28,19 +61,11 @@ func reflectFindRepoTarget(pbMsg proto.Message, targetOID []int) (*gitalypb.Repo
 
 		msgV, err = findProtoField(msgV, fieldNo)
 		if err != nil {
-			return nil, fmt.Errorf(
-				"unable to descend OID %+v into message %s: %s",
-				targetOID, proto.MessageName(pbMsg), err,
-			)
+			return reflect.Value{}, err
 		}
 	}
 
-	targetRepo, ok := msgV.Interface().(*gitalypb.Repository)
-	if !ok {
-		return nil, fmt.Errorf("repo target OID %v points to non-Repo type %+v", targetOID, msgV.Interface())
-	}
-
-	return targetRepo, nil
+	return msgV, nil
 }
 
 // matches a tag string like "bytes,1,opt,name=repository,proto3"
diff --git a/proto/go/gitalypb/namespace.pb.go b/proto/go/gitalypb/namespace.pb.go
index aa49ccb42..3858a50d9 100644
--- a/proto/go/gitalypb/namespace.pb.go
+++ b/proto/go/gitalypb/namespace.pb.go
@@ -366,29 +366,29 @@ func init() {
 func init() { proto.RegisterFile("namespace.proto", fileDescriptor_ecb1e126f615f5dd) }
 
 var fileDescriptor_ecb1e126f615f5dd = []byte{
-	// 340 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcd, 0x4e, 0x02, 0x31,
-	0x10, 0xc7, 0x43, 0x21, 0x04, 0x47, 0x22, 0xa4, 0x1a, 0x40, 0x34, 0x7e, 0xec, 0x89, 0x8b, 0xbb,
-	0x7e, 0x3c, 0x81, 0x26, 0xde, 0x8c, 0x26, 0xcb, 0xcd, 0x98, 0x90, 0x02, 0xe3, 0x4a, 0xc2, 0xd2,
-	0xb5, 0xad, 0x44, 0x8f, 0x3e, 0x85, 0xef, 0xea, 0xc9, 0xb4, 0x5d, 0x60, 0x77, 0x29, 0x17, 0xf5,
-	0x36, 0xfd, 0xff, 0x67, 0x7f, 0x9d, 0x9d, 0x99, 0x42, 0x63, 0xc6, 0x62, 0x94, 0x09, 0x1b, 0xa1,
-	0x9f, 0x08, 0xae, 0x38, 0xad, 0x46, 0x13, 0xc5, 0xa6, 0x1f, 0xdd, 0xba, 0x7c, 0x61, 0x02, 0xc7,
-	0x56, 0xf5, 0xee, 0x60, 0xf7, 0x7a, 0x3c, 0xbe, 0x5f, 0xe4, 0x86, 0xf8, 0xfa, 0x86, 0x52, 0xd1,
-	0x53, 0xa8, 0x4b, 0xc5, 0x05, 0x8b, 0x70, 0xa0, 0x39, 0x9d, 0xd2, 0x49, 0xa9, 0xb7, 0x15, 0x6e,
-	0xa7, 0x9a, 0x4e, 0xa7, 0x14, 0x2a, 0xc6, 0x22, 0xc6, 0x32, 0xb1, 0xf7, 0x00, 0xad, 0x10, 0x63,
-	0x3e, 0xc7, 0xff, 0x02, 0x0e, 0x34, 0x50, 0x47, 0xbf, 0x04, 0x3e, 0x0b, 0x1e, 0x2f, 0x80, 0x3a,
-	0xa6, 0x3b, 0x40, 0x14, 0xef, 0x94, 0x8d, 0x42, 0x14, 0xd7, 0x15, 0x2f, 0xd1, 0xb7, 0xef, 0x13,
-	0xa9, 0xe4, 0x1f, 0x2b, 0xbe, 0x80, 0xf6, 0x1a, 0x50, 0x26, 0x7c, 0x26, 0x91, 0xb6, 0xa0, 0x8a,
-	0x46, 0x31, 0xac, 0x5a, 0x98, 0x9e, 0xbc, 0x16, 0xec, 0xe5, 0x67, 0x60, 0xf3, 0xbd, 0x7d, 0x68,
-	0xaf, 0x75, 0x33, 0x6b, 0x15, 0xfa, 0x62, 0xad, 0xcb, 0xcf, 0x32, 0x34, 0x97, 0x6a, 0x1f, 0xc5,
-	0x7c, 0x32, 0x42, 0xda, 0x87, 0x7a, 0xf6, 0x0a, 0x7a, 0xe0, 0xdb, 0x6d, 0xf0, 0x1d, 0xc3, 0xef,
-	0x1e, 0xba, 0xcd, 0xf4, 0xea, 0xda, 0xf7, 0x57, 0xaf, 0x52, 0x2b, 0x35, 0x09, 0x7d, 0x82, 0x46,
-	0xa1, 0x3e, 0x7a, 0xb4, 0xf8, 0xd4, 0xbd, 0x06, 0xdd, 0xe3, 0x8d, 0xbe, 0x9b, 0x9e, 0xfb, 0xc5,
-	0x2c, 0xdd, 0xb5, 0x13, 0x59, 0xba, 0xb3, 0x37, 0x79, 0x7a, 0x61, 0x4c, 0x2b, 0xba, 0x7b, 0x21,
-	0x56, 0xf4, 0x0d, 0xf3, 0x4d, 0xe9, 0xa4, 0x49, 0x6e, 0xce, 0x1f, 0x75, 0xee, 0x94, 0x0d, 0xfd,
-	0x11, 0x8f, 0x03, 0x1b, 0x9e, 0x71, 0x11, 0x05, 0x96, 0x10, 0x98, 0xb7, 0x17, 0x44, 0x3c, 0x3d,
-	0x27, 0xc3, 0x61, 0xd5, 0x48, 0x57, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x03, 0xa2, 0x6d,
-	0xb7, 0x03, 0x00, 0x00,
+	// 345 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x4f, 0x4f, 0xfa, 0x40,
+	0x10, 0x4d, 0xcb, 0x2f, 0xfc, 0x70, 0x20, 0x42, 0x56, 0x03, 0x88, 0xc6, 0x3f, 0x3d, 0x71, 0xb1,
+	0x15, 0xfd, 0x04, 0x9a, 0x78, 0x33, 0x9a, 0xd4, 0xc4, 0x83, 0x17, 0xb2, 0xc0, 0x58, 0x49, 0x28,
+	0x5b, 0x77, 0x57, 0xa2, 0x1f, 0xc2, 0xb3, 0xdf, 0xd5, 0x93, 0xd9, 0xdd, 0x02, 0xa5, 0xdd, 0x5e,
+	0xd4, 0xdb, 0xcc, 0x7b, 0xd3, 0xf7, 0xa6, 0x33, 0xb3, 0xd0, 0x9c, 0xd3, 0x18, 0x45, 0x42, 0xc7,
+	0xe8, 0x27, 0x9c, 0x49, 0x46, 0xaa, 0xd1, 0x54, 0xd2, 0xd9, 0x7b, 0xaf, 0x21, 0x9e, 0x29, 0xc7,
+	0x89, 0x41, 0xbd, 0x1b, 0xd8, 0xb9, 0x9c, 0x4c, 0x6e, 0x97, 0xb5, 0x21, 0xbe, 0xbc, 0xa2, 0x90,
+	0xe4, 0x04, 0x1a, 0x42, 0x32, 0x4e, 0x23, 0x1c, 0x2a, 0x9d, 0xae, 0x73, 0xec, 0xf4, 0xb7, 0xc2,
+	0x7a, 0x8a, 0xa9, 0x72, 0x42, 0xe0, 0x9f, 0xa6, 0x5c, 0x4d, 0xe9, 0xd8, 0xbb, 0x83, 0x76, 0x88,
+	0x31, 0x5b, 0xe0, 0x5f, 0x09, 0x0e, 0x95, 0xa0, 0x8a, 0x7e, 0x28, 0xf8, 0xc4, 0x59, 0xbc, 0x14,
+	0x54, 0x31, 0xd9, 0x06, 0x57, 0xb2, 0x6e, 0x45, 0x23, 0xae, 0x64, 0xaa, 0xe3, 0x95, 0xf4, 0xf5,
+	0xdb, 0x54, 0x48, 0xf1, 0xcb, 0x8e, 0x07, 0xd0, 0x29, 0x08, 0x8a, 0x84, 0xcd, 0x05, 0x92, 0x36,
+	0x54, 0x51, 0x23, 0x5a, 0xab, 0x16, 0xa6, 0x99, 0xd7, 0x86, 0xdd, 0xcd, 0x1d, 0x98, 0x7a, 0x6f,
+	0x0f, 0x3a, 0x85, 0x69, 0x66, 0xa9, 0xdc, 0x5c, 0x0c, 0x75, 0xfe, 0x51, 0x81, 0xd6, 0x0a, 0xbd,
+	0x47, 0xbe, 0x98, 0x8e, 0x91, 0x3c, 0x40, 0x23, 0x6b, 0x41, 0xf6, 0x7d, 0x73, 0x0d, 0xbe, 0x65,
+	0xf9, 0xbd, 0x03, 0x3b, 0x99, 0x5a, 0xd7, 0xbf, 0x3e, 0xfb, 0xff, 0x6b, 0x4e, 0xcb, 0xf5, 0x9c,
+	0x01, 0x19, 0x42, 0x33, 0xd7, 0x22, 0x39, 0x5c, 0x7e, 0x6d, 0xbf, 0x84, 0xde, 0x51, 0x29, 0x5f,
+	0x6a, 0xb0, 0xf1, 0xa3, 0x59, 0x03, 0xdb, 0x65, 0x64, 0x0d, 0xac, 0x13, 0x2a, 0x18, 0xe4, 0xf6,
+	0xb5, 0x36, 0xb0, 0x5f, 0xc6, 0xda, 0xa0, 0x64, 0xd1, 0xa9, 0x81, 0xab, 0x0d, 0xae, 0xce, 0x1e,
+	0x55, 0xf9, 0x8c, 0x8e, 0xfc, 0x31, 0x8b, 0x03, 0x13, 0x9e, 0x32, 0x1e, 0x05, 0x46, 0x24, 0xd0,
+	0xef, 0x30, 0x88, 0x58, 0x9a, 0x27, 0xa3, 0x51, 0x55, 0x43, 0x17, 0xdf, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0xf1, 0x73, 0x15, 0x86, 0xc3, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/go/gitalypb/shared.pb.go b/proto/go/gitalypb/shared.pb.go
index 05bd72e83..4e1985a8d 100644
--- a/proto/go/gitalypb/shared.pb.go
+++ b/proto/go/gitalypb/shared.pb.go
@@ -133,6 +133,7 @@ type OperationMsg struct {
 	// For example, the following OID refers to a target repo field
 	// nested in a one-of field, both at field one: "1.1"
 	TargetRepositoryField string   `protobuf:"bytes,3,opt,name=target_repository_field,json=targetRepositoryField,proto3" json:"target_repository_field,omitempty"`
+	TargetStorageField    string   `protobuf:"bytes,4,opt,name=target_storage_field,json=targetStorageField,proto3" json:"target_storage_field,omitempty"`
 	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
 	XXX_unrecognized      []byte   `json:"-"`
 	XXX_sizecache         int32    `json:"-"`
@@ -184,6 +185,13 @@ func (m *OperationMsg) GetTargetRepositoryField() string {
 	return ""
 }
 
+func (m *OperationMsg) GetTargetStorageField() string {
+	if m != nil {
+		return m.TargetStorageField
+	}
+	return ""
+}
+
 type Repository struct {
 	StorageName  string `protobuf:"bytes,2,opt,name=storage_name,json=storageName,proto3" json:"storage_name,omitempty"`
 	RelativePath string `protobuf:"bytes,3,opt,name=relative_path,json=relativePath,proto3" json:"relative_path,omitempty"`
@@ -720,62 +728,63 @@ func init() {
 func init() { proto.RegisterFile("shared.proto", fileDescriptor_d8a4e87e678c5ced) }
 
 var fileDescriptor_d8a4e87e678c5ced = []byte{
-	// 899 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0xe3, 0x44,
-	0x14, 0x5e, 0x3b, 0xce, 0xdf, 0x89, 0x5b, 0xcc, 0x50, 0x84, 0x55, 0xb4, 0xbb, 0xc1, 0x48, 0xa8,
-	0x42, 0x90, 0x56, 0x5d, 0x69, 0x2f, 0xe0, 0x86, 0xa4, 0x84, 0xaa, 0xcb, 0xa6, 0xae, 0x26, 0x2e,
-	0x08, 0x6e, 0xac, 0x49, 0x3c, 0x9d, 0x0c, 0xb2, 0x33, 0xd6, 0x78, 0x52, 0xd1, 0xbd, 0xe4, 0x31,
-	0x78, 0x08, 0x9e, 0x84, 0xf7, 0xe0, 0x31, 0x40, 0x33, 0x63, 0xa7, 0xd9, 0x6e, 0x41, 0xdc, 0xcd,
-	0x39, 0xe7, 0x3b, 0xff, 0xe7, 0xb3, 0xc1, 0xaf, 0x56, 0x44, 0xd2, 0x6c, 0x54, 0x4a, 0xa1, 0x04,
-	0xea, 0x30, 0xae, 0x48, 0x7e, 0x77, 0xf8, 0x9c, 0x09, 0xc1, 0x72, 0x7a, 0x6c, 0xb4, 0x8b, 0xcd,
-	0xcd, 0xb1, 0xe2, 0x05, 0xad, 0x14, 0x29, 0x4a, 0x0b, 0x3c, 0x1c, 0x3e, 0x04, 0x64, 0xb4, 0x5a,
-	0x4a, 0x5e, 0x2a, 0x21, 0x2d, 0x22, 0xfa, 0xdd, 0x05, 0x3f, 0x2e, 0xa9, 0x24, 0x8a, 0x8b, 0xf5,
-	0xac, 0x62, 0x68, 0x04, 0xae, 0x28, 0x43, 0x67, 0xe8, 0x1c, 0xed, 0x9f, 0x3e, 0x1b, 0xd9, 0x44,
-	0xa3, 0x5d, 0xc4, 0xbd, 0x80, 0x5d, 0x51, 0xa2, 0xaf, 0x61, 0x50, 0x2d, 0x45, 0x49, 0xd3, 0x9c,
-	0xde, 0xd2, 0x3c, 0x74, 0x8d, 0xe3, 0xe1, 0xa3, 0x8e, 0x73, 0x8d, 0xc3, 0x60, 0xe0, 0xaf, 0x35,
-	0x1a, 0xbd, 0x84, 0x8f, 0x14, 0x91, 0x8c, 0xaa, 0x54, 0xd2, 0x52, 0x54, 0x5c, 0x09, 0x79, 0x97,
-	0xde, 0x70, 0x9a, 0x67, 0x61, 0x6b, 0xe8, 0x1c, 0xf5, 0xf1, 0x87, 0xd6, 0x8c, 0xb7, 0xd6, 0xef,
-	0xb4, 0x31, 0x7a, 0x01, 0xfd, 0x6d, 0x64, 0x34, 0x80, 0xee, 0xf5, 0xe5, 0xf7, 0x97, 0xf1, 0x8f,
-	0x97, 0xc1, 0x13, 0x2d, 0xcc, 0xae, 0x93, 0x71, 0x12, 0xe3, 0xc0, 0x41, 0x3e, 0xf4, 0xc6, 0x67,
-	0x67, 0xd3, 0xf9, 0x3c, 0xc6, 0x81, 0x1b, 0x9d, 0x40, 0xdb, 0x54, 0x80, 0xf6, 0x01, 0xf0, 0xf4,
-	0x2a, 0x9e, 0x5f, 0x24, 0x31, 0xfe, 0x29, 0x78, 0x82, 0x00, 0x3a, 0xf3, 0x29, 0xfe, 0x61, 0xaa,
-	0x5d, 0x06, 0xd0, 0x9d, 0x27, 0x31, 0x1e, 0x9f, 0x4f, 0x03, 0x37, 0xfa, 0xc3, 0x05, 0xb8, 0x4f,
-	0x8d, 0x3e, 0x01, 0xbf, 0x52, 0x42, 0x12, 0x46, 0xd3, 0x35, 0x29, 0xa8, 0xe9, 0xb5, 0x8f, 0x07,
-	0xb5, 0xee, 0x92, 0x14, 0x14, 0x7d, 0x0a, 0x7b, 0x92, 0xe6, 0x44, 0xf1, 0x5b, 0x9a, 0x96, 0x44,
-	0xad, 0xea, 0x36, 0xfc, 0x46, 0x79, 0x45, 0xd4, 0x0a, 0x9d, 0xc0, 0x01, 0xe3, 0x2a, 0x15, 0x8b,
-	0x5f, 0xe8, 0x52, 0xa5, 0x19, 0x97, 0x74, 0xa9, 0xe3, 0x87, 0x9e, 0xc1, 0x22, 0xc6, 0x55, 0x6c,
-	0x4c, 0xdf, 0x36, 0x16, 0x74, 0x0e, 0x43, 0xed, 0x41, 0x72, 0x45, 0xe5, 0x9a, 0x28, 0xfa, 0xd0,
-	0x97, 0xd3, 0x2a, 0x6c, 0x0f, 0x5b, 0x47, 0x7d, 0xfc, 0x94, 0x71, 0x35, 0x6e, 0x60, 0x6f, 0x87,
-	0xe1, 0xb4, 0xd2, 0xf5, 0xb1, 0x7c, 0x67, 0xd8, 0x61, 0xc7, 0xd6, 0xc7, 0xf2, 0x9d, 0x3e, 0x3f,
-	0x83, 0xf7, 0x58, 0x9e, 0x96, 0x52, 0x98, 0x1c, 0xa6, 0x8d, 0x9e, 0x81, 0xed, 0xb1, 0xfc, 0xca,
-	0x6a, 0x75, 0x1f, 0xaf, 0xbc, 0x9e, 0x13, 0xb8, 0xaf, 0xbc, 0x5e, 0x37, 0xe8, 0x61, 0x4f, 0xc3,
-	0xa2, 0xbf, 0x1c, 0xe8, 0x9f, 0x73, 0x75, 0x26, 0x8a, 0x82, 0x2b, 0xb4, 0x0f, 0x2e, 0xcf, 0xcc,
-	0x29, 0xf5, 0xb1, 0xcb, 0x33, 0x14, 0x42, 0xb7, 0xda, 0x98, 0x92, 0xcc, 0xe8, 0x7c, 0xdc, 0x88,
-	0x08, 0x81, 0xb7, 0x10, 0xd9, 0x9d, 0x99, 0x96, 0x8f, 0xcd, 0x1b, 0x7d, 0x01, 0x1d, 0xb2, 0x51,
-	0x2b, 0x21, 0xcd, 0x5c, 0x06, 0xa7, 0x07, 0xcd, 0x4d, 0xd9, 0xe8, 0x63, 0x63, 0xc3, 0x35, 0x06,
-	0x9d, 0x42, 0x7f, 0x69, 0xf4, 0x8a, 0xca, 0xb0, 0xfd, 0x1f, 0x0e, 0xf7, 0x30, 0xf4, 0x14, 0xa0,
-	0x24, 0x92, 0xae, 0x55, 0xca, 0xb3, 0x2a, 0xec, 0x98, 0xf9, 0xf5, 0xad, 0xe6, 0x22, 0xab, 0xd0,
-	0xc7, 0xd0, 0xd7, 0x85, 0xa4, 0x15, 0x7f, 0x43, 0xc3, 0xee, 0xd0, 0x39, 0x6a, 0xe1, 0x9e, 0x56,
-	0xcc, 0xf9, 0x1b, 0x1a, 0xad, 0xc0, 0xdf, 0x0d, 0xab, 0x3b, 0x30, 0x37, 0xe1, 0xd8, 0x0e, 0xf4,
-	0x1b, 0x1d, 0x40, 0x9b, 0x16, 0x84, 0xe7, 0x75, 0xb7, 0x56, 0x40, 0x23, 0xf0, 0x32, 0xa2, 0xa8,
-	0xe9, 0x75, 0xa0, 0x99, 0x62, 0x28, 0x3a, 0x6a, 0x28, 0x3a, 0x4a, 0x1a, 0x0e, 0x63, 0x83, 0x8b,
-	0x22, 0x80, 0xe9, 0xaf, 0x5c, 0xcd, 0x15, 0x51, 0x9b, 0x4a, 0xc7, 0xbc, 0x25, 0xf9, 0xc6, 0x26,
-	0x6a, 0x63, 0x2b, 0x44, 0x09, 0x74, 0x26, 0x92, 0xac, 0x97, 0xab, 0x47, 0xeb, 0x78, 0x09, 0x7b,
-	0x35, 0xcb, 0x6c, 0xef, 0xa6, 0x9e, 0xc1, 0xe9, 0xfb, 0xcd, 0x7c, 0xb6, 0x1b, 0xc3, 0xbe, 0xc5,
-	0x59, 0x29, 0xfa, 0xd3, 0x81, 0x56, 0x42, 0xd8, 0xa3, 0x31, 0xed, 0x6e, 0xdd, 0xed, 0x6e, 0xdf,
-	0xc9, 0xd1, 0xfa, 0x5f, 0x39, 0xf4, 0x4d, 0x14, 0xb4, 0xaa, 0x08, 0xa3, 0x66, 0xcd, 0x3e, 0x6e,
-	0x44, 0xcd, 0xb6, 0xfa, 0x69, 0x37, 0xd0, 0x36, 0x1b, 0x18, 0xd4, 0x3a, 0xbd, 0x04, 0x7d, 0x22,
-	0x8a, 0x30, 0x46, 0xa5, 0x39, 0xe3, 0x7f, 0x3d, 0x11, 0x8b, 0x89, 0x6e, 0xc0, 0xbb, 0xae, 0xa8,
-	0x44, 0x1f, 0x40, 0x9b, 0xe5, 0xe9, 0xf6, 0x32, 0x3d, 0x96, 0x5f, 0x64, 0xdb, 0x1e, 0xdd, 0xc7,
-	0xf6, 0xd7, 0xda, 0xdd, 0xdf, 0x73, 0x18, 0xb0, 0x3c, 0xdd, 0x54, 0x9a, 0x62, 0x05, 0xad, 0x49,
-	0x0b, 0x2c, 0xbf, 0xae, 0x35, 0xd1, 0x37, 0x00, 0x96, 0x78, 0x57, 0x42, 0xe4, 0xe8, 0x14, 0x60,
-	0x87, 0x6e, 0x8e, 0xa9, 0x13, 0x35, 0x75, 0xde, 0x93, 0x0e, 0xef, 0xa0, 0x3e, 0x9f, 0x34, 0x11,
-	0x92, 0xbb, 0x92, 0xbe, 0xfd, 0x7d, 0x03, 0xe8, 0x9c, 0xc5, 0xb3, 0xd9, 0x45, 0x12, 0x38, 0xa8,
-	0x07, 0xde, 0xe4, 0x75, 0x3c, 0x09, 0x5c, 0xfd, 0x4a, 0xf0, 0x74, 0x1a, 0xb4, 0x50, 0x17, 0x5a,
-	0xc9, 0xf8, 0x3c, 0xf0, 0xbe, 0x8a, 0xa1, 0x2b, 0xca, 0x54, 0xe9, 0x00, 0xcf, 0xde, 0xb9, 0xb1,
-	0x19, 0x55, 0x2b, 0x91, 0xc5, 0xa5, 0xfe, 0x7e, 0x56, 0xe1, 0xdf, 0xbf, 0x3d, 0x20, 0xcc, 0xee,
-	0x57, 0x1b, 0x77, 0x44, 0xa9, 0xcb, 0x98, 0x9c, 0xfc, 0xac, 0xcd, 0x39, 0x59, 0x8c, 0x96, 0xa2,
-	0x38, 0xb6, 0xcf, 0x2f, 0x85, 0x64, 0xc7, 0xd6, 0xc9, 0xfe, 0x63, 0x8e, 0x99, 0xa8, 0xe5, 0x72,
-	0xb1, 0xe8, 0x18, 0xd5, 0x8b, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2f, 0xad, 0xe3, 0x2d, 0xbd,
-	0x06, 0x00, 0x00,
+	// 913 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x5f, 0x6f, 0xe3, 0x44,
+	0x10, 0x3f, 0x3b, 0xce, 0xbf, 0x89, 0x5b, 0xcc, 0x52, 0x84, 0x55, 0x74, 0x77, 0xc1, 0x48, 0xa8,
+	0x42, 0x90, 0x56, 0x3d, 0xe9, 0x1e, 0xe0, 0x85, 0xa4, 0x84, 0xaa, 0xc7, 0xa5, 0xae, 0x36, 0x2e,
+	0x08, 0x5e, 0xac, 0x4d, 0xbc, 0xdd, 0x2c, 0xb2, 0xb3, 0xd6, 0x7a, 0x53, 0xd1, 0x7b, 0xe4, 0x03,
+	0xf1, 0x49, 0xee, 0x7b, 0xf0, 0x31, 0x40, 0xbb, 0x6b, 0xa7, 0xb9, 0x5e, 0x41, 0xbc, 0xed, 0xcc,
+	0xfc, 0x66, 0xf6, 0x37, 0x3b, 0xf3, 0xb3, 0xc1, 0xaf, 0x56, 0x44, 0xd2, 0x6c, 0x54, 0x4a, 0xa1,
+	0x04, 0xea, 0x30, 0xae, 0x48, 0x7e, 0x77, 0xf8, 0x9c, 0x09, 0xc1, 0x72, 0x7a, 0x6c, 0xbc, 0x8b,
+	0xcd, 0xcd, 0xb1, 0xe2, 0x05, 0xad, 0x14, 0x29, 0x4a, 0x0b, 0x3c, 0x1c, 0x3e, 0x04, 0x64, 0xb4,
+	0x5a, 0x4a, 0x5e, 0x2a, 0x21, 0x2d, 0x22, 0x7a, 0xeb, 0x82, 0x1f, 0x97, 0x54, 0x12, 0xc5, 0xc5,
+	0x7a, 0x56, 0x31, 0x34, 0x02, 0x57, 0x94, 0xa1, 0x33, 0x74, 0x8e, 0xf6, 0x4f, 0x9f, 0x8d, 0xec,
+	0x45, 0xa3, 0x5d, 0xc4, 0xbd, 0x81, 0x5d, 0x51, 0xa2, 0x6f, 0x61, 0x50, 0x2d, 0x45, 0x49, 0xd3,
+	0x9c, 0xde, 0xd2, 0x3c, 0x74, 0x4d, 0xe2, 0xe1, 0xa3, 0x89, 0x73, 0x8d, 0xc3, 0x60, 0xe0, 0xaf,
+	0x35, 0x1a, 0xbd, 0x84, 0x4f, 0x14, 0x91, 0x8c, 0xaa, 0x54, 0xd2, 0x52, 0x54, 0x5c, 0x09, 0x79,
+	0x97, 0xde, 0x70, 0x9a, 0x67, 0x61, 0x6b, 0xe8, 0x1c, 0xf5, 0xf1, 0xc7, 0x36, 0x8c, 0xb7, 0xd1,
+	0x1f, 0x74, 0x10, 0x9d, 0xc0, 0x41, 0x9d, 0x57, 0x29, 0x21, 0x09, 0xa3, 0x75, 0x92, 0x67, 0x92,
+	0x90, 0x8d, 0xcd, 0x6d, 0xc8, 0x64, 0x44, 0x2f, 0xa0, 0xbf, 0xe5, 0x82, 0x06, 0xd0, 0xbd, 0xbe,
+	0xfc, 0xf1, 0x32, 0xfe, 0xf9, 0x32, 0x78, 0xa2, 0x8d, 0xd9, 0x75, 0x32, 0x4e, 0x62, 0x1c, 0x38,
+	0xc8, 0x87, 0xde, 0xf8, 0xec, 0x6c, 0x3a, 0x9f, 0xc7, 0x38, 0x70, 0xa3, 0x13, 0x68, 0x1b, 0xce,
+	0x68, 0x1f, 0x00, 0x4f, 0xaf, 0xe2, 0xf9, 0x45, 0x12, 0xe3, 0x5f, 0x82, 0x27, 0x08, 0xa0, 0x33,
+	0x9f, 0xe2, 0x9f, 0xa6, 0x3a, 0x65, 0x00, 0xdd, 0x79, 0x12, 0xe3, 0xf1, 0xf9, 0x34, 0x70, 0xa3,
+	0x3f, 0x5d, 0x80, 0x7b, 0xb2, 0xe8, 0x33, 0xf0, 0x1b, 0x82, 0x6b, 0x52, 0x50, 0xf3, 0x3a, 0x7d,
+	0x3c, 0xa8, 0x7d, 0x97, 0xa4, 0xa0, 0xe8, 0x73, 0xd8, 0x93, 0x34, 0x27, 0x8a, 0xdf, 0xd2, 0xb4,
+	0x24, 0x6a, 0x55, 0x37, 0xee, 0x37, 0xce, 0x2b, 0xa2, 0x56, 0xba, 0x5f, 0xc6, 0x55, 0x2a, 0x16,
+	0xbf, 0xd1, 0xa5, 0x4a, 0x33, 0x2e, 0xe9, 0x52, 0xd7, 0x6f, 0xfa, 0x65, 0x5c, 0xc5, 0x26, 0xf4,
+	0x7d, 0x13, 0x41, 0xe7, 0x30, 0xd4, 0x19, 0x24, 0x57, 0x54, 0xae, 0x89, 0xa2, 0x0f, 0x73, 0x39,
+	0xad, 0xc2, 0xf6, 0xb0, 0x75, 0xd4, 0xc7, 0x4f, 0x19, 0x57, 0xe3, 0x06, 0xf6, 0x6e, 0x19, 0x4e,
+	0x2b, 0xcd, 0x8f, 0xe5, 0x3b, 0xe3, 0x09, 0x3b, 0x96, 0x1f, 0xcb, 0x77, 0xfa, 0xfc, 0x02, 0x3e,
+	0x60, 0x79, 0x5a, 0x4a, 0x61, 0xee, 0x30, 0x6d, 0xf4, 0x0c, 0x6c, 0x8f, 0xe5, 0x57, 0xd6, 0xab,
+	0xfb, 0x78, 0xe5, 0xf5, 0x9c, 0xc0, 0x7d, 0xe5, 0xf5, 0xba, 0x41, 0x0f, 0x7b, 0x1a, 0x16, 0xfd,
+	0xe5, 0x40, 0xff, 0x9c, 0xab, 0x33, 0x51, 0x14, 0x5c, 0xa1, 0x7d, 0x70, 0x79, 0x66, 0x96, 0xaf,
+	0x8f, 0x5d, 0x9e, 0xa1, 0x10, 0xba, 0xd5, 0xc6, 0x50, 0x32, 0x4f, 0xe7, 0xe3, 0xc6, 0x44, 0x08,
+	0xbc, 0x85, 0xc8, 0xee, 0xcc, 0x6b, 0xf9, 0xd8, 0x9c, 0xd1, 0x57, 0xd0, 0x21, 0x1b, 0xb5, 0x12,
+	0xd2, 0xbc, 0xcb, 0xe0, 0xf4, 0xa0, 0xd9, 0x42, 0x5b, 0x7d, 0x6c, 0x62, 0xb8, 0xc6, 0xa0, 0x53,
+	0xe8, 0x2f, 0x8d, 0x5f, 0x51, 0x19, 0xb6, 0xff, 0x23, 0xe1, 0x1e, 0x86, 0x9e, 0x02, 0x94, 0x44,
+	0xd2, 0xb5, 0x4a, 0x79, 0x56, 0x85, 0x1d, 0xf3, 0x7e, 0x7d, 0xeb, 0xb9, 0xc8, 0x2a, 0xf4, 0x29,
+	0xf4, 0x35, 0x91, 0xb4, 0xe2, 0x6f, 0x68, 0xd8, 0x1d, 0x3a, 0x47, 0x2d, 0xdc, 0xd3, 0x8e, 0x39,
+	0x7f, 0x43, 0xa3, 0x15, 0xf8, 0xbb, 0x65, 0x75, 0x07, 0x66, 0x27, 0x1c, 0xdb, 0x81, 0x3e, 0xa3,
+	0x03, 0x68, 0xd3, 0x82, 0xf0, 0xbc, 0xee, 0xd6, 0x1a, 0x68, 0x04, 0x5e, 0x46, 0x14, 0x35, 0xbd,
+	0x0e, 0xb4, 0xb6, 0x8c, 0xa8, 0x47, 0x8d, 0xa8, 0x47, 0x49, 0xa3, 0x7a, 0x6c, 0x70, 0x51, 0x04,
+	0x30, 0xfd, 0x9d, 0xab, 0xb9, 0x22, 0x6a, 0x53, 0xe9, 0x9a, 0xb7, 0x24, 0xdf, 0xd8, 0x8b, 0xda,
+	0xd8, 0x1a, 0x51, 0x02, 0x9d, 0x89, 0x24, 0xeb, 0xe5, 0xea, 0x51, 0x1e, 0x2f, 0x61, 0xaf, 0xd6,
+	0x97, 0xed, 0xdd, 0xf0, 0x19, 0x9c, 0x7e, 0xd8, 0xbc, 0xcf, 0x76, 0x62, 0xd8, 0xb7, 0x38, 0x6b,
+	0x45, 0x6f, 0x1d, 0x68, 0x25, 0x84, 0x3d, 0x5a, 0xd3, 0xce, 0xd6, 0xdd, 0xce, 0xf6, 0xbd, 0x3b,
+	0x5a, 0xff, 0xeb, 0x0e, 0xbd, 0x13, 0x05, 0xad, 0x2a, 0xc2, 0xa8, 0x19, 0xb3, 0x8f, 0x1b, 0x53,
+	0xab, 0xad, 0x3e, 0xda, 0x09, 0xb4, 0xcd, 0x04, 0x06, 0xb5, 0x4f, 0x0f, 0x41, 0xaf, 0x88, 0x22,
+	0x8c, 0x51, 0x69, 0xd6, 0xf8, 0x5f, 0x57, 0xc4, 0x62, 0xa2, 0x1b, 0xf0, 0xae, 0x2b, 0x2a, 0xd1,
+	0x47, 0xd0, 0x66, 0x79, 0xba, 0xdd, 0x4c, 0x8f, 0xe5, 0x17, 0xd9, 0xb6, 0x47, 0xf7, 0xb1, 0xf9,
+	0xb5, 0x76, 0xe7, 0xf7, 0x1c, 0x06, 0x2c, 0x4f, 0x37, 0x95, 0x96, 0x58, 0x41, 0x6b, 0xd1, 0x02,
+	0xcb, 0xaf, 0x6b, 0x4f, 0xf4, 0x1d, 0x80, 0x15, 0xde, 0x95, 0x10, 0x39, 0x3a, 0x05, 0xd8, 0x91,
+	0x9b, 0x63, 0x78, 0xa2, 0x86, 0xe7, 0xbd, 0xe8, 0xf0, 0x0e, 0xea, 0xcb, 0x49, 0x53, 0x21, 0xb9,
+	0x2b, 0xe9, 0xbb, 0xdf, 0x37, 0x80, 0xce, 0x59, 0x3c, 0x9b, 0x5d, 0x24, 0x81, 0x83, 0x7a, 0xe0,
+	0x4d, 0x5e, 0xc7, 0x93, 0xc0, 0xd5, 0xa7, 0x04, 0x4f, 0xa7, 0x41, 0x0b, 0x75, 0xa1, 0x95, 0x8c,
+	0xcf, 0x03, 0xef, 0x9b, 0x18, 0xba, 0xa2, 0x4c, 0x95, 0x2e, 0xf0, 0xec, 0xbd, 0x1d, 0x9b, 0x51,
+	0xb5, 0x12, 0x59, 0x5c, 0xea, 0xef, 0x67, 0x15, 0xfe, 0xfd, 0xc7, 0x03, 0xc1, 0xec, 0x7e, 0xe7,
+	0x71, 0x47, 0x94, 0x9a, 0xc6, 0xe4, 0xe4, 0x57, 0x1d, 0xce, 0xc9, 0x62, 0xb4, 0x14, 0xc5, 0xb1,
+	0x3d, 0x7e, 0x2d, 0x24, 0x3b, 0xb6, 0x49, 0xf6, 0xaf, 0x74, 0xcc, 0x44, 0x6d, 0x97, 0x8b, 0x45,
+	0xc7, 0xb8, 0x5e, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xec, 0x08, 0xa4, 0xef, 0x06, 0x00,
+	0x00,
 }
diff --git a/proto/namespace.proto b/proto/namespace.proto
index 54ce1ceaa..76e41797d 100644
--- a/proto/namespace.proto
+++ b/proto/namespace.proto
@@ -10,25 +10,29 @@ service NamespaceService {
   rpc AddNamespace(AddNamespaceRequest) returns (AddNamespaceResponse) {
     option (op_type) = {
       op: MUTATOR
-      scope_level: STORAGE,
+      target_storage_field: "1"
+      scope_level: STORAGE
     };
   }
   rpc RemoveNamespace(RemoveNamespaceRequest) returns (RemoveNamespaceResponse) {
     option (op_type) = {
       op: MUTATOR
-      scope_level: STORAGE,
+      target_storage_field: "1"
+      scope_level: STORAGE
     };
   }
   rpc RenameNamespace(RenameNamespaceRequest) returns (RenameNamespaceResponse) {
     option (op_type) = {
       op: MUTATOR
-      scope_level: STORAGE,
+      target_storage_field: "1"
+      scope_level: STORAGE
     };
   }
   rpc NamespaceExists(NamespaceExistsRequest) returns (NamespaceExistsResponse) {
     option (op_type) = {
       op: ACCESSOR
-      scope_level: STORAGE,
+      target_storage_field: "1"
+      scope_level: STORAGE
     };
   }
 }
diff --git a/proto/shared.proto b/proto/shared.proto
index b4c3dbac4..fe9cc8e2b 100644
--- a/proto/shared.proto
+++ b/proto/shared.proto
@@ -15,19 +15,19 @@ message OperationMsg {
   }
 
   Operation op = 1;
-  
+
   enum Scope {
     REPOSITORY = 0;
     SERVER = 1;
     STORAGE = 2;
   }
-  
+
   // Scope level indicates what level an RPC interacts with a server:
   //   - REPOSITORY: scoped to only a single repo
   //   - SERVER: affects the entire server and potentially all repos
   //   - STORAGE: scoped to a specific storage location and all repos within
   Scope scope_level = 2;
-  
+
   // If this operation modifies a repository, this field will
   // specify the location of the Repository field within the
   // request message. The field is specified in an OID style
@@ -42,6 +42,7 @@ message OperationMsg {
   // For example, the following OID refers to a target repo field
   // nested in a one-of field, both at field one: "1.1"
   string target_repository_field = 3;
+  string target_storage_field = 4;
 }
 
 enum ObjectType {
diff --git a/ruby/proto/gitaly/shared_pb.rb b/ruby/proto/gitaly/shared_pb.rb
index 9b4294067..f7a972b47 100644
--- a/ruby/proto/gitaly/shared_pb.rb
+++ b/ruby/proto/gitaly/shared_pb.rb
@@ -9,6 +9,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :op, :enum, 1, "gitaly.OperationMsg.Operation"
     optional :scope_level, :enum, 2, "gitaly.OperationMsg.Scope"
     optional :target_repository_field, :string, 3
+    optional :target_storage_field, :string, 4
   end
   add_enum "gitaly.OperationMsg.Operation" do
     value :UNKNOWN, 0