climc: k8s general raw resource GET, PUT, DELETE support

cmd/climc/shell/k8s/raw.go

@@ -1,32 +1,64 @@
 package k8s
 
 import (
+	"fmt"
+	"io/ioutil"
+
+	"yunion.io/x/jsonutils"
+
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 )
 
-type rawGetOpt struct {
+type rawOpt struct {
 	namespaceOptions
 	KIND string `help:"resource kind"`
 	NAME string `help:"instance name"`
 }
 
+type rawGetOpt struct {
+	rawOpt
+	Output string `help:"Output format" short-token:"o" default:"yaml" choices:"json|yaml"`
+}
+
 type rawDeleteOpt struct {
-	rawGetOpt
+	rawOpt
+}
+
+type rawPutOpt struct {
+	rawOpt
+	File string `help:"Resource json description file" short-token:"f"`
 }
 
 func initRaw() {
 	R(&rawGetOpt{}, "k8s-get", "Get k8s resource instance raw info", func(s *mcclient.ClientSession, args *rawGetOpt) error {
-		obj, err := k8s.RawResource.Get(s, args.KIND, args.Namespace, args.NAME, args.ClusterParams())
+		obj, err := k8s.RawResource.Get(s, args.KIND, args.Namespace, args.NAME, args.Cluster)
 		if err != nil {
 			return err
 		}
-		printObjectYAML(obj)
+		if args.Output == "json" {
+			fmt.Println(obj.PrettyString())
+		} else {
+			printObjectYAML(obj)
+		}
 		return nil
 	})
 
 	R(&rawDeleteOpt{}, "k8s-delete", "Delete k8s resource instance", func(s *mcclient.ClientSession, args *rawDeleteOpt) error {
-		err := k8s.RawResource.Delete(s, args.KIND, args.Namespace, args.NAME, args.ClusterParams())
+		err := k8s.RawResource.Delete(s, args.KIND, args.Namespace, args.NAME, args.Cluster)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+
+	R(&rawPutOpt{}, "k8s-put", "Update k8s resource instance", func(s *mcclient.ClientSession, args *rawPutOpt) error {
+		content, err := ioutil.ReadFile(args.File)
+		if err != nil {
+			return err
+		}
+		body := jsonutils.Marshal(string(content))
+		err = k8s.RawResource.Put(s, args.KIND, args.Namespace, args.NAME, body, args.Cluster)
 		if err != nil {
 			return err
 		}