fix tests

Signed-off-by: Pavel Tishkov <[email protected]>

Author: fl64

images/hooks/cmd/discovery-virthandler-nodes/main.go

@@ -63,9 +63,6 @@ var configDiscoveryService = &pkg.HookConfig{
 
 func handleDiscoveryVirtHandkerNodes(_ context.Context, input *pkg.HookInput) error {
 	nodeCount := len(input.Snapshots.Get(nodesSnapshot))
-	if nodeCount == 0 {
-		nodeCount = 1
-	}
 	input.Values.Set(virtHandlerNodeCountPath, nodeCount)
 	return nil
 }

images/hooks/cmd/discovery-virthandler-nodes/main_test.go

@@ -19,20 +19,15 @@ package main
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"os"
 	"testing"
 	"time"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
 	"github.com/deckhouse/module-sdk/pkg"
-	"github.com/deckhouse/module-sdk/pkg/jq"
 	"github.com/deckhouse/module-sdk/testing/mock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/yaml"
 )
 
 func TestDiscoveryVirthandlerNodes(t *testing.T) {
@@ -44,28 +39,6 @@ var _ = Describe("Discovery virt-handler nodes", func() {
 	err := os.Setenv("D8_IS_TESTS_ENVIRONMENT", "true")
 	Expect(err).ShouldNot(HaveOccurred())
 
-	const (
-		node1YAML = `
----
-apiVersion: v1
-kind: Node
-metadata:
-  labels:
-    kubevirt.internal.virtualization.deckhouse.io/schedulable: "true"
-  name: node1
-`
-
-		node2YAML = `
----
-apiVersion: v1
-kind: Node
-metadata:
-  labels:
-    kubevirt.internal.virtualization.deckhouse.io/schedulable: "true"
-  name: node2
-`
-	)
-
 	var (
 		snapshots      *mock.SnapshotsMock
 		values         *mock.PatchableValuesCollectorMock
@@ -74,16 +47,6 @@ metadata:
 		buf            *bytes.Buffer
 	)
 
-	filterResultNode1, err := nodeYamlToSnapshot(node1YAML)
-	if err != nil {
-		Expect(err).ShouldNot(HaveOccurred())
-	}
-
-	filterResultNode2, err := nodeYamlToSnapshot(node2YAML)
-	if err != nil {
-		Expect(err).ShouldNot(HaveOccurred())
-	}
-
 	BeforeEach(func() {
 		snapshots = mock.NewSnapshotsMock(GinkgoT())
 		values = mock.NewPatchableValuesCollectorMock(GinkgoT())
@@ -112,19 +75,19 @@ metadata:
 			snapshots.GetMock.When(nodesSnapshot).Then(
 				[]pkg.Snapshot{},
 			)
-			values.SetMock.When(virtHandlerNodeCountPath, 1)
+			values.SetMock.When(virtHandlerNodeCountPath, 0)
 			err := handleDiscoveryVirtHandkerNodes(context.Background(), input)
 			Expect(err).ShouldNot(HaveOccurred())
 		})
 	})
 
-	Context("Four nodes but only two should be patched.", func() {
+	Context("Two nodes should be discovered.", func() {
 		It("Hook must execute successfully", func() {
 
 			snapshots.GetMock.When(nodesSnapshot).Then(
 				[]pkg.Snapshot{
-					mock.NewSnapshotMock(GinkgoT()).UnmarshalToMock.Set(getNodeSnapshot(filterResultNode1)),
-					mock.NewSnapshotMock(GinkgoT()).UnmarshalToMock.Set(getNodeSnapshot(filterResultNode2)),
+					mock.NewSnapshotMock(GinkgoT()).StringMock.Return("n1"),
+					mock.NewSnapshotMock(GinkgoT()).StringMock.Return("n2"),
 				},
 			)
 
@@ -135,34 +98,3 @@ metadata:
 	})
 
 })
-
-func nodeYamlToSnapshot(manifest string) (string, error) {
-	node := new(v1.Node)
-	err := yaml.Unmarshal([]byte(manifest), node)
-	if err != nil {
-		return "", err
-	}
-
-	query, err := jq.NewQuery(nodeJQFilter)
-	if err != nil {
-		return "", err
-	}
-
-	filterResult, err := query.FilterObject(context.Background(), node)
-	if err != nil {
-		return "", err
-	}
-
-	return filterResult.String(), nil
-}
-
-func getNodeSnapshot(nodeManifest string) func(v any) (err error) {
-	return func(v any) (err error) {
-		rt := v.(*metav1.ObjectMeta)
-		if err := json.Unmarshal([]byte(nodeManifest), rt); err != nil {
-			return err
-		}
-
-		return nil
-	}
-}

images/hooks/go.mod

@@ -16,7 +16,6 @@ require (
 	k8s.io/api v0.30.11
 	k8s.io/apimachinery v0.30.11
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
-	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
@@ -52,8 +51,6 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/itchyny/gojq v0.12.17 // indirect
-	github.com/itchyny/timefmt-go v0.1.6 // indirect
 	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/jonboulle/clockwork v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -112,6 +109,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.18.7 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace golang.org/x/net => golang.org/x/net v0.40.0 // CVE-2025-22870, CVE-2025-22872