bump

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

Author: ldmonster

common-hooks/tls-certificate/internal_tls_test.go

@@ -32,7 +32,7 @@ import (
 	"github.com/deckhouse/module-sdk/pkg"
 	"github.com/deckhouse/module-sdk/pkg/certificate"
 	"github.com/deckhouse/module-sdk/pkg/jq"
-	tframework "github.com/deckhouse/module-sdk/testing/framework"
+	"github.com/deckhouse/module-sdk/testing/helpers"
 	mock "github.com/deckhouse/module-sdk/testing/mock"
 )
 
@@ -453,11 +453,23 @@ func Test_GenSelfSignedTLS_NewFramework(t *testing.T) {
 
 		hookConfig := tlscertificate.GenSelfSignedTLSConfig(tlsConfig)
 
-		f := tframework.NewHookFramework(t, hookConfig, tlscertificate.GenSelfSignedTLS(tlsConfig))
-
-		f.PrepareHookSnapshots(hookConfig, map[string][]string{
-			tlscertificate.InternalTLSSnapshotKey: {
-				`
+		snaps := helpers.PrepareHookSnapshots(t, hookConfig, map[string]string{
+			tlscertificate.InternalTLSSnapshotKey: `
+apiVersion: v1
+data:
+  ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJpRENDQVM2Z0F3SUJBZ0lVV3VXcVhMQ1ZnWXVSaVNmZVZvT3RHMG9vU3pZd0NnWUlLb1pJemowRUF3SXcKSWpFZ01CNEdBMVVFQXhNWFpHVmphMmh2ZFhObExtUTRMWE41YzNSbGJTNXpkbU13SGhjTk1qVXdOakU0TVRnMApOREF3V2hjTk16VXdOakUyTVRnME5EQXdXakFpTVNBd0hnWURWUVFERXhka1pXTnJhRzkxYzJVdVpEZ3RjM2x6CmRHVnRMbk4yWXpCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkM0N3h1WCs2VkhvVVVpaG9VSUsKbzY1QzR2OVU5UjV5dXZLQUN3SlJ3bFoxUGs1MGR2aXFFNHJjbXRsdTRsZkRPSW9qaFlJN3ZUS1piMVByVTY3MgpTSHVqUWpCQU1BNEdBMVVkRHdFQi93UUVBd0lCQmpBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXCkJCVDF1U3JvYjNJeHpaNlJOc042dEFjTGlyUGt3REFLQmdncWhrak9QUVFEQWdOSUFEQkZBaUJ6YTVSS3p0RDYKRmJuT2NOTm5ncjhQazhrME4vcGtzTGNiemZXd3NCN0lVQUloQU5tMjNMSzczNVJ0c3F4TGhGNmtyTCtlZmJicgpBbU9jSmpWdGwvNWc5aEhhCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUIwakNDQVhpZ0F3SUJBZ0lVVk5uZTJHaE1vV2k2RUdSVlh3bW1Kak1OdU40d0NnWUlLb1pJemowRUF3SXcKSWpFZ01CNEdBMVVFQXhNWFpHVmphMmh2ZFhObExtUTRMWE41YzNSbGJTNXpkbU13SGhjTk1qVXdOakU0TVRnMApOREF3V2hjTk16VXdOakUyTVRnME5EQXdXakFpTVNBd0hnWURWUVFERXhka1pXTnJhRzkxYzJVdVpEZ3RjM2x6CmRHVnRMbk4yWXpCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQlBSdWduRk1yMlFZM0lKSFhvNlAKSEN3ZnYxRVJyS0dQdXZMYVovNHI1QWNmUkhJT3AzYUNvR1pwT0JRbFRUejBSaTE3VDRVeStHdmZxRWg0MHVCNQowYldqZ1lzd2dZZ3dEZ1lEVlIwUEFRSC9CQVFEQWdXZ01Bd0dBMVVkRXdFQi93UUNNQUF3SFFZRFZSME9CQllFCkZPMmpYOXE5MDc0WHdkNU90RFVhOE9vaXJiNEtNRWtHQTFVZEVRUkNNRUNDRjJSbFkydG9iM1Z6WlM1a09DMXoKZVhOMFpXMHVjM1pqZ2lWa1pXTnJhRzkxYzJVdVpEZ3RjM2x6ZEdWdExuTjJZeTVqYkhWemRHVnlMbXh2WTJGcwpNQW9HQ0NxR1NNNDlCQU1DQTBnQU1FVUNJUUN6dEJGbEY2eEpueHYyS3hrNHNqam5mQjQ1YjRmdjNsTFJYVkp6CmZmL2lsZ0lnTXQvM3pHSXRqVndlV3B1eDdyZnN0RkxxalhtZmkwRk4xL3ZwWGtOTEljZz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+  tls.key: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUdIUUdieWlDdlV2WDdiUUhBbmZ2YkExbVdBLy9ESjlUdC83WW94akMvZ2dvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFOUc2Q2NVeXZaQmpjZ2tkZWpvOGNMQisvVVJHc29ZKzY4dHBuL2l2a0J4OUVjZzZuZG9LZwpabWs0RkNWTlBQUkdMWHRQaFRMNGE5K29TSGpTNEhuUnRRPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
+kind: Secret
+metadata:
+  creationTimestamp: "2025-06-18T18:48:49Z"
+  labels:
+    app: deckhouse
+    heritage: deckhouse
+    module: deckhouse
+  name: admission-webhook-certs
+  namespace: d8-system
+---
 apiVersion: v1
 data:
   ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJpRENDQVM2Z0F3SUJBZ0lVV3VXcVhMQ1ZnWXVSaVNmZVZvT3RHMG9vU3pZd0NnWUlLb1pJemowRUF3SXcKSWpFZ01CNEdBMVVFQXhNWFpHVmphMmh2ZFhObExtUTRMWE41YzNSbGJTNXpkbU13SGhjTk1qVXdOakU0TVRnMApOREF3V2hjTk16VXdOakUyTVRnME5EQXdXakFpTVNBd0hnWURWUVFERXhka1pXTnJhRzkxYzJVdVpEZ3RjM2x6CmRHVnRMbk4yWXpCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkM0N3h1WCs2VkhvVVVpaG9VSUsKbzY1QzR2OVU5UjV5dXZLQUN3SlJ3bFoxUGs1MGR2aXFFNHJjbXRsdTRsZkRPSW9qaFlJN3ZUS1piMVByVTY3MgpTSHVqUWpCQU1BNEdBMVVkRHdFQi93UUVBd0lCQmpBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXCkJCVDF1U3JvYjNJeHpaNlJOc042dEFjTGlyUGt3REFLQmdncWhrak9QUVFEQWdOSUFEQkZBaUJ6YTVSS3p0RDYKRmJuT2NOTm5ncjhQazhrME4vcGtzTGNiemZXd3NCN0lVQUloQU5tMjNMSzczNVJ0c3F4TGhGNmtyTCtlZmJicgpBbU9jSmpWdGwvNWc5aEhhCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
@@ -473,7 +485,6 @@ metadata:
   name: admission-webhook-certs
   namespace: d8-system
 `,
-			},
 		})
 
 		values := mock.NewPatchableValuesCollectorMock(t)
@@ -486,9 +497,25 @@ metadata:
 			assert.NotEmpty(t, value)
 		})
 
-		f.HookInput.Values = values
+		input := helpers.NewHookInput(t)
+		input.Snapshots = snaps
+		input.Values = values
 
-		err := f.Execute(context.TODO())
+		config := tlscertificate.GenSelfSignedTLSHookConf{
+			CN:            "cert-name",
+			TLSSecretName: "secret-webhook-cert",
+			Namespace:     "some-namespace",
+			SANs: tlscertificate.DefaultSANs([]string{
+				"example-webhook",
+				"example-webhook.d8-example-module",
+				"example-webhook.d8-example-module.svc",
+				"%CLUSTER_DOMAIN%://example-webhook.d8-example-module.svc",
+				"%PUBLIC_DOMAIN%://example-webhook.d8-example-module.svc",
+			}),
+			FullValuesPathPrefix: "d8-example-module.internal.webhookCert",
+		}
+
+		err := tlscertificate.GenSelfSignedTLS(config)(context.Background(), input)
 		assert.NoError(t, err)
 	})
 }

testing/helpers/hook_input.go

@@ -0,0 +1,21 @@
+package helpers
+
+import (
+	"testing"
+
+	"github.com/deckhouse/deckhouse/pkg/log"
+	"github.com/deckhouse/module-sdk/pkg"
+	"github.com/deckhouse/module-sdk/testing/mock"
+)
+
+func NewHookInput(t *testing.T) *pkg.HookInput {
+	return &pkg.HookInput{
+		Snapshots:        mock.NewSnapshotsMock(t),
+		Values:           mock.NewPatchableValuesCollectorMock(t),
+		ConfigValues:     mock.NewPatchableValuesCollectorMock(t),
+		PatchCollector:   mock.NewPatchCollectorMock(t),
+		MetricsCollector: mock.NewMetricsCollectorMock(t),
+		DC:               mock.NewDependencyContainerMock(t),
+		Logger:           log.NewNop(),
+	}
+}

testing/helpers/snapshots.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"testing"
 
 	objectpatch "github.com/deckhouse/module-sdk/internal/object-patch"
@@ -14,9 +15,9 @@ import (
 )
 
 // input snapshots must be in yaml format
-func PrepareHookSnapshots(t *testing.T, config *pkg.HookConfig, inputSnapshots map[string][]string) pkg.Snapshots {
+func PrepareHookSnapshots(t *testing.T, config *pkg.HookConfig, inputSnapshots map[string]string) pkg.Snapshots {
 	formattedSnapshots := make(objectpatch.Snapshots, len(inputSnapshots))
-	for snapBindingName, snaps := range inputSnapshots {
+	for snapBindingName, rawSnaps := range inputSnapshots {
 		var (
 			err   error
 			query *jq.Query
@@ -30,6 +31,8 @@ func PrepareHookSnapshots(t *testing.T, config *pkg.HookConfig, inputSnapshots m
 			}
 		}
 
+		snaps := strings.Split(rawSnaps, "---")
+
 		for _, snap := range snaps {
 			var yml map[string]interface{}