- Update gitaly vendoring

- Wire up gitaly-*-pack to Gitaly. Don't pass git-*-pack to go - Disable tests for go1.5 & 1.6

Author: bkcsoft

.gitlab-ci.yml

@@ -63,14 +63,6 @@ go:1.7:
  <<: *go_definition
  image: golang:1.7
 
-go:1.6:
- <<: *go_definition
- image: golang:1.6
-
-go:1.5:
- <<: *go_definition
- image: golang:1.5
-
 codeclimate:
  before_script: []
  image: docker:latest

go/cmd/gitaly-receive-pack/main.go

@@ -29,7 +29,9 @@ func main() {
 logger.Fatal("unmarshaling request json failed", err)
 }
 
-if err := handler.ReceivePack(os.Args[1], &request); err != nil {
+code, err := handler.ReceivePack(os.Args[1], &request)
+if err != nil {
 logger.Fatal("receive-pack failed", err)
 }
+os.Exit(int(code))
 }

go/cmd/gitaly-upload-pack/main.go

@@ -29,7 +29,9 @@ func main() {
 logger.Fatal("unmarshaling request json failed", err)
 }
 
-if err := handler.UploadPack(os.Args[1], &request); err != nil {
+code, err := handler.UploadPack(os.Args[1], &request)
+if err != nil {
 logger.Fatal("upload-pack failed", err)
 }
+os.Exit(int(code))
 }

go/internal/handler/receive_pack.go

@@ -1,16 +1,26 @@
 package handler
 
 import (
+"context"
 "fmt"
+"os"
 
 pb "gitlab.com/gitlab-org/gitaly-proto/go"
+"gitlab.com/gitlab-org/gitaly/client"
 )
 
-func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) error {
-repoPath := request.Repository.Path
-if repoPath == "" {
-return fmt.Errorf("empty path in repository message")
+func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) (int32, error) {
+if gitalyAddress == "" {
+return -1, fmt.Errorf("no gitaly_address given")
 }
 
-return execCommand("git-receive-pack", repoPath)
+conn, err := client.Dial(gitalyAddress, client.DefaultDialOpts)
+if err != nil {
+return -1, err
+}
+defer conn.Close()
+
+ctx, cancel := context.WithCancel(context.TODO())
+defer cancel()
+return client.ReceivePack(ctx, conn, os.Stdin, os.Stdout, os.Stderr, request)
 }

go/internal/handler/upload_pack.go

@@ -1,16 +1,26 @@
 package handler
 
 import (
+"context"
 "fmt"
+"os"
 
 pb "gitlab.com/gitlab-org/gitaly-proto/go"
+"gitlab.com/gitlab-org/gitaly/client"
 )
 
-func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) error {
-repoPath := request.Repository.Path
-if repoPath == "" {
-return fmt.Errorf("empty path in repository message")
+func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (int32, error) {
+if gitalyAddress == "" {
+return -1, fmt.Errorf("no gitaly_address given")
 }
 
-return execCommand("git-upload-pack", repoPath)
+conn, err := client.Dial(gitalyAddress, client.DefaultDialOpts)
+if err != nil {
+return -1, err
+}
+defer conn.Close()
+
+ctx, cancel := context.WithCancel(context.TODO())
+defer cancel()
+return client.UploadPack(ctx, conn, os.Stdin, os.Stdout, os.Stderr, request)
 }