use ParseK8sObjectsFromYAMLManifest in ParseYAMLToK8sObject, and remo…

…ve ut of ParseYAMLToK8sObject. (istio#47005)
WillardHu · Sep 21, 2023 · e81a033 · e81a033
1 parent e07b87a
commit e81a033
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 136 deletions.
diff --git a/operator/pkg/object/objects.go b/operator/pkg/object/objects.go
@@ -117,15 +117,17 @@ func ParseJSONToK8sObject(json []byte) (*K8sObject, error) {
 
 // ParseYAMLToK8sObject parses YAML to an Object.
 func ParseYAMLToK8sObject(yaml []byte) (*K8sObject, error) {
-	r := bytes.NewReader(yaml)
-	decoder := k8syaml.NewYAMLOrJSONDecoder(r, 1024)
-
-	out := &unstructured.Unstructured{}
-	err := decoder.Decode(out)
+	objects, err := ParseK8sObjectsFromYAMLManifest(string(yaml))
 	if err != nil {
-		return nil, fmt.Errorf("error decoding object %v: %v", string(yaml), err)
+		return nil, err
+	}
+	if len(objects) > 1 {
+		return nil, fmt.Errorf("expect one object, actually: %d", len(objects))
+	}
+	if len(objects) == 0 || objects[0] == nil {
+		return nil, fmt.Errorf("decoding object %v: %v", string(yaml), "no object found")
 	}
-	return NewK8sObject(out, nil, yaml), nil
+	return objects[0], nil
 }
 
 // UnstructuredObject exposes the raw object, primarily for testing

diff --git a/operator/pkg/object/objects_test.go b/operator/pkg/object/objects_test.go
@@ -280,135 +280,6 @@ func TestParseJSONToK8sObject(t *testing.T) {
 	}
 }
 
-func TestParseYAMLToK8sObject(t *testing.T) {
-	testDeploymentYaml := `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: istio-citadel
-  namespace: istio-system
-  labels:
-    istio: citadel
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      istio: citadel
-  template:
-    metadata:
-      labels:
-        istio: citadel
-    spec:
-      containers:
-      - name: citadel
-        image: docker.io/istio/citadel:1.1.8
-        args:
-        - "--append-dns-names=true"
-        - "--grpc-port=8060"
-        - "--grpc-hostname=citadel"
-        - "--citadel-storage-namespace=istio-system"
-        - "--custom-dns-names=istio-pilot-service-account.istio-system:istio-pilot.istio-system"
-        - "--monitoring-port=15014"
-        - "--self-signed-ca=true"`
-
-	testPodYaml := `apiVersion: v1
-kind: Pod
-metadata:
-  name: istio-galley-75bcd59768-hpt5t
-  namespace: istio-system
-  labels:
-    istio: galley
-spec:
-  containers:
-  - name: galley
-    image: docker.io/istio/galley:1.1.8
-    command:
-    - "/usr/local/bin/galley"
-    - server
-    - "--meshConfigFile=/etc/mesh-config/mesh"
-    - "--livenessProbeInterval=1s"
-    - "--livenessProbePath=/healthliveness"
-    - "--readinessProbePath=/healthready"
-    - "--readinessProbeInterval=1s"
-    - "--deployment-namespace=istio-system"
-    - "--insecure=true"
-    - "--validation-webhook-config-file"
-    - "/etc/config/validatingwebhookconfiguration.yaml"
-    - "--monitoringPort=15014"
-    - "--log_output_level=default:info"
-    ports:
-    - containerPort: 443
-      protocol: TCP
-    - containerPort: 15014
-      protocol: TCP
-    - containerPort: 9901
-      protocol: TCP`
-
-	testServiceYaml := `apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: pilot
-  name: istio-pilot
-  namespace: istio-system
-spec:
-  clusterIP: 10.102.230.31
-  ports:
-  - name: grpc-xds
-    port: 15010
-    protocol: TCP
-    targetPort: 15010
-  - name: https-xds
-    port: 15011
-    protocol: TCP
-    targetPort: 15011
-  - name: http-legacy-discovery
-    port: 8080
-    protocol: TCP
-    targetPort: 8080
-  - name: http-monitoring
-    port: 15014
-    protocol: TCP
-    targetPort: 15014
-  selector:
-    istio: pilot
-  sessionAffinity: None
-  type: ClusterIP`
-
-	parseYAMLToK8sObjectTests := []struct {
-		desc          string
-		objString     string
-		wantGroup     string
-		wantKind      string
-		wantName      string
-		wantNamespace string
-	}{
-		{"ParseYamlToK8sDeployment", testDeploymentYaml, "apps", "Deployment", "istio-citadel", "istio-system"},
-		{"ParseYamlToK8sPod", testPodYaml, "", "Pod", "istio-galley-75bcd59768-hpt5t", "istio-system"},
-		{"ParseYamlToK8sService", testServiceYaml, "", "Service", "istio-pilot", "istio-system"},
-	}
-
-	for _, tt := range parseYAMLToK8sObjectTests {
-		t.Run(tt.desc, func(t *testing.T) {
-			k8sObj, err := ParseYAMLToK8sObject([]byte(tt.objString))
-			if err != nil {
-				k8sObjStr := k8sObj.YAMLDebugString()
-				if k8sObj.Group != tt.wantGroup {
-					t.Errorf("ParseYAMLToK8sObject(%s): got group %s for k8s object %s, want %s", tt.desc, k8sObj.Group, k8sObjStr, tt.wantGroup)
-				}
-				if k8sObj.Kind != tt.wantKind {
-					t.Errorf("ParseYAMLToK8sObject(%s): got kind %s for k8s object %s, want %s", tt.desc, k8sObj.Kind, k8sObjStr, tt.wantKind)
-				}
-				if k8sObj.Name != tt.wantName {
-					t.Errorf("ParseYAMLToK8sObject(%s): got name %s for k8s object %s, want %s", tt.desc, k8sObj.Name, k8sObjStr, tt.wantName)
-				}
-				if k8sObj.Namespace != tt.wantNamespace {
-					t.Errorf("ParseYAMLToK8sObject(%s): got group %s for k8s object %s, want %s", tt.desc, k8sObj.Namespace, k8sObjStr, tt.wantNamespace)
-				}
-			}
-		})
-	}
-}
-
 func TestParseK8sObjectsFromYAMLManifest(t *testing.T) {
 	testDeploymentYaml := `apiVersion: apps/v1
 kind: Deployment