bufmod: Move proto -> proto/buf

buf.work.yaml

@@ -1,3 +1,3 @@
 version: v1
 directories:
-  - proto
+  - proto/buf

make/buf/all.mk

@@ -165,12 +165,12 @@ bufgenerateclean:: \
 
 .PHONY: bufgenerateprotogo
 bufgenerateprotogo:
-	$(BUF_BIN) generate proto --template data/template/buf.go.gen.yaml
+	$(BUF_BIN) generate proto/buf --template data/template/buf.go.gen.yaml
 	$(BUF_BIN) generate buf.build/grpc/grpc --type grpc.reflection.v1.ServerReflection --template data/template/buf.go.gen.yaml
 
 .PHONY: bufgenerateprotogoclient
 bufgenerateprotogoclient:
-	$(BUF_BIN) generate proto --template data/template/buf.go-client.gen.yaml
+	$(BUF_BIN) generate proto/buf --template data/template/buf.go-client.gen.yaml
 
 .PHONY: bufgeneratebuflinttestdata
 bufgeneratebuflinttestdata:

private/bufpkg/bufwkt/cmd/wkt-go-data/main.go

@@ -148,16 +148,18 @@ func getProtosourceFiles(
 	container appflag.Container,
 	bucket storage.ReadBucket,
 ) ([]protosource.File, error) {
-	// TODO: why is this not working? this is the path that should be used, not NewModuleForBucket
-	//module, err := bufmodulebuild.NewModuleBucketBuilder(container.Logger()).BuildForBucket(
-	//ctx,
-	//bucket,
-	//&bufmoduleconfig.Config{},
-	//)
-	module, err := bufmodule.NewModuleForBucket(ctx, bucket)
+	moduleSet, err := bufmodule.NewModuleSetBuilder(
+		ctx,
+		bufmodule.NopModuleDataProvider,
+	).AddLocalModule(
+		bucket,
+		".",
+		true,
+	).Build()
 	if err != nil {
 		return nil, err
 	}
+	module := bufmodule.ModuleSetToModuleReadBucketWithOnlyProtoFiles(moduleSet)
 	image, fileAnnotations, err := bufimage.BuildImage(
 		ctx,
 		module,