From bc592cafdc319b3487f58d60846244acd98f1370 Mon Sep 17 00:00:00 2001 From: Monthon Klongklaew Date: Wed, 18 May 2022 10:11:40 +0000 Subject: [PATCH 1/2] Add Goofys as user agent for s3 request --- internal/backend_s3.go | 4 ++++ internal/flags.go | 3 ++- main.go | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/backend_s3.go b/internal/backend_s3.go index 3ee2d489..b8d82241 100644 --- a/internal/backend_s3.go +++ b/internal/backend_s3.go @@ -124,6 +124,10 @@ func (s *S3Backend) newS3() { s.setV2Signer(&s.S3.Handlers) } s.S3.Handlers.Sign.PushBack(addAcceptEncoding) + s.S3.Handlers.Build.PushFrontNamed(request.NamedHandler{ + Name: "UserAgentHandler", + Fn: request.MakeAddToUserAgentHandler("Goofys", VersionNumber+"-"+VersionHash), + }) } func (s *S3Backend) detectBucketLocationByHEAD() (err error, isAws bool) { diff --git a/internal/flags.go b/internal/flags.go index f18633a8..0cea21f4 100644 --- a/internal/flags.go +++ b/internal/flags.go @@ -77,6 +77,7 @@ COPYRIGHT: ` } +var VersionNumber string var VersionHash string func NewApp() (app *cli.App) { @@ -86,7 +87,7 @@ func NewApp() (app *cli.App) { app = &cli.App{ Name: "goofys", - Version: "0.24.0-" + VersionHash, + Version: VersionNumber + "-" + VersionHash, Usage: "Mount an S3 bucket locally", HideHelp: true, Writer: os.Stderr, diff --git a/main.go b/main.go index e2e06a1f..112b8595 100644 --- a/main.go +++ b/main.go @@ -134,6 +134,7 @@ func massageArg0() { var Version = "use `make build' to fill version hash correctly" func main() { + VersionNumber = "0.24.0" VersionHash = Version massagePath() From f236c0b86b8828cb3c371a54b6441b06c638582f Mon Sep 17 00:00:00 2001 From: Monthon Klongklaew Date: Thu, 19 May 2022 08:37:47 +0000 Subject: [PATCH 2/2] change name to lower case --- internal/backend_s3.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/backend_s3.go b/internal/backend_s3.go index b8d82241..aa42b0fd 100644 --- a/internal/backend_s3.go +++ b/internal/backend_s3.go @@ -126,7 +126,7 @@ func (s *S3Backend) newS3() { s.S3.Handlers.Sign.PushBack(addAcceptEncoding) s.S3.Handlers.Build.PushFrontNamed(request.NamedHandler{ Name: "UserAgentHandler", - Fn: request.MakeAddToUserAgentHandler("Goofys", VersionNumber+"-"+VersionHash), + Fn: request.MakeAddToUserAgentHandler("goofys", VersionNumber+"-"+VersionHash), }) }