fix: redundant nil checks

csatib02 · csatib02 · commit a3c77da141fb · 2025-10-07T10:01:31.000+02:00
Signed-off-by: Bence Csati &lt;bence.csati@axoflow.com&gt;
diff --git a/pkg/resources/fluentd/service.go b/pkg/resources/fluentd/service.go
@@ -125,7 +125,7 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired
 func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredState, error) {
 	if r.fluentdSpec.BufferVolumeMetrics != nil && r.fluentdSpec.BufferVolumeMetrics.IsEnabled() {
 		port := int32(defaultBufferVolumeMetricsPort)
-		if r.fluentdSpec.BufferVolumeMetrics != nil && r.fluentdSpec.BufferVolumeMetrics.IsEnabled() && r.fluentdSpec.BufferVolumeMetrics.Port != 0 {
+		if r.fluentdSpec.BufferVolumeMetrics.Port != 0 {
 			port = r.fluentdSpec.BufferVolumeMetrics.Port
 		}
 
diff --git a/pkg/resources/syslogng/service.go b/pkg/resources/syslogng/service.go
@@ -124,7 +124,7 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired
 func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredState, error) {
 	if r.syslogNGSpec.BufferVolumeMetrics != nil && r.syslogNGSpec.BufferVolumeMetrics.IsEnabled() {
 		port := int32(defaultBufferVolumeMetricsPort)
-		if r.syslogNGSpec.BufferVolumeMetrics != nil && r.syslogNGSpec.BufferVolumeMetrics.IsEnabled() && r.syslogNGSpec.BufferVolumeMetrics.Port != 0 {
+		if r.syslogNGSpec.BufferVolumeMetrics.Port != 0 {
 			port = r.syslogNGSpec.BufferVolumeMetrics.Port
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired`
`125`	`125`	`func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredState, error) {`
`126`	`126`	`if r.fluentdSpec.BufferVolumeMetrics != nil && r.fluentdSpec.BufferVolumeMetrics.IsEnabled() {`
`127`	`127`	`port := int32(defaultBufferVolumeMetricsPort)`
`128`		`- if r.fluentdSpec.BufferVolumeMetrics != nil && r.fluentdSpec.BufferVolumeMetrics.IsEnabled() && r.fluentdSpec.BufferVolumeMetrics.Port != 0 {`
	`128`	`+ if r.fluentdSpec.BufferVolumeMetrics.Port != 0 {`
`129`	`129`	`port = r.fluentdSpec.BufferVolumeMetrics.Port`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired`
`124`	`124`	`func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredState, error) {`
`125`	`125`	`if r.syslogNGSpec.BufferVolumeMetrics != nil && r.syslogNGSpec.BufferVolumeMetrics.IsEnabled() {`
`126`	`126`	`port := int32(defaultBufferVolumeMetricsPort)`
`127`		`- if r.syslogNGSpec.BufferVolumeMetrics != nil && r.syslogNGSpec.BufferVolumeMetrics.IsEnabled() && r.syslogNGSpec.BufferVolumeMetrics.Port != 0 {`
	`127`	`+ if r.syslogNGSpec.BufferVolumeMetrics.Port != 0 {`
`128`	`128`	`port = r.syslogNGSpec.BufferVolumeMetrics.Port`
`129`	`129`	`}`
`130`	`130`