Makefile: Rename gitaly-git2go to gitaly-git2go-v14

We've been using a hack to build gitaly-git2go as gitaly-git2go. This
hack is annoying to make future changes, so instead of doing a mv(1) to
rename the binary, propertly rename the cmd/ directory so `go install`
will do the right thing right away.

30 files changed, 21 insertions, 40 deletions

diff --git a/Makefile b/Makefile
index aa8cf9c6f..b91c1ed19 100644
--- a/Makefile
+++ b/Makefile
@@ -320,11 +320,6 @@ ifdef WITHOUT_BUILD_ID
 	go install -ldflags '${GO_LDFLAGS}' -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
 endif
 
-	@ # We use version suffix for the gitaly-git2go binary to support compatibility contract between
-	@ # gitaly and gitaly-git2go during upgrade deployment.
-	@ # For more information refer to https://gitlab.com/gitlab-org/gitaly/-/issues/3647#note_599082033
-	${Q}mv ${BUILD_DIR}/bin/gitaly-git2go "${BUILD_DIR}/bin/gitaly-git2go-${MODULE_VERSION}"
-
 ifndef WITHOUT_BUILD_ID
 build: $(call find_commands)
 
diff --git a/cmd/gitaly-git2go/apply.go b/cmd/gitaly-git2go-v14/apply.go
index 0c863d82c..fd3d9eb71 100644
--- a/cmd/gitaly-git2go/apply.go
+++ b/cmd/gitaly-git2go-v14/apply.go
@@ -16,7 +16,7 @@ import (
 	"path/filepath"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go/cherry_pick.go b/cmd/gitaly-git2go-v14/cherry_pick.go
index 0125e73e0..605abcc39 100644
--- a/cmd/gitaly-git2go/cherry_pick.go
+++ b/cmd/gitaly-git2go-v14/cherry_pick.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go/cherry_pick_test.go b/cmd/gitaly-git2go-v14/cherry_pick_test.go
index 195f777f7..a578893ca 100644
--- a/cmd/gitaly-git2go/cherry_pick_test.go
+++ b/cmd/gitaly-git2go-v14/cherry_pick_test.go
@@ -11,8 +11,8 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testcfg"
diff --git a/cmd/gitaly-git2go/commit.go b/cmd/gitaly-git2go-v14/commit.go
index 0f6b69cdb..1b8f010c2 100644
--- a/cmd/gitaly-git2go/commit.go
+++ b/cmd/gitaly-git2go-v14/commit.go
@@ -8,7 +8,7 @@ import (
 	"encoding/gob"
 	"flag"
 
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/commit"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/commit"
 )
 
 type commitSubcommand struct{}
diff --git a/cmd/gitaly-git2go/commit/change_file_mode.go b/cmd/gitaly-git2go-v14/commit/change_file_mode.go
index 74d27c142..74d27c142 100644
--- a/cmd/gitaly-git2go/commit/change_file_mode.go
+++ b/cmd/gitaly-git2go-v14/commit/change_file_mode.go
diff --git a/cmd/gitaly-git2go/commit/commit.go b/cmd/gitaly-git2go-v14/commit/commit.go
index 0e62eee7c..2992dc7f3 100644
--- a/cmd/gitaly-git2go/commit/commit.go
+++ b/cmd/gitaly-git2go-v14/commit/commit.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go/commit/create_directory.go b/cmd/gitaly-git2go-v14/commit/create_directory.go
index cb9da2a22..cb9da2a22 100644
--- a/cmd/gitaly-git2go/commit/create_directory.go
+++ b/cmd/gitaly-git2go-v14/commit/create_directory.go
diff --git a/cmd/gitaly-git2go/commit/create_file.go b/cmd/gitaly-git2go-v14/commit/create_file.go
index 4aafc6f18..4aafc6f18 100644
--- a/cmd/gitaly-git2go/commit/create_file.go
+++ b/cmd/gitaly-git2go-v14/commit/create_file.go
diff --git a/cmd/gitaly-git2go/commit/delete_file.go b/cmd/gitaly-git2go-v14/commit/delete_file.go
index a8a3ad870..a8a3ad870 100644
--- a/cmd/gitaly-git2go/commit/delete_file.go
+++ b/cmd/gitaly-git2go-v14/commit/delete_file.go
diff --git a/cmd/gitaly-git2go/commit/move_file.go b/cmd/gitaly-git2go-v14/commit/move_file.go
index 2bdf114d8..2bdf114d8 100644
--- a/cmd/gitaly-git2go/commit/move_file.go
+++ b/cmd/gitaly-git2go-v14/commit/move_file.go
diff --git a/cmd/gitaly-git2go/commit/update_file.go b/cmd/gitaly-git2go-v14/commit/update_file.go
index 1972872bd..1972872bd 100644
--- a/cmd/gitaly-git2go/commit/update_file.go
+++ b/cmd/gitaly-git2go-v14/commit/update_file.go
diff --git a/cmd/gitaly-git2go/commit/validate.go b/cmd/gitaly-git2go-v14/commit/validate.go
index 52b2faaff..52b2faaff 100644
--- a/cmd/gitaly-git2go/commit/validate.go
+++ b/cmd/gitaly-git2go-v14/commit/validate.go
diff --git a/cmd/gitaly-git2go/conflicts.go b/cmd/gitaly-git2go-v14/conflicts.go
index 7ac05fa57..1923fec42 100644
--- a/cmd/gitaly-git2go/conflicts.go
+++ b/cmd/gitaly-git2go-v14/conflicts.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/helper"
 	"google.golang.org/grpc/codes"
diff --git a/cmd/gitaly-git2go/conflicts_test.go b/cmd/gitaly-git2go-v14/conflicts_test.go
index 74b079c9c..b7e3adeb2 100644
--- a/cmd/gitaly-git2go/conflicts_test.go
+++ b/cmd/gitaly-git2go-v14/conflicts_test.go
@@ -9,7 +9,7 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/testhelper"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
 	glgit "gitlab.com/gitlab-org/gitaly/v14/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
diff --git a/cmd/gitaly-git2go/git2goutil/repo.go b/cmd/gitaly-git2go-v14/git2goutil/repo.go
index 259da77e8..259da77e8 100644
--- a/cmd/gitaly-git2go/git2goutil/repo.go
+++ b/cmd/gitaly-git2go-v14/git2goutil/repo.go
diff --git a/cmd/gitaly-git2go/main.go b/cmd/gitaly-git2go-v14/main.go
index 1bbdf6e20..1bbdf6e20 100644
--- a/cmd/gitaly-git2go/main.go
+++ b/cmd/gitaly-git2go-v14/main.go
diff --git a/cmd/gitaly-git2go/merge.go b/cmd/gitaly-git2go-v14/merge.go
index 80c9662d1..14589c96c 100644
--- a/cmd/gitaly-git2go/merge.go
+++ b/cmd/gitaly-git2go-v14/merge.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go/merge_test.go b/cmd/gitaly-git2go-v14/merge_test.go
index da438e527..708a010b8 100644
--- a/cmd/gitaly-git2go/merge_test.go
+++ b/cmd/gitaly-git2go-v14/merge_test.go
@@ -11,8 +11,8 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
diff --git a/cmd/gitaly-git2go/rebase.go b/cmd/gitaly-git2go-v14/rebase.go
index 0ca365ff4..1c2e9acd0 100644
--- a/cmd/gitaly-git2go/rebase.go
+++ b/cmd/gitaly-git2go-v14/rebase.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go/rebase_test.go b/cmd/gitaly-git2go-v14/rebase_test.go
index 5c6e84299..f3756e9f6 100644
--- a/cmd/gitaly-git2go/rebase_test.go
+++ b/cmd/gitaly-git2go-v14/rebase_test.go
@@ -10,8 +10,8 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
 	gitalygit "gitlab.com/gitlab-org/gitaly/v14/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
diff --git a/cmd/gitaly-git2go/resolve_conflicts.go b/cmd/gitaly-git2go-v14/resolve_conflicts.go
index 6314e6a87..13c06243e 100644
--- a/cmd/gitaly-git2go/resolve_conflicts.go
+++ b/cmd/gitaly-git2go-v14/resolve_conflicts.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git/conflict"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 )
diff --git a/cmd/gitaly-git2go/revert.go b/cmd/gitaly-git2go-v14/revert.go
index fdefa1fd2..acb9e9d3d 100644
--- a/cmd/gitaly-git2go/revert.go
+++ b/cmd/gitaly-git2go-v14/revert.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go/revert_test.go b/cmd/gitaly-git2go-v14/revert_test.go
index 3b71409f0..fb0235e60 100644
--- a/cmd/gitaly-git2go/revert_test.go
+++ b/cmd/gitaly-git2go-v14/revert_test.go
@@ -11,8 +11,8 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testcfg"
diff --git a/cmd/gitaly-git2go/submodule.go b/cmd/gitaly-git2go-v14/submodule.go
index ef993fd21..24e3fef7e 100644
--- a/cmd/gitaly-git2go/submodule.go
+++ b/cmd/gitaly-git2go-v14/submodule.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go/submodule_test.go b/cmd/gitaly-git2go-v14/submodule_test.go
index 98ba9cbe6..98ba9cbe6 100644
--- a/cmd/gitaly-git2go/submodule_test.go
+++ b/cmd/gitaly-git2go-v14/submodule_test.go
diff --git a/cmd/gitaly-git2go/testhelper/testhelper.go b/cmd/gitaly-git2go-v14/testhelper/testhelper.go
index a0d874484..0b3a5e9e5 100644
--- a/cmd/gitaly-git2go/testhelper/testhelper.go
+++ b/cmd/gitaly-git2go-v14/testhelper/testhelper.go
@@ -9,7 +9,7 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
 )
 
 // DefaultAuthor is the author used by BuildCommit
diff --git a/cmd/gitaly-git2go/testhelper_test.go b/cmd/gitaly-git2go-v14/testhelper_test.go
index 826c9250f..826c9250f 100644
--- a/cmd/gitaly-git2go/testhelper_test.go
+++ b/cmd/gitaly-git2go-v14/testhelper_test.go
diff --git a/cmd/gitaly-git2go/util.go b/cmd/gitaly-git2go-v14/util.go
index feed724ab..feed724ab 100644
--- a/cmd/gitaly-git2go/util.go
+++ b/cmd/gitaly-git2go-v14/util.go
diff --git a/internal/testhelper/testcfg/build.go b/internal/testhelper/testcfg/build.go
index ce958358c..8aec16f11 100644
--- a/internal/testhelper/testcfg/build.go
+++ b/internal/testhelper/testcfg/build.go
@@ -1,7 +1,6 @@
 package testcfg
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -11,26 +10,13 @@ import (
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/version"
 )
 
 var buildOnceByName sync.Map
 
 // BuildGitalyGit2Go builds the gitaly-git2go command and installs it into the binary directory.
 func BuildGitalyGit2Go(t testing.TB, cfg config.Cfg) string {
-	binaryPath := BuildBinary(t, cfg.BinDir, gitalyCommandPath("gitaly-git2go"))
-	symlinkPath := filepath.Join(cfg.BinDir, "gitaly-git2go-"+version.GetModuleVersion())
-
-	// The link is needed because gitaly uses version-named binary.
-	// Please check out https://gitlab.com/gitlab-org/gitaly/-/issues/3647 for more info.
-	if err := os.Link(binaryPath, symlinkPath); err != nil {
-		if errors.Is(err, os.ErrExist) {
-			return symlinkPath
-		}
-		require.NoError(t, err)
-	}
-
-	return symlinkPath
+	return BuildBinary(t, cfg.BinDir, gitalyCommandPath("gitaly-git2go-v14"))
 }
 
 // BuildGitalyWrapper builds the gitaly-wrapper command and installs it into the binary directory.