Fix naming

bufbuild · Oct 28, 2024 · 64eda56 · 64eda56
1 parent 73cfa3b
commit 64eda56
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/private/buf/cmd/buf/command/registry/label/labellist/labellist.go b/private/buf/cmd/buf/command/registry/label/labellist/labellist.go
@@ -120,9 +120,9 @@ func run(
 	if err != nil {
 		return err
 	}
-	clientProvider := bufregistryapimodule.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/bufpkg/bufmodule/bufmoduleapi/universal_proto_commit.go b/private/bufpkg/bufmodule/bufmoduleapi/universal_proto_commit.go
@@ -70,15 +70,15 @@ func newUniversalProtoCommitForV1Beta1(v1beta1ProtoCommit *modulev1beta1.Commit)
 
 func getUniversalProtoCommitForRegistryAndCommitID(
 	ctx context.Context,
-	clientProvider interface {
+	moduleClientProvider interface {
 		bufregistryapimodule.V1CommitServiceClientProvider
 		bufregistryapimodule.V1Beta1CommitServiceClientProvider
 	},
 	registry string,
 	commitID uuid.UUID,
 	digestType bufmodule.DigestType,
 ) (*universalProtoCommit, error) {
-	universalProtoCommits, err := getUniversalProtoCommitsForRegistryAndCommitIDs(ctx, clientProvider, registry, []uuid.UUID{commitID}, digestType)
+	universalProtoCommits, err := getUniversalProtoCommitsForRegistryAndCommitIDs(ctx, moduleClientProvider, registry, []uuid.UUID{commitID}, digestType)
 	if err != nil {
 		return nil, err
 	}
@@ -88,7 +88,7 @@ func getUniversalProtoCommitForRegistryAndCommitID(
 
 func getUniversalProtoCommitsForRegistryAndCommitIDs(
 	ctx context.Context,
-	clientProvider interface {
+	moduleClientProvider interface {
 		bufregistryapimodule.V1CommitServiceClientProvider
 		bufregistryapimodule.V1Beta1CommitServiceClientProvider
 	},
@@ -99,14 +99,14 @@ func getUniversalProtoCommitsForRegistryAndCommitIDs(
 	switch digestType {
 	case bufmodule.DigestTypeB4:
 		v1beta1ProtoResourceRefs := commitIDsToV1Beta1ProtoResourceRefs(commitIDs)
-		v1beta1ProtoCommits, err := getV1Beta1ProtoCommitsForRegistryAndResourceRefs(ctx, clientProvider, registry, v1beta1ProtoResourceRefs, digestType)
+		v1beta1ProtoCommits, err := getV1Beta1ProtoCommitsForRegistryAndResourceRefs(ctx, moduleClientProvider, registry, v1beta1ProtoResourceRefs, digestType)
 		if err != nil {
 			return nil, err
 		}
 		return slicesext.MapError(v1beta1ProtoCommits, newUniversalProtoCommitForV1Beta1)
 	case bufmodule.DigestTypeB5:
 		v1ProtoResourceRefs := commitIDsToV1ProtoResourceRefs(commitIDs)
-		v1ProtoCommits, err := getV1ProtoCommitsForRegistryAndResourceRefs(ctx, clientProvider, registry, v1ProtoResourceRefs)
+		v1ProtoCommits, err := getV1ProtoCommitsForRegistryAndResourceRefs(ctx, moduleClientProvider, registry, v1ProtoResourceRefs)
 		if err != nil {
 			return nil, err
 		}
@@ -118,7 +118,7 @@ func getUniversalProtoCommitsForRegistryAndCommitIDs(
 
 func getUniversalProtoCommitsForRegistryAndModuleRefs(
 	ctx context.Context,
-	clientProvider interface {
+	moduleClientProvider interface {
 		bufregistryapimodule.V1CommitServiceClientProvider
 		bufregistryapimodule.V1Beta1CommitServiceClientProvider
 	},
@@ -129,14 +129,14 @@ func getUniversalProtoCommitsForRegistryAndModuleRefs(
 	switch digestType {
 	case bufmodule.DigestTypeB4:
 		v1beta1ProtoResourceRefs := moduleRefsToV1Beta1ProtoResourceRefs(moduleRefs)
-		v1beta1ProtoCommits, err := getV1Beta1ProtoCommitsForRegistryAndResourceRefs(ctx, clientProvider, registry, v1beta1ProtoResourceRefs, digestType)
+		v1beta1ProtoCommits, err := getV1Beta1ProtoCommitsForRegistryAndResourceRefs(ctx, moduleClientProvider, registry, v1beta1ProtoResourceRefs, digestType)
 		if err != nil {
 			return nil, err
 		}
 		return slicesext.MapError(v1beta1ProtoCommits, newUniversalProtoCommitForV1Beta1)
 	case bufmodule.DigestTypeB5:
 		v1ProtoResourceRefs := moduleRefsToV1ProtoResourceRefs(moduleRefs)
-		v1ProtoCommits, err := getV1ProtoCommitsForRegistryAndResourceRefs(ctx, clientProvider, registry, v1ProtoResourceRefs)
+		v1ProtoCommits, err := getV1ProtoCommitsForRegistryAndResourceRefs(ctx, moduleClientProvider, registry, v1ProtoResourceRefs)
 		if err != nil {
 			return nil, err
 		}
@@ -148,11 +148,11 @@ func getUniversalProtoCommitsForRegistryAndModuleRefs(
 
 func getV1ProtoCommitsForRegistryAndResourceRefs(
 	ctx context.Context,
-	clientProvider bufregistryapimodule.V1CommitServiceClientProvider,
+	moduleClientProvider bufregistryapimodule.V1CommitServiceClientProvider,
 	registry string,
 	v1ProtoResourceRefs []*modulev1.ResourceRef,
 ) ([]*modulev1.Commit, error) {
-	response, err := clientProvider.V1CommitServiceClient(registry).GetCommits(
+	response, err := moduleClientProvider.V1CommitServiceClient(registry).GetCommits(
 		ctx,
 		connect.NewRequest(
 			&modulev1.GetCommitsRequest{
@@ -172,7 +172,7 @@ func getV1ProtoCommitsForRegistryAndResourceRefs(
 
 func getV1Beta1ProtoCommitsForRegistryAndResourceRefs(
 	ctx context.Context,
-	clientProvider bufregistryapimodule.V1Beta1CommitServiceClientProvider,
+	moduleClientProvider bufregistryapimodule.V1Beta1CommitServiceClientProvider,
 	registry string,
 	v1beta1ProtoResourceRefs []*modulev1beta1.ResourceRef,
 	digestType bufmodule.DigestType,
@@ -181,7 +181,7 @@ func getV1Beta1ProtoCommitsForRegistryAndResourceRefs(
 	if err != nil {
 		return nil, err
 	}
-	response, err := clientProvider.V1Beta1CommitServiceClient(registry).GetCommits(
+	response, err := moduleClientProvider.V1Beta1CommitServiceClient(registry).GetCommits(
 		ctx,
 		connect.NewRequest(
 			&modulev1beta1.GetCommitsRequest{