From 336aa7ac5f0fd96c32115c871710509f3b1bf42b Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Thu, 25 Jul 2024 11:47:06 +0530 Subject: [PATCH] [server] Make linter happy --- server/pkg/controller/file.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go index 5bb4f47bf9..c001089d4d 100644 --- a/server/pkg/controller/file.go +++ b/server/pkg/controller/file.go @@ -371,11 +371,10 @@ func (c *FileController) GetCastFileUrl(ctx *gin.Context, fileID int64, objType return c.getSignedURLForType(ctx, fileID, objType) } -func (c *FileController) getSignedURLForType(_ *gin.Context, fileID int64, objType ente.ObjectType) (string, error) { - // todo:(neeraj) enable it back after wasabi changes - //if isCliRequest(ctx) { - // return c.getWasabiSignedUrlIfAvailable(fileID, objType) - //} +func (c *FileController) getSignedURLForType(ctx *gin.Context, fileID int64, objType ente.ObjectType) (string, error) { + if isCliRequest(ctx) { + return c.getWasabiSignedUrlIfAvailable(fileID, objType) + } s3Object, err := c.ObjectRepo.GetObject(fileID, objType) if err != nil { return "", stacktrace.Propagate(err, "") @@ -383,10 +382,14 @@ func (c *FileController) getSignedURLForType(_ *gin.Context, fileID int64, objTy return c.getHotDcSignedUrl(s3Object.ObjectKey) } +// ignore lint unused inspection func isCliRequest(ctx *gin.Context) bool { + // todo: (neeraj) remove this short-circuit after wasabi migration + return false // check if user-agent contains go-resty - userAgent := ctx.Request.Header.Get("User-Agent") - return strings.Contains(userAgent, "go-resty") + //userAgent := ctx.Request.Header.Get("User-Agent") + //return strings.Contains(userAgent, "go-resty") + } // getWasabiSignedUrlIfAvailable returns a signed URL for the given fileID and objectType. It prefers wasabi over b2