feat: Parse YAML parameters sequentially.

Signed-off-by: joyceliu <joyceliu@yunify.com>

Author: redscholar

.golangci.yaml

@@ -69,8 +69,8 @@ linters:
     - nakedret
     - nestif
     # - nilerr
-    - nilnil
-    - nlreturn
+    # - nilnil
+    # - nlreturn
     - noctx
     - nolintlint
     - nonamedreturns
@@ -459,7 +459,7 @@ linters-settings:
 #      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#enforce-map-style
       - name: enforce-map-style
         severity: warning
-        disabled: false
+        disabled: true
         exclude: [""]
         arguments:
           - "make"
@@ -473,7 +473,7 @@ linters-settings:
 #      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#enforce-slice-style
       - name: enforce-slice-style
         severity: warning
-        disabled: false
+        disabled: true
         exclude: [""]
         arguments:
           - "make"

api/project/v1/base.go

@@ -16,6 +16,8 @@ limitations under the License.
 
 package v1
 
+import "gopkg.in/yaml.v3"
+
 // Base defined in project.
 type Base struct {
 	Name string `yaml:"name,omitempty"`
@@ -26,7 +28,7 @@ type Base struct {
 	RemoteUser string `yaml:"remote_user,omitempty"`
 
 	// variables
-	Vars map[string]any `yaml:"vars,omitempty"`
+	Vars yaml.Node `yaml:"vars,omitempty"`
 
 	// module default params
 	//ModuleDefaults []map[string]map[string]any `yaml:"module_defaults,omitempty"`

go.mod

@@ -17,7 +17,6 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.31.0
-	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.31.3
 	k8s.io/apimachinery v0.31.3
@@ -146,6 +145,7 @@ require (
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/apiextensions-apiserver v0.31.3 // indirect
 	k8s.io/cluster-bootstrap v0.31.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect

pkg/converter/converter.go

@@ -21,6 +21,7 @@ import (
 	"strconv"
 	"strings"
 
+	"gopkg.in/yaml.v3"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/json"
@@ -149,3 +150,19 @@ func ConvertKKClusterToInventoryHost(kkcluster *capkkinfrav1beta1.KKCluster) (kk
 
 	return inventoryHosts, nil
 }
+
+// ConvertMap2Node converts a map[string]any to a yaml.Node by first marshaling to YAML bytes
+// then unmarshaling into a Node. This allows working with the YAML node structure directly.
+func ConvertMap2Node(m map[string]any) (yaml.Node, error) {
+	data, err := yaml.Marshal(m)
+	if err != nil {
+		return yaml.Node{}, errors.Wrap(err, "failed to marshal map to yaml")
+	}
+	var node yaml.Node
+	err = yaml.Unmarshal(data, &node)
+	if err != nil {
+		return yaml.Node{}, errors.Wrap(err, "failed to unmarshal yaml to node")
+	}
+
+	return node, nil
+}

pkg/converter/converter_test.go

@@ -170,3 +170,51 @@ func TestConvertKKClusterToInventoryHost(t *testing.T) {
 		})
 	}
 }
+
+func TestConvertMap2Node(t *testing.T) {
+	testcases := []struct {
+		name    string
+		input   map[string]any
+		wantErr bool
+	}{
+		{
+			name: "simple map",
+			input: map[string]any{
+				"key1": "value1",
+				"key2": 123,
+				"key3": true,
+			},
+		},
+		{
+			name: "nested map",
+			input: map[string]any{
+				"outer": map[string]any{
+					"inner": "value",
+				},
+				"array": []any{"a", "b", "c"},
+			},
+		},
+		{
+			name:  "empty map",
+			input: map[string]any{},
+		},
+	}
+
+	for _, tc := range testcases {
+		t.Run(tc.name, func(t *testing.T) {
+			node, err := ConvertMap2Node(tc.input)
+			if err != nil {
+				t.Fatal(err)
+			}
+			assert.NotNil(t, node)
+
+			// Convert back to map to verify roundtrip
+			var result map[string]any
+			err = node.Decode(&result)
+			if err != nil {
+				t.Fatal(err)
+			}
+			assert.Equal(t, tc.input, result)
+		})
+	}
+}

pkg/executor/executor_test.go

@@ -8,46 +8,55 @@ import (
 	kkcorev1alpha1 "github.com/kubesphere/kubekey/api/core/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	_const "github.com/kubesphere/kubekey/v4/pkg/const"
 	"github.com/kubesphere/kubekey/v4/pkg/variable"
 	"github.com/kubesphere/kubekey/v4/pkg/variable/source"
 )
 
-func newTestOption() (*option, error) {
+func newTestOption(hosts []string) (*option, error) {
 	var err error
+	// convert host to InventoryHost
+	inventoryHost := make(kkcorev1.InventoryHost)
+	for _, h := range hosts {
+		inventoryHost[h] = runtime.RawExtension{}
+	}
+	client := fake.NewClientBuilder().WithScheme(_const.Scheme).WithStatusSubresource(&kkcorev1.Playbook{}, &kkcorev1alpha1.Task{}).Build()
+	inventory := &kkcorev1.Inventory{
+		TypeMeta: metav1.TypeMeta{},
+		ObjectMeta: metav1.ObjectMeta{
+			GenerateName: "test-",
+			Namespace:    corev1.NamespaceDefault,
+		},
+		Spec: kkcorev1.InventorySpec{
+			Hosts: inventoryHost,
+		},
+	}
+	if err := client.Create(context.TODO(), inventory); err != nil {
+		return nil, err
+	}
 
 	o := &option{
-		client: fake.NewClientBuilder().WithScheme(_const.Scheme).WithStatusSubresource(&kkcorev1.Playbook{}, &kkcorev1alpha1.Task{}).Build(),
+		client: client,
 		playbook: &kkcorev1.Playbook{
 			TypeMeta: metav1.TypeMeta{},
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "test",
-				Namespace: corev1.NamespaceDefault,
+				GenerateName: "test-",
+				Namespace:    corev1.NamespaceDefault,
 			},
 			Spec: kkcorev1.PlaybookSpec{
 				InventoryRef: &corev1.ObjectReference{
-					Name:      "test",
-					Namespace: corev1.NamespaceDefault,
+					Name:      inventory.Name,
+					Namespace: inventory.Namespace,
 				},
 			},
 			Status: kkcorev1.PlaybookStatus{},
 		},
 		logOutput: os.Stdout,
 	}
 
-	if err := o.client.Create(context.TODO(), &kkcorev1.Inventory{
-		TypeMeta: metav1.TypeMeta{},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test",
-			Namespace: corev1.NamespaceDefault,
-		},
-		Spec: kkcorev1.InventorySpec{},
-	}); err != nil {
-		return nil, err
-	}
-
 	o.variable, err = variable.New(context.TODO(), o.client, *o.playbook, source.MemorySource)
 	if err != nil {
 		return nil, err