Consolidate endpoint into ServerInfo

4 files changed, 25 insertions, 39 deletions

diff --git a/internal/service/server/info.go b/internal/service/server/info.go
new file mode 100644
index 000000000..3a1d88314
--- /dev/null
+++ b/internal/service/server/info.go
@@ -0,0 +1,18 @@
+package server
+
+import (
+	pb "gitlab.com/gitlab-org/gitaly-proto/go"
+	"gitlab.com/gitlab-org/gitaly/internal/git"
+	"gitlab.com/gitlab-org/gitaly/internal/version"
+
+	"golang.org/x/net/context"
+)
+
+func (s *server) ServerInfo(ctx context.Context, in *pb.ServerInfoRequest) (*pb.ServerInfoResponse, error) {
+	gitVersion, err := git.Version()
+
+	return &pb.ServerInfoResponse{
+		ServerVersion: version.GetVersion(),
+		GitVersion:    gitVersion,
+	}, err
+}
diff --git a/internal/service/server/versions_test.go b/internal/service/server/info_test.go
index 67222f27a..1a79fe1b9 100644
--- a/internal/service/server/versions_test.go
+++ b/internal/service/server/info_test.go
@@ -13,43 +13,28 @@ import (
 	"gitlab.com/gitlab-org/gitaly/internal/version"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )
 
-func TestGitalyServerVersion(t *testing.T) {
+func TestGitalyServerInfo(t *testing.T) {
 	server, serverSocketPath := runServer(t)
 	defer server.Stop()
 
 	client, conn := newServerClient(t, serverSocketPath)
 	defer conn.Close()
 
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := testhelper.Context()
 	defer cancel()
 
-	c, err := client.ServerVersion(ctx, &pb.ServerVersionRequest{})
+	c, err := client.ServerInfo(ctx, &pb.ServerInfoRequest{})
 	require.NoError(t, err)
 
-	require.Equal(t, version.GetVersion(), c.GetVersion())
-}
-
-func TestGitalyServerGitVersion(t *testing.T) {
-	server, serverSocketPath := runServer(t)
-	defer server.Stop()
-
-	client, conn := newServerClient(t, serverSocketPath)
-	defer conn.Close()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	c, err := client.ServerGitVersion(ctx, &pb.ServerGitVersionRequest{})
-	require.NoError(t, err)
+	require.Equal(t, version.GetVersion(), c.GetServerVersion())
 
-	version, err := git.Version()
+	gitVersion, err := git.Version()
 	require.NoError(t, err)
-	require.Equal(t, version, c.GetVersion())
+	require.Equal(t, gitVersion, c.GetGitVersion())
 }
 
 func runServer(t *testing.T) (*grpc.Server, string) {
diff --git a/internal/service/server/server.go b/internal/service/server/server.go
index 21cfd8145..5314ada3b 100644
--- a/internal/service/server/server.go
+++ b/internal/service/server/server.go
@@ -6,6 +6,7 @@ import (
 
 type server struct{}
 
+// NewServer creates a new instance of a grpc ServerServiceServer
 func NewServer() pb.ServerServiceServer {
 	return &server{}
 }
diff --git a/internal/service/server/versions.go b/internal/service/server/versions.go
deleted file mode 100644
index 62fc6c389..000000000
--- a/internal/service/server/versions.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package server
-
-import (
-	pb "gitlab.com/gitlab-org/gitaly-proto/go"
-	"gitlab.com/gitlab-org/gitaly/internal/git"
-	"gitlab.com/gitlab-org/gitaly/internal/version"
-
-	"golang.org/x/net/context"
-)
-
-func (s *server) ServerVersion(ctx context.Context, in *pb.ServerVersionRequest) (*pb.ServerVersionResponse, error) {
-	return &pb.ServerVersionResponse{Version: version.GetVersion()}, nil
-}
-
-func (s *server) ServerGitVersion(ctx context.Context, in *pb.ServerGitVersionRequest) (*pb.ServerGitVersionResponse, error) {
-	version, err := git.Version()
-	return &pb.ServerGitVersionResponse{Version: version}, err
-}