Merge branch 'jc-praefect-data-model' into 'master'

Updating data model for praefect

See merge request gitlab-org/gitaly!1399

1 files changed, 12 insertions, 8 deletions

diff --git a/internal/praefect/protoregistry/protoregistry.go b/internal/praefect/protoregistry/protoregistry.go
index 363e023be..21c5254ff 100644
--- a/internal/praefect/protoregistry/protoregistry.go
+++ b/internal/praefect/protoregistry/protoregistry.go
@@ -207,11 +207,6 @@ func parseMethodInfo(methodDesc *descriptor.MethodDescriptorProto) (MethodInfo,
 		opCode = OpUnknown
 	}
 
-	targetRepo, err := parseOID(opMsg.GetTargetRepositoryField())
-	if err != nil {
-		return MethodInfo{}, err
-	}
-
 	// for some reason, the protobuf descriptor contains an extra dot in front
 	// of the request name that the generated code does not. This trimming keeps
 	// the two copies consistent for comparisons.
@@ -227,13 +222,22 @@ func parseMethodInfo(methodDesc *descriptor.MethodDescriptorProto) (MethodInfo,
 		return MethodInfo{}, fmt.Errorf("encountered unknown method scope %d", opMsg.GetScopeLevel())
 	}
 
-	return MethodInfo{
+	mi := MethodInfo{
 		Operation:      opCode,
 		Scope:          scope,
-		targetRepo:     targetRepo,
 		requestName:    requestName,
 		requestFactory: reqFactory,
-	}, nil
+	}
+
+	if scope == ScopeRepository {
+		targetRepo, err := parseOID(opMsg.GetTargetRepositoryField())
+		if err != nil {
+			return MethodInfo{}, err
+		}
+		mi.targetRepo = targetRepo
+	}
+
+	return mi, nil
 }
 
 // parses a string like "1.1" and returns a slice of ints