From 4edd816483173fc31503c57c767f9b3e30ba5395 Mon Sep 17 00:00:00 2001 From: Sami Hiltunen Date: Fri, 28 Jul 2023 19:43:28 +0300 Subject: Include transaction ID in the hook payload The reference transaction hook needs the transaction ID in order to stage the reference changes in the transaction. This commit includes the transaction ID in the hook payload. --- cmd/gitaly-hooks/hooks_test.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index 1503e7077..c8886caac 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -22,6 +22,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" @@ -79,7 +80,11 @@ func envForHooks(tb testing.TB, ctx context.Context, cfg config.Cfg, repo *gital Username: glHookValues.GLUsername, Protocol: glHookValues.GLProtocol, RemoteIP: glHookValues.RemoteIP, - }, git.AllHooks, featureFlags(ctx)).Env() + }, + git.AllHooks, + featureFlags(ctx), + storage.ExtractTransactionID(ctx), + ).Env() require.NoError(tb, err) env := append(command.AllowedEnvironment(os.Environ()), []string{ @@ -453,6 +458,7 @@ func TestHooksPostReceiveFailed(t *testing.T) { }, git.PostReceiveHook, featureFlags(ctx), + storage.ExtractTransactionID(ctx), ).Env() require.NoError(t, err) @@ -557,6 +563,7 @@ func TestRequestedHooks(t *testing.T) { nil, git.AllHooks&^hook, nil, + 0, ).Env() require.NoError(t, err) @@ -579,6 +586,7 @@ func TestRequestedHooks(t *testing.T) { nil, hook, nil, + 0, ).Env() require.NoError(t, err) -- cgit v1.2.3