fix: lint errors after upgrading golangci-lint (#12368)

pkg/bucket/replication/rule.go

@@ -140,10 +140,7 @@ func (r Rule) validateStatus() error {
 }
 
 func (r Rule) validateFilter() error {
-	if err := r.Filter.Validate(); err != nil {
-		return err
-	}
-	return nil
+	return r.Filter.Validate()
 }
 
 // Prefix - a rule can either have prefix under <filter></filter> or under

pkg/event/target/amqp.go

@@ -205,16 +205,12 @@ func (target *AMQPTarget) send(eventData event.Event, ch *amqp.Channel) error {
 		return err
 	}
 
-	if err := ch.Publish(target.args.Exchange, target.args.RoutingKey, target.args.Mandatory,
+	return ch.Publish(target.args.Exchange, target.args.RoutingKey, target.args.Mandatory,
 		target.args.Immediate, amqp.Publishing{
 			ContentType:  "application/json",
 			DeliveryMode: target.args.DeliveryMode,
 			Body:         data,
-		}); err != nil {
-		return err
-	}
-
-	return nil
+		})
 }
 
 // Save - saves the events to the store which will be replayed when the amqp connection is active.

pkg/s3select/csv/record.go

@@ -103,11 +103,7 @@ func (r *Record) WriteCSV(writer io.Writer, opts sql.WriteCSVOpts) error {
 		return err
 	}
 	w.Flush()
-	if err := w.Error(); err != nil {
-		return err
-	}
-
-	return nil
+	return w.Error()
 }
 
 // WriteJSON - encodes to JSON data.

pkg/s3select/json/record.go

@@ -145,11 +145,7 @@ func (r *Record) WriteCSV(writer io.Writer, opts sql.WriteCSVOpts) error {
 		return err
 	}
 	w.Flush()
-	if err := w.Error(); err != nil {
-		return err
-	}
-
-	return nil
+	return w.Error()
 }
 
 // Raw - returns the underlying representation.

pkg/s3select/simdj/record.go

@@ -181,11 +181,7 @@ allElems:
 		return err
 	}
 	w.Flush()
-	if err := w.Error(); err != nil {
-		return err
-	}
-
-	return nil
+	return w.Error()
 }
 
 // Raw - returns the underlying representation.