From 1b4ec8118eba35b48f62aac0664862c63fbbb09c Mon Sep 17 00:00:00 2001
From: Eric Ju <eju@gitlab.com>
Date: Wed, 2 Apr 2025 17:18:03 -0400
Subject: [PATCH] Shrink gitaly-ssh by 20M, still need gitaly-hooks and
 gitaly-lfs-smudge

---
 internal/gitaly/storage/storagemgr/middleware.go |  2 +-
 internal/grpc/protoregistry/method_info.go       |  5 ++---
 internal/offloading/sink.go                      | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/internal/gitaly/storage/storagemgr/middleware.go b/internal/gitaly/storage/storagemgr/middleware.go
index b352ec5d77..558ffb7ab9 100644
--- a/internal/gitaly/storage/storagemgr/middleware.go
+++ b/internal/gitaly/storage/storagemgr/middleware.go
@@ -278,7 +278,7 @@ func beginTransactionForPartition(ctx context.Context, logger log.Logger, txRegi
 		return transactionalizedRequest{}, fmt.Errorf("get storage: %w", err)
 	}
 
-	partition, err := storageHandle.GetPartition(ctx, targetPartition)
+	partition, err := storageHandle.GetPartition(ctx, storage.PartitionID(targetPartition))
 	if err != nil {
 		return transactionalizedRequest{}, fmt.Errorf("get partition: %w", err)
 	}
diff --git a/internal/grpc/protoregistry/method_info.go b/internal/grpc/protoregistry/method_info.go
index 837b826b8b..1e17962e04 100644
--- a/internal/grpc/protoregistry/method_info.go
+++ b/internal/grpc/protoregistry/method_info.go
@@ -6,7 +6,6 @@ import (
 	"strconv"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/protoutil"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 	"google.golang.org/protobuf/proto"
@@ -201,7 +200,7 @@ func (mi MethodInfo) getStorageField(msg proto.Message) (valueField, error) {
 }
 
 // Partition returns the partition id for a protobuf message if it exists
-func (mi MethodInfo) Partition(msg proto.Message) (storage.PartitionID, error) {
+func (mi MethodInfo) Partition(msg proto.Message) (uint64, error) {
 	field, err := mi.getPartitionField(msg)
 	if err != nil {
 		return 0, err
@@ -212,7 +211,7 @@ func (mi MethodInfo) Partition(msg proto.Message) (storage.PartitionID, error) {
 		return 0, err
 	}
 
-	return storage.PartitionID(value), nil
+	return value, nil
 }
 
 func (mi MethodInfo) getPartitionField(msg proto.Message) (valueField, error) {
diff --git a/internal/offloading/sink.go b/internal/offloading/sink.go
index 8ea3a17407..32d6205165 100644
--- a/internal/offloading/sink.go
+++ b/internal/offloading/sink.go
@@ -13,11 +13,11 @@ import (
 	"gocloud.dev/blob"
 	"golang.org/x/sync/errgroup"
 
-	_ "gocloud.dev/blob/azureblob" // register Azure driver
-	_ "gocloud.dev/blob/fileblob"  // register file driver
-	_ "gocloud.dev/blob/gcsblob"   // register Google Cloud driver
-	_ "gocloud.dev/blob/memblob"   // register in-memory driver
-	_ "gocloud.dev/blob/s3blob"
+	//_ "gocloud.dev/blob/azureblob" // register Azure driver
+	//_ "gocloud.dev/blob/fileblob"  // register file driver
+	_ "gocloud.dev/blob/gcsblob" // register Google Cloud driver
+	//_ "gocloud.dev/blob/memblob"   // register in-memory driver
+	//_ "gocloud.dev/blob/s3blob"
 )
 
 var (
-- 
GitLab