Improve error message for not found keys (#3863)

Author: emcfarlane

private/bufpkg/bufmodule/added_module.go

@@ -115,7 +115,7 @@ func (a *addedModule) ToModule(
 				[]ModuleKey{a.remoteModuleKey},
 			)
 			if err != nil {
-				return nil, err
+				return nil, fmt.Errorf("could not get module data for remote module %q: %w", a.remoteModuleKey.FullName().String(), err)
 			}
 			if len(moduleDatas) != 1 {
 				return nil, syserror.Newf("expected 1 ModuleData, got %d", len(moduleDatas))

private/bufpkg/bufmodule/bufmoduleapi/convert.go

@@ -248,6 +248,45 @@ func moduleRefsToV1Beta1ProtoResourceRefs(moduleRefs []bufparse.Ref) []*modulev1
 	return xslices.Map(moduleRefs, moduleRefToV1Beta1ProtoResourceRef)
 }
 
+func moduleKeyToV1ProtoResourceRef(moduleKey bufmodule.ModuleKey) *modulev1.ResourceRef {
+	return &modulev1.ResourceRef{
+		Value: &modulev1.ResourceRef_Name_{
+			Name: &modulev1.ResourceRef_Name{
+				Owner:  moduleKey.FullName().Owner(),
+				Module: moduleKey.FullName().Name(),
+				Child: &modulev1.ResourceRef_Name_Ref{
+					Ref: uuidutil.ToDashless(moduleKey.CommitID()),
+				},
+			},
+		},
+	}
+}
+
+func moduleKeysToV1ProtoResourceRefs(moduleKeys []bufmodule.ModuleKey) []*modulev1.ResourceRef {
+	return xslices.Map(moduleKeys, moduleKeyToV1ProtoResourceRef)
+}
+
+func moduleKeyToV1Beta1ProtoGetGraphRequestResourceRef(moduleKey bufmodule.ModuleKey) *modulev1beta1.GetGraphRequest_ResourceRef {
+	return &modulev1beta1.GetGraphRequest_ResourceRef{
+		ResourceRef: &modulev1beta1.ResourceRef{
+			Value: &modulev1beta1.ResourceRef_Name_{
+				Name: &modulev1beta1.ResourceRef_Name{
+					Owner:  moduleKey.FullName().Owner(),
+					Module: moduleKey.FullName().Name(),
+					Child: &modulev1beta1.ResourceRef_Name_Ref{
+						Ref: uuidutil.ToDashless(moduleKey.CommitID()),
+					},
+				},
+			},
+		},
+		Registry: moduleKey.FullName().Registry(),
+	}
+}
+
+func moduleKeysToV1Beta1ProtoGetGraphRequestResourceRefs(moduleKeys []bufmodule.ModuleKey) []*modulev1beta1.GetGraphRequest_ResourceRef {
+	return xslices.Map(moduleKeys, moduleKeyToV1Beta1ProtoGetGraphRequestResourceRef)
+}
+
 // We have to make sure all the below is updated if a field is added.
 // This is enforced via exhaustruct using golangci-lint.
 // Search .golangci.yml for convert.go to see where this is enabled.

private/bufpkg/bufmodule/bufmoduleapi/graph_provider.go

@@ -111,7 +111,7 @@ func (a *graphProvider) GetGraphForModuleKeys(
 	ctx context.Context,
 	moduleKeys []bufmodule.ModuleKey,
 ) (*dag.Graph[bufmodule.RegistryCommitID, bufmodule.ModuleKey], error) {
-	graph := dag.NewGraph[bufmodule.RegistryCommitID, bufmodule.ModuleKey](bufmodule.ModuleKeyToRegistryCommitID)
+	graph := dag.NewGraph(bufmodule.ModuleKeyToRegistryCommitID)
 	if len(moduleKeys) == 0 {
 		return graph, nil
 	}
@@ -222,7 +222,6 @@ func (a *graphProvider) getV1Beta1ProtoGraphForModuleKeys(
 	// Legacy federation is allowed, or we are using b4. We may have dependencies on modules from other registries, or we
 	// are using a digest type not supported by the v1 API. Fall back to the v1beta1 API.
 
-	registryCommitIDs := xslices.Map(moduleKeys, bufmodule.ModuleKeyToRegistryCommitID)
 	v1beta1ProtoDigestType, err := digestTypeToV1Beta1Proto(digestType)
 	if err != nil {
 		return nil, err
@@ -232,20 +231,8 @@ func (a *graphProvider) getV1Beta1ProtoGraphForModuleKeys(
 		connect.NewRequest(
 			&modulev1beta1.GetGraphRequest{
 				// TODO FUTURE: chunking
-				ResourceRefs: xslices.Map(
-					registryCommitIDs,
-					func(registryCommitID bufmodule.RegistryCommitID) *modulev1beta1.GetGraphRequest_ResourceRef {
-						return &modulev1beta1.GetGraphRequest_ResourceRef{
-							ResourceRef: &modulev1beta1.ResourceRef{
-								Value: &modulev1beta1.ResourceRef_Id{
-									Id: uuidutil.ToDashless(registryCommitID.CommitID),
-								},
-							},
-							Registry: registryCommitID.Registry,
-						}
-					},
-				),
-				DigestType: v1beta1ProtoDigestType,
+				ResourceRefs: moduleKeysToV1Beta1ProtoGetGraphRequestResourceRefs(moduleKeys),
+				DigestType:   v1beta1ProtoDigestType,
 			},
 		),
 	)
@@ -261,13 +248,12 @@ func (a *graphProvider) getV1ProtoGraphForRegistryAndModuleKeys(
 	registry string,
 	moduleKeys []bufmodule.ModuleKey,
 ) (*modulev1.Graph, error) {
-	commitIDs := xslices.Map(moduleKeys, bufmodule.ModuleKey.CommitID)
 	response, err := a.moduleClientProvider.V1GraphServiceClient(registry).GetGraph(
 		ctx,
 		connect.NewRequest(
 			&modulev1.GetGraphRequest{
 				// TODO FUTURE: chunking
-				ResourceRefs: commitIDsToV1ProtoResourceRefs(commitIDs),
+				ResourceRefs: moduleKeysToV1ProtoResourceRefs(moduleKeys),
 			},
 		),
 	)

private/bufpkg/bufplugin/bufpluginapi/plugin_data_provider.go

@@ -111,8 +111,14 @@ func (p *pluginDataProvider) getIndexedPluginDatasForRegistryAndIndexedPluginKey
 	values := xslices.Map(indexedPluginKeys, func(indexedPluginKey xslices.Indexed[bufplugin.PluginKey]) *pluginv1beta1.DownloadRequest_Value {
 		return &pluginv1beta1.DownloadRequest_Value{
 			ResourceRef: &pluginv1beta1.ResourceRef{
-				Value: &pluginv1beta1.ResourceRef_Id{
-					Id: uuidutil.ToDashless(indexedPluginKey.Value.CommitID()),
+				Value: &pluginv1beta1.ResourceRef_Name_{
+					Name: &pluginv1beta1.ResourceRef_Name{
+						Owner:  indexedPluginKey.Value.FullName().Owner(),
+						Plugin: indexedPluginKey.Value.FullName().Name(),
+						Child: &pluginv1beta1.ResourceRef_Name_Ref{
+							Ref: uuidutil.ToDashless(indexedPluginKey.Value.CommitID()),
+						},
+					},
 				},
 			},
 		}