fix: resolve linting and test issues

aditmeno · aditmeno · commit a97336ce2bf6 · 2025-11-24T02:56:47.000+01:00
Changes:
1. Fixed gci formatting in session.go - proper tab indentation
2. Fixed gci formatting in session_test.go - added space before struct{
3. Fixed fieldalignment in vals.go - reordered Options fields for optimal memory layout
4. Updated test expectation - changed default behavior test to expect secure default (no logging)

All linting checks now pass (0 issues)
All tests now pass (4/4 test suites passing)

Signed-off-by: Aditya Menon &lt;amenon@canarytechnologies.com&gt;
diff --git a/pkg/awsclicompat/session.go b/pkg/awsclicompat/session.go
@@ -51,7 +51,7 @@ func parseAWSLogLevel(defaultLevel string) aws.ClientLogMode {
 		return aws.LogRetries | aws.LogRequest
 	case "verbose":
 		return aws.LogRetries | aws.LogRequest | aws.LogRequestWithBody |
-		       aws.LogResponse | aws.LogResponseWithBody | aws.LogSigning
+			aws.LogResponse | aws.LogResponseWithBody | aws.LogSigning
 	}
 
 	// Parse individual flags (comma-separated)
diff --git a/pkg/awsclicompat/session_test.go b/pkg/awsclicompat/session_test.go
@@ -14,9 +14,9 @@ func TestParseAWSLogLevel(t *testing.T) {
 		expected aws.ClientLogMode
 	}{
 		{
-			name:     "empty environment variable defaults to retries and request",
+			name:     "empty environment variable defaults to no logging (secure default)",
 			envValue: "",
-			expected: aws.LogRetries | aws.LogRequest,
+			expected: 0,
 		},
 		{
 			name:     "off disables all logging",
@@ -151,7 +151,7 @@ func TestDefaultSecureBehavior(t *testing.T) {
 
 // TestPresetLevels tests the new preset log levels
 func TestPresetLevels(t *testing.T) {
-	tests := []struct{
+	tests := []struct {
 		name     string
 		level    string
 		expected aws.ClientLogMode
diff --git a/vals.go b/vals.go
@@ -531,18 +531,18 @@ func IgnorePrefix(p string) Option {
 }
 
 type Options struct {
-	LogOutput             io.Writer
-	CacheSize             int
-	ExcludeSecret         bool
-	FailOnMissingKeyInMap bool
+	LogOutput io.Writer
 	// AWSLogLevel controls AWS SDK logging. Valid values:
 	// - "off" or "" (default): No AWS SDK logging
 	// - "minimal": Log only retries
 	// - "standard": Log retries and requests (previous default)
 	// - "verbose": Log everything (requests, responses, signing)
 	// - Custom: Comma-separated values (e.g., "request,response")
 	// This is overridden by AWS_SDK_GO_LOG_LEVEL environment variable if set
-	AWSLogLevel string
+	AWSLogLevel           string
+	CacheSize             int
+	ExcludeSecret         bool
+	FailOnMissingKeyInMap bool
 }
 
 var unsafeCharRegexp = regexp.MustCompile(`[^\w@%+=:,./-]`)

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func parseAWSLogLevel(defaultLevel string) aws.ClientLogMode {`
`51`	`51`	`return aws.LogRetries \| aws.LogRequest`
`52`	`52`	`case "verbose":`
`53`	`53`	`return aws.LogRetries \| aws.LogRequest \| aws.LogRequestWithBody \|`
`54`		`- aws.LogResponse \| aws.LogResponseWithBody \| aws.LogSigning`
	`54`	`+ aws.LogResponse \| aws.LogResponseWithBody \| aws.LogSigning`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// Parse individual flags (comma-separated)`