diff --git a/internal/bundleuri/git_config.go b/internal/bundleuri/git_config.go index 6350311532dc066647501038e4abee35caa97d70..98e72e32dbee77d9a38891485e4c57024193cd3d 100644 --- a/internal/bundleuri/git_config.go +++ b/internal/bundleuri/git_config.go @@ -8,6 +8,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" "gitlab.com/gitlab-org/gitaly/v16/internal/git" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v16/internal/log" ) // InfoRefsGitConfig return a slice of git.ConfigPairs you can inject into the @@ -33,6 +34,7 @@ func InfoRefsGitConfig(ctx context.Context) []git.ConfigPair { // slice is returned without error. func UploadPackGitConfig( ctx context.Context, + logger log.Logger, backupLocator backup.Locator, backupSink backup.Sink, repo storage.Repository, @@ -57,6 +59,8 @@ func UploadPackGitConfig( return []git.ConfigPair{} } + logger.WithField("bundle_uri", uri) + return []git.ConfigPair{ { Key: "uploadpack.advertiseBundleURIs", diff --git a/internal/bundleuri/git_config_test.go b/internal/bundleuri/git_config_test.go index c14c3625b82ae0f4f4dd557a5b2a063a5f49b13c..b2eded6cc1d7c527eba299c4ad75463f5bc27be2 100644 --- a/internal/bundleuri/git_config_test.go +++ b/internal/bundleuri/git_config_test.go @@ -138,7 +138,7 @@ func testUploadPackGitConfig(t *testing.T, ctx context.Context) { sink = dummySink{signedURLFunc: tc.signedURLFunc} } - actual := UploadPackGitConfig(ctx, locator, sink, repo) + actual := UploadPackGitConfig(ctx, testhelper.NewLogger(t), locator, sink, repo) if featureflag.BundleURI.IsEnabled(ctx) && tc.expectedConfig != nil { require.Equal(t, tc.expectedConfig, actual) diff --git a/internal/gitaly/service/smarthttp/upload_pack.go b/internal/gitaly/service/smarthttp/upload_pack.go index e16fe92d533ccf33eadf3b263383c406ad0d322d..1197e72143b5af9ac777be75b7ab59440a217aa6 100644 --- a/internal/gitaly/service/smarthttp/upload_pack.go +++ b/internal/gitaly/service/smarthttp/upload_pack.go @@ -107,7 +107,13 @@ func (s *server) runUploadPack(ctx context.Context, req *gitalypb.PostUploadPack }() gitConfig = append(gitConfig, - bundleuri.UploadPackGitConfig(ctx, s.backupLocator, s.backupSink, req.GetRepository())...) + bundleuri.UploadPackGitConfig( + ctx, + s.logger, + s.backupLocator, + s.backupSink, + req.GetRepository())..., + ) commandOpts := []git.CmdOpt{ git.WithStdin(stdin), diff --git a/internal/gitaly/service/ssh/upload_pack.go b/internal/gitaly/service/ssh/upload_pack.go index 1036d8f520f7c0491864fa1ad2fc5217a28b4882..c052e34f507a9f96e94b7c3e883afcae22766bc1 100644 --- a/internal/gitaly/service/ssh/upload_pack.go +++ b/internal/gitaly/service/ssh/upload_pack.go @@ -113,7 +113,13 @@ func (s *server) sshUploadPack(ctx context.Context, req sshUploadPackRequest, st }() config = append(config, - bundleuri.UploadPackGitConfig(ctx, s.backupLocator, s.backupSink, req.GetRepository())...) + bundleuri.UploadPackGitConfig( + ctx, + s.logger, + s.backupLocator, + s.backupSink, + req.GetRepository())..., + ) commandOpts := []git.CmdOpt{ git.WithGitProtocol(s.logger, req),