From 8ef105cbe55b3095a233aeba9e1c708beeb52272 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 7 May 2021 13:12:04 +0200 Subject: metadata: Move transaction metadata into shared package Now that we have a shared `internal/transaction` package, it makes sense to move over transactional metadata there too given that it's used by both Gitaly and Praefect. This commit thus moves the package and renames it to `txinfo`, which gives a lot more context compared to the generic `metadata` name. --- cmd/gitaly-hooks/hooks_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd/gitaly-hooks') diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index a25837a6a..d4e14c000 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -28,10 +28,10 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/gitlab" gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" "gitlab.com/gitlab-org/gitaly/internal/testhelper" "gitlab.com/gitlab-org/gitaly/internal/testhelper/testcfg" "gitlab.com/gitlab-org/gitaly/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/internal/transaction/txinfo" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc" ) @@ -399,12 +399,12 @@ func TestHooksPostReceiveFailed(t *testing.T) { hooksPayload, err := git.NewHooksPayload( cfg, repo, - &metadata.Transaction{ + &txinfo.Transaction{ ID: 1, Node: "node", Primary: tc.primary, }, - &metadata.PraefectServer{ + &txinfo.PraefectServer{ SocketPath: "/path/to/socket", Token: "secret", }, -- cgit v1.2.3