Merge remote-tracking branch 'origin/main' into lsp-format-mem-leak

Author: doriable

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Add `textDocument/rename` and `textDocument/prepareRename` support for `buf lsp serve`.
 - Fix panic in LSP for empty option paths.
+- Fix support for multi-arch image manifests for `buf beta registry plugin push`.
 
 ## [v1.61.0] - 2025-11-25
 

cmd/buf/internal/command/beta/registry/plugin/pluginpush/pluginpush.go

@@ -495,19 +495,14 @@ func getImageIDAndDigestFromReference(
 				break
 			}
 		}
-		refNameWithoutDigest, _, ok := strings.Cut(ref.Name(), "@")
-		if !ok {
-			return "", "", fmt.Errorf("failed to parse reference name %q", ref)
-		}
-		repository, err := name.NewRepository(refNameWithoutDigest)
-		if err != nil {
-			return "", "", fmt.Errorf("failed to construct repository %q: %w", refNameWithoutDigest, err)
+		if manifest.Digest.String() == "" {
+			return "", "", fmt.Errorf("no valid platform manifest found in image index for %q", ref)
 		}
 		// We resolved the image index to an image manifest digest, we can now call this function
 		// again to resolve the image manifest digest to an image config digest.
 		return getImageIDAndDigestFromReference(
 			ctx,
-			repository.Digest(manifest.Digest.String()),
+			ref.Context().Digest(manifest.Digest.String()),
 			options...,
 		)
 	case desc.MediaType.IsImage():