Merge branch 'ash2k/remove-not-found-ff' into 'master'

Remove GrpcTreeEntryNotFound feature flag

See merge request gitlab-org/gitaly!3567

3 files changed, 1 insertions, 31 deletions

diff --git a/internal/gitaly/service/commit/tree_entry.go b/internal/gitaly/service/commit/tree_entry.go
index 00e57ab0c..6d0ab14f6 100644
--- a/internal/gitaly/service/commit/tree_entry.go
+++ b/internal/gitaly/service/commit/tree_entry.go
@@ -8,7 +8,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/helper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/v14/streamio"
 	"google.golang.org/grpc/codes"
@@ -24,10 +23,7 @@ func sendTreeEntry(stream gitalypb.CommitService_TreeEntryServer, c catfile.Batc
 	}
 
 	if treeEntry == nil || len(treeEntry.Oid) == 0 {
-		if featureflag.IsEnabled(ctx, featureflag.GrpcTreeEntryNotFound) {
-			return status.Errorf(codes.NotFound, "not found: %s", path)
-		}
-		return helper.DecorateError(codes.Unavailable, stream.Send(&gitalypb.TreeEntryResponse{}))
+		return status.Errorf(codes.NotFound, "not found: %s", path)
 	}
 
 	if treeEntry.Type == gitalypb.TreeEntry_COMMIT {
diff --git a/internal/gitaly/service/commit/tree_entry_test.go b/internal/gitaly/service/commit/tree_entry_test.go
index df8298c02..ab470349b 100644
--- a/internal/gitaly/service/commit/tree_entry_test.go
+++ b/internal/gitaly/service/commit/tree_entry_test.go
@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/metadata/featureflag"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
@@ -150,28 +149,6 @@ func TestSuccessfulTreeEntry(t *testing.T) {
 	}
 }
 
-// Extracted from TestSuccessfulTreeEntry, to be removed with featureflag.GrpcTreeEntryNotFound
-func TestFFGrpcTreeEntryNotFoundDisabled(t *testing.T) {
-	_, repo, _, client := setupCommitServiceWithRepo(t, true)
-
-	testRequests := []*gitalypb.TreeEntryRequest{
-		{Repository: repo, Revision: []byte("913c66a37b4a45b9769037c55c2d238bd0942d2e"), Path: []byte("../bar/.gitkeep")}, // Git blows up on paths like this
-		{Repository: repo, Revision: []byte("deadfacedeadfacedeadfacedeadfacedeadface"), Path: []byte("with space/README.md")},
-		{Repository: repo, Revision: []byte("e63f41fe459e62e1228fcef60d7189127aeba95a"), Path: []byte("missing.rb")},
-	}
-
-	for _, request := range testRequests {
-		t.Run(fmt.Sprintf("revision=%q path=%q", request.Revision, request.Path), func(t *testing.T) {
-			ctx, cancel := testhelper.Context()
-			defer cancel()
-			ctx = featureflag.OutgoingCtxWithFeatureFlagValue(ctx, featureflag.GrpcTreeEntryNotFound, "false")
-			c, err := client.TreeEntry(ctx, request)
-			require.NoError(t, err)
-			assertExactReceivedTreeEntry(t, c, &treeEntry{})
-		})
-	}
-}
-
 func TestFailedTreeEntry(t *testing.T) {
 	_, repo, _, client := setupCommitServiceWithRepo(t, true)
 
diff --git a/internal/metadata/featureflag/feature_flags.go b/internal/metadata/featureflag/feature_flags.go
index 3978a13ff..5f844558d 100644
--- a/internal/metadata/featureflag/feature_flags.go
+++ b/internal/metadata/featureflag/feature_flags.go
@@ -13,8 +13,6 @@ var (
 	ReferenceTransactions = FeatureFlag{Name: "reference_transactions", OnByDefault: true}
 	// GoUpdateRemoteMirror enables the Go implementation of UpdateRemoteMirror
 	GoUpdateRemoteMirror = FeatureFlag{Name: "go_update_remote_mirror", OnByDefault: false}
-	// GrpcTreeEntryNotFound makes the TreeEntry gRPC call return NotFound instead of an empty blob
-	GrpcTreeEntryNotFound = FeatureFlag{Name: "grpc_tree_entry_not_found", OnByDefault: false}
 	// FetchInternalRemoteErrors makes FetchInternalRemote return actual errors instead of a boolean
 	FetchInternalRemoteErrors = FeatureFlag{Name: "fetch_internal_remote_errors", OnByDefault: false}
 	// TxConfig enables transactional voting for SetConfig and DeleteConfig RPCs.
@@ -26,7 +24,6 @@ var (
 // All includes all feature flags.
 var All = []FeatureFlag{
 	ReferenceTransactions,
-	GrpcTreeEntryNotFound,
 	GoUpdateRemoteMirror,
 	FetchInternalRemoteErrors,
 	TxConfig,