Make logger and repository service client optional in api module reader

private/buf/bufcli/bufcli.go

@@ -544,7 +544,9 @@ func newModuleReaderAndCreateCacheDirs(
 	delegateReader := bufapimodule.NewModuleReader(
 		container.Logger(),
 		bufapimodule.NewDownloadServiceClientFactory(clientConfig),
-		bufapimodule.NewRepositoryServiceClientFactory(clientConfig),
+		bufapimodule.ModuleReaderWithDeprecationWarning(
+			bufapimodule.NewRepositoryServiceClientFactory(clientConfig),
+		),
 	)
 	storageosProvider := storageos.NewProvider(storageos.ProviderWithSymlinks())
 	var moduleReader bufmodule.ModuleReader

private/bufpkg/bufapimodule/bufapimodule.go

@@ -48,20 +48,28 @@ func NewRepositoryServiceClientFactory(clientConfig *connectclient.Config) Repos
 func NewModuleReader(
 	logger *zap.Logger,
 	downloadClientFactory DownloadServiceClientFactory,
-	repositoryClientFactory RepositoryServiceClientFactory,
 	opts ...ModuleReaderOption,
 ) bufmodule.ModuleReader {
 	return newModuleReader(
 		logger,
 		downloadClientFactory,
-		repositoryClientFactory,
 		opts...,
 	)
 }
 
 // ModuleReaderOption allows configuration of a module reader.
 type ModuleReaderOption func(reader *moduleReader)
 
+// ModuleReaderWithDeprecationWarning makes the module reader print a warning
+// when reading a deprecated module.
+func ModuleReaderWithDeprecationWarning(
+	repositoryClientFactory RepositoryServiceClientFactory,
+) ModuleReaderOption {
+	return func(reader *moduleReader) {
+		reader.repositoryClientFactory = repositoryClientFactory
+	}
+}
+
 // NewModuleResolver returns a new ModuleResolver backed by the resolve service.
 func NewModuleResolver(
 	logger *zap.Logger,

private/bufpkg/bufapimodule/module_reader.go

@@ -30,21 +30,20 @@ import (
 )
 
 type moduleReader struct {
-	logger                  *zap.Logger
-	downloadClientFactory   DownloadServiceClientFactory
+	logger                *zap.Logger
+	downloadClientFactory DownloadServiceClientFactory
+	// repositoryClientFactory may be nil
 	repositoryClientFactory RepositoryServiceClientFactory
 }
 
 func newModuleReader(
 	logger *zap.Logger,
 	downloadClientFactory DownloadServiceClientFactory,
-	repositoryClientFactory RepositoryServiceClientFactory,
 	opts ...ModuleReaderOption,
 ) *moduleReader {
 	reader := &moduleReader{
-		logger:                  logger,
-		downloadClientFactory:   downloadClientFactory,
-		repositoryClientFactory: repositoryClientFactory,
+		logger:                logger,
+		downloadClientFactory: downloadClientFactory,
 	}
 	for _, opt := range opts {
 		opt(reader)
@@ -80,8 +79,10 @@ func (m *moduleReader) GetModule(ctx context.Context, modulePin bufmoduleref.Mod
 	if err != nil {
 		return nil, err
 	}
-	if err := warnIfDeprecated(ctx, m.repositoryClientFactory, modulePin, m.logger); err != nil {
-		return nil, err
+	if m.repositoryClientFactory != nil {
+		if err := warnIfDeprecated(ctx, m.repositoryClientFactory, modulePin, m.logger); err != nil {
+			return nil, err
+		}
 	}
 	return bufmodule.NewModuleForFileSet(ctx, fileSet, identityAndCommitOpt)
 }

private/bufpkg/bufapimodule/module_reader_test.go

@@ -121,9 +121,6 @@ func testDownload(
 		moduleReader := newModuleReader(
 			zap.NewNop(),
 			mock.factory,
-			func(string) registryv1alpha1connect.RepositoryServiceClient {
-				return &nopRepositoryServiceClient{}
-			},
 			moduleReaderOpts...,
 		)
 		ctx := context.Background()