diff options
| -rw-r--r-- | cmd/gitaly-lfs-smudge/lfs_smudge.go | 10 | ||||
| -rw-r--r-- | cmd/gitaly-lfs-smudge/lfs_smudge_test.go | 3 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 |
4 files changed, 4 insertions, 15 deletions
diff --git a/cmd/gitaly-lfs-smudge/lfs_smudge.go b/cmd/gitaly-lfs-smudge/lfs_smudge.go index e8aca4517..a36bf3877 100644 --- a/cmd/gitaly-lfs-smudge/lfs_smudge.go +++ b/cmd/gitaly-lfs-smudge/lfs_smudge.go @@ -8,7 +8,6 @@ import ( "path/filepath" "github.com/git-lfs/git-lfs/lfs" - "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" "gitlab.com/gitlab-org/labkit/log" @@ -85,15 +84,6 @@ func handleSmudge(to io.Writer, from io.Reader, config configProvider) (io.Reade return contents, fmt.Errorf("error loading LFS object: %v", err) } - // This cannot go to STDOUT or it will corrupt the stream - logger.WithFields(logrus.Fields{ - "status": response.StatusCode, - "gl_repository": glRepository, - "oid": ptr.Oid, - "content_length_bytes": response.ContentLength, - "path": path, - }).Info("completed HTTP request") - if response.StatusCode == 200 { return response.Body, nil } diff --git a/cmd/gitaly-lfs-smudge/lfs_smudge_test.go b/cmd/gitaly-lfs-smudge/lfs_smudge_test.go index 5833ca95c..4a05d1e58 100644 --- a/cmd/gitaly-lfs-smudge/lfs_smudge_test.go +++ b/cmd/gitaly-lfs-smudge/lfs_smudge_test.go @@ -94,8 +94,7 @@ func TestSuccessfulLfsSmudge(t *testing.T) { require.Contains(t, d, `"msg":"Finished HTTP request"`) require.Contains(t, d, `"status":200`) - require.Contains(t, d, `"gl_repository":"project-1"`) - require.Contains(t, d, `"oid":"`+lfsOid) + require.Contains(t, d, `"content_length_bytes":`) } func TestUnsuccessfulLfsSmudge(t *testing.T) { @@ -26,7 +26,7 @@ require ( github.com/sirupsen/logrus v1.7.0 github.com/stretchr/testify v1.5.1 github.com/uber/jaeger-client-go v2.15.0+incompatible - gitlab.com/gitlab-org/gitlab-shell v1.9.8-0.20201015160834-d2f888583c77 + gitlab.com/gitlab-org/gitlab-shell v0.0.0-20201103045505-ac9fee4d247c gitlab.com/gitlab-org/labkit v0.0.0-20201014124351-eb1fe6499318 go.uber.org/atomic v1.4.0 // indirect golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect @@ -411,8 +411,8 @@ github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZ github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= gitlab.com/gitlab-org/gitaly v1.68.0/go.mod h1:/pCsB918Zu5wFchZ9hLYin9WkJ2yQqdVNz0zlv5HbXg= -gitlab.com/gitlab-org/gitlab-shell v1.9.8-0.20201015160834-d2f888583c77 h1:4OJ1ZTsIKyKSmTGrb8vne+kQGWIp20zZ2jv54ny/cY8= -gitlab.com/gitlab-org/gitlab-shell v1.9.8-0.20201015160834-d2f888583c77/go.mod h1:5QSTbpAHY2v0iIH5uHh2KA9w7sPUqPmnLjDApI/sv1U= +gitlab.com/gitlab-org/gitlab-shell v0.0.0-20201103045505-ac9fee4d247c h1:OC7ONEbdhI8rCC/wNfFQp+NZBhSWWZaIQwWnunptOg4= +gitlab.com/gitlab-org/gitlab-shell v0.0.0-20201103045505-ac9fee4d247c/go.mod h1:5QSTbpAHY2v0iIH5uHh2KA9w7sPUqPmnLjDApI/sv1U= gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c/go.mod h1:rYhLgfrbEcyfinG+R3EvKu6bZSsmwQqcXzLfHWSfUKM= gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c/go.mod h1:rYhLgfrbEcyfinG+R3EvKu6bZSsmwQqcXzLfHWSfUKM= gitlab.com/gitlab-org/labkit v0.0.0-20200908084045-45895e129029 h1:L7b9YLsU3zBfTShAPl4fjhgFdfSvuo9tu4VobJdcKDs= |