From fddc2dc0b632c95b357cf502d14b91d575d4ccb7 Mon Sep 17 00:00:00 2001 From: Joakim Olsson Date: Mon, 29 Jan 2024 09:17:28 +0100 Subject: [PATCH] fix: trim prefix slash --- server/server.go | 2 +- server/server_test.go | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server/server.go b/server/server.go index e4f7474..8ec8c66 100644 --- a/server/server.go +++ b/server/server.go @@ -64,7 +64,7 @@ func (s *Server) HandleHealth(w http.ResponseWriter, _ *http.Request) { func (s *Server) upload(path string, w http.ResponseWriter, req *http.Request) { s.logger.Infof("uploading to %s", path) - err := s.store.Store(path, req.Body) + err := s.store.Store(strings.TrimPrefix(path, "/"), req.Body) if err != nil { s.logger.WithError(err).Error("error storing object in bucket") w.WriteHeader(http.StatusInternalServerError) diff --git a/server/server_test.go b/server/server_test.go index 287eea3..7578285 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -4,7 +4,6 @@ import ( "crypto/rand" "fmt" "io" - "io/ioutil" "net/http" "net/http/httptest" "net/url" @@ -91,8 +90,8 @@ func TestServer(t *testing.T) { args: args{ store: func(t *testing.T) StoreFunc { return func(path string, content io.Reader) error { - assert.Equal(t, "/some/file", path) - temp, err := ioutil.ReadAll(content) + assert.Equal(t, "some/file", path) + temp, err := io.ReadAll(content) assert.NoError(t, err) assert.Equal(t, "abc", string(temp)) return fmt.Errorf("error") @@ -175,8 +174,8 @@ func TestServer(t *testing.T) { args: args{ store: func(t *testing.T) StoreFunc { return func(path string, content io.Reader) error { - assert.Equal(t, "/20211125/588b41ebf261820104615b83201c729bd16016d6e43649b28b0ef77d54ca5aaf8da0ce74ae3f20a4", path) - temp, err := ioutil.ReadAll(content) + assert.Equal(t, "20211125/588b41ebf261820104615b83201c729bd16016d6e43649b28b0ef77d54ca5aaf8da0ce74ae3f20a4", path) + temp, err := io.ReadAll(content) assert.NoError(t, err) assert.Equal(t, "abc", string(temp)) return fmt.Errorf("error")