support for reading the value of a parameter from a file (#199)

Author: night556

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ### Master
 
+- new: support for reading the value of a parameter from a file
+    >*Note: Only works on api parameters and rpc style*  
+    
+    >The value of some parameters is very long, which is not conducive to terminal input.
+    >You can add `-FILE` to the original parameter to specify to read from the file, 
+    >followed by the file path.
+
+    >example:  
+    >command `aliyun ecs CreateInstance` has a parameter `--UserData`, You can specify the value of this parameter from a file by using `--UserData-FILE <filePath>`
+    ```shell
+    aliyun ecs CreateInstance --UserData-FILE '/home/Document/user_data'
+    ```
+    >*NOTE: The above example is not a complete command, just a demonstration of how new features are used.*
+
 ### 3.0.19
 
 - add product: oos, default version 2019-06-01

openapi/rpc.go

@@ -15,6 +15,9 @@ package openapi
 
 import (
 	"fmt"
+	"io/ioutil"
+	"strings"
+
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/aliyun-cli/cli"
 	"github.com/aliyun/aliyun-cli/meta"
@@ -42,8 +45,11 @@ func (a *RpcInvoker) Prepare(ctx *cli.Context) error {
 
 	// assign parameters
 	for _, f := range ctx.UnknownFlags().Flags() {
+		if strings.HasSuffix(f.Name, "-FILE") {
+			f.Name = strings.TrimSuffix(f.Name, "-FILE")
+			replaceValueWithFile(f)
+		}
 		param := api.FindParameter(f.Name)
-		// cli.Printf("flag: %s %v\n", f.Name, param)
 		if param == nil {
 			return &InvalidParameterError{Name: f.Name, api: api, flags: ctx.Flags()}
 		}
@@ -85,154 +91,11 @@ func (a *RpcInvoker) Call() (*responses.CommonResponse, error) {
 	return resp, err
 }
 
-// Deprecated Code
-//
-//func (c *Caller) InvokeRpc(ctx *cli.Context, product *meta.Product, apiName string) error {
-//	api, ok := c.library.GetApi(product.Code, product.Version, apiName)
-//	if !ok {
-//		return &InvalidApiError{Name: apiName, product: product}
-//	}
-//
-//	//
-//	// call OpenApi
-//	// return: if check failed return error, otherwise return nil
-//	client, request, err := c.InitClient(ctx, product, true)
-//	if err != nil {
-//		return err
-//	}
-//
-//	request.ApiName = apiName
-//	err = c.FillRpcParameters(ctx, request, &api)
-//	if err != nil {
-//		return err
-//	}
-//
-//	request.Scheme = api.GetProtocol()
-//	request.Method = api.GetMethod()
-//
-//	err = c.UpdateRequest(ctx, request)
-//	if err != nil {
-//		return err
-//	}
-//
-//	if v, ok := PagerFlag.GetValue(); ok {
-//		pager := GetPager(v)
-//		r, err := c.InvokeRpcWithPager(client, request, pager)
-//		if err != nil {
-//			ctx.Command().PrintFailed(err, "")
-//		} else {
-//			filter, err := GetOutputFilter()
-//			if err != nil {
-//				ctx.Command().PrintFailed(err,"init output filter failed")
-//				return nil
-//			}
-//
-//			if filter != nil {
-//				r, err = filter.FilterOutput(r)
-//				if err != nil {
-//					ctx.Command().PrintFailed(err,"output filter process failed")
-//					return nil
-//				}
-//			}
-//			cli.Println(r)
-//			if err != nil {
-//				ctx.Command().PrintFailed(err, "")
-//			}
-//			return nil
-//		}
-//	}
-//
-//		// waiter := NewWaiterWithCTX(ctx, client, request)
-//
-//
-//	filter, err := GetOutputFilter()
-//	if err != nil {
-//		ctx.Command().PrintFailed(err,"init output filter failed")
-//		return nil
-//	}
-//
-//	if filter != nil {
-//		out, err = filter.FilterOutput(out)
-//		if err != nil {
-//			ctx.Command().PrintFailed(err,"output filter process failed")
-//			return nil
-//		}
-//	}
-//	cli.Println(out)
-//
-//	//
-//	return nil
-//}
-//
-//func (c *Caller) InvokeRpcForce(ctx *cli.Context, product *meta.Product, apiName string) {
-//	//
-//	// call OpenApi
-//	// return: if check failed return error, otherwise return nil
-//	client, request, err := c.InitClient(ctx, product, true)
-//
-//	if err != nil {
-//		ctx.Command().PrintFailed(fmt.Errorf("init client failed: %v", err), "")
-//		return
-//	}
-//
-//
-//	err = c.UpdateRequest(ctx, request)
-//	if err != nil {
-//		ctx.Command().PrintFailed(err, "")
-//		return
-//	}
-//
-//	resp, err := client.ProcessCommonRequest(request)
-//	if err != nil {
-//		ctx.Command().PrintFailed(err, "")
-//	}
-//
-//	// err = outputProcessor(ctx, resp.GetHttpContentString())
-//	//if err != nil {
-//	//	ctx.Command().PrintFailed(err, "")
-//	//}
-//
-//	out := resp.GetHttpContentString()
-//
-//	filter, err := GetOutputFilter()
-//
-//	if err != nil {
-//		ctx.Command().PrintFailed(err,"init output filter failed")
-//		return
-//	}
-//
-//	if filter != nil {
-//		out, err = filter.FilterOutput(out)
-//		if err != nil {
-//			ctx.Command().PrintFailed(err,"output filter process failed")
-//			return
-//		}
-//	}
-//	cli.Println(out)
-//}
-//
-//func (c *Caller) FillRpcParameters(ctx *cli.Context, request *requests.CommonRequest, api *meta.Api) error {
-//
-//}
-//
-//func (c *Caller) InvokeRpcWithPager(client *sdk.Client, request *requests.CommonRequest, pager *Pager) (string, error) {
-//	for {
-//		resp, err := client.ProcessCommonRequest(request)
-//		if err != nil {
-//			return "", fmt.Errorf("call failed %s", err)
-//		}
-//		//
-//		// jmespath.Parser{}
-//		err = pager.FeedResponse(resp.GetHttpContentBytes())
-//		if err != nil {
-//			return "", fmt.Errorf("call failed %s", err)
-//		}
-//
-//		if !pager.HasMore() {
-//			break
-//		}
-//		pager.MoveNextPage(request)
-//	}
-//
-//	return pager.GetResponseCollection(), nil
-//}
+func replaceValueWithFile(f *cli.Flag) {
+	value, _ := f.GetValue()
+	data, err := ioutil.ReadFile(value)
+	if err != nil {
+		panic(err)
+	}
+	f.SetValue(string(data))
+}

openapi/rpc_test.go

@@ -101,6 +101,21 @@ func TestRpcInvoker_Prepare(t *testing.T) {
 	}
 	err = a.Prepare(ctx)
 	assert.Nil(t, err)
+
+	a.api.Parameters = []meta.Parameter{
+		{
+			Name:     "body",
+			Position: "Domain",
+		},
+	}
+	ctx.SetUnknownFlags(cli.NewFlagSet())
+	ctx.UnknownFlags().AddByName("body-FILE")
+	defer func() {
+		e := recover()
+		assert.NotNil(t, e)
+	}()
+	a.Prepare(ctx)
+
 }
 
 func TestRpcInvoker_Call(t *testing.T) {