Split bufapi module to separate packages (#3428)

Co-authored-by: bufdev <[email protected]>
bufbuild · Oct 29, 2024 · 225aeaf · 225aeaf
1 parent 91bf561
commit 225aeaf
Show file tree

Hide file tree

Showing 39 changed files with 565 additions and 290 deletions.
diff --git a/private/buf/bufcli/cache.go b/private/buf/bufcli/cache.go
@@ -22,11 +22,12 @@ import (
 	"path/filepath"
 
 	"github.com/bufbuild/buf/private/buf/bufwkt/bufwktstore"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmodulecache"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmodulestore"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiowner"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/command"
 	"github.com/bufbuild/buf/private/pkg/filelock"
@@ -119,7 +120,10 @@ func NewModuleDataProvider(container appext.Container) (bufmodule.ModuleDataProv
 	}
 	return newModuleDataProvider(
 		container,
-		bufapi.NewClientProvider(
+		bufregistryapimodule.NewClientProvider(
+			clientConfig,
+		),
+		bufregistryapiowner.NewClientProvider(
 			clientConfig,
 		),
 	)
@@ -134,7 +138,10 @@ func NewCommitProvider(container appext.Container) (bufmodule.CommitProvider, er
 	}
 	return newCommitProvider(
 		container,
-		bufapi.NewClientProvider(
+		bufregistryapimodule.NewClientProvider(
+			clientConfig,
+		),
+		bufregistryapiowner.NewClientProvider(
 			clientConfig,
 		),
 	)
@@ -174,16 +181,17 @@ func NewWKTStore(container appext.Container) (bufwktstore.Store, error) {
 
 func newModuleDataProvider(
 	container appext.Container,
-	clientProvider bufapi.ClientProvider,
+	moduleClientProvider bufregistryapimodule.ClientProvider,
+	ownerClientProvider bufregistryapiowner.ClientProvider,
 ) (bufmodule.ModuleDataProvider, error) {
 	if err := createCacheDir(container.CacheDirPath(), v3CacheModuleRelDirPath); err != nil {
 		return nil, err
 	}
 	fullCacheDirPath := normalpath.Join(container.CacheDirPath(), v3CacheModuleRelDirPath)
 	delegateModuleDataProvider := bufmoduleapi.NewModuleDataProvider(
 		container.Logger(),
-		clientProvider,
-		newGraphProvider(container, clientProvider),
+		moduleClientProvider,
+		newGraphProvider(container, moduleClientProvider, ownerClientProvider),
 	)
 	// No symlinks.
 	storageosProvider := storageos.NewProvider()
@@ -211,13 +219,14 @@ func newModuleDataProvider(
 
 func newCommitProvider(
 	container appext.Container,
-	clientProvider bufapi.ClientProvider,
+	moduleClientProvider bufregistryapimodule.ClientProvider,
+	ownerClientProvider bufregistryapiowner.ClientProvider,
 ) (bufmodule.CommitProvider, error) {
 	if err := createCacheDir(container.CacheDirPath(), v3CacheCommitsRelDirPath); err != nil {
 		return nil, err
 	}
 	fullCacheDirPath := normalpath.Join(container.CacheDirPath(), v3CacheCommitsRelDirPath)
-	delegateReader := bufmoduleapi.NewCommitProvider(container.Logger(), clientProvider)
+	delegateReader := bufmoduleapi.NewCommitProvider(container.Logger(), moduleClientProvider, ownerClientProvider)
 	// No symlinks.
 	storageosProvider := storageos.NewProvider()
 	cacheBucket, err := storageosProvider.NewReadWriteBucket(fullCacheDirPath)

diff --git a/private/buf/bufcli/controller.go b/private/buf/bufcli/controller.go
@@ -16,8 +16,9 @@ package bufcli
 
 import (
 	"github.com/bufbuild/buf/private/buf/bufctl"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiowner"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 )
 
@@ -36,12 +37,13 @@ func NewController(
 	if err != nil {
 		return nil, err
 	}
-	clientProvider := bufapi.NewClientProvider(clientConfig)
-	moduleDataProvider, err := newModuleDataProvider(container, clientProvider)
+	moduleClientProvider := bufregistryapimodule.NewClientProvider(clientConfig)
+	ownerClientProvider := bufregistryapiowner.NewClientProvider(clientConfig)
+	moduleDataProvider, err := newModuleDataProvider(container, moduleClientProvider, ownerClientProvider)
 	if err != nil {
 		return nil, err
 	}
-	commitProvider, err := newCommitProvider(container, clientProvider)
+	commitProvider, err := newCommitProvider(container, moduleClientProvider, ownerClientProvider)
 	if err != nil {
 		return nil, err
 	}
@@ -52,8 +54,8 @@ func NewController(
 	return bufctl.NewController(
 		container.Logger(),
 		container,
-		newGraphProvider(container, clientProvider),
-		bufmoduleapi.NewModuleKeyProvider(container.Logger(), clientProvider),
+		newGraphProvider(container, moduleClientProvider, ownerClientProvider),
+		bufmoduleapi.NewModuleKeyProvider(container.Logger(), moduleClientProvider),
 		moduleDataProvider,
 		commitProvider,
 		wktStore,

diff --git a/private/buf/bufcli/graph_provider.go b/private/buf/bufcli/graph_provider.go
@@ -15,9 +15,10 @@
 package bufcli
 
 import (
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiowner"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 )
 
@@ -27,16 +28,22 @@ func NewGraphProvider(container appext.Container) (bufmodule.GraphProvider, erro
 	if err != nil {
 		return nil, err
 	}
-	return newGraphProvider(container, bufapi.NewClientProvider(clientConfig)), nil
+	return newGraphProvider(
+		container,
+		bufregistryapimodule.NewClientProvider(clientConfig),
+		bufregistryapiowner.NewClientProvider(clientConfig),
+	), nil
 }
 
 func newGraphProvider(
 	container appext.Container,
-	clientProvider bufapi.ClientProvider,
+	moduleClientProvider bufregistryapimodule.ClientProvider,
+	ownerClientProvider bufregistryapiowner.ClientProvider,
 ) bufmodule.GraphProvider {
 	return bufmoduleapi.NewGraphProvider(
 		container.Logger(),
-		clientProvider,
+		moduleClientProvider,
+		ownerClientProvider,
 		// OK if empty
 		bufmoduleapi.GraphProviderWithLegacyFederationRegistry(container.Env(legacyFederationRegistryEnvKey)),
 		// OK if empty

diff --git a/private/buf/bufcli/module_key_provider.go b/private/buf/bufcli/module_key_provider.go
@@ -15,9 +15,9 @@
 package bufcli
 
 import (
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 )
 
@@ -29,7 +29,7 @@ func NewModuleKeyProvider(container appext.Container) (bufmodule.ModuleKeyProvid
 	}
 	return bufmoduleapi.NewModuleKeyProvider(
 		container.Logger(),
-		bufapi.NewClientProvider(
+		bufregistryapimodule.NewClientProvider(
 			clientConfig,
 		),
 	), nil

diff --git a/private/buf/bufcli/uploader.go b/private/buf/bufcli/uploader.go
@@ -15,9 +15,9 @@
 package bufcli
 
 import (
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 )
 
@@ -27,12 +27,12 @@ func NewUploader(container appext.Container) (bufmodule.Uploader, error) {
 	if err != nil {
 		return nil, err
 	}
-	return newUploader(container, bufapi.NewClientProvider(clientConfig)), nil
+	return newUploader(container, bufregistryapimodule.NewClientProvider(clientConfig)), nil
 }
 
 func newUploader(
 	container appext.Container,
-	clientProvider bufapi.ClientProvider,
+	clientProvider bufregistryapimodule.ClientProvider,
 ) bufmodule.Uploader {
 	return bufmoduleapi.NewUploader(
 		container.Logger(),

diff --git a/private/buf/cmd/buf/command/registry/commit/commitaddlabel/commitaddlabel.go b/private/buf/cmd/buf/command/registry/commit/commitaddlabel/commitaddlabel.go
@@ -22,8 +22,8 @@ import (
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufprint"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/slicesext"
@@ -107,8 +107,8 @@ func run(
 	if err != nil {
 		return err
 	}
-	clientProvider := bufapi.NewClientProvider(clientConfig)
-	labelServiceClient := clientProvider.V1LabelServiceClient(moduleRef.ModuleFullName().Registry())
+	moduleClientProvider := bufregistryapimodule.NewClientProvider(clientConfig)
+	labelServiceClient := moduleClientProvider.V1LabelServiceClient(moduleRef.ModuleFullName().Registry())
 	requestValues := slicesext.Map(labels, func(label string) *modulev1.CreateOrUpdateLabelsRequest_Value {
 		return &modulev1.CreateOrUpdateLabelsRequest_Value{
 			LabelRef: &modulev1.LabelRef{

diff --git a/private/buf/cmd/buf/command/registry/commit/commitinfo/commitinfo.go b/private/buf/cmd/buf/command/registry/commit/commitinfo/commitinfo.go
@@ -22,8 +22,8 @@ import (
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufprint"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/syserror"
@@ -94,7 +94,7 @@ func run(
 	if err != nil {
 		return err
 	}
-	commitServiceClient := bufapi.NewClientProvider(clientConfig).V1CommitServiceClient(moduleRef.ModuleFullName().Registry())
+	commitServiceClient := bufregistryapimodule.NewClientProvider(clientConfig).V1CommitServiceClient(moduleRef.ModuleFullName().Registry())
 	resp, err := commitServiceClient.GetCommits(
 		ctx,
 		connect.NewRequest(

diff --git a/private/buf/cmd/buf/command/registry/commit/commitlist/commitlist.go b/private/buf/cmd/buf/command/registry/commit/commitlist/commitlist.go
@@ -22,8 +22,8 @@ import (
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufprint"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/slicesext"
@@ -117,10 +117,10 @@ func run(
 		return err
 	}
 	registry := moduleRef.ModuleFullName().Registry()
-	clientProvider := bufapi.NewClientProvider(clientConfig)
-	commitServiceClient := clientProvider.V1CommitServiceClient(registry)
-	labelServiceClient := clientProvider.V1LabelServiceClient(registry)
-	resourceServiceClient := clientProvider.V1ResourceServiceClient(registry)
+	moduleClientProvider := bufregistryapimodule.NewClientProvider(clientConfig)
+	commitServiceClient := moduleClientProvider.V1CommitServiceClient(registry)
+	labelServiceClient := moduleClientProvider.V1LabelServiceClient(registry)
+	resourceServiceClient := moduleClientProvider.V1ResourceServiceClient(registry)
 	resourceResp, err := resourceServiceClient.GetResources(
 		ctx,
 		connect.NewRequest(

diff --git a/private/buf/cmd/buf/command/registry/commit/commitresolve/commitresolve.go b/private/buf/cmd/buf/command/registry/commit/commitresolve/commitresolve.go
@@ -22,8 +22,8 @@ import (
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufprint"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/syserror"
@@ -86,7 +86,7 @@ func run(
 	if err != nil {
 		return err
 	}
-	commitServiceClient := bufapi.NewClientProvider(clientConfig).V1CommitServiceClient(moduleRef.ModuleFullName().Registry())
+	commitServiceClient := bufregistryapimodule.NewClientProvider(clientConfig).V1CommitServiceClient(moduleRef.ModuleFullName().Registry())
 	resp, err := commitServiceClient.GetCommits(
 		ctx,
 		connect.NewRequest(

diff --git a/private/buf/cmd/buf/command/registry/label/labelarchive/labelarchive.go b/private/buf/cmd/buf/command/registry/label/labelarchive/labelarchive.go
@@ -21,8 +21,8 @@ import (
 	modulev1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/module/v1"
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/spf13/pflag"
@@ -75,7 +75,7 @@ func run(
 		return err
 	}
 	moduleFullName := moduleRef.ModuleFullName()
-	labelServiceClient := bufapi.NewClientProvider(clientConfig).V1LabelServiceClient(moduleFullName.Registry())
+	labelServiceClient := bufregistryapimodule.NewClientProvider(clientConfig).V1LabelServiceClient(moduleFullName.Registry())
 	// ArchiveLabelsResponse is empty.
 	if _, err := labelServiceClient.ArchiveLabels(
 		ctx,

diff --git a/private/buf/cmd/buf/command/registry/label/labelinfo/labelinfo.go b/private/buf/cmd/buf/command/registry/label/labelinfo/labelinfo.go
@@ -22,8 +22,8 @@ import (
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufprint"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/syserror"
@@ -89,9 +89,9 @@ func run(
 	if err != nil {
 		return err
 	}
-	clientProvider := bufapi.NewClientProvider(clientConfig)
+	moduleClientProvider := bufregistryapimodule.NewClientProvider(clientConfig)
 	moduleFullName := moduleRef.ModuleFullName()
-	labelServiceClient := clientProvider.V1LabelServiceClient(moduleFullName.Registry())
+	labelServiceClient := moduleClientProvider.V1LabelServiceClient(moduleFullName.Registry())
 	resp, err := labelServiceClient.GetLabels(
 		ctx,
 		connect.NewRequest(

diff --git a/private/buf/cmd/buf/command/registry/label/labellist/labellist.go b/private/buf/cmd/buf/command/registry/label/labellist/labellist.go
@@ -22,8 +22,8 @@ import (
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufprint"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/slicesext"
@@ -120,9 +120,9 @@ func run(
 	if err != nil {
 		return err
 	}
-	clientProvider := bufapi.NewClientProvider(clientConfig)
+	moduleClientProvider := bufregistryapimodule.NewClientProvider(clientConfig)
 	moduleFullName := moduleRef.ModuleFullName()
-	labelServiceClient := clientProvider.V1LabelServiceClient(moduleFullName.Registry())
+	labelServiceClient := moduleClientProvider.V1LabelServiceClient(moduleFullName.Registry())
 	order := modulev1.ListLabelsRequest_ORDER_UPDATE_TIME_DESC
 	if flags.Reverse {
 		order = modulev1.ListLabelsRequest_ORDER_UPDATE_TIME_ASC

diff --git a/private/buf/cmd/buf/command/registry/label/labelunarchive/labelunarchive.go b/private/buf/cmd/buf/command/registry/label/labelunarchive/labelunarchive.go
@@ -21,8 +21,8 @@ import (
 	modulev1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/module/v1"
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/spf13/pflag"
@@ -75,7 +75,7 @@ func run(
 		return err
 	}
 	moduleFullName := moduleRef.ModuleFullName()
-	labelServiceClient := bufapi.NewClientProvider(clientConfig).V1LabelServiceClient(moduleFullName.Registry())
+	labelServiceClient := bufregistryapimodule.NewClientProvider(clientConfig).V1LabelServiceClient(moduleFullName.Registry())
 	// UnarchiveLabelsResponse is empty.
 	if _, err := labelServiceClient.UnarchiveLabels(
 		ctx,

diff --git a/private/buf/cmd/buf/command/registry/module/modulecreate/modulecreate.go b/private/buf/cmd/buf/command/registry/module/modulecreate/modulecreate.go
@@ -23,8 +23,8 @@ import (
 	"connectrpc.com/connect"
 	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufprint"
-	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/syserror"
@@ -106,7 +106,7 @@ func run(
 	if err != nil {
 		return err
 	}
-	moduleServiceClient := bufapi.NewClientProvider(clientConfig).V1ModuleServiceClient(moduleFullName.Registry())
+	moduleServiceClient := bufregistryapimodule.NewClientProvider(clientConfig).V1ModuleServiceClient(moduleFullName.Registry())
 	resp, err := moduleServiceClient.CreateModules(
 		ctx,
 		connect.NewRequest(