Merge pull request #53 from lixiaojun629/develop

add command 'ucloud api' & adapt to cloudshell

Author: lixiaojun629

Makefile

@@ -1,4 +1,4 @@
-export VERSION=0.1.32
+export VERSION=0.1.33
 
 .PHONY : install
 install:

README-CN.md

@@ -216,3 +216,39 @@ gssh[uga-0psxxx] created
 $ ssh root@152.32.140.92.ipssh.net
 root@152.32.140.92.ipssh.net's password: password of the uhost instance
 ```
+
+使用"ucloud api"命令调用任意API，根据API文档把某个API的参数依次填入。此命令比较特殊，不支持--public-key,--private-key,--debug,--profile,--timeout-sec等公共参数，如果要开启debug模式，可以设置环境变量$UCLOUD_CLI_DEBUG=on
+
+```
+$ ucloud api --Action <APIName>  --Param1 <value> --Param2 <value> ...
+```
+或者把API参数写到JSON文件中，举例如下
+```
+$ ucloud api --local-file ./create_uhost.json
+
+//create_uhost.json文件内容
+{
+    "Action":"CreateUHostInstance",
+    "Region":"cn-bj2",
+    "Zone":"cn-bj2-02",
+    "ImageId":"uimage-gk2x3x",
+    "NetworkInterface": [{
+        "EIP":{
+            "Bandwidth":1,
+            "OperatorName":"Bgp",
+            "PayMode": "Bandwidth"
+        }
+    }],
+    "LoginMode":"Password",
+    "Password":"dGVzdGx4ajEy",
+    "CPU":1,
+    "Memory":2048,
+    "Disks":[
+        {
+            "Size":20,
+            "Type":"LOCAL_NORMAL",
+            "IsBoot":"true"
+        }
+    ]
+}
+```

README.md

@@ -225,3 +225,39 @@ gssh[uga-0psxxx] created
 $ ssh root@152.32.140.92.ipssh.net
 root@152.32.140.92.ipssh.net's password: password of the uhost instance
 ```
+
+Using command "ucloud api" to call any API.Fill in the parameters of an API in sequence according to the API documentation. This command is quite special, and public parameters such as --public-key,--private-key,--debug,--profile,--timeout-sec are not supported. If you want to tune on debug mode, set environment variable $UCLOUD_CLI_DEBUG=on 
+
+```
+$ ucloud api --Action <APIName>  --Param1 <value> --Param2 <value> ...
+```
+You can also put those API parameters into a json file, like this.
+```
+$ ucloud api --local-file ./create_uhost.json
+
+//content of file create_uhost.json
+{
+    "Action":"CreateUHostInstance",
+    "Region":"cn-bj2",
+    "Zone":"cn-bj2-02",
+    "ImageId":"uimage-gk2x3x",
+    "NetworkInterface": [{
+        "EIP":{
+            "Bandwidth":1,
+            "OperatorName":"Bgp",
+            "PayMode": "Bandwidth"
+        }
+    }],
+    "LoginMode":"Password",
+    "Password":"dGVzdGx4ajEy",
+    "CPU":1,
+    "Memory":2048,
+    "Disks":[
+        {
+            "Size":20,
+            "Type":"LOCAL_NORMAL",
+            "IsBoot":"true"
+        }
+    ]
+}
+```

base/client.go

@@ -1,6 +1,7 @@
 package base
 
 import (
+	"github.com/ucloud/ucloud-sdk-go/private/protocol/http"
 	ppathx "github.com/ucloud/ucloud-sdk-go/private/services/pathx"
 	pudb "github.com/ucloud/ucloud-sdk-go/private/services/udb"
 	puhost "github.com/ucloud/ucloud-sdk-go/private/services/uhost"
@@ -53,11 +54,26 @@ type Client struct {
 }
 
 // NewClient will return a aggregate client
-func NewClient(config *sdk.Config, credential *auth.Credential) *Client {
+func NewClient(config *sdk.Config, credConfig *CredentialConfig) *Client {
 	var handler sdk.RequestHandler = func(c *sdk.Client, req request.Common) (request.Common, error) {
 		err := req.SetProjectId(PickResourceID(req.GetProjectId()))
 		return req, err
 	}
+	var injectCredHeader sdk.HttpRequestHandler = func(c *sdk.Client, req *http.HttpRequest) (*http.HttpRequest, error) {
+		err := req.SetHeader("Cookie", credConfig.Cookie)
+		if err != nil {
+			return req, err
+		}
+		err = req.SetHeader("Csrf-Token", credConfig.CSRFToken)
+		if err != nil {
+			return req, err
+		}
+		return req, err
+	}
+	credential := &auth.Credential{
+		PublicKey:  credConfig.PublicKey,
+		PrivateKey: credConfig.PrivateKey,
+	}
 	var (
 		uaccountClient = *uaccount.NewClient(config, credential)
 		uhostClient    = *uhost.NewClient(config, credential)
@@ -77,20 +93,49 @@ func NewClient(config *sdk.Config, credential *auth.Credential) *Client {
 	)
 
 	uaccountClient.Client.AddRequestHandler(handler)
+	uaccountClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	uhostClient.Client.AddRequestHandler(handler)
+	uhostClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	unetClient.Client.AddRequestHandler(handler)
+	unetClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	vpcClient.Client.AddRequestHandler(handler)
+	vpcClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	udpnClient.Client.AddRequestHandler(handler)
+	udpnClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	pathxClient.Client.AddRequestHandler(handler)
+	pathxClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	udiskClient.Client.AddRequestHandler(handler)
+	udiskClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	ulbClient.Client.AddRequestHandler(handler)
+	ulbClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	udbClient.Client.AddRequestHandler(handler)
+	udbClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	umemClient.Client.AddRequestHandler(handler)
+	umemClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	uphostClient.Client.AddRequestHandler(handler)
+	uphostClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	puhostClient.Client.AddRequestHandler(handler)
+	puhostClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	pudbClient.Client.AddRequestHandler(handler)
+	pudbClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	pumemClient.Client.AddRequestHandler(handler)
+	pumemClient.Client.AddHttpRequestHandler(injectCredHeader)
+
 	ppathxClient.Client.AddRequestHandler(handler)
+	ppathxClient.Client.AddHttpRequestHandler(injectCredHeader)
 
 	return &Client{
 		uaccountClient,