chore(golangci-lint: fix various

Author: grokify

cmd/ogen-fixerror/main.go

@@ -47,17 +47,14 @@ func run(args []string) error {
 		return fmt.Errorf("read file: %w", err)
 	}
 
-	fixed, count, err := FixUnexpectedStatusCodeBody(content)
-	if err != nil {
-		return fmt.Errorf("fix error body: %w", err)
-	}
+	fixed, count := FixUnexpectedStatusCodeBody(content)
 
 	if count == 0 {
 		fmt.Printf("No UnexpectedStatusCode returns needed fixing in %s\n", filename)
 		return nil
 	}
 
-	if err := os.WriteFile(filename, fixed, 0644); err != nil {
+	if err := os.WriteFile(filename, fixed, 0600); err != nil {
 		return fmt.Errorf("write file: %w", err)
 	}
 
@@ -67,7 +64,7 @@ func run(args []string) error {
 
 // FixUnexpectedStatusCodeBody finds returns of validate.UnexpectedStatusCodeWithResponse
 // and adds code to buffer the response body before returning.
-func FixUnexpectedStatusCodeBody(content []byte) ([]byte, int, error) {
+func FixUnexpectedStatusCodeBody(content []byte) ([]byte, int) {
 	// Check if we need to add imports
 	needsImports := !bytes.Contains(content, []byte(`"bytes"`)) ||
 		!bytes.Contains(content, []byte(`"io"`))
@@ -100,7 +97,7 @@ func FixUnexpectedStatusCodeBody(content []byte) ([]byte, int, error) {
 		fixed = addImports(fixed)
 	}
 
-	return fixed, count, nil
+	return fixed, count
 }
 
 // addImports ensures "bytes" and "io" are in the import block

cmd/ogen-fixerror/main_test.go

@@ -26,10 +26,7 @@ func decodeTestResponse(resp *http.Response) (res TestRes, _ error) {
 	resp.Body = io.NopCloser(bytes.NewReader(body))
 	return res, validate.UnexpectedStatusCodeWithResponse(resp)`
 
-	fixed, count, err := FixUnexpectedStatusCodeBody([]byte(input))
-	if err != nil {
-		t.Fatalf("FixUnexpectedStatusCodeBody() error = %v", err)
-	}
+	fixed, count := FixUnexpectedStatusCodeBody([]byte(input))
 
 	if count != 1 {
 		t.Errorf("count = %d, want 1", count)
@@ -64,10 +61,7 @@ func decode2(resp *http.Response) (res Res2, _ error) {
 }
 `
 
-	fixed, count, err := FixUnexpectedStatusCodeBody([]byte(input))
-	if err != nil {
-		t.Fatalf("FixUnexpectedStatusCodeBody() error = %v", err)
-	}
+	fixed, count := FixUnexpectedStatusCodeBody([]byte(input))
 
 	if count != 2 {
 		t.Errorf("count = %d, want 2", count)
@@ -94,10 +88,7 @@ func decodeTest(resp *http.Response) (res TestRes, _ error) {
 }
 `
 
-	fixed, count, err := FixUnexpectedStatusCodeBody([]byte(input))
-	if err != nil {
-		t.Fatalf("FixUnexpectedStatusCodeBody() error = %v", err)
-	}
+	fixed, count := FixUnexpectedStatusCodeBody([]byte(input))
 
 	if count != 1 {
 		t.Errorf("count = %d, want 1", count)

cmd/ogen-fixnull/main.go

@@ -44,17 +44,14 @@ func run(args []string) error {
 		return fmt.Errorf("read file: %w", err)
 	}
 
-	fixed, count, err := FixOptDecodeNullHandling(content)
-	if err != nil {
-		return fmt.Errorf("fix null handling: %w", err)
-	}
+	fixed, count := FixOptDecodeNullHandling(content)
 
 	if count == 0 {
 		fmt.Printf("No Opt* Decode methods needed fixing in %s\n", filename)
 		return nil
 	}
 
-	if err := os.WriteFile(filename, fixed, 0644); err != nil {
+	if err := os.WriteFile(filename, fixed, 0600); err != nil {
 		return fmt.Errorf("write file: %w", err)
 	}
 
@@ -88,7 +85,7 @@ func run(args []string) error {
 //		}
 //		o.Set = true
 //		if err := o.Value.Decode(d); err != nil {
-func FixOptDecodeNullHandling(content []byte) ([]byte, int, error) {
+func FixOptDecodeNullHandling(content []byte) ([]byte, int) {
 	// Pattern matches Opt* Decode methods that are missing null handling.
 	// It captures:
 	// 1. The type name (e.g., OptManualVerificationResponseModel)
@@ -142,5 +139,5 @@ func FixOptDecodeNullHandling(content []byte) ([]byte, int, error) {
 		return result.Bytes()
 	})
 
-	return fixed, count, nil
+	return fixed, count
 }

cmd/ogen-fixnull/main_test.go

@@ -148,10 +148,7 @@ func (o *OptBar) Decode(d *jx.Decoder) error {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			fixed, count, err := FixOptDecodeNullHandling([]byte(tt.input))
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
+			fixed, count := FixOptDecodeNullHandling([]byte(tt.input))
 
 			if count != tt.wantCount {
 				t.Errorf("count = %d, want %d", count, tt.wantCount)
@@ -199,10 +196,7 @@ func SomeOtherFunc() {
 }
 `
 
-	fixed, count, err := FixOptDecodeNullHandling([]byte(input))
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
+	fixed, count := FixOptDecodeNullHandling([]byte(input))
 
 	if count != 1 {
 		t.Errorf("count = %d, want 1", count)