Remove GetCommitSignatures RPC feature flagremove_get_commit_signatures_feature_flag

Remove feature flag and use golang implementation of the RPC.
The ruby code will be removed later.

2 files changed, 5 insertions, 27 deletions

diff --git a/internal/service/commit/commit_signatures.go b/internal/service/commit/commit_signatures.go
index 2284444a6..81897ab5b 100644
--- a/internal/service/commit/commit_signatures.go
+++ b/internal/service/commit/commit_signatures.go
@@ -10,7 +10,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
-	"gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/streamio"
@@ -18,8 +17,6 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-const getCommitSignaturesFeatureFlag = "get-commit-signatures"
-
 var gpgSiganturePrefix = []byte("gpgsig")
 
 func (s *server) GetCommitSignatures(request *gitalypb.GetCommitSignaturesRequest, stream gitalypb.CommitService_GetCommitSignaturesServer) error {
@@ -27,11 +24,7 @@ func (s *server) GetCommitSignatures(request *gitalypb.GetCommitSignaturesReques
 		return status.Errorf(codes.InvalidArgument, "GetCommitSignatures: %v", err)
 	}
 
-	if featureflag.IsEnabled(stream.Context(), getCommitSignaturesFeatureFlag) {
-		return getCommitSignatures(s, request, stream)
-	}
-
-	return rubyGetCommitSignatures(s, request, stream)
+	return getCommitSignatures(s, request, stream)
 }
 
 func getCommitSignatures(s *server, request *gitalypb.GetCommitSignaturesRequest, stream gitalypb.CommitService_GetCommitSignaturesServer) error {
diff --git a/internal/service/commit/commit_signatures_test.go b/internal/service/commit/commit_signatures_test.go
index 660696add..9486b15e9 100644
--- a/internal/service/commit/commit_signatures_test.go
+++ b/internal/service/commit/commit_signatures_test.go
@@ -1,16 +1,13 @@
 package commit
 
 import (
-	"context"
 	"io"
 	"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"
-	"google.golang.org/grpc/metadata"
 )
 
 func TestSuccessfulGetCommitSignaturesRequest(t *testing.T) {
@@ -55,23 +52,11 @@ func TestSuccessfulGetCommitSignaturesRequest(t *testing.T) {
 		},
 	}
 
-	flagDisabled := metadata.New(map[string]string{featureflag.HeaderKey(getCommitSignaturesFeatureFlag): "false"})
-	ctxWithFlagDisabled := metadata.NewOutgoingContext(ctx, flagDisabled)
+	c, err := client.GetCommitSignatures(ctx, request)
+	require.NoError(t, err)
+	fetchedSignatures := readAllSignaturesFromClient(t, c)
 
-	flagEnabled := metadata.New(map[string]string{featureflag.HeaderKey(getCommitSignaturesFeatureFlag): "true"})
-	ctxWithFlagEnabled := metadata.NewOutgoingContext(ctx, flagEnabled)
-
-	// Test contexts with feature flag nil, enabled and disabled
-	testContexts := []context.Context{ctx, ctxWithFlagEnabled, ctxWithFlagDisabled}
-
-	for _, context := range testContexts {
-		c, err := client.GetCommitSignatures(context, request)
-		require.NoError(t, err)
-
-		fetchedSignatures := readAllSignaturesFromClient(t, c)
-
-		require.Equal(t, expectedSignautes, fetchedSignatures)
-	}
+	require.Equal(t, expectedSignautes, fetchedSignatures)
 }
 
 func TestFailedGetCommitSignaturesRequest(t *testing.T) {