Cleanup for cmd/buf move (#4086)

Author: bufdev

.dockerignore

@@ -10,13 +10,13 @@ cmd/buf/internal/command/alpha/protoc/internal/protoc-gen-insertion-point-receiv
 cmd/buf/internal/command/alpha/protoc/internal/protoc-gen-insertion-point-writer/protoc-gen-insertion-point-writer
 cmd/buf/internal/command/alpha/protoc/test.txt
 cmd/buf/internal/command/generate/internal/protoc-gen-top-level-type-names-yaml/protoc-gen-top-level-type-names-yaml
+cmd/buf/testdata/imports/cache/v3/modulelocks/
+cmd/buf/testdata/imports/corrupted_cache_dep/v3/modulelocks/
+cmd/buf/testdata/imports/corrupted_cache_file/v3/modulelocks/
 cmd/protoc-gen-buf-breaking/protoc-gen-buf-breaking
 cmd/protoc-gen-buf-lint/protoc-gen-buf-lint
 private/buf/buftesting/cache/
 private/buf/bufwkt/cmd/wkt-go-data/wkt-go-data
-private/buf/cmd/buf/testdata/imports/cache/v3/modulelocks/
-private/buf/cmd/buf/testdata/imports/corrupted_cache_dep/v3/modulelocks/
-private/buf/cmd/buf/testdata/imports/corrupted_cache_file/v3/modulelocks/
 private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-category/buf-plugin-duplicate-category
 private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-rule/buf-plugin-duplicate-rule
 private/bufpkg/bufcheck/internal/cmd/buf-plugin-panic/buf-plugin-panic

.gitignore

@@ -10,13 +10,13 @@
 /cmd/buf/internal/command/alpha/protoc/internal/protoc-gen-insertion-point-writer/protoc-gen-insertion-point-writer
 /cmd/buf/internal/command/alpha/protoc/test.txt
 /cmd/buf/internal/command/generate/internal/protoc-gen-top-level-type-names-yaml/protoc-gen-top-level-type-names-yaml
+/cmd/buf/testdata/imports/cache/v3/modulelocks/
+/cmd/buf/testdata/imports/corrupted_cache_dep/v3/modulelocks/
+/cmd/buf/testdata/imports/corrupted_cache_file/v3/modulelocks/
 /cmd/protoc-gen-buf-breaking/protoc-gen-buf-breaking
 /cmd/protoc-gen-buf-lint/protoc-gen-buf-lint
 /private/buf/buftesting/cache/
 /private/buf/bufwkt/cmd/wkt-go-data/wkt-go-data
-/private/buf/cmd/buf/testdata/imports/cache/v3/modulelocks/
-/private/buf/cmd/buf/testdata/imports/corrupted_cache_dep/v3/modulelocks/
-/private/buf/cmd/buf/testdata/imports/corrupted_cache_file/v3/modulelocks/
 /private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-category/buf-plugin-duplicate-category
 /private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-rule/buf-plugin-duplicate-rule
 /private/bufpkg/bufcheck/internal/cmd/buf-plugin-panic/buf-plugin-panic

cmd/buf/internal/command/alpha/protoc/protoc_test.go

@@ -45,8 +45,6 @@ var buftestingDirPath = filepath.Join(
 	"..",
 	"..",
 	"..",
-	"..",
-	"..",
 	"private",
 	"buf",
 	"buftesting",

cmd/buf/internal/command/convert/testdata/convert/README.md

@@ -2,7 +2,7 @@ To re-generate the `descriptor.plain.binpb` file, run the following command in t
 
 ```
 echo "{\"one\":\"55\"}" | \
-buf convert private/buf/cmd/buf/testdata/success \
+buf convert cmd/buf/testdata/success \
     --type buf.Foo \
     --from -#format=json \
     --to cmd/buf/internal/command/convert/testdata/convert/descriptor.plain.binpb

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

@@ -9,9 +9,9 @@ To re-generate digests:
 
 ```
 buf-digest \
-  private/buf/cmd/buf/testdata/imports/success/school \
-  private/buf/cmd/buf/testdata/imports/success/people \
-  private/buf/cmd/buf/testdata/imports/success/students
+  cmd/buf/testdata/imports/success/school \
+  cmd/buf/testdata/imports/success/people \
+  cmd/buf/testdata/imports/success/students
 ```
 
 To make new commit IDs:

make/buf/all.mk

@@ -33,12 +33,12 @@ FILE_IGNORES := $(FILE_IGNORES) \
 	.idea/ \
 	.vscode/ \
 	cmd/buf/internal/command/alpha/protoc/test.txt \
+	cmd/buf/testdata/imports/cache/v3/modulelocks/ \
+	cmd/buf/testdata/imports/corrupted_cache_dep/v3/modulelocks/ \
+	cmd/buf/testdata/imports/corrupted_cache_file/v3/modulelocks/ \
 	private/bufpkg/buftesting/cache/ \
 	private/buf/buftesting/cache/ \
-	private/pkg/storage/storageos/tmp/ \
-	private/buf/cmd/buf/testdata/imports/cache/v3/modulelocks/ \
-	private/buf/cmd/buf/testdata/imports/corrupted_cache_dep/v3/modulelocks/ \
-	private/buf/cmd/buf/testdata/imports/corrupted_cache_file/v3/modulelocks/
+	private/pkg/storage/storageos/tmp/
 LICENSE_HEADER_LICENSE_TYPE := apache
 LICENSE_HEADER_COPYRIGHT_HOLDER := Buf Technologies, Inc.
 LICENSE_HEADER_YEAR_RANGE := 2020-2025