Remove feature flag for GetAllLFSPointersjc-remove-ff-for-get-all-lfs-pointers

4 files changed, 10 insertions, 42 deletions

diff --git a/changelogs/unreleased/jc-remove-ff-for-get-all-lfs-pointers.yml b/changelogs/unreleased/jc-remove-ff-for-get-all-lfs-pointers.yml
new file mode 100644
index 000000000..1de922c25
--- /dev/null
+++ b/changelogs/unreleased/jc-remove-ff-for-get-all-lfs-pointers.yml
@@ -0,0 +1,5 @@
+---
+title: Remove feature flag for GetAllLFSPointers
+merge_request: 1516
+author:
+type: other
diff --git a/internal/metadata/featureflag/featureflags.go b/internal/metadata/featureflag/featureflags.go
index 9860291b9..ce1891d73 100644
--- a/internal/metadata/featureflag/featureflags.go
+++ b/internal/metadata/featureflag/featureflags.go
@@ -1,9 +1,6 @@
 package featureflag
 
 const (
-	// GetAllLFSPointersGo will cause the GetAllLFSPointers RPC to use the go implementation when set
-	GetAllLFSPointersGo = "get_all_lfs_pointers_go"
-
 	// LinguistFileCountStats will invoke an additional git-linguist command to get the number of files per language
 	LinguistFileCountStats = "linguist_file_count_stats"
 )
diff --git a/internal/service/blob/lfs_pointers.go b/internal/service/blob/lfs_pointers.go
index 1bffee8f7..d3607e7ac 100644
--- a/internal/service/blob/lfs_pointers.go
+++ b/internal/service/blob/lfs_pointers.go
@@ -16,7 +16,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/internal/helper/chunk"
-	"gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
@@ -130,48 +129,17 @@ func init() {
 }
 
 func (s *server) GetAllLFSPointers(in *gitalypb.GetAllLFSPointersRequest, stream gitalypb.BlobService_GetAllLFSPointersServer) error {
-	ctx := stream.Context()
-
 	if err := validateGetLfsPointersByRevisionRequest(in); err != nil {
 		return helper.ErrInvalidArgument(err)
 	}
 
-	if featureflag.IsEnabled(stream.Context(), featureflag.GetAllLFSPointersGo) {
-		getAllLFSPointersRequests.WithLabelValues("go").Inc()
-
-		if err := getAllLFSPointersRubyScript(in.GetRepository(), stream); err != nil {
-			return helper.ErrInternal(err)
-		}
-
-		return nil
-	}
-
-	getAllLFSPointersRequests.WithLabelValues("ruby").Inc()
+	getAllLFSPointersRequests.WithLabelValues("go").Inc()
 
-	client, err := s.BlobServiceClient(ctx)
-	if err != nil {
-		return err
-	}
-
-	clientCtx, err := rubyserver.SetHeaders(ctx, in.GetRepository())
-	if err != nil {
-		return err
+	if err := getAllLFSPointersRubyScript(in.GetRepository(), stream); err != nil {
+		return helper.ErrInternal(err)
 	}
 
-	rubyStream, err := client.GetAllLFSPointers(clientCtx, in)
-	if err != nil {
-		return err
-	}
-
-	return rubyserver.Proxy(func() error {
-		resp, err := rubyStream.Recv()
-		if err != nil {
-			md := rubyStream.Trailer()
-			stream.SetTrailer(md)
-			return err
-		}
-		return stream.Send(resp)
-	})
+	return nil
 }
 
 func validateGetLfsPointersByRevisionRequest(in getLFSPointerByRevisionRequest) error {
diff --git a/internal/service/blob/lfs_pointers_test.go b/internal/service/blob/lfs_pointers_test.go
index a9036300c..b68ad26d7 100644
--- a/internal/service/blob/lfs_pointers_test.go
+++ b/internal/service/blob/lfs_pointers_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
@@ -408,8 +407,7 @@ func TestSuccessfulGetAllLFSPointersRequest(t *testing.T) {
 	require.ElementsMatch(t, expectedLFSPointers, getAllPointers(t, c))
 
 	// test with go implementation
-	// TODO: remove once feature flag is removed
-	c, err = client.GetAllLFSPointers(featureflag.EnableFeatureFlag(ctx, featureflag.GetAllLFSPointersGo), request)
+	c, err = client.GetAllLFSPointers(ctx, request)
 	require.NoError(t, err)
 
 	require.ElementsMatch(t, expectedLFSPointers, getAllPointers(t, c))