Convert CommitIDs to uuid.UUIDs (#2733)

.dockerignore

@@ -14,6 +14,8 @@ private/buf/cmd/buf/command/alpha/protoc/internal/protoc-gen-insertion-point-rec
 private/buf/cmd/buf/command/alpha/protoc/internal/protoc-gen-insertion-point-writer/protoc-gen-insertion-point-writer
 private/buf/cmd/buf/command/alpha/protoc/test.txt
 private/buf/cmd/buf/workspacetests/other/proto/workspacetest/cache/
+private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-commit-id-from-dashless/buf-commit-id-from-dashless
+private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-commit-id-to-dashless/buf-commit-id-to-dashless
 private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-digest/buf-digest
 private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-new-commit-id/buf-new-commit-id
 private/bufpkg/bufstyle/cmd/bufstyle/bufstyle

.gitignore

@@ -14,6 +14,8 @@
 /private/buf/cmd/buf/command/alpha/protoc/internal/protoc-gen-insertion-point-writer/protoc-gen-insertion-point-writer
 /private/buf/cmd/buf/command/alpha/protoc/test.txt
 /private/buf/cmd/buf/workspacetests/other/proto/workspacetest/cache/
+/private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-commit-id-from-dashless/buf-commit-id-from-dashless
+/private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-commit-id-to-dashless/buf-commit-id-to-dashless
 /private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-digest/buf-digest
 /private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-new-commit-id/buf-new-commit-id
 /private/bufpkg/bufstyle/cmd/bufstyle/bufstyle

go.sum

@@ -1,11 +1,7 @@
 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-20231115204500-e097f827e652.1 h1:u0olL4yf2p7Tl5jfsAK5keaFi+JFJuv1CDHrbiXkxkk=
 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-20231115204500-e097f827e652.1/go.mod h1:tiTMKD8j6Pd/D2WzREoweufjzaJKHZg35f/VGcZ2v3I=
-buf.build/gen/go/bufbuild/registry/connectrpc/go v1.14.0-20240103033507-2860fe703a60.1 h1:tyOczeIHltbjCt0R1FqOUW6GYOFGtxfWmVROxZtGfNo=
-buf.build/gen/go/bufbuild/registry/connectrpc/go v1.14.0-20240103033507-2860fe703a60.1/go.mod h1:In1Pi5BipMwL3oumRdchqsf/xKZ8BM8+g2/8+qUIFAM=
 buf.build/gen/go/bufbuild/registry/connectrpc/go v1.14.0-20240124193556-c1b9aad65c81.1 h1:pFs/DMJMhNd+tlwkXbzx2bzWXiJPLHDyZjFZyNYICoE=
 buf.build/gen/go/bufbuild/registry/connectrpc/go v1.14.0-20240124193556-c1b9aad65c81.1/go.mod h1:czrtSW9UGDwm5munsVYBBIpRaL29UBCOE6qi7em+4qE=
-buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.32.0-20240103033507-2860fe703a60.1 h1:slGktetnGQEVfeAaDjpy/uv1XTJXrbW0sElbiMj4fEc=
-buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.32.0-20240103033507-2860fe703a60.1/go.mod h1:L+pboYag9Pd0vt+ErAHa7QSdqP0Dzd7S+4OLKlrXNXQ=
 buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.32.0-20240124193556-c1b9aad65c81.1 h1:ZiA3hFK2dF93c8uOLOB78dQ4xWas8KM04NDKguPWIUE=
 buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.32.0-20240124193556-c1b9aad65c81.1/go.mod h1:L+pboYag9Pd0vt+ErAHa7QSdqP0Dzd7S+4OLKlrXNXQ=
 connectrpc.com/connect v1.14.0 h1:PDS+J7uoz5Oui2VEOMcfz6Qft7opQM9hPiKvtGC01pA=

make/buf/all.mk

@@ -5,6 +5,8 @@ GO_BINS := $(GO_BINS) \
 	cmd/protoc-gen-buf-breaking \
 	cmd/protoc-gen-buf-lint \
 	private/buf/bufwkt/cmd/wkt-go-data \
+	private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-commit-id-from-dashless \
+	private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-commit-id-to-dashless \
 	private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-digest \
 	private/bufpkg/bufmodule/bufmoduletesting/cmd/buf-new-commit-id \
 	private/bufpkg/bufstyle/cmd/bufstyle \

private/buf/bufctl/controller.go

@@ -45,6 +45,7 @@ import (
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
 	"github.com/bufbuild/buf/private/pkg/syserror"
 	"github.com/bufbuild/buf/private/pkg/tracing"
+	"github.com/gofrs/uuid/v5"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
@@ -67,7 +68,7 @@ type ProtoFileInfo interface {
 	storage.ObjectInfo
 
 	ModuleFullName() bufmodule.ModuleFullName
-	CommitID() string
+	CommitID() uuid.UUID
 
 	isProtoFileInfo()
 }
@@ -508,7 +509,10 @@ func (c *controller) PutImage(
 	if functionOptions.imageAsFileDescriptorSet {
 		putMessage = bufimage.ImageToFileDescriptorSet(putImage)
 	} else {
-		putMessage = bufimage.ImageToProtoImage(putImage)
+		putMessage, err = bufimage.ImageToProtoImage(putImage)
+		if err != nil {
+			return err
+		}
 	}
 	data, err := marshaler.Marshal(putMessage)
 	if err != nil {

private/buf/bufctl/module_proto_file_info.go

@@ -16,6 +16,7 @@ package bufctl
 
 import (
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/gofrs/uuid/v5"
 )
 
 type moduleProtoFileInfo struct {
@@ -32,7 +33,7 @@ func (p *moduleProtoFileInfo) ModuleFullName() bufmodule.ModuleFullName {
 	return p.FileInfo.Module().ModuleFullName()
 }
 
-func (p *moduleProtoFileInfo) CommitID() string {
+func (p *moduleProtoFileInfo) CommitID() uuid.UUID {
 	return p.FileInfo.Module().CommitID()
 }
 

private/buf/bufgen/generator.go

@@ -362,11 +362,15 @@ func (g *generator) execRemotePluginsV2(
 		requests[i] = request
 	}
 	codeGenerationService := connectclient.Make(g.clientConfig, remote, registryv1alpha1connect.NewCodeGenerationServiceClient)
+	protoImage, err := bufimage.ImageToProtoImage(image)
+	if err != nil {
+		return nil, err
+	}
 	response, err := codeGenerationService.GenerateCode(
 		ctx,
 		connect.NewRequest(
 			&registryv1alpha1.GenerateCodeRequest{
-				Image:    bufimage.ImageToProtoImage(image),
+				Image:    protoImage,
 				Requests: requests,
 			},
 		),

private/buf/bufmigrate/migrator.go

@@ -38,6 +38,7 @@ import (
 	"github.com/bufbuild/buf/private/pkg/storage"
 	"github.com/bufbuild/buf/private/pkg/stringutil"
 	"github.com/bufbuild/buf/private/pkg/syserror"
+	"github.com/gofrs/uuid/v5"
 	"go.uber.org/multierr"
 )
 
@@ -344,7 +345,7 @@ func (m *migrator) addModuleDirectory(
 		m.rootBucket,
 		moduleDir,
 		bufconfig.BufLockFileWithDigestResolver(
-			func(ctx context.Context, remote, commitID string) (bufmodule.Digest, error) {
+			func(ctx context.Context, remote string, commitID uuid.UUID) (bufmodule.Digest, error) {
 				return bufmoduleapi.DigestForCommitID(ctx, m.clientProvider, remote, commitID, bufmodule.DigestTypeB4)
 			},
 		),
@@ -521,7 +522,7 @@ func (m *migrator) buildBufYAMLAndBufLock(
 	for depModule, lockEntries := range depModuleToLockEntries {
 		commitIDToKey, err := slicesext.ToUniqueValuesMapError(
 			lockEntries,
-			func(moduleKey bufmodule.ModuleKey) (string, error) {
+			func(moduleKey bufmodule.ModuleKey) (uuid.UUID, error) {
 				return moduleKey.CommitID(), nil
 			},
 		)
@@ -660,7 +661,7 @@ func (m *migrator) warnf(format string, args ...any) {
 
 func resolvedDeclaredAndLockedDependencies(
 	moduleToRefToCommit map[string]map[string]*modulev1beta1.Commit,
-	commitIDToCommit map[string]*modulev1beta1.Commit,
+	commitIDToCommit map[uuid.UUID]*modulev1beta1.Commit,
 	moduleFullNameToDeclaredRefs map[string][]bufmodule.ModuleRef,
 	moduleFullNameToLockKeys map[string][]bufmodule.ModuleKey,
 ) ([]bufmodule.ModuleRef, []bufmodule.ModuleKey, error) {
@@ -682,9 +683,13 @@ func resolvedDeclaredAndLockedDependencies(
 			// If we have already picked a pinned dependency ref for this dependency,
 			// we use that as the lock entry as well.
 			resolvedCommit := moduleToRefToCommit[moduleFullName][resolvedRef.Ref()]
+			commitID, err := uuid.FromString(resolvedCommit.GetId())
+			if err != nil {
+				return nil, nil, err
+			}
 			key, err := bufmodule.NewModuleKey(
 				resolvedRef.ModuleFullName(),
-				resolvedCommit.GetId(),
+				commitID,
 				func() (bufmodule.Digest, error) {
 					return bufmoduleapi.ProtoToDigest(resolvedCommit.GetDigest())
 				},
@@ -766,8 +771,8 @@ func getCommitIDToCommit(
 	ctx context.Context,
 	clientProvider bufapi.ClientProvider,
 	moduleKeys []bufmodule.ModuleKey,
-) (map[string]*modulev1beta1.Commit, error) {
-	commitIDToCommit := make(map[string]*modulev1beta1.Commit)
+) (map[uuid.UUID]*modulev1beta1.Commit, error) {
+	commitIDToCommit := make(map[uuid.UUID]*modulev1beta1.Commit)
 	for _, moduleKey := range moduleKeys {
 		moduleFullName := moduleKey.ModuleFullName()
 		response, err := clientProvider.CommitServiceClient(moduleFullName.Registry()).GetCommits(
@@ -777,8 +782,7 @@ func getCommitIDToCommit(
 					ResourceRefs: []*modulev1beta1.ResourceRef{
 						{
 							Value: &modulev1beta1.ResourceRef_Id{
-								// TODO: is this in the correct dashless/dashful form? Answer: no
-								Id: moduleKey.CommitID(),
+								Id: moduleKey.CommitID().String(),
 							},
 						},
 					},
@@ -787,7 +791,7 @@ func getCommitIDToCommit(
 		)
 		if err != nil {
 			if connect.CodeOf(err) == connect.CodeNotFound {
-				return nil, &fs.PathError{Op: "read", Path: moduleKey.CommitID(), Err: fs.ErrNotExist}
+				return nil, &fs.PathError{Op: "read", Path: moduleKey.CommitID().String(), Err: fs.ErrNotExist}
 			}
 			return nil, err
 		}

private/buf/bufworkspace/testdata/basic/scripts/fakebuflock.bash

@@ -7,8 +7,8 @@ cd "${DIR}"
 
 DATE_DIGEST="$(buf-digest bsr/buf.testing/acme/date bsr/buf.testing/acme/extension | grep date | cut -f 2 -d ' ')"
 EXTENSION_DIGEST="$(buf-digest bsr/buf.testing/acme/date bsr/buf.testing/acme/extension | grep extension | cut -f 2 -d ' ')"
-DATE_COMMIT_ID="ffded0b4cf6b47cab74da08d291a3c2f"
-EXTENSION_COMMIT_ID="b8488077ea6d4f6d9562a337b98259c8"
+DATE_COMMIT_ID="ffded0b4-cf6b-47ca-b74d-a08d291a3c2f"
+EXTENSION_COMMIT_ID="b8488077-ea6d-4f6d-9562-a337b98259c8"
 
 rm -f workspacev1/finance/bond/proto/buf.lock
 cat <<EOF > workspacev1/finance/bond/proto/buf.lock

private/buf/bufworkspace/testdata/basic/workspace_undeclared_dep/buf.lock

@@ -1,8 +1,8 @@
 version: v2
 deps:
   - name: buf.testing/acme/date
-    commit: ffded0b4cf6b47cab74da08d291a3c2f
+    commit: ffded0b4-cf6b-47ca-b74d-a08d291a3c2f
     digest: b5:24ed4f13925cf89ea0ae0127fa28540704c7ae14750af027270221b737a1ce658f8014ca2555f6f7fcd95ea84e071d33f37f86cc36d07fe0d0963329a5ec2462
   - name: buf.testing/acme/extension
-    commit: b8488077ea6d4f6d9562a337b98259c8
+    commit: b8488077-ea6d-4f6d-9562-a337b98259c8
     digest: b5:d2c1da8f8331c5c75b50549c79fc360394dedfb6a11f5381c4523592018964119f561088fc8aaddfc9f5773ba02692e6fd9661853450f76a3355dec62c1f57b4

private/buf/bufworkspace/testdata/basic/workspace_unused_dep/buf.lock

@@ -1,8 +1,8 @@
 version: v2
 deps:
   - name: buf.testing/acme/date
-    commit: ffded0b4cf6b47cab74da08d291a3c2f
+    commit: ffded0b4-cf6b-47ca-b74d-a08d291a3c2f
     digest: b5:24ed4f13925cf89ea0ae0127fa28540704c7ae14750af027270221b737a1ce658f8014ca2555f6f7fcd95ea84e071d33f37f86cc36d07fe0d0963329a5ec2462
   - name: buf.testing/acme/extension
-    commit: b8488077ea6d4f6d9562a337b98259c8
+    commit: b8488077-ea6d-4f6d-9562-a337b98259c8
     digest: b5:d2c1da8f8331c5c75b50549c79fc360394dedfb6a11f5381c4523592018964119f561088fc8aaddfc9f5773ba02692e6fd9661853450f76a3355dec62c1f57b4

private/buf/bufworkspace/testdata/basic/workspacev1/finance/bond/proto/buf.lock

@@ -1,8 +1,8 @@
 version: v2
 deps:
   - name: buf.testing/acme/date
-    commit: ffded0b4cf6b47cab74da08d291a3c2f
+    commit: ffded0b4-cf6b-47ca-b74d-a08d291a3c2f
     digest: b5:24ed4f13925cf89ea0ae0127fa28540704c7ae14750af027270221b737a1ce658f8014ca2555f6f7fcd95ea84e071d33f37f86cc36d07fe0d0963329a5ec2462
   - name: buf.testing/acme/extension
-    commit: b8488077ea6d4f6d9562a337b98259c8
+    commit: b8488077-ea6d-4f6d-9562-a337b98259c8
     digest: b5:d2c1da8f8331c5c75b50549c79fc360394dedfb6a11f5381c4523592018964119f561088fc8aaddfc9f5773ba02692e6fd9661853450f76a3355dec62c1f57b4

private/buf/bufworkspace/testdata/basic/workspacev1/finance/portfolio/proto/buf.lock

@@ -1,8 +1,8 @@
 version: v2
 deps:
   - name: buf.testing/acme/date
-    commit: ffded0b4cf6b47cab74da08d291a3c2f
+    commit: ffded0b4-cf6b-47ca-b74d-a08d291a3c2f
     digest: b5:24ed4f13925cf89ea0ae0127fa28540704c7ae14750af027270221b737a1ce658f8014ca2555f6f7fcd95ea84e071d33f37f86cc36d07fe0d0963329a5ec2462
   - name: buf.testing/acme/extension
-    commit: b8488077ea6d4f6d9562a337b98259c8
+    commit: b8488077-ea6d-4f6d-9562-a337b98259c8
     digest: b5:d2c1da8f8331c5c75b50549c79fc360394dedfb6a11f5381c4523592018964119f561088fc8aaddfc9f5773ba02692e6fd9661853450f76a3355dec62c1f57b4

private/buf/bufworkspace/testdata/basic/workspacev2/buf.lock

@@ -1,8 +1,8 @@
 version: v2
 deps:
   - name: buf.testing/acme/date
-    commit: ffded0b4cf6b47cab74da08d291a3c2f
+    commit: ffded0b4-cf6b-47ca-b74d-a08d291a3c2f
     digest: b5:24ed4f13925cf89ea0ae0127fa28540704c7ae14750af027270221b737a1ce658f8014ca2555f6f7fcd95ea84e071d33f37f86cc36d07fe0d0963329a5ec2462
   - name: buf.testing/acme/extension
-    commit: b8488077ea6d4f6d9562a337b98259c8
+    commit: b8488077-ea6d-4f6d-9562-a337b98259c8
     digest: b5:d2c1da8f8331c5c75b50549c79fc360394dedfb6a11f5381c4523592018964119f561088fc8aaddfc9f5773ba02692e6fd9661853450f76a3355dec62c1f57b4

private/buf/bufworkspace/workspace.go

@@ -30,6 +30,7 @@ import (
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
 	"github.com/bufbuild/buf/private/pkg/syserror"
 	"github.com/bufbuild/buf/private/pkg/tracing"
+	"github.com/gofrs/uuid/v5"
 	"go.uber.org/zap"
 )
 
@@ -584,7 +585,7 @@ func newWorkspaceForBucketAndModuleDirPathsV1Beta1OrV1(
 			// buf.lock files live at the module root
 			moduleDirPath,
 			bufconfig.BufLockFileWithDigestResolver(
-				func(ctx context.Context, remote string, commitID string) (bufmodule.Digest, error) {
+				func(ctx context.Context, remote string, commitID uuid.UUID) (bufmodule.Digest, error) {
 					return bufmoduleapi.DigestForCommitID(ctx, clientProvider, remote, commitID, bufmodule.DigestTypeB4)
 				},
 			),

private/buf/cmd/buf/command/graph/graph.go

@@ -137,8 +137,8 @@ func run(
 
 func moduleToString(module bufmodule.Module) string {
 	if moduleFullName := module.ModuleFullName(); moduleFullName != nil {
-		if commitID := module.CommitID(); commitID != "" {
-			return moduleFullName.String() + ":" + commitID
+		if commitID := module.CommitID(); !commitID.IsNil() {
+			return moduleFullName.String() + ":" + commitID.String()
 		}
 		return moduleFullName.String()
 	}

private/buf/cmd/buf/command/push/push.go

@@ -32,6 +32,7 @@ import (
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/slicesext"
 	"github.com/bufbuild/buf/private/pkg/stringutil"
+	"github.com/bufbuild/buf/private/pkg/uuidutil"
 	"github.com/spf13/pflag"
 )
 
@@ -190,13 +191,20 @@ func run(
 	if err != nil {
 		return err
 	}
+	commitIDs, err := slicesext.MapError(
+		commits,
+		// TODO: Printing dashless for historical reasons, can we only print dashless in certain situations?
+		func(commit bufmodule.Commit) (string, error) {
+			return uuidutil.ToDashless(commit.ModuleKey().CommitID())
+		},
+	)
+	if err != nil {
+		return err
+	}
 	if _, err := container.Stdout().Write(
 		[]byte(
 			strings.Join(
-				slicesext.Map(
-					commits,
-					func(commit bufmodule.Commit) string { return commit.ModuleKey().CommitID() },
-				),
+				commitIDs,
 				"\n",
 			) + "\n",
 		),

private/buf/cmd/buf/imports_test.go

@@ -49,7 +49,7 @@ func TestValidImportFromCorruptedCacheFile(t *testing.T) {
 		t,
 		func(use string) *appcmd.Command { return NewRootCommand(use) },
 		1,
-		`Failure: ***Digest verification failed for module bufbuild.test/bufbot/people:fc7d540124fd42db92511c19a60a1d98***
+		`Failure: ***Digest verification failed for module bufbuild.test/bufbot/people:fc7d5401-24fd-42db-9251-1c19a60a1d98***
 	Expected digest: "b5:b22338d6faf2a727613841d760c9cbfd21af6950621a589df329e1fe6611125904c39e22a73e0aa8834006a514dbd084e6c33b6bef29c8e4835b4b9dec631465"
 	Downloaded data digest: "b5:87403abcc5ec8403180536840a46bef8751df78caa8ad4b46939f4673d8bd58663d0f593668651bb2cd23049fedac4989e8b28c7e0e36b9b524f58ab09bf1053"`,
 		func(use string) map[string]string {
@@ -70,7 +70,7 @@ func TestValidImportFromCorruptedCacheDep(t *testing.T) {
 		t,
 		func(use string) *appcmd.Command { return NewRootCommand(use) },
 		1,
-		`Failure: ***Digest verification failed for module bufbuild.test/bufbot/students:6c776ed5bee54462b06d31fb7f7c16b8***
+		`Failure: ***Digest verification failed for module bufbuild.test/bufbot/students:6c776ed5-bee5-4462-b06d-31fb7f7c16b8***
 	Expected digest: "b5:01764dd31d0e1b8355eb3b262bba4539657af44872df6e4dfec76f57fbd9f1ae645c7c9c607db5c8352fb7041ca97111e3b0f142dafc1028832acbbc14ba1d70"
 	Downloaded data digest: "b5:975dad3641303843fb6a06eedf038b0e6ff41da82b8a483920afb36011e0b0a24f720a2407f5e0783389530486ff410b7e132f219add69a5c7324d54f6f89a6c"`,
 		func(use string) map[string]string {

private/buf/cmd/buf/testdata/imports/cache/README.md

@@ -17,5 +17,5 @@ buf-digest \
 To make new commit IDs:
 
 ```
-buf-new-commit-id
+buf-new-commit-id --type v1
 ```

private/buf/cmd/buf/testdata/imports/cache/v3/modules/bufbuild.test/bufbot/school/f4329b95720e46da93b5b4011a42ae7b/module.yaml → private/buf/cmd/buf/testdata/imports/cache/v3/modules/bufbuild.test/bufbot/school/f4329b95-720e-46da-93b5-b4011a42ae7b/module.yaml

@@ -1,10 +1,10 @@
 version: v1
 deps:
   - name: bufbuild.test/bufbot/people
-    commit: fc7d540124fd42db92511c19a60a1d98
+    commit: fc7d5401-24fd-42db-9251-1c19a60a1d98
     digest: b5:b22338d6faf2a727613841d760c9cbfd21af6950621a589df329e1fe6611125904c39e22a73e0aa8834006a514dbd084e6c33b6bef29c8e4835b4b9dec631465
   - name: bufbuild.test/bufbot/students
-    commit: 6c776ed5bee54462b06d31fb7f7c16b8
+    commit: 6c776ed5-bee5-4462-b06d-31fb7f7c16b8
     digest: b5:01764dd31d0e1b8355eb3b262bba4539657af44872df6e4dfec76f57fbd9f1ae645c7c9c607db5c8352fb7041ca97111e3b0f142dafc1028832acbbc14ba1d70
 files_dir: files
 v1_buf_yaml_file: v1_buf_yaml/buf.yaml

private/buf/cmd/buf/testdata/imports/cache/v3/modules/bufbuild.test/bufbot/students/6c776ed5bee54462b06d31fb7f7c16b8/module.yaml → private/buf/cmd/buf/testdata/imports/cache/v3/modules/bufbuild.test/bufbot/students/6c776ed5-bee5-4462-b06d-31fb7f7c16b8/module.yaml

@@ -1,7 +1,7 @@
 version: v1
 deps:
   - name: bufbuild.test/bufbot/people
-    commit: fc7d540124fd42db92511c19a60a1d98
+    commit: fc7d5401-24fd-42db-9251-1c19a60a1d98
     digest: b5:b22338d6faf2a727613841d760c9cbfd21af6950621a589df329e1fe6611125904c39e22a73e0aa8834006a514dbd084e6c33b6bef29c8e4835b4b9dec631465
 files_dir: files
 v1_buf_yaml_file: v1_buf_yaml/buf.yaml

private/buf/cmd/buf/testdata/imports/corrupted_cache_dep/v3/modules/bufbuild.test/bufbot/students/6c776ed5bee54462b06d31fb7f7c16b8/module.yaml → private/buf/cmd/buf/testdata/imports/corrupted_cache_dep/v3/modules/bufbuild.test/bufbot/students/6c776ed5-bee5-4462-b06d-31fb7f7c16b8/module.yaml

@@ -1,7 +1,7 @@
 version: v1
 deps:
   - name: bufbuild.test/bufbot/people
-    commit: fc7d540124fd42db92511c19a60a1d98
+    commit: fc7d5401-24fd-42db-9251-1c19a60a1d98
     # Last character changed from 5 to 4 to corrupt digest.
     digest: b5:b22338d6faf2a727613841d760c9cbfd21af6950621a589df329e1fe6611125904c39e22a73e0aa8834006a514dbd084e6c33b6bef29c8e4835b4b9dec631464
 files_dir: files

private/buf/cmd/buf/testdata/imports/failure/school/buf.lock

@@ -2,8 +2,8 @@
 version: v2
 deps:
   - name: bufbuild.test/bufbot/people
-    commit: fc7d540124fd42db92511c19a60a1d98
+    commit: fc7d5401-24fd-42db-9251-1c19a60a1d98
     digest: b5:b22338d6faf2a727613841d760c9cbfd21af6950621a589df329e1fe6611125904c39e22a73e0aa8834006a514dbd084e6c33b6bef29c8e4835b4b9dec631465
   - name: bufbuild.test/bufbot/students
-    commit: 6c776ed5bee54462b06d31fb7f7c16b8
+    commit: 6c776ed5-bee5-4462-b06d-31fb7f7c16b8
     digest: b5:01764dd31d0e1b8355eb3b262bba4539657af44872df6e4dfec76f57fbd9f1ae645c7c9c607db5c8352fb7041ca97111e3b0f142dafc1028832acbbc14ba1d70

private/buf/cmd/buf/testdata/imports/failure/students/buf.lock

@@ -2,5 +2,5 @@
 version: v2
 deps:
   - name: bufbuild.test/bufbot/people
-    commit: fc7d540124fd42db92511c19a60a1d98
+    commit: fc7d5401-24fd-42db-9251-1c19a60a1d98
     digest: b5:b22338d6faf2a727613841d760c9cbfd21af6950621a589df329e1fe6611125904c39e22a73e0aa8834006a514dbd084e6c33b6bef29c8e4835b4b9dec631465

private/buf/cmd/buf/testdata/imports/success/school/buf.lock

@@ -2,8 +2,8 @@
 version: v2
 deps:
   - name: bufbuild.test/bufbot/people
-    commit: fc7d540124fd42db92511c19a60a1d98
+    commit: fc7d5401-24fd-42db-9251-1c19a60a1d98
     digest: b5:b22338d6faf2a727613841d760c9cbfd21af6950621a589df329e1fe6611125904c39e22a73e0aa8834006a514dbd084e6c33b6bef29c8e4835b4b9dec631465
   - name: bufbuild.test/bufbot/students
-    commit: 6c776ed5bee54462b06d31fb7f7c16b8
+    commit: 6c776ed5-bee5-4462-b06d-31fb7f7c16b8
     digest: b5:01764dd31d0e1b8355eb3b262bba4539657af44872df6e4dfec76f57fbd9f1ae645c7c9c607db5c8352fb7041ca97111e3b0f142dafc1028832acbbc14ba1d70