Merge branch 'pre-release' into support-glide

Author: jxyowen

CHANGELOG.md

@@ -1,11 +1,17 @@
 # CHANGE LOG
 
+### 3.0.1 Final Version
+
+- support `version` command
+- fix `--dryrun` flag bugs
+-
+
 ### 3.0.0 GA Version
 
 - refactoring cli package design, support composite flag with fields
 - refactoring openapi package design, make it more extensible
 - support `--quiet` flag
-- support `--dry-run` flag
+- support `--dryrun` flag
 - support `aliyun oss --profile xxx`
 
 ### 0.81

Makefile

@@ -1,4 +1,4 @@
-export VERSION=3.0.0
+export VERSION=3.0.1
 
 all: build
 publish: build build_mac build_linux build_windows

README.md

@@ -5,7 +5,7 @@
 
 The Alibaba Cloud CLI is an open source tool, you can get the latest version from [GitHub](https://github.com/aliyun/aliyun-cli).
 
-This version is a new version built on Go. The new CLI is in the testing phase.  If you want to use the old version (built on Alibaba Cloud Python SDK), click [here](https://github.com/aliyun/aliyun-cli/tree/python_final).
+This version is a new version built on Go. If you want to use the old version (built on Alibaba Cloud Python SDK), click [here](https://github.com/aliyun/aliyun-cli/tree/python_final).
 
 ## Introduction
 
@@ -23,17 +23,11 @@ You can install Alibaba Cloud CLI either through the installer or the source cod
 
 	Download the installer, then extract the installer. You can move the extracted `aliyun` executable file to the `/usr/local/bin` directory or add it to the `$PATH`.
 
-	Download link: (3.0.0 GA)
+	Download link: (3.0.1)
 
-	- [Mac](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-macosx-3.0.0-amd64.tgz)
-	- [Linux](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-linux-3.0.0-amd64.tgz)
-	- [Windows (64 bit)](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-windows-3.0.0-amd64.zip)
-
-    Download link: (0.80 Beta)
-
-	- [Mac](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-macosx-0.80-amd64.tgz)
-	- [Linux](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-linux-0.80-amd64.tgz)
-	- [Windows (64 bit)](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-windows-0.80-amd64.zip)
+	- [Mac](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-macosx-3.0.1-amd64.tgz)
+	- [Linux](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-linux-3.0.1-amd64.tgz)
+	- [Windows (64 bit)](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-windows-3.0.1-amd64.zip)
 
 - **Compile source code**
 

README_zh.md

@@ -3,7 +3,7 @@
 
 阿里云命令行工具（Alibaba Cloud Command Line Interface）是开源项目，您可以从[Github](https://github.com/aliyun/aliyun-cli)上获取最新版本的CLI。
 
-该版本的CLI为Go语言重构版本，目前处于**BETA**发布中，如果您想使用原有的Python版本，请切换到[Python分支](https://github.com/aliyun/aliyun-cli/tree/python_final)。
+该版本的CLI为Go语言重构版本，如果您想使用原有的Python版本，请切换到[Python分支](https://github.com/aliyun/aliyun-cli/tree/python_final)。
 
 ## 简介
 
@@ -22,17 +22,11 @@
 
 	阿里云CLI工具下载、解压后即可使用，支持Mac, Linux, Windows平台(x64版本)。	您可以将解压的`aliyun`可执行文件移至`/usr/local/bin`目录下，或添加到`$PATH`中。
 
-	下载链接如下 (3.00 GA)：
+	下载链接如下 (3.0.1)：
 
-	- [Mac](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-macosx-3.00-amd64.tgz)
-	- [Linux](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-linux-3.00-amd64.tgz)
-	- [Windows (64 bit)](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-windows-3.0.0-amd64.zip)
-
-    下载链接如下: (0.80 Beta)
-
-	- [Mac](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-macosx-0.80-amd64.tgz)
-	- [Linux](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-linux-0.80-amd64.tgz)
-	- [Windows (64 bit)](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-windows-0.80-amd64.zip)
+	- [Mac](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-macosx-3.0.1-amd64.tgz)
+	- [Linux](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-linux-3.0.1-amd64.tgz)
+	- [Windows (64 bit)](http://aliyun-cli.oss-cn-hangzhou.aliyuncs.com/aliyun-cli-windows-3.0.1-amd64.zip)
 
 - **编译源码**
 
@@ -172,4 +166,65 @@ $ aliyun newproduct --version 2018-01-01 --endpoint newproduct.aliyuncs.com --pa
 - `--version`: 指定API的版本，你可以在API文档中找到版本号，如ECS的版本号是`2014-05-26`。
 - `--endpoint`: 指定产品的接入地址，一般产品接入地址是`product.aliyuncs.com`，或`product.en-central-1.aliyuncs.com`，请参考各产品的API文档。
 
-- `--waiter timeout=xxx`：
+#### 使用`--output`参数
+
+阿里云产品的查询接口会返回json结构化数据，不方便阅读。例如：
+
+```
+$ aliyun ecs DescribeInstances
+```
+
+执行以上命令将得到以下json结果：
+
+```
+{
+  "PageNumber": 1,
+  "TotalCount": 2,
+  "PageSize": 10,
+  "RequestId": "2B76ECBD-A296-407E-BE17-7E668A609DDA",
+  "Instances": {
+    "Instance": [
+      {
+        "ImageId": "ubuntu_16_0402_64_20G_alibase_20171227.vhd",
+        "InstanceTypeFamily": "ecs.xn4",
+        "VlanId": "",
+        "InstanceId": "i-12345678912345678123",
+        "Status": "Stopped",
+        //omit some fields
+      },
+      Instance": [
+      {
+        "ImageId": "ubuntu_16_0402_64_20G_alibase_20171227.vhd",
+        "InstanceTypeFamily": "ecs.xn4",
+        "VlanId": "",
+        "InstanceId": "i-abcdefghijklmnopqrst",
+        "Status": "Running",
+        //omit some fields
+      },
+    ]
+  }
+}
+```
+
+可以使用`--output`参数提取结果中感兴趣的字段，并进行表格化输出。例如：
+
+
+```
+$ aliyun ecs DescribeInstances --output cols=InstanceId,Status
+```
+
+执行以上命令将得到以下形式的结果：
+```
+InstanceId             | Status
+----------             | ------
+i-12345678912345678123 | Stopped
+i-abcdefghijklmnopqrst | Running
+```
+
+在使用`--output`参数时，必须指定以下参数：
+
+- `--cols`: 表格的列名，需要与json数据中的字段相对应。如ECS DescribeInstances 接口返回结果中的字段`InstanceId` 以及 `Status`。
+
+可选参数：
+- `--rows`: 通过[jmespath](http://jmespath.org/)查询语句来指定表格行在json结果中的数据来源。当查询语句具有`Instances.Instance[]`的形式时，可以省略该参数。
+

cli/version.go

@@ -3,7 +3,11 @@
  */
 package cli
 
-import "strings"
+import (
+	"strings"
+	"github.com/aliyun/aliyun-cli/i18n"
+	"fmt"
+)
 
 //
 // This variable is replaced in compile time
@@ -14,4 +18,16 @@ var (
 
 func GetVersion() string {
 	return strings.Replace(Version, " ", "-", -1)
+}
+
+func NewVersionCommand() *Command {
+	return &Command{
+		Name: "version",
+		Short: i18n.T("print current version", "打印当前版本号"),
+		Hidden: true,
+		Run: func(ctx *Context, args []string) error {
+			fmt.Printf("%s\n", Version)
+			return nil
+		},
+	}
 }

main/main.go

@@ -62,6 +62,7 @@ func main() {
 	rootCmd.AddSubCommand(configureCommand)
 	// rootCmd.AddSubCommand(command.NewTestCommand())
 	rootCmd.AddSubCommand(lib.NewOssCommand())
+	rootCmd.AddSubCommand(cli.NewVersionCommand())
 	rootCmd.AddSubCommand(cli.NewAutoCompleteCommand())
 	rootCmd.Execute(os.Args[1:])
 }

openapi/caller.go

@@ -87,10 +87,12 @@ func (c *Commando) processInvoke(ctx *cli.Context, productCode string, apiOrMeth
 		return err
 	}
 
-	// process --dry-run
+	// process --dryrun
 	if DryRunFlag.IsAssigned() {
-		fmt.Printf("Dry-run with request: \n------------------------------------\n%v\n",
-			invoker.getRequest())
+		invoker.getRequest().TransToAcsRequest()
+		invoker.getClient().BuildRequestWithSigner(invoker.getRequest(), nil)
+		fmt.Printf("Skip invoke in dry-run mode, request is:\n------------------------------------\n%s\n",
+			invoker.getRequest().String())
 		return nil
 	}