feat: split runtime resource getter from the apply action add general printer output

Author: Peefy

VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

examples/kcl-apply.yaml

@@ -1,10 +1,18 @@
-functionConfig:
-  # kcl-fn-config.yaml
-  apiVersion: krm.kcl.dev/v1alpha1
-  kind: KCLRun
-  metadata:
-  # EDIT THE SOURCE!
-  # This should be your KCL code which preloads the `ResourceList` to `option("resource_list")
-  spec:
-    source: |
-      [resource | {if resource.kind == "Deployment": metadata.annotations: {"managed-by" = "krm-kcl"}} for resource in option("resource_list").items]
+apiVersion: krm.kcl.dev/v1alpha1
+kind: KCLRun
+metadata:
+  name: web-service-abtraction
+spec:
+  params:
+    name: app
+    containers:
+      ngnix:
+        image: ngnix
+        ports:
+        - containerPort: 80
+    service:
+      ports:
+      - port: 80
+    labels:
+      name: app
+  source: oci://docker.io/kcllang/web-service

pkg/client/client.go

@@ -2,20 +2,26 @@ package client
 
 import (
 	"io"
+	"os"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/kubectl/pkg/scheme"
 )
 
 type KubeCliRuntime struct {
-	Flags         *genericclioptions.ConfigFlags
-	AllNamespaces bool
-	Namespace     string
-	Selector      string
-	FieldSelector string
+	Flags          *genericclioptions.ConfigFlags
+	AllNamespaces  bool
+	Namespace      string
+	Selector       string
+	FieldSelector  string
+	ForceConflicts bool
 }
 
 func NewKubeCliRuntime() *KubeCliRuntime {
@@ -65,6 +71,8 @@ func (k *KubeCliRuntime) GetObjects(flags resource.RESTClientGetter, r io.Reader
 
 // Apply yaml file from io reader
 func (k *KubeCliRuntime) Apply(flags resource.RESTClientGetter, r io.Reader) error {
+	// Generates the objects using the resource builder if they have not
+	// already been stored by calling "SetObjects()" in the pre-processor.
 	errs := []error{}
 	infos, err := k.GetObjects(flags, r)
 	if err != nil {
@@ -83,24 +91,41 @@ func (k *KubeCliRuntime) Apply(flags resource.RESTClientGetter, r io.Reader) err
 		return errs[0]
 	}
 	if len(errs) > 1 {
-		return errs[0]
+		return utilerrors.NewAggregate(errs)
 	}
 	return nil
 }
 
 func (k *KubeCliRuntime) applyOneObject(info *resource.Info) error {
-	helper := resource.NewHelper(info.Client, info.Mapping).WithFieldManager("kubectl-client-side-apply")
-	obj, err := helper.Replace(
+	helper := resource.NewHelper(info.Client, info.Mapping).WithFieldManager("kubectl-kcl-client-side-apply")
+	// Send the full object to be applied on the server side.
+	data, err := runtime.Encode(unstructured.UnstructuredJSONScheme, info.Object)
+	if err != nil {
+		return err
+	}
+	obj, err := helper.Patch(
 		info.Namespace,
 		info.Name,
-		true,
-		info.Object,
+		types.ApplyPatchType,
+		data,
+		&metav1.PatchOptions{
+			Force: &k.ForceConflicts,
+		},
 	)
 	if err != nil {
 		return err
 	}
 	if err := info.Refresh(obj, true); err != nil {
 		return err
 	}
+	// TODO: use kubectl ApplyOptions intead of genericclioptions.
+	printer, err := genericclioptions.NewPrintFlags("configured").ToPrinter()
+	if err != nil {
+		return err
+	}
+
+	if err = printer.PrintObj(info.Object, os.Stdout); err != nil {
+		return err
+	}
 	return nil
 }

pkg/options/apply.go

@@ -3,7 +3,6 @@ package options
 import (
 	"bufio"
 	"bytes"
-	"errors"
 	"io"
 	"os"
 
@@ -14,10 +13,7 @@ import (
 
 // ApplyOptions is the options for the apply sub command.
 type ApplyOptions struct {
-	// InputPath is the -f flag
-	InputPath string
-	// OutputPath is the -o flag
-	OutputPath string
+	RunOptions
 
 	// Namespace is the -n flag --namespace. It will set kubernetes namespace scope
 	Namespace string
@@ -37,20 +33,13 @@ func NewApplyOptions() *ApplyOptions {
 
 // Run apply command option.
 func (o *ApplyOptions) Run() error {
-	var buf bytes.Buffer
 	cli := o.getCliRuntime()
-	if err := cli.GetGeneralResources(&buf); err != nil {
-		logger.GetLogger().Errorf("get general resource err: %s", err.Error())
-		return err
-	}
-	_, bs, err := o.reader()
+
+	reader, err := o.reader()
 	if err != nil {
-		logger.GetLogger().Errorf("read kcl code err: %s", err.Error())
+		logger.GetLogger().Errorf("read manifests err: %s", err.Error())
 		return err
 	}
-	n := append(buf.Bytes(), bs...)
-	reader := bytes.NewReader(n)
-
 	// use the io pipe feat to connect io writer to io reader
 	pr, pw := io.Pipe()
 	go func() {
@@ -67,7 +56,15 @@ func (o *ApplyOptions) Run() error {
 		return err
 	}
 	if err := cli.Apply(cli.Flags, &input); err != nil {
-		logger.GetLogger().Errorf("cli apply err: %s", err.Error())
+		logger.GetLogger().Errorf("apply err: %s", err.Error())
+		return err
+	}
+	return nil
+}
+
+func (o *ApplyOptions) getGeneralResource(w io.Writer) error {
+	cli := o.getCliRuntime()
+	if err := cli.GetGeneralResources(w); err != nil {
 		return err
 	}
 	return nil
@@ -86,29 +83,15 @@ func (o *ApplyOptions) Validate() error {
 	return nil
 }
 
-func (o *ApplyOptions) reader() (io.Reader, []byte, error) {
+func (o *ApplyOptions) reader() (io.Reader, error) {
 	if o.InputPath == "-" {
-		scanner := bufio.NewScanner(os.Stdin)
-		if !scanner.Scan() {
-			return nil, nil, errors.New("input scan err")
-		}
-		line := scanner.Bytes()
-		return os.Stdin, line, nil
+		return os.Stdin, nil
 	} else {
 		file, err := os.Open(o.InputPath)
 		if err != nil {
-			return nil, nil, err
-		}
-		stat, err := file.Stat()
-		if err != nil {
-			return nil, nil, err
-		}
-		bs := make([]byte, stat.Size())
-		_, err = bufio.NewReader(file).Read(bs)
-		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
-		return bufio.NewReader(file), bs, nil
+		return bufio.NewReader(file), nil
 	}
 }
 

pkg/options/apply_test.go

@@ -28,9 +28,11 @@ func TestApplyOptions_Run(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			o := &ApplyOptions{
-				InputPath:  tt.fields.InputPath,
-				OutputPath: tt.fields.OutputPath,
-				Namespace:  tt.fields.Namespace,
+				RunOptions: RunOptions{
+					InputPath:  tt.fields.InputPath,
+					OutputPath: tt.fields.OutputPath,
+				},
+				Namespace: tt.fields.Namespace,
 			}
 			if err := o.Run(); (err != nil) != tt.wantErr {
 				t.Errorf("ApplyOptions.Run() error = %v, wantErr %v", err, tt.wantErr)