Merge branch 'master' into vpc

Author: JacksonTian

.appveyor.yml

@@ -7,11 +7,11 @@ clone_folder: C:\Users\appveyor\go\src\github.com\aliyun\aliyun-cli
 # scripts that run after cloning repository
 install:
   # by default, all script lines are interpreted as batch
-  - cmd: git clone -q --branch=master https://github.com/aliyun/aliyun-openapi-meta.git C:\Users\appveyor\go\src\github.com\aliyun\aliyun-openapi-meta
+  - cmd: git submodule update --init --recursive
   - cmd: set path=%path%;C:\Users\appveyor\go\bin
-  - cmd: set VERSION=3.0.81
+  - cmd: set VERSION=3.0.85
   - cmd: go get -u github.com/shuLhan/go-bindata/...  
-  - cmd: go-bindata -o resource/metas.go -pkg resource -prefix ../aliyun-openapi-meta ../aliyun-openapi-meta/...
+  - cmd: go-bindata -o resource/metas.go -pkg resource ./aliyun-openapi-meta/...
   - cmd: go build -ldflags "-X 'github.com/aliyun/aliyun-cli/cli.Version=%VERSION%'" -o C:\Users\appveyor\go\bin\aliyun.exe main/main.go
 
 # build platform, i.e. x86, x64, Any CPU. This setting is optional.
@@ -28,4 +28,3 @@ test_script:
     $client.DownloadFile('https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win64.exe', 'C:/go/bin/jq.exe')
 
     if (-not $env:ACCESS_KEY_ID.length -eq 0 -and -not $env:ACCESS_KEY_SECRET.length -eq 0){./integration/ecs_test.PS1}
-  

.github/workflows/go.yml

@@ -10,6 +10,10 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
+    env:
+      ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
+      ACCESS_KEY_SECRET: ${{ secrets.ACCESS_KEY_SECRET }}
+      REGION_ID: ${{ secrets.REGION_ID }}
     steps:
     - uses: actions/checkout@v2
     # fetch submodule for aliyun-openapi-meta

.travis.yml

@@ -13,6 +13,7 @@ before_install:
   - sudo apt-get install -y jq
 
 install:
+  - git submodule update --init --recursive
   - make build
   - sudo cp out/aliyun /usr/local/bin
 

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ### Master
 
+### 3.0.85
+
+- update: meta data
+
+### 3.0.84
+
+- update: meta data
+
+### 3.0.83
+
+- update: meta data
+
+### 3.0.82
+
+- update: meta data
+
 ### 3.0.81
 
 - update: meta data

Makefile

@@ -1,4 +1,4 @@
-export VERSION=3.0.81
+export VERSION=3.0.85
 export RELEASE_PATH="releases/aliyun-cli-${VERSION}"
 
 all: build

README-CN.md

@@ -43,11 +43,11 @@ CLI 版本更改说明请参考 [CHANGELOG](./CHANGELOG.md)
 
   阿里云CLI工具下载、解压后即可使用，支持Mac, Linux, Windows平台(x64版本)。您可以将解压的`aliyun`可执行文件移至`/usr/local/bin`目录下，或添加到`$PATH`中。
 
-  下载链接如下 (3.0.81)：
+  下载链接如下 (3.0.85)：
 
-  - [Mac](https://aliyuncli.alicdn.com/aliyun-cli-macosx-3.0.81-amd64.tgz)
-  - [Linux](https://aliyuncli.alicdn.com/aliyun-cli-linux-3.0.81-amd64.tgz)
-  - [Windows (64 bit)](https://aliyuncli.alicdn.com/aliyun-cli-windows-3.0.81-amd64.zip)
+  - [Mac](https://aliyuncli.alicdn.com/aliyun-cli-macosx-3.0.85-amd64.tgz)
+  - [Linux](https://aliyuncli.alicdn.com/aliyun-cli-linux-3.0.85-amd64.tgz)
+  - [Windows (64 bit)](https://aliyuncli.alicdn.com/aliyun-cli-windows-3.0.85-amd64.zip)
 
 - **使用brew**
 

README.md

@@ -41,11 +41,11 @@ The release notes for the CLI can be found in the [CHANGELOG](./CHANGELOG.md)
 
   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.81)
+  Download link: (3.0.85)
 
-  - [Mac](https://aliyuncli.alicdn.com/aliyun-cli-macosx-3.0.81-amd64.tgz)
-  - [Linux](https://aliyuncli.alicdn.com/aliyun-cli-linux-3.0.81-amd64.tgz)
-  - [Windows (64 bit)](https://aliyuncli.alicdn.com/aliyun-cli-windows-3.0.81-amd64.zip)
+  - [Mac](https://aliyuncli.alicdn.com/aliyun-cli-macosx-3.0.85-amd64.tgz)
+  - [Linux](https://aliyuncli.alicdn.com/aliyun-cli-linux-3.0.85-amd64.tgz)
+  - [Windows (64 bit)](https://aliyuncli.alicdn.com/aliyun-cli-windows-3.0.85-amd64.zip)
 
 - **Use brew**
 If you have installed `brew` in your computer, you can use it to install Alibaba Cloud CLI as following:

aliyun-openapi-meta

@@ -230,14 +230,14 @@ func (c *Command) executeInner(ctx *Context, args []string) error {
 }
 
 func (c *Command) processError(ctx *Context, err error) {
-	Errorf(ctx.Writer(), "ERROR: %s\n", err.Error())
+	Errorf(ctx.Stderr(), "ERROR: %s\n", err.Error())
 	if e, ok := err.(SuggestibleError); ok {
 		PrintSuggestions(ctx, i18n.GetLanguage(), e.GetSuggestions())
 		Exit(2)
 		return
 	}
 	if e, ok := err.(ErrorWithTip); ok {
-		Noticef(ctx.Writer(), "\n%s\n", e.GetTip(i18n.GetLanguage()))
+		Noticef(ctx.Stderr(), "\n%s\n", e.GetTip(i18n.GetLanguage()))
 		Exit(3)
 		return
 	}

cli/command.go

@@ -77,8 +77,8 @@ func (c *Command) PrintFlags(ctx *Context) {
 }
 
 func (c *Command) PrintFailed(ctx *Context, err error, suggestion string) {
-	Errorf(ctx.Writer(), "ERROR: %v\n", err)
-	Printf(ctx.Writer(), "%s\n", suggestion)
+	Errorf(ctx.Stderr(), "ERROR: %v\n", err)
+	Printf(ctx.Stderr(), "%s\n", suggestion)
 }
 
 func (c *Command) PrintTail(ctx *Context) {