diff --git a/internal/service/worker.go b/internal/service/worker.go index f0aaf58..3126e15 100644 --- a/internal/service/worker.go +++ b/internal/service/worker.go @@ -3,7 +3,6 @@ package service import ( "bytes" "context" - "encoding/base64" "errors" "fmt" "io" @@ -211,10 +210,6 @@ func (w *Worker) fetchFile(ctx context.Context, path string) (_ []byte, err erro span, ctx := ddTracer.StartSpanFromContext(ctx, "Worker.fetchFile") defer func() { span.Finish(ddTracer.WithError(err)) }() - if strings.HasPrefix(path, "dropbox/") { - return w.fetchFileFromDropbox(ctx, path) - } - var bucket, filePath string switch { case strings.HasPrefix(path, "s3://"): @@ -263,40 +258,6 @@ func (w *Worker) fetchFile(ctx context.Context, path string) (_ []byte, err erro return payload, nil } -func (w *Worker) fetchFileFromDropbox(ctx context.Context, path string) (_ []byte, err error) { - span, ctx := ddTracer.StartSpanFromContext(ctx, "Worker.fetchFileFromDropbox") - defer func() { span.Finish(ddTracer.WithError(err)) }() - - fileURL, err := base64.RawURLEncoding.DecodeString(strings.TrimPrefix(path, "dropbox/")) - if err != nil { - return nil, newClientError(fmt.Errorf("fail to decode base64 path: %w", err)) - } - - req, err := http.NewRequestWithContext(ctx, http.MethodGet, string(fileURL), nil) - if err != nil { - return nil, fmt.Errorf("fail to create the HTTP request: %w", err) - } - - resp, err := w.HTTPClient.Do(req) - if err != nil { - return nil, fmt.Errorf("fail to download file: %w", err) - } - defer resp.Body.Close() - - if resp.StatusCode == http.StatusNotFound { - return nil, newNotFoundError(errors.New("dropbox returned 404")) - } else if resp.StatusCode < 200 || resp.StatusCode >= 300 { - return nil, fmt.Errorf("invalid status code '%d'", resp.StatusCode) - } - - payload, err := io.ReadAll(resp.Body) - if err != nil { - return nil, fmt.Errorf("fail to read the body response: %w", err) - } - - return payload, nil -} - func (w *Worker) fetchFileFromInternet(ctx context.Context, uri string) (_ []byte, err error) { span, ctx := ddTracer.StartSpanFromContext(ctx, "Worker.fetchFileFromInternet") defer func() { span.Finish(ddTracer.WithError(err)) }() diff --git a/internal/transport/middleware.go b/internal/transport/middleware.go index 99d18fa..6380ed7 100644 --- a/internal/transport/middleware.go +++ b/internal/transport/middleware.go @@ -71,9 +71,6 @@ func (m middleware) logger(next http.Handler) http.Handler { if token := r.URL.Query().Get("token"); token != "" { requestURI = strings.ReplaceAll(requestURI, token, "[REDACTED]") } - if strings.HasPrefix(requestURI, "/documents/dropbox/") { - requestURI = "/documents/dropbox/[REDACTED]" - } log, err := m.traceExtractor(r.Context(), m.log) if err != nil { @@ -135,9 +132,6 @@ func (m middleware) logger(next http.Handler) http.Handler { func (m middleware) datadogTracer(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { path := r.URL.Path - if strings.HasPrefix(path, "/documents/dropbox/") { - path = "/documents/dropbox/[REDACTED]" - } opts := []ddtrace.StartSpanOption{ tracer.SpanType(ext.SpanTypeWeb), diff --git a/internal/transport/server.go b/internal/transport/server.go index dcbc127..22713b5 100644 --- a/internal/transport/server.go +++ b/internal/transport/server.go @@ -98,6 +98,5 @@ func (s *Server) initHandler() { s.router.MethodNotAllowed(h.methodNotAllowed) s.router.NotFound(h.notFound) s.router.Get("/health", h.health) - s.router.Get("/documents/dropbox/*", h.document) s.router.Get("/documents/*", h.document) }