Add EnvironmentVariables field in hook rpcs

EnvironmentVariables can be used to pass environment variables in, which includes
GL_ID, GL_PROTOCOL, and GL_USERNAME so we can pass these values into the ruby hooks.
GL_REPOSITORY will be passed through the repository struct.

13 files changed, 276 insertions, 140 deletions

diff --git a/changelogs/unreleased/jc-add-gl-values.yml b/changelogs/unreleased/jc-add-gl-values.yml
new file mode 100644
index 000000000..d0301e992
--- /dev/null
+++ b/changelogs/unreleased/jc-add-gl-values.yml
@@ -0,0 +1,5 @@
+---
+title: Add EnvironmentVariables field in hook rpcs
+merge_request: 1969
+author:
+type: changed
diff --git a/internal/service/hooks/post_receive.go b/internal/service/hooks/post_receive.go
index 55ec0323f..f4e312d08 100644
--- a/internal/service/hooks/post_receive.go
+++ b/internal/service/hooks/post_receive.go
@@ -20,12 +20,7 @@ func (s *server) PostReceiveHook(stream gitalypb.HookService_PostReceiveHookServ
 		return helper.ErrInvalidArgument(err)
 	}
 
-	hookEnv, err := hookRequestEnv(firstRequest)
-	if err != nil {
-		return helper.ErrInternal(err)
-	}
-
-	hookEnv = append(hookEnv, hooks.GitPushOptions(firstRequest.GetGitPushOptions())...)
+	hookEnv := append(hookRequestEnv(firstRequest), hooks.GitPushOptions(firstRequest.GetGitPushOptions())...)
 
 	stdin := streamio.NewReader(func() ([]byte, error) {
 		req, err := stream.Recv()
diff --git a/internal/service/hooks/post_receive_test.go b/internal/service/hooks/post_receive_test.go
index a85128967..fe7b4145d 100644
--- a/internal/service/hooks/post_receive_test.go
+++ b/internal/service/hooks/post_receive_test.go
@@ -63,33 +63,87 @@ func TestPostReceive(t *testing.T) {
 		stderr string
 	}{
 		{
-			desc:   "valid stdin",
-			stdin:  bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
-			req:    gitalypb.PostReceiveHookRequest{Repository: testRepo, KeyId: "key_id", GitPushOptions: []string{"option0", "option1"}},
+			desc:  "everything OK",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PostReceiveHookRequest{
+				Repository:           testRepo,
+				EnvironmentVariables: []string{"GL_ID=key_id", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
+				GitPushOptions:       []string{"option0", "option1"}},
 			status: 0,
 			stdout: "OK",
 			stderr: "",
 		},
 		{
-			desc:   "missing stdin",
-			stdin:  bytes.NewBuffer(nil),
-			req:    gitalypb.PostReceiveHookRequest{Repository: testRepo, KeyId: "key_id", GitPushOptions: []string{"option0"}},
+			desc:  "missing stdin",
+			stdin: bytes.NewBuffer(nil),
+			req: gitalypb.PostReceiveHookRequest{
+				Repository:           testRepo,
+				EnvironmentVariables: []string{"GL_ID=key_id", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
+				GitPushOptions:       []string{"option0"},
+			},
 			status: 1,
 			stdout: "",
 			stderr: "FAIL",
 		},
 		{
-			desc:   "missing key_id",
-			stdin:  bytes.NewBuffer(nil),
-			req:    gitalypb.PostReceiveHookRequest{Repository: testRepo, GitPushOptions: []string{"option0"}},
+			desc:  "missing gl_id",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PostReceiveHookRequest{
+				Repository:           testRepo,
+				EnvironmentVariables: []string{"GL_ID=", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
+				GitPushOptions:       []string{"option0"},
+			},
 			status: 1,
 			stdout: "",
 			stderr: "FAIL",
 		},
 		{
-			desc:   "missing git push option",
-			stdin:  bytes.NewBuffer(nil),
-			req:    gitalypb.PostReceiveHookRequest{Repository: testRepo, KeyId: "key_id"},
+			desc:  "missing gl_username",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PostReceiveHookRequest{
+				Repository:           testRepo,
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=", "GL_PROTOCOL=protocol"},
+				GitPushOptions:       []string{"option0"},
+			},
+			status: 1,
+			stdout: "",
+			stderr: "FAIL",
+		},
+		{
+			desc:  "missing gl_protocol",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PostReceiveHookRequest{
+				Repository:           testRepo,
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL="},
+				GitPushOptions:       []string{"option0"},
+			},
+			status: 1,
+			stdout: "",
+			stderr: "FAIL",
+		},
+		{
+			desc:  "missing gl_repository value",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PostReceiveHookRequest{
+				Repository: &gitalypb.Repository{
+					StorageName:  testRepo.GetStorageName(),
+					RelativePath: testRepo.GetRelativePath(),
+					GlRepository: "",
+				},
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
+				GitPushOptions:       []string{"option0"},
+			},
+			status: 1,
+			stdout: "",
+			stderr: "FAIL",
+		},
+		{
+			desc:  "missing git push option",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PostReceiveHookRequest{
+				Repository:           testRepo,
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
+			},
 			status: 1,
 			stdout: "",
 			stderr: "FAIL",
@@ -128,7 +182,7 @@ func TestPostReceive(t *testing.T) {
 				status = resp.GetExitStatus().GetValue()
 			}
 
-			require.Equal(t, tc.status, status)
+			assert.Equal(t, tc.status, status)
 			assert.Equal(t, tc.stderr, text.ChompBytes(stderr.Bytes()), "hook stderr")
 			assert.Equal(t, tc.stdout, text.ChompBytes(stdout.Bytes()), "hook stdout")
 		})
diff --git a/internal/service/hooks/pre_receive.go b/internal/service/hooks/pre_receive.go
index e855d2584..6458c68b5 100644
--- a/internal/service/hooks/pre_receive.go
+++ b/internal/service/hooks/pre_receive.go
@@ -14,14 +14,13 @@ import (
 )
 
 type hookRequest interface {
-	GetKeyId() string
+	GetEnvironmentVariables() []string
 	GetRepository() *gitalypb.Repository
 }
 
-func hookRequestEnv(req hookRequest) ([]string, error) {
+func hookRequestEnv(req hookRequest) []string {
 	return append(gitlabshell.Env(),
-		fmt.Sprintf("GL_ID=%s", req.GetKeyId()),
-		fmt.Sprintf("GL_REPOSITORY=%s", req.GetRepository().GetGlRepository())), nil
+		append(req.GetEnvironmentVariables(), fmt.Sprintf("GL_REPOSITORY=%s", req.GetRepository().GetGlRepository()))...)
 }
 
 func gitlabShellHook(hookName string) string {
@@ -38,13 +37,6 @@ func (s *server) PreReceiveHook(stream gitalypb.HookService_PreReceiveHookServer
 		return helper.ErrInvalidArgument(err)
 	}
 
-	hookEnv, err := hookRequestEnv(firstRequest)
-	if err != nil {
-		return helper.ErrInternal(err)
-	}
-
-	hookEnv = append(hookEnv, fmt.Sprintf("GL_PROTOCOL=%s", firstRequest.GetProtocol()))
-
 	stdin := streamio.NewReader(func() ([]byte, error) {
 		req, err := stream.Recv()
 		return req.GetStdin(), err
@@ -65,7 +57,7 @@ func (s *server) PreReceiveHook(stream gitalypb.HookService_PreReceiveHookServer
 		stdin,
 		stdout, stderr,
 		c,
-		hookEnv,
+		hookRequestEnv(firstRequest),
 	)
 
 	if err != nil {
diff --git a/internal/service/hooks/pre_receive_test.go b/internal/service/hooks/pre_receive_test.go
index 8b2d5c943..2a2d40a57 100644
--- a/internal/service/hooks/pre_receive_test.go
+++ b/internal/service/hooks/pre_receive_test.go
@@ -65,33 +65,95 @@ func TestPreReceive(t *testing.T) {
 		stdout, stderr string
 	}{
 		{
-			desc:   "valid stdin",
-			stdin:  bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
-			req:    gitalypb.PreReceiveHookRequest{Repository: testRepo, KeyId: "key_id", Protocol: "protocol"},
+			desc:  "everything OK",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PreReceiveHookRequest{
+				Repository: testRepo,
+				EnvironmentVariables: []string{
+					"GL_ID=key-123",
+					"GL_PROTOCOL=protocol",
+					"GL_USERNAME=username",
+				},
+			},
 			status: 0,
 			stdout: "OK",
 			stderr: "",
 		},
 		{
-			desc:   "missing stdin",
-			stdin:  bytes.NewBuffer(nil),
-			req:    gitalypb.PreReceiveHookRequest{Repository: testRepo, KeyId: "key_id", Protocol: "protocol"},
+			desc:  "missing stdin",
+			stdin: bytes.NewBuffer(nil),
+			req: gitalypb.PreReceiveHookRequest{
+				Repository: testRepo,
+				EnvironmentVariables: []string{
+					"GL_ID=key-123",
+					"GL_PROTOCOL=protocol",
+					"GL_USERNAME=username",
+				},
+			},
 			status: 1,
 			stdout: "",
 			stderr: "FAIL",
 		},
 		{
-			desc:   "missing protocol",
-			stdin:  bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
-			req:    gitalypb.PreReceiveHookRequest{Repository: testRepo, KeyId: "key_id"},
+			desc:  "missing gl_protocol",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PreReceiveHookRequest{
+				Repository: testRepo,
+				EnvironmentVariables: []string{
+					"GL_ID=key-123",
+					"GL_USERNAME=username",
+					"GL_PROTOCOL=",
+				},
+			},
 			status: 1,
 			stdout: "",
 			stderr: "FAIL",
 		},
 		{
-			desc:   "missing key_id",
-			stdin:  bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
-			req:    gitalypb.PreReceiveHookRequest{Repository: testRepo, Protocol: "protocol"},
+			desc:  "missing gl_id",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PreReceiveHookRequest{
+				Repository: testRepo,
+				EnvironmentVariables: []string{
+					"GL_ID=",
+					"GL_PROTOCOL=protocol",
+					"GL_USERNAME=username",
+				},
+			},
+			status: 1,
+			stdout: "",
+			stderr: "FAIL",
+		},
+		{
+			desc:  "missing gl_username",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PreReceiveHookRequest{
+				Repository: testRepo,
+				EnvironmentVariables: []string{
+					"GL_ID=key-123",
+					"GL_PROTOCOL=protocol",
+					"GL_USERNAME=",
+				},
+			},
+			status: 1,
+			stdout: "",
+			stderr: "FAIL",
+		},
+		{
+			desc:  "missing gl_repository",
+			stdin: bytes.NewBufferString("a\nb\nc\nd\ne\nf\ng"),
+			req: gitalypb.PreReceiveHookRequest{
+				Repository: &gitalypb.Repository{
+					StorageName:  testRepo.GetStorageName(),
+					RelativePath: testRepo.GetRelativePath(),
+					GlRepository: "",
+				},
+				EnvironmentVariables: []string{
+					"GL_ID=key-123",
+					"GL_PROTOCOL=",
+					"GL_USERNAME=username",
+				},
+			},
 			status: 1,
 			stdout: "",
 			stderr: "FAIL",
@@ -133,7 +195,7 @@ func TestPreReceive(t *testing.T) {
 				require.NoError(t, err)
 			}
 
-			require.Equal(t, tc.status, status)
+			assert.Equal(t, tc.status, status)
 			assert.Equal(t, tc.stderr, text.ChompBytes(stderr.Bytes()), "hook stderr")
 			assert.Equal(t, tc.stdout, text.ChompBytes(stdout.Bytes()), "hook stdout")
 		})
diff --git a/internal/service/hooks/testdata/gitlab-shell/hooks/post-receive b/internal/service/hooks/testdata/gitlab-shell/hooks/post-receive
index aa0b008de..09af4c677 100755
--- a/internal/service/hooks/testdata/gitlab-shell/hooks/post-receive
+++ b/internal/service/hooks/testdata/gitlab-shell/hooks/post-receive
@@ -3,8 +3,8 @@
 # Tests inputs to post-receive
 
 abort("FAIL") if $stdin.read.empty?
-abort("FAIL") if %w[GL_ID GL_REPOSITORY].any? { |k| ENV[k].empty? }
+abort("FAIL") if %w[GL_ID GL_REPOSITORY GL_PROTOCOL GL_USERNAME].any? { |k| ENV[k].nil? || ENV[k].empty? }
 # git push options are not required. This is only for the sake of testing the values get through
-abort("FAIL") if %w[GIT_PUSH_OPTION_COUNT GIT_PUSH_OPTION_0].any? { |k| ENV[k].empty? }
+abort("FAIL") if %w[GIT_PUSH_OPTION_COUNT GIT_PUSH_OPTION_0].any? { |k| ENV[k].nil? || ENV[k].empty? }
 
 puts "OK"
diff --git a/internal/service/hooks/testdata/gitlab-shell/hooks/pre-receive b/internal/service/hooks/testdata/gitlab-shell/hooks/pre-receive
index fc967a761..12574b7b7 100755
--- a/internal/service/hooks/testdata/gitlab-shell/hooks/pre-receive
+++ b/internal/service/hooks/testdata/gitlab-shell/hooks/pre-receive
@@ -3,7 +3,7 @@
 # Tests inputs to pre-receive
 
 abort("FAIL") if $stdin.read.empty?
-abort("FAIL") if %w[GL_ID GL_REPOSITORY GL_PROTOCOL].any? { |k| ENV[k].empty? }
+abort("FAIL") if %w[GL_ID GL_REPOSITORY GL_PROTOCOL GL_USERNAME].any? { |k| ENV[k].nil? || ENV[k].empty? }
 
 puts "OK"
 
diff --git a/internal/service/hooks/testdata/gitlab-shell/hooks/update b/internal/service/hooks/testdata/gitlab-shell/hooks/update
index f7a121069..b9f19fd2f 100755
--- a/internal/service/hooks/testdata/gitlab-shell/hooks/update
+++ b/internal/service/hooks/testdata/gitlab-shell/hooks/update
@@ -4,6 +4,6 @@
 
 abort("FAIL") unless ARGV.size == 3
 abort("FAIL") if ARGV.any? { |arg| arg.empty? }
-abort("FAIL") if ENV['GL_ID'].empty?
+abort("FAIL") if %w[GL_ID GL_REPOSITORY GL_PROTOCOL GL_USERNAME].any? { |k| ENV[k].nil? || ENV[k].empty? }
 
 puts "OK"
diff --git a/internal/service/hooks/update.go b/internal/service/hooks/update.go
index e1ee167d4..c980dd92f 100644
--- a/internal/service/hooks/update.go
+++ b/internal/service/hooks/update.go
@@ -14,11 +14,6 @@ func (s *server) UpdateHook(in *gitalypb.UpdateHookRequest, stream gitalypb.Hook
 		return helper.ErrInvalidArgument(err)
 	}
 
-	hookEnv, err := hookRequestEnv(in)
-	if err != nil {
-		return helper.ErrInternal(err)
-	}
-
 	stdout := streamio.NewWriter(func(p []byte) error { return stream.Send(&gitalypb.UpdateHookResponse{Stdout: p}) })
 	stderr := streamio.NewWriter(func(p []byte) error { return stream.Send(&gitalypb.UpdateHookResponse{Stderr: p}) })
 
@@ -35,7 +30,7 @@ func (s *server) UpdateHook(in *gitalypb.UpdateHookRequest, stream gitalypb.Hook
 		nil,
 		stdout, stderr,
 		c,
-		hookEnv,
+		hookRequestEnv(in),
 	)
 
 	if err != nil {
diff --git a/internal/service/hooks/update_test.go b/internal/service/hooks/update_test.go
index 0a581f4fe..81e0f0639 100644
--- a/internal/service/hooks/update_test.go
+++ b/internal/service/hooks/update_test.go
@@ -64,11 +64,11 @@ func TestUpdate(t *testing.T) {
 		{
 			desc: "valid inputs",
 			req: gitalypb.UpdateHookRequest{
-				Repository: testRepo,
-				Ref:        []byte("master"),
-				OldValue:   "a",
-				NewValue:   "b",
-				KeyId:      "key",
+				Repository:           testRepo,
+				Ref:                  []byte("master"),
+				OldValue:             "a",
+				NewValue:             "b",
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
 			},
 			status: 0,
 			stdout: "OK",
@@ -77,11 +77,11 @@ func TestUpdate(t *testing.T) {
 		{
 			desc: "missing ref",
 			req: gitalypb.UpdateHookRequest{
-				Repository: testRepo,
-				Ref:        nil,
-				OldValue:   "a",
-				NewValue:   "b",
-				KeyId:      "key",
+				Repository:           testRepo,
+				Ref:                  nil,
+				OldValue:             "a",
+				NewValue:             "b",
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
 			},
 			status: 1,
 			stdout: "",
@@ -90,11 +90,11 @@ func TestUpdate(t *testing.T) {
 		{
 			desc: "missing old value",
 			req: gitalypb.UpdateHookRequest{
-				Repository: testRepo,
-				Ref:        []byte("master"),
-				OldValue:   "",
-				NewValue:   "b",
-				KeyId:      "key",
+				Repository:           testRepo,
+				Ref:                  []byte("master"),
+				OldValue:             "",
+				NewValue:             "b",
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
 			},
 			status: 1,
 			stdout: "",
@@ -103,24 +103,67 @@ func TestUpdate(t *testing.T) {
 		{
 			desc: "missing new value",
 			req: gitalypb.UpdateHookRequest{
-				Repository: testRepo,
-				Ref:        []byte("master"),
-				OldValue:   "a",
-				NewValue:   "",
-				KeyId:      "key",
+				Repository:           testRepo,
+				Ref:                  []byte("master"),
+				OldValue:             "a",
+				NewValue:             "",
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
 			},
 			status: 1,
 			stdout: "",
 			stderr: "FAIL",
 		},
 		{
-			desc: "missing key_id value",
+			desc: "missing gl_id value",
 			req: gitalypb.UpdateHookRequest{
-				Repository: testRepo,
-				Ref:        []byte("master"),
-				OldValue:   "a",
-				NewValue:   "b",
-				KeyId:      "",
+				Repository:           testRepo,
+				Ref:                  []byte("master"),
+				OldValue:             "a",
+				NewValue:             "b",
+				EnvironmentVariables: []string{"GL_ID=", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
+			},
+			status: 1,
+			stdout: "",
+			stderr: "FAIL",
+		},
+		{
+			desc: "missing gl_username value",
+			req: gitalypb.UpdateHookRequest{
+				Repository:           testRepo,
+				Ref:                  []byte("master"),
+				OldValue:             "a",
+				NewValue:             "b",
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=", "GL_PROTOCOL=protocol"},
+			},
+			status: 1,
+			stdout: "",
+			stderr: "FAIL",
+		},
+		{
+			desc: "missing gl_protocol value",
+			req: gitalypb.UpdateHookRequest{
+				Repository:           testRepo,
+				Ref:                  []byte("master"),
+				OldValue:             "a",
+				NewValue:             "b",
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL="},
+			},
+			status: 1,
+			stdout: "",
+			stderr: "FAIL",
+		},
+		{
+			desc: "missing gl_repository value",
+			req: gitalypb.UpdateHookRequest{
+				Repository: &gitalypb.Repository{
+					StorageName:  testRepo.GetStorageName(),
+					RelativePath: testRepo.GetRelativePath(),
+					GlRepository: "",
+				},
+				Ref:                  []byte("master"),
+				OldValue:             "a",
+				NewValue:             "b",
+				EnvironmentVariables: []string{"GL_ID=key-123", "GL_USERNAME=username", "GL_PROTOCOL=protocol"},
 			},
 			status: 1,
 			stdout: "",
@@ -152,7 +195,7 @@ func TestUpdate(t *testing.T) {
 				require.NoError(t, err)
 			}
 
-			require.Equal(t, tc.status, status)
+			assert.Equal(t, tc.status, status)
 			assert.Equal(t, tc.stderr, text.ChompBytes(stderr.Bytes()), "hook stderr")
 			assert.Equal(t, tc.stdout, text.ChompBytes(stdout.Bytes()), "hook stdout")
 		})
diff --git a/proto/go/gitalypb/hook.pb.go b/proto/go/gitalypb/hook.pb.go
index 75df02b07..1c5ae1b00 100644
--- a/proto/go/gitalypb/hook.pb.go
+++ b/proto/go/gitalypb/hook.pb.go
@@ -26,8 +26,7 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type PreReceiveHookRequest struct {
 	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
-	KeyId                string      `protobuf:"bytes,2,opt,name=key_id,json=keyId,proto3" json:"key_id,omitempty"`
-	Protocol             string      `protobuf:"bytes,3,opt,name=protocol,proto3" json:"protocol,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"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
@@ -66,18 +65,11 @@ func (m *PreReceiveHookRequest) GetRepository() *Repository {
 	return nil
 }
 
-func (m *PreReceiveHookRequest) GetKeyId() string {
+func (m *PreReceiveHookRequest) GetEnvironmentVariables() []string {
 	if m != nil {
-		return m.KeyId
+		return m.EnvironmentVariables
 	}
-	return ""
-}
-
-func (m *PreReceiveHookRequest) GetProtocol() string {
-	if m != nil {
-		return m.Protocol
-	}
-	return ""
+	return nil
 }
 
 func (m *PreReceiveHookRequest) GetStdin() []byte {
@@ -144,7 +136,7 @@ func (m *PreReceiveHookResponse) GetExitStatus() *ExitStatus {
 
 type PostReceiveHookRequest struct {
 	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
-	KeyId                string      `protobuf:"bytes,2,opt,name=key_id,json=keyId,proto3" json:"key_id,omitempty"`
+	EnvironmentVariables []string    `protobuf:"bytes,2,rep,name=environment_variables,json=environmentVariables,proto3" json:"environment_variables,omitempty"`
 	Stdin                []byte      `protobuf:"bytes,3,opt,name=stdin,proto3" json:"stdin,omitempty"`
 	GitPushOptions       []string    `protobuf:"bytes,4,rep,name=git_push_options,json=gitPushOptions,proto3" json:"git_push_options,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
@@ -184,11 +176,11 @@ func (m *PostReceiveHookRequest) GetRepository() *Repository {
 	return nil
 }
 
-func (m *PostReceiveHookRequest) GetKeyId() string {
+func (m *PostReceiveHookRequest) GetEnvironmentVariables() []string {
 	if m != nil {
-		return m.KeyId
+		return m.EnvironmentVariables
 	}
-	return ""
+	return nil
 }
 
 func (m *PostReceiveHookRequest) GetStdin() []byte {
@@ -262,7 +254,7 @@ func (m *PostReceiveHookResponse) GetExitStatus() *ExitStatus {
 
 type UpdateHookRequest struct {
 	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
-	KeyId                string      `protobuf:"bytes,2,opt,name=key_id,json=keyId,proto3" json:"key_id,omitempty"`
+	EnvironmentVariables []string    `protobuf:"bytes,2,rep,name=environment_variables,json=environmentVariables,proto3" json:"environment_variables,omitempty"`
 	Ref                  []byte      `protobuf:"bytes,3,opt,name=ref,proto3" json:"ref,omitempty"`
 	OldValue             string      `protobuf:"bytes,4,opt,name=old_value,json=oldValue,proto3" json:"old_value,omitempty"`
 	NewValue             string      `protobuf:"bytes,5,opt,name=new_value,json=newValue,proto3" json:"new_value,omitempty"`
@@ -303,11 +295,11 @@ func (m *UpdateHookRequest) GetRepository() *Repository {
 	return nil
 }
 
-func (m *UpdateHookRequest) GetKeyId() string {
+func (m *UpdateHookRequest) GetEnvironmentVariables() []string {
 	if m != nil {
-		return m.KeyId
+		return m.EnvironmentVariables
 	}
-	return ""
+	return nil
 }
 
 func (m *UpdateHookRequest) GetRef() []byte {
@@ -398,37 +390,37 @@ func init() {
 func init() { proto.RegisterFile("hook.proto", fileDescriptor_3eef30da1c11ee1b) }
 
 var fileDescriptor_3eef30da1c11ee1b = []byte{
-	// 480 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcb, 0x6e, 0xd3, 0x40,
-	0x14, 0x86, 0x35, 0xb9, 0x58, 0xc9, 0x49, 0x54, 0xca, 0x88, 0x06, 0x63, 0x04, 0x44, 0x5e, 0x79,
-	0x01, 0x49, 0xd4, 0x6e, 0x58, 0x57, 0x42, 0x82, 0x05, 0x22, 0x9a, 0x0a, 0x16, 0x20, 0x61, 0x39,
-	0xf1, 0xc1, 0x19, 0xc5, 0x78, 0xcc, 0xcc, 0x38, 0xad, 0x17, 0xf0, 0x1a, 0x5c, 0xde, 0x80, 0x1d,
-	0x4f, 0xc1, 0x43, 0xb1, 0x42, 0x9e, 0x71, 0xd3, 0xb4, 0x4d, 0x97, 0xcd, 0x6e, 0xfe, 0xf3, 0xcd,
-	0xb9, 0xcc, 0xaf, 0x63, 0x03, 0x2c, 0x84, 0x58, 0x8e, 0x72, 0x29, 0xb4, 0xa0, 0x4e, 0xc2, 0x75,
-	0x94, 0x96, 0x1e, 0xa4, 0x3c, 0xd3, 0x36, 0xe6, 0xf5, 0xd5, 0x22, 0x92, 0x18, 0x5b, 0xe5, 0xff,
-	0x22, 0x70, 0x30, 0x95, 0xc8, 0x70, 0x8e, 0x7c, 0x85, 0x2f, 0x85, 0x58, 0x32, 0xfc, 0x52, 0xa0,
-	0xd2, 0xf4, 0x39, 0x80, 0xc4, 0x5c, 0x28, 0xae, 0x85, 0x2c, 0x5d, 0x32, 0x24, 0x41, 0xef, 0x90,
-	0x8e, 0x6c, 0xc1, 0x11, 0x5b, 0x93, 0xe3, 0xd6, 0x8f, 0xbf, 0x4f, 0x09, 0xdb, 0xb8, 0x4b, 0x0f,
-	0xc0, 0x59, 0x62, 0x19, 0xf2, 0xd8, 0x6d, 0x0c, 0x49, 0xd0, 0x65, 0xed, 0x25, 0x96, 0xaf, 0x62,
-	0xea, 0x41, 0xc7, 0xf4, 0x9c, 0x8b, 0xd4, 0x6d, 0x1a, 0xb0, 0xd6, 0xf4, 0x1e, 0xb4, 0x95, 0x8e,
-	0x79, 0xe6, 0xb6, 0x86, 0x24, 0xe8, 0x33, 0x2b, 0xfc, 0xaf, 0x30, 0xb8, 0x3a, 0x9b, 0xca, 0x45,
-	0xa6, 0x90, 0x0e, 0xc0, 0x51, 0x3a, 0x16, 0x85, 0x36, 0x83, 0xf5, 0x59, 0xad, 0xea, 0x38, 0x4a,
-	0x69, 0x5a, 0xdb, 0x38, 0x4a, 0x49, 0x8f, 0xa0, 0x87, 0x67, 0x5c, 0x87, 0x4a, 0x47, 0xba, 0x50,
-	0xa6, 0xfd, 0xc6, 0x6b, 0x5e, 0x9c, 0x71, 0x7d, 0x62, 0x08, 0x03, 0x5c, 0x9f, 0xfd, 0xdf, 0x04,
-	0x06, 0x53, 0xa1, 0xf4, 0x2e, 0xcc, 0x59, 0x1b, 0xd0, 0xdc, 0x30, 0x80, 0x06, 0xb0, 0x9f, 0x70,
-	0x1d, 0xe6, 0x85, 0x5a, 0x84, 0x22, 0xd7, 0x5c, 0x64, 0xca, 0x6d, 0x0d, 0x9b, 0x41, 0x97, 0xed,
-	0x25, 0x5c, 0x4f, 0x0b, 0xb5, 0x78, 0x63, 0xa3, 0xfe, 0x37, 0xb8, 0x7f, 0x6d, 0xd4, 0x5d, 0x7a,
-	0xf5, 0x87, 0xc0, 0xdd, 0xb7, 0x79, 0x1c, 0xe9, 0xdb, 0xb5, 0x69, 0x1f, 0x9a, 0x12, 0x3f, 0xd5,
-	0x26, 0x55, 0x47, 0xfa, 0x10, 0xba, 0x22, 0x8d, 0xc3, 0x55, 0x94, 0x16, 0x68, 0xb6, 0xa7, 0xcb,
-	0x3a, 0x22, 0x8d, 0xdf, 0x55, 0xba, 0x82, 0x19, 0x9e, 0xd6, 0xb0, 0x6d, 0x61, 0x86, 0xa7, 0x06,
-	0xfa, 0x25, 0xd0, 0xcd, 0x89, 0x77, 0xe8, 0xd6, 0xe1, 0xcf, 0x06, 0xf4, 0xaa, 0xae, 0x27, 0x28,
-	0x57, 0x7c, 0x8e, 0xf4, 0x03, 0xec, 0x5d, 0x5e, 0x74, 0xfa, 0xe8, 0xbc, 0xc2, 0xd6, 0x8f, 0xd3,
-	0x7b, 0x7c, 0x13, 0xb6, 0xaf, 0xf0, 0x9d, 0x7f, 0xdf, 0x83, 0x46, 0xa7, 0x11, 0x90, 0x09, 0xa1,
-	0x1f, 0xe1, 0xce, 0x95, 0xd5, 0xa0, 0x17, 0xe9, 0x5b, 0xd7, 0xdb, 0x7b, 0x72, 0x23, 0xdf, 0x52,
-	0xff, 0x35, 0xc0, 0x85, 0x8f, 0xf4, 0xc1, 0x79, 0xea, 0xb5, 0x6d, 0xf0, 0xbc, 0x6d, 0xe8, 0x72,
-	0xc1, 0x09, 0x39, 0x9e, 0xbc, 0xaf, 0xae, 0xa5, 0xd1, 0x6c, 0x34, 0x17, 0x9f, 0xc7, 0xf6, 0xf8,
-	0x4c, 0xc8, 0x64, 0x6c, 0x93, 0xc7, 0xe6, 0x9f, 0x31, 0x4e, 0x44, 0xad, 0xf3, 0xd9, 0xcc, 0x31,
-	0xa1, 0xa3, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xad, 0xdb, 0x7f, 0xfa, 0x04, 0x00, 0x00,
+	// 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,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/hook.proto b/proto/hook.proto
index 7199a59fd..b29c3dc81 100644
--- a/proto/hook.proto
+++ b/proto/hook.proto
@@ -27,8 +27,7 @@ service HookService {
 
 message PreReceiveHookRequest {
   Repository repository = 1 [(target_repository)=true];
-  string key_id = 2;
-  string protocol = 3;
+  repeated string environment_variables = 2;
   bytes stdin = 4;
 }
 
@@ -40,7 +39,7 @@ message PreReceiveHookResponse{
 
 message PostReceiveHookRequest {
   Repository repository = 1 [(target_repository)=true];
-  string key_id = 2;
+  repeated string environment_variables = 2;
   bytes stdin = 3;
   repeated string git_push_options = 4;
 }
@@ -53,7 +52,7 @@ message PostReceiveHookResponse{
 
 message UpdateHookRequest {
   Repository repository = 1 [(target_repository)=true];
-  string key_id = 2;
+  repeated string environment_variables = 2;
   bytes ref = 3;
   string old_value = 4;
   string new_value = 5;
diff --git a/ruby/proto/gitaly/hook_pb.rb b/ruby/proto/gitaly/hook_pb.rb
index f356b7abb..26a13e941 100644
--- a/ruby/proto/gitaly/hook_pb.rb
+++ b/ruby/proto/gitaly/hook_pb.rb
@@ -8,8 +8,7 @@ require 'shared_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "gitaly.PreReceiveHookRequest" do
     optional :repository, :message, 1, "gitaly.Repository"
-    optional :key_id, :string, 2
-    optional :protocol, :string, 3
+    repeated :environment_variables, :string, 2
     optional :stdin, :bytes, 4
   end
   add_message "gitaly.PreReceiveHookResponse" do
@@ -19,7 +18,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   end
   add_message "gitaly.PostReceiveHookRequest" do
     optional :repository, :message, 1, "gitaly.Repository"
-    optional :key_id, :string, 2
+    repeated :environment_variables, :string, 2
     optional :stdin, :bytes, 3
     repeated :git_push_options, :string, 4
   end
@@ -30,7 +29,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   end
   add_message "gitaly.UpdateHookRequest" do
     optional :repository, :message, 1, "gitaly.Repository"
-    optional :key_id, :string, 2
+    repeated :environment_variables, :string, 2
     optional :ref, :bytes, 3
     optional :old_value, :string, 4
     optional :new_value, :string, 5