Merge remote-tracking branch 'remotes/origin/pre-release' into 3.0.1_Final

Author: ailan.gl

.travis.yml

@@ -1,23 +1,29 @@
 language: go
 
-sudo: false
+sudo: true
 
 go:
-  - 1.7.x
   - 1.8.x
-  - 1.9.x
-  - 1.10.x
+
+branches:
+  only:
+    - master
+    - pre-release
+
+before_install:
+  - sudo apt-get install -y jq
 
 install:
   - make deps
   - make testdeps
 
 notifications:
-    #webhooks: https://oapi.dingtalk.com/robot/send?access_token=096ed387df243a6d60835aadeccc47165f3813bc7cb81cdd0cfeadfd28e3acc1
+    webhooks: https://oapi.dingtalk.com/robot/send?access_token=096ed387df243a6d60835aadeccc47165f3813bc7cb81cdd0cfeadfd28e3acc1
     email: false
     on_success: change
     on_failure: always
 
 script:
   - make build
-  - go test -v -timeout 30m ./...
+  - sudo cp out/aliyun /usr/local/bin
+  - cd ./integration && ./test

Makefile

@@ -15,14 +15,15 @@ deps:
 	go get github.com/aliyun/alibaba-cloud-sdk-go/sdk
 	go get github.com/posener/complete
 	go get github.com/aliyun/ossutil/lib
+	go get gopkg.in/yaml.v2
 
-testdeps:
+testdeps: deps
 	go get -v github.com/onsi/ginkgo/ginkgo
 	go get -v github.com/onsi/gomega
 	go install github.com/onsi/ginkgo/ginkgo
 	go get gopkg.in/check.v1
 
-metas:
+metas: deps
 	go-bindata -o resource/metas.go -pkg resource -prefix ../aliyun-openapi-meta ../aliyun-openapi-meta/**/* ../aliyun-openapi-meta/products.json
 
 clean:

README.md

@@ -1,4 +1,5 @@
 # Aliyun Command Line Interface
+[![Build Status](https://travis-ci.org/aliyun/aliyun-cli.svg?branch=master)](https://travis-ci.org/aliyun/aliyun-cli) 
 
 [中文文档](./README_zh.md)
 

README_zh.md

@@ -1,4 +1,5 @@
 # 阿里云命令行工具 (Aliyun Command Line Interface)
+[![Build Status](https://travis-ci.org/aliyun/aliyun-cli.svg?branch=master)](https://travis-ci.org/aliyun/aliyun-cli) 
 
 阿里云命令行工具（Alibaba Cloud Command Line Interface）是开源项目，您可以从[Github](https://github.com/aliyun/aliyun-cli)上获取最新版本的CLI。
 

integration/common

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+g_var=
+g_error=0
+force="force"
+
+do_command() {
+	if [[ $2 != $force && $g_error -eq 1 ]]
+	then
+		g_var=
+		return $g_error
+	fi
+
+	cmd="$1 --access-key-id $ACCESS_KEY_ID --access-key-secret $ACCESS_KEY_SECRET --region cn-beijing 2>&1"
+
+	echo "Command<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+	echo $cmd
+	echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Command"
+
+	g_var=$(eval $cmd)
+
+	echo "Result<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+	echo $g_var
+	echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Result"
+
+	err=$(echo $g_var | grep -i "error")
+
+	if [[ $2 != $force && $err != "" ]]
+	then
+		g_var=
+		g_error=1
+		return $g_error
+	fi
+
+	return 0
+}

integration/ecs_test

@@ -0,0 +1,87 @@
+#!/bin/bash
+source common
+
+
+ecs_create_instance() {
+	do_command "aliyun ecs CreateInstance --ImageId ubuntu_16_0402_64_20G_alibase_20171227.vhd --InstanceType ecs.xn4.small" $1
+}
+
+ecs_start_instance() {
+	do_command "aliyun ecs StartInstance --InstanceId $1" $2
+}
+
+ecs_stop_instance() {
+	do_command "aliyun ecs StopInstance --InstanceId $1" $2
+}
+
+ecs_instance_status_wait_until() {
+	do_command "aliyun ecs DescribeInstances --InstanceIds ['$1'] --waiter expr=Instances.Instance[0].Status to=$2 timeout=600" $3
+}
+
+ecs_describe_instances() {
+	do_command "aliyun ecs DescribeInstances" $1
+}
+
+ecs_delete_instance() {
+	do_command "aliyun ecs DeleteInstance --InstanceId $1" $2
+}
+
+ecs_get_instance_ids() {
+	ecs_describe_instances $force
+	ids=$(echo $g_var | jq '.Instances.Instance[].InstanceId')
+	err=$(echo ids | grep -i "error")
+	if [[ $err != "" ]]
+	then
+		g_var=""
+	else
+		g_var=$ids
+	fi
+}
+
+ecs_clear_all_instances() {
+	ecs_get_instance_ids
+
+	ids=$g_var
+
+	for id in ${ids[@]}; do
+		echo "###### Try to stop instance $id ######"
+		ecs_stop_instance $id $force
+	done
+
+	for id in ${ids[@]}; do
+		echo "###### Try to delete instance $id ######"
+
+		ecs_instance_status_wait_until $id Stopped $force
+
+		ecs_delete_instance $id $force
+	done
+}
+
+ecs_test() {
+	ecs_create_instance
+
+	id=$(echo $g_var | jq '.InstanceId')
+
+	echo "###### Try to test instance $id ######"
+
+	ecs_instance_status_wait_until $id Stopped
+
+	ecs_start_instance $id
+
+	ecs_instance_status_wait_until $id Running
+
+	ecs_stop_instance $id $force
+
+	ecs_instance_status_wait_until $id Stopped
+
+	ecs_delete_instance $id
+
+	if [[ $g_error -eq 1 ]]
+	then
+		ecs_clear_all_instances
+	fi
+
+	return $g_error
+}
+
+

integration/test

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+source ecs_test
+
+ecs_test
+
+echo "test result is $g_error"
+
+exit $g_error

openapi/waiter.go

@@ -57,8 +57,8 @@ func (a *Waiter) CallWith(invoker Invoker) (string, error) {
 	timeout := time.Duration(time.Second * 180)
 	if s, ok := WaiterFlag.GetFieldValue("timeout"); ok {
 		if n, err := strconv.Atoi(s); err == nil {
-			if n <= 0 && n > 180 {
-				return "", fmt.Errorf("--waiter timeout=%s must between 1-180 (seconds)", s)
+			if n <= 0 && n > 600 {
+				return "", fmt.Errorf("--waiter timeout=%s must between 1-600 (seconds)", s)
 			}
 			timeout = time.Duration(time.Second * time.Duration(n))
 		} else {