chore(all): fix nil check to value first (#3689)

Signed-off-by: Koichi Shiraishi <[email protected]>
open-telemetry · Feb 5, 2025 · 3c8f286 · 3c8f286
1 parent 98e4cfe
commit 3c8f286
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/internal/manifests/manifestutils/annotations.go b/internal/manifests/manifestutils/annotations.go
@@ -16,7 +16,7 @@ func Annotations(instance v1beta1.OpenTelemetryCollector, filterAnnotations []st
 	// new map every time, so that we don't touch the instance's annotations
 	annotations := map[string]string{}
 
-	if nil != instance.ObjectMeta.Annotations {
+	if instance.ObjectMeta.Annotations != nil {
 		for k, v := range instance.ObjectMeta.Annotations {
 			if !IsFilteredSet(k, filterAnnotations) {
 				annotations[k] = v
@@ -31,7 +31,7 @@ func Annotations(instance v1beta1.OpenTelemetryCollector, filterAnnotations []st
 func PodAnnotations(instance v1beta1.OpenTelemetryCollector, filterAnnotations []string) (map[string]string, error) {
 	// new map every time, so that we don't touch the instance's annotations
 	podAnnotations := map[string]string{}
-	if nil != instance.Spec.PodAnnotations {
+	if instance.Spec.PodAnnotations != nil {
 		for k, v := range instance.Spec.PodAnnotations {
 			if !IsFilteredSet(k, filterAnnotations) {
 				podAnnotations[k] = v

diff --git a/internal/manifests/manifestutils/labels.go b/internal/manifests/manifestutils/labels.go
@@ -28,7 +28,7 @@ func Labels(instance metav1.ObjectMeta, name string, image string, component str
 	var versionLabel string
 	// new map every time, so that we don't touch the instance's label
 	base := map[string]string{}
-	if nil != instance.Labels {
+	if instance.Labels != nil {
 		for k, v := range instance.Labels {
 			if !IsFilteredSet(k, filterLabels) {
 				base[k] = v

diff --git a/internal/manifests/opampbridge/annotations.go b/internal/manifests/opampbridge/annotations.go
@@ -22,7 +22,7 @@ func Annotations(instance v1alpha1.OpAMPBridge, configMap *v1.ConfigMap, filterA
 	for key, value := range instance.Spec.PodAnnotations {
 		annotations[key] = value
 	}
-	if nil != instance.ObjectMeta.Annotations {
+	if instance.ObjectMeta.Annotations != nil {
 		for k, v := range instance.ObjectMeta.Annotations {
 			if !manifestutils.IsFilteredSet(k, filterAnnotations) {
 				annotations[k] = v

diff --git a/internal/manifests/targetallocator/annotations.go b/internal/manifests/targetallocator/annotations.go
@@ -22,7 +22,7 @@ func Annotations(instance v1alpha1.TargetAllocator, configMap *v1.ConfigMap, fil
 	for key, value := range instance.Spec.PodAnnotations {
 		annotations[key] = value
 	}
-	if nil != instance.ObjectMeta.Annotations {
+	if instance.ObjectMeta.Annotations != nil {
 		for k, v := range instance.ObjectMeta.Annotations {
 			if !manifestutils.IsFilteredSet(k, filterAnnotations) {
 				annotations[k] = v