From 40da4a31d356cb1f5094d65cbf4fc6222fb411ff Mon Sep 17 00:00:00 2001 From: Ben McClelland Date: Thu, 9 Oct 2025 12:19:00 -0700 Subject: [PATCH] chore: cleanup unused constants We have some leftover constants from some previous changes. This just cleans up all that are no longer needed. --- backend/scoutfs/scoutfs.go | 2 -- s3api/controllers/base.go | 1 - s3api/utils/chunk-reader.go | 2 +- s3api/utils/signed-chunk-reader.go | 1 - s3log/file.go | 6 +++--- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/backend/scoutfs/scoutfs.go b/backend/scoutfs/scoutfs.go index b6d98cb..784ee97 100644 --- a/backend/scoutfs/scoutfs.go +++ b/backend/scoutfs/scoutfs.go @@ -94,9 +94,7 @@ const ( const ( // ScoutFS special xattr types systemPrefix = "scoutfs.hide." - onameAttr = systemPrefix + "objname" flagskey = systemPrefix + "sam_flags" - stagecopykey = systemPrefix + "sam_stagereq" ) const ( diff --git a/s3api/controllers/base.go b/s3api/controllers/base.go index 3e1374c..d2146f3 100644 --- a/s3api/controllers/base.go +++ b/s3api/controllers/base.go @@ -41,7 +41,6 @@ type S3ApiController struct { const ( // time constants - iso8601Format = "20060102T150405Z" iso8601TimeFormatExtended = "Mon Jan _2 15:04:05 2006" timefmt = "Mon, 02 Jan 2006 15:04:05 GMT" diff --git a/s3api/utils/chunk-reader.go b/s3api/utils/chunk-reader.go index 15f1321..99ee0e9 100644 --- a/s3api/utils/chunk-reader.go +++ b/s3api/utils/chunk-reader.go @@ -174,7 +174,7 @@ func NewChunkReader(ctx *fiber.Ctx, r io.Reader, authdata AuthData, region, secr } if decContLength > maxObjSizeLimit { - debuglogger.Logf("the object size exceeds the allowed limit: (size): %v, (limit): %v", decContLength, maxObjSizeLimit) + debuglogger.Logf("the object size exceeds the allowed limit: (size): %v, (limit): %v", decContLength, int64(maxObjSizeLimit)) return nil, s3err.GetAPIError(s3err.ErrEntityTooLarge) } diff --git a/s3api/utils/signed-chunk-reader.go b/s3api/utils/signed-chunk-reader.go index a48b4c8..58d8ade 100644 --- a/s3api/utils/signed-chunk-reader.go +++ b/s3api/utils/signed-chunk-reader.go @@ -39,7 +39,6 @@ import ( // https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html const ( - chunkHdrDelim = "\r\n" zeroLenSig = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" awsV4 = "AWS4" awsS3Service = "s3" diff --git a/s3log/file.go b/s3log/file.go index 7c337ab..e2e8b41 100644 --- a/s3log/file.go +++ b/s3log/file.go @@ -29,7 +29,7 @@ import ( ) const ( - logFileMode = 0600 + logFileMode = 0644 timeFormat = "02/January/2006:15:04:05 -0700" ) @@ -45,12 +45,12 @@ var _ AuditLogger = &FileLogger{} // InitFileLogger initializes audit logs to local file func InitFileLogger(logname string) (AuditLogger, error) { - f, err := os.OpenFile(logname, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) + f, err := os.OpenFile(logname, os.O_APPEND|os.O_CREATE|os.O_WRONLY, logFileMode) if err != nil { return nil, fmt.Errorf("open log: %w", err) } - f.WriteString(fmt.Sprintf("log starts %v\n", time.Now())) + fmt.Fprintf(f, "log starts %v\n", time.Now()) return &FileLogger{logfile: logname, f: f}, nil }