Pass git push options into pre receive

7 files changed, 63 insertions, 32 deletions

diff --git a/changelogs/unreleased/jc-pass-git-push-options-prereceive.yml b/changelogs/unreleased/jc-pass-git-push-options-prereceive.yml
new file mode 100644
index 000000000..3e575b40b
--- /dev/null
+++ b/changelogs/unreleased/jc-pass-git-push-options-prereceive.yml
@@ -0,0 +1,5 @@
+---
+title: Pass git push options into pre receive
+merge_request: 2266
+author:
+type: fixed
diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go
index 9eb674475..fbac69f45 100644
--- a/cmd/gitaly-hooks/hooks.go
+++ b/cmd/gitaly-hooks/hooks.go
@@ -119,6 +119,7 @@ func main() {
 		if err := preReceiveHookStream.Send(&gitalypb.PreReceiveHookRequest{
 			Repository:           repository,
 			EnvironmentVariables: environment,
+			GitPushOptions:       gitPushOptions(),
 		}); err != nil {
 			logger.Fatalf("error when sending request for %q: %v", subCmd, err)
 		}
diff --git a/internal/service/hook/pre_receive.go b/internal/service/hook/pre_receive.go
index b4627ee13..b858f6db8 100644
--- a/internal/service/hook/pre_receive.go
+++ b/internal/service/hook/pre_receive.go
@@ -11,6 +11,7 @@ import (
 
 	"gitlab.com/gitlab-org/gitaly/internal/config"
 	"gitlab.com/gitlab-org/gitaly/internal/git/alternates"
+	"gitlab.com/gitlab-org/gitaly/internal/git/hooks"
 	"gitlab.com/gitlab-org/gitaly/internal/gitlabshell"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/internal/praefect/metadata"
@@ -24,6 +25,11 @@ type hookRequest interface {
 	GetRepository() *gitalypb.Repository
 }
 
+type prePostRequest interface {
+	hookRequest
+	GetGitPushOptions() []string
+}
+
 func hookRequestEnv(req hookRequest) ([]string, error) {
 	gitlabshellEnv, err := gitlabshell.Env()
 	if err != nil {
@@ -32,7 +38,7 @@ func hookRequestEnv(req hookRequest) ([]string, error) {
 	return append(gitlabshellEnv, req.GetEnvironmentVariables()...), nil
 }
 
-func preReceiveEnv(req hookRequest) ([]string, error) {
+func preReceiveEnv(req prePostRequest) ([]string, error) {
 	_, env, err := alternates.PathAndEnv(req.GetRepository())
 	if err != nil {
 		return nil, err
@@ -43,6 +49,9 @@ func preReceiveEnv(req hookRequest) ([]string, error) {
 		return nil, err
 	}
 
+	env = append(env, hookEnv...)
+	env = append(env, hooks.GitPushOptions(req.GetGitPushOptions())...)
+
 	return append(hookEnv, env...), nil
 }
 
diff --git a/internal/service/operations/rebase_test.go b/internal/service/operations/rebase_test.go
index 73e137e22..a967f0f22 100644
--- a/internal/service/operations/rebase_test.go
+++ b/internal/service/operations/rebase_test.go
@@ -62,6 +62,12 @@ func testSuccessfulUserRebaseConfirmableRequest(t *testing.T, ctxOuter context.C
 	branchSha := getBranchSha(t, testRepoPath, rebaseBranchName)
 
 	md := testhelper.GitalyServersMetadata(t, serverSocketPath)
+
+	mdFromCtx, ok := metadata.FromOutgoingContext(ctxOuter)
+	if ok {
+		md = metadata.Join(md, mdFromCtx)
+	}
+
 	ctx := metadata.NewOutgoingContext(ctxOuter, md)
 
 	rebaseStream, err := client.UserRebaseConfirmable(ctx)
diff --git a/proto/go/gitalypb/hook.pb.go b/proto/go/gitalypb/hook.pb.go
index 1c5ae1b00..6ab19d47e 100644
--- a/proto/go/gitalypb/hook.pb.go
+++ b/proto/go/gitalypb/hook.pb.go
@@ -28,6 +28,7 @@ type PreReceiveHookRequest struct {
 	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
 	EnvironmentVariables []string    `protobuf:"bytes,2,rep,name=environment_variables,json=environmentVariables,proto3" json:"environment_variables,omitempty"`
 	Stdin                []byte      `protobuf:"bytes,4,opt,name=stdin,proto3" json:"stdin,omitempty"`
+	GitPushOptions       []string    `protobuf:"bytes,5,rep,name=git_push_options,json=gitPushOptions,proto3" json:"git_push_options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -79,6 +80,13 @@ func (m *PreReceiveHookRequest) GetStdin() []byte {
 	return nil
 }
 
+func (m *PreReceiveHookRequest) GetGitPushOptions() []string {
+	if m != nil {
+		return m.GitPushOptions
+	}
+	return nil
+}
+
 type PreReceiveHookResponse struct {
 	Stdout               []byte      `protobuf:"bytes,1,opt,name=stdout,proto3" json:"stdout,omitempty"`
 	Stderr               []byte      `protobuf:"bytes,2,opt,name=stderr,proto3" json:"stderr,omitempty"`
@@ -390,37 +398,37 @@ func init() {
 func init() { proto.RegisterFile("hook.proto", fileDescriptor_3eef30da1c11ee1b) }
 
 var fileDescriptor_3eef30da1c11ee1b = []byte{
-	// 474 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x86, 0xb5, 0x4e, 0x1a, 0x35, 0x93, 0xa8, 0x94, 0x55, 0x1b, 0x8c, 0x11, 0x10, 0xf9, 0xe4,
-	0x03, 0x24, 0x51, 0x73, 0xe1, 0x5c, 0x09, 0x89, 0x0b, 0x22, 0x72, 0x45, 0x0f, 0x20, 0x61, 0x39,
-	0xf1, 0xe0, 0xac, 0xea, 0x7a, 0xcc, 0xee, 0xda, 0x6d, 0x0e, 0xf0, 0x1a, 0x80, 0xc4, 0xf3, 0xc0,
-	0x8d, 0x07, 0xe2, 0x84, 0xec, 0x75, 0xd2, 0xa4, 0x4d, 0xaf, 0x85, 0xdb, 0xce, 0x7c, 0x3b, 0xbf,
-	0x77, 0x7e, 0xcd, 0x18, 0x60, 0x4e, 0x74, 0x36, 0xc8, 0x24, 0x69, 0xe2, 0xad, 0x58, 0xe8, 0x30,
-	0x59, 0x38, 0x90, 0x88, 0x54, 0x9b, 0x9c, 0xd3, 0x55, 0xf3, 0x50, 0x62, 0x64, 0x22, 0xf7, 0x07,
-	0x83, 0xc3, 0x89, 0x44, 0x1f, 0x67, 0x28, 0x0a, 0x7c, 0x45, 0x74, 0xe6, 0xe3, 0xa7, 0x1c, 0x95,
-	0xe6, 0x2f, 0x00, 0x24, 0x66, 0xa4, 0x84, 0x26, 0xb9, 0xb0, 0x59, 0x9f, 0x79, 0x9d, 0x23, 0x3e,
-	0x30, 0x82, 0x03, 0x7f, 0x45, 0x8e, 0x9b, 0xdf, 0x7e, 0x3e, 0x63, 0xfe, 0xda, 0x5d, 0x3e, 0x86,
-	0x43, 0x4c, 0x0b, 0x21, 0x29, 0x3d, 0xc7, 0x54, 0x07, 0x45, 0x28, 0x45, 0x38, 0x4d, 0x50, 0xd9,
-	0x56, 0xbf, 0xe1, 0xb5, 0xfd, 0x83, 0x35, 0x78, 0xba, 0x64, 0xfc, 0x00, 0x76, 0x94, 0x8e, 0x44,
-	0x6a, 0x37, 0xfb, 0xcc, 0xeb, 0xfa, 0x26, 0x70, 0x3f, 0x43, 0xef, 0xfa, 0xeb, 0x54, 0x46, 0xa9,
-	0x42, 0xde, 0x83, 0x96, 0xd2, 0x11, 0xe5, 0xba, 0x7a, 0x5a, 0xd7, 0xaf, 0xa3, 0x3a, 0x8f, 0x52,
-	0xda, 0xd6, 0x2a, 0x8f, 0x52, 0xf2, 0x31, 0x74, 0xf0, 0x52, 0xe8, 0x40, 0xe9, 0x50, 0xe7, 0xca,
-	0x6e, 0x6c, 0xf6, 0xf3, 0xf2, 0x52, 0xe8, 0x93, 0x8a, 0xf8, 0x80, 0xab, 0xb3, 0xfb, 0x8b, 0x41,
-	0x6f, 0x42, 0x4a, 0xff, 0x47, 0xf6, 0x34, 0xd6, 0xec, 0xe1, 0x1e, 0xec, 0xc7, 0x42, 0x07, 0x59,
-	0xae, 0xe6, 0x01, 0x65, 0x5a, 0x50, 0xaa, 0xec, 0x66, 0xa5, 0xb2, 0x17, 0x0b, 0x3d, 0xc9, 0xd5,
-	0xfc, 0x8d, 0xc9, 0xba, 0x5f, 0xe0, 0xc1, 0x8d, 0x46, 0xee, 0xd2, 0xc9, 0xdf, 0x0c, 0xee, 0xbf,
-	0xcd, 0xa2, 0x50, 0xff, 0x4b, 0x13, 0xf7, 0xa1, 0x21, 0xf1, 0x63, 0x6d, 0x61, 0x79, 0xe4, 0x8f,
-	0xa0, 0x4d, 0x49, 0x14, 0x14, 0x61, 0x92, 0x63, 0x35, 0x79, 0x6d, 0x7f, 0x97, 0x92, 0xe8, 0xb4,
-	0x8c, 0x4b, 0x98, 0xe2, 0x45, 0x0d, 0x77, 0x0c, 0x4c, 0xf1, 0xa2, 0x82, 0xee, 0x02, 0xf8, 0x7a,
-	0x3f, 0x77, 0xe8, 0xe5, 0xd1, 0x77, 0x0b, 0x3a, 0xe5, 0x57, 0x4f, 0x50, 0x16, 0x62, 0x86, 0xfc,
-	0x3d, 0xec, 0x6d, 0x2e, 0x09, 0x7f, 0xbc, 0x54, 0xd8, 0xba, 0xda, 0xce, 0x93, 0xdb, 0xb0, 0xe9,
-	0xc2, 0x6d, 0xfd, 0xf9, 0xea, 0x59, 0xbb, 0x96, 0xc7, 0x46, 0x8c, 0x7f, 0x80, 0x7b, 0xd7, 0x06,
-	0x87, 0x5f, 0x95, 0x6f, 0x5d, 0x0d, 0xe7, 0xe9, 0xad, 0x7c, 0x8b, 0xfe, 0x6b, 0x80, 0x2b, 0x1f,
-	0xf9, 0xc3, 0x65, 0xe9, 0x8d, 0x59, 0x71, 0x9c, 0x6d, 0x68, 0x53, 0x70, 0xc4, 0x8e, 0x47, 0xef,
-	0xca, 0x6b, 0x49, 0x38, 0x1d, 0xcc, 0xe8, 0x7c, 0x68, 0x8e, 0xcf, 0x49, 0xc6, 0x43, 0x53, 0x3c,
-	0xac, 0xfe, 0x7a, 0xc3, 0x98, 0xea, 0x38, 0x9b, 0x4e, 0x5b, 0x55, 0x6a, 0xfc, 0x37, 0x00, 0x00,
-	0xff, 0xff, 0xba, 0x91, 0xf9, 0x6c, 0x38, 0x05, 0x00, 0x00,
+	// 477 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0xc7, 0xb5, 0xce, 0x87, 0x9a, 0x49, 0x54, 0xca, 0xaa, 0x0d, 0xc6, 0x08, 0x88, 0x7c, 0xf2,
+	0x01, 0x92, 0xa8, 0xb9, 0x70, 0xae, 0x84, 0xc4, 0x05, 0x11, 0xb9, 0xa2, 0x07, 0x90, 0xb0, 0x9c,
+	0x78, 0x70, 0x56, 0x75, 0x3d, 0x66, 0x77, 0xed, 0x36, 0x07, 0x78, 0x0d, 0xe0, 0x85, 0xca, 0x8d,
+	0x07, 0xe2, 0x84, 0xfc, 0x91, 0x34, 0x69, 0x5d, 0x71, 0x2b, 0xbd, 0xcd, 0xcc, 0x6f, 0x67, 0x56,
+	0xff, 0xbf, 0x66, 0x17, 0x60, 0x41, 0x74, 0x3a, 0x4c, 0x24, 0x69, 0xe2, 0xed, 0x50, 0x68, 0x3f,
+	0x5a, 0x5a, 0x10, 0x89, 0x58, 0x97, 0x35, 0xab, 0xa7, 0x16, 0xbe, 0xc4, 0xa0, 0xcc, 0xec, 0x4b,
+	0x06, 0x07, 0x53, 0x89, 0x2e, 0xce, 0x51, 0x64, 0xf8, 0x86, 0xe8, 0xd4, 0xc5, 0x2f, 0x29, 0x2a,
+	0xcd, 0x5f, 0x01, 0x48, 0x4c, 0x48, 0x09, 0x4d, 0x72, 0x69, 0xb2, 0x01, 0x73, 0xba, 0x87, 0x7c,
+	0x58, 0x0e, 0x1c, 0xba, 0x6b, 0x72, 0xd4, 0xfc, 0x71, 0xf9, 0x82, 0xb9, 0x1b, 0x67, 0xf9, 0x04,
+	0x0e, 0x30, 0xce, 0x84, 0xa4, 0xf8, 0x0c, 0x63, 0xed, 0x65, 0xbe, 0x14, 0xfe, 0x2c, 0x42, 0x65,
+	0x1a, 0x83, 0x86, 0xd3, 0x71, 0xf7, 0x37, 0xe0, 0xc9, 0x8a, 0xf1, 0x7d, 0x68, 0x29, 0x1d, 0x88,
+	0xd8, 0x6c, 0x0e, 0x98, 0xd3, 0x73, 0xcb, 0x84, 0x3b, 0xb0, 0x17, 0x0a, 0xed, 0x25, 0xa9, 0x5a,
+	0x78, 0x94, 0x68, 0x41, 0xb1, 0x32, 0x5b, 0xc5, 0x94, 0xdd, 0x50, 0xe8, 0x69, 0xaa, 0x16, 0xef,
+	0xca, 0xaa, 0xfd, 0x15, 0xfa, 0xd7, 0x75, 0xa8, 0x84, 0x62, 0x85, 0xbc, 0x0f, 0x6d, 0xa5, 0x03,
+	0x4a, 0x75, 0x21, 0xa2, 0xe7, 0x56, 0x59, 0x55, 0x47, 0x29, 0x4d, 0x63, 0x5d, 0x47, 0x29, 0xf9,
+	0x04, 0xba, 0x78, 0x21, 0xb4, 0xa7, 0xb4, 0xaf, 0x53, 0x65, 0x36, 0xb6, 0x95, 0xbf, 0xbe, 0x10,
+	0xfa, 0xb8, 0x20, 0x2e, 0xe0, 0x3a, 0xb6, 0x7f, 0x31, 0xe8, 0x4f, 0x49, 0xe9, 0x7b, 0x64, 0x64,
+	0xe3, 0x5f, 0x46, 0x36, 0x6b, 0x8d, 0xfc, 0x06, 0x8f, 0x6e, 0x08, 0xb9, 0x4b, 0x27, 0x7f, 0x33,
+	0x78, 0xf8, 0x3e, 0x09, 0x7c, 0xfd, 0x3f, 0x4d, 0xdc, 0x83, 0x86, 0xc4, 0xcf, 0x95, 0x85, 0x79,
+	0xc8, 0x9f, 0x40, 0x87, 0xa2, 0xc0, 0xcb, 0xfc, 0x28, 0xc5, 0x62, 0x47, 0x3b, 0xee, 0x0e, 0x45,
+	0xc1, 0x49, 0x9e, 0xe7, 0x30, 0xc6, 0xf3, 0x0a, 0xb6, 0x4a, 0x18, 0xe3, 0x79, 0x01, 0xed, 0x25,
+	0xf0, 0x4d, 0x3d, 0x77, 0xe8, 0xe5, 0xe1, 0x4f, 0x03, 0xba, 0xf9, 0xad, 0xc7, 0x28, 0x33, 0x31,
+	0x47, 0xfe, 0x11, 0x76, 0xb7, 0x1f, 0x09, 0x7f, 0xba, 0x9a, 0x50, 0xfb, 0x09, 0x58, 0xcf, 0x6e,
+	0xc3, 0xa5, 0x0a, 0xbb, 0xfd, 0xe7, 0xbb, 0x63, 0xec, 0x18, 0x0e, 0x1b, 0x33, 0xfe, 0x09, 0x1e,
+	0x5c, 0x5b, 0x1c, 0x7e, 0xd5, 0x5e, 0xfb, 0x34, 0xac, 0xe7, 0xb7, 0xf2, 0x9a, 0xf9, 0x6f, 0x01,
+	0xae, 0x7c, 0xe4, 0x8f, 0x57, 0xad, 0x37, 0x76, 0xc5, 0xb2, 0xea, 0xd0, 0xf6, 0xc0, 0x31, 0x3b,
+	0x1a, 0x7f, 0xc8, 0x8f, 0x45, 0xfe, 0x6c, 0x38, 0xa7, 0xb3, 0x51, 0x19, 0xbe, 0x24, 0x19, 0x8e,
+	0xca, 0xe6, 0x51, 0xf1, 0x3f, 0x8e, 0x42, 0xaa, 0xf2, 0x64, 0x36, 0x6b, 0x17, 0xa5, 0xc9, 0xdf,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x0d, 0xf2, 0x9e, 0x62, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/hook.proto b/proto/hook.proto
index b29c3dc81..0af53620e 100644
--- a/proto/hook.proto
+++ b/proto/hook.proto
@@ -29,6 +29,7 @@ message PreReceiveHookRequest {
   Repository repository = 1 [(target_repository)=true];
   repeated string environment_variables = 2;
   bytes stdin = 4;
+  repeated string git_push_options = 5;
 }
 
 message PreReceiveHookResponse{
diff --git a/ruby/proto/gitaly/hook_pb.rb b/ruby/proto/gitaly/hook_pb.rb
index 26a13e941..54e8a9d5d 100644
--- a/ruby/proto/gitaly/hook_pb.rb
+++ b/ruby/proto/gitaly/hook_pb.rb
@@ -10,6 +10,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :repository, :message, 1, "gitaly.Repository"
     repeated :environment_variables, :string, 2
     optional :stdin, :bytes, 4
+    repeated :git_push_options, :string, 5
   end
   add_message "gitaly.PreReceiveHookResponse" do
     optional :stdout, :bytes, 1