Merge branch 'master' into vpc

Author: JacksonTian

.github/workflows/go.yml

@@ -0,0 +1,29 @@
+name: Go
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    # fetch submodule for aliyun-openapi-meta
+    - run: git submodule update --init --recursive
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+
+    - name: Build
+      run: make build
+
+    - name: Test
+      run: go vet ./cli/... ./config/... ./i18n/... ./main/... ./openapi/... ./oss/... ./resource/...
+    - run: go test -race -coverprofile=coverage.txt -covermode=atomic ./cli/... ./config/... ./i18n/... ./meta/... ./main/... ./openapi/... ./resource/...
+    - run: test -z $ACCESS_KEY_ID -a -z $ACCESS_KEY_SECRET || bash ./integration/ecs_test

README.md

@@ -3,7 +3,7 @@ English | [简体中文](./README-CN.md)
 <h1 align="center">Alibaba Cloud CLI</h1>
 
 <p align="center">
-<a href="https://travis-ci.com/aliyun/aliyun-cli"><img src="https://travis-ci.com/aliyun/aliyun-cli.svg?branch=master" alt="Travis Build Status"></a>
+<a href="https://github.com/aliyun/aliyun-cli/actions/workflows/go.yml"><img src="https://github.com/aliyun/aliyun-cli/actions/workflows/go.yml/badge.svg" alt="Go build Status"></a>
 <a href="https://ci.appveyor.com/project/aliyun/aliyun-cli"><img src="https://ci.appveyor.com/api/projects/status/avxoqqcmgksbt3d8/branch/master?svg=true" alt="Appveyor Build Status"></a>
 <a href="https://codecov.io/gh/aliyun/aliyun-cli"><img src="https://codecov.io/gh/aliyun/aliyun-cli/branch/master/graph/badge.svg" alt="codecov"></a>
 <a href="https://github.com/aliyun/aliyun-cli/blob/master/LICENSE"><img src="https://img.shields.io/github/license/aliyun/aliyun-cli.svg" alt="License"></a>

config/legacy.go

@@ -27,13 +27,17 @@ func MigrateLegacyConfiguration() (conf *Configuration, err error) {
 		return
 	}
 
-	conf, err = MigrateCredentials(path)
-	if err != nil {
+	conf, migrateErr := MigrateCredentials(path)
+	if migrateErr != nil {
 		return
 	}
 
 	path = hookGetHomePath(GetHomePath)() + "/.aliyuncli/configure"
-	err = MigrateConfigure(path, conf)
+	mfErr := MigrateConfigure(path, conf)
+	if mfErr != nil {
+		return
+	}
+
 	return
 }
 
@@ -97,5 +101,5 @@ func MigrateConfigure(path string, conf *Configuration) (err error) {
 		}
 	}
 
-	return
+	return nil
 }

config/legacy_test.go

@@ -62,9 +62,9 @@ func TestMigrateConfigure(t *testing.T) {
 	conf := &Configuration{CurrentProfile: "default", Profiles: []Profile{Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"}, Profile{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}
 	err := MigrateConfigure("http://nici", conf)
 	if runtime.GOOS == "windows" {
-		assert.Equal(t, "parse failed: open http://nici: The filename, directory name, or volume label syntax is incorrect.", err.Error())
+		assert.Equal(t, "parse failed: open http://nici: The filename, directory name, or volume label syntax is incorrect.\n", err.Error())
 	} else {
-		assert.Equal(t, "parse failed: open http://nici: no such file or directory", err.Error())
+		assert.Equal(t, "parse failed: open http://nici: no such file or directory\n", err.Error())
 	}
 
 	test, err := os.Create("testconf.ini")
@@ -101,11 +101,13 @@ func TestMigrateLegacyConfiguration(t *testing.T) {
 		os.RemoveAll("./.aliyuncli")
 		hookGetHomePath = orighookGetHomePath
 	}()
+
 	hookGetHomePath = func(fn func() string) func() string {
 		return func() string {
 			return "."
 		}
 	}
+
 	err := os.Mkdir("./.aliyuncli", os.ModePerm)
 	assert.Nil(t, err)
 
@@ -126,5 +128,5 @@ func TestMigrateLegacyConfiguration(t *testing.T) {
 	test.Close()
 	conf, err := MigrateLegacyConfiguration()
 	assert.Nil(t, err)
-	assert.Nil(t, conf)
+	assert.NotNil(t, conf)
 }

oss/lib/allpart_size.go

@@ -95,6 +95,14 @@ var allPartSizeCommand = AllPartSizeCommand{
 			OptionEncodingType,
 			OptionLogLevel,
 			OptionPassword,
+			OptionMode,
+			OptionECSRoleName,
+			OptionTokenTimeout,
+			OptionRamRoleArn,
+			OptionRoleSessionName,
+			OptionReadTimeout,
+			OptionConnectTimeout,
+			OptionSTSRegion,
 		},
 	},
 }

oss/lib/append_file.go

@@ -150,6 +150,14 @@ var appendFileCommand = AppendFileCommand{
 			OptionLogLevel,
 			OptionRequestPayer,
 			OptionPassword,
+			OptionMode,
+			OptionECSRoleName,
+			OptionTokenTimeout,
+			OptionRamRoleArn,
+			OptionRoleSessionName,
+			OptionReadTimeout,
+			OptionConnectTimeout,
+			OptionSTSRegion,
 		},
 	},
 }

oss/lib/bucket_cors.go

@@ -146,6 +146,14 @@ var corsCommand = CorsCommand{
 			OptionMethod,
 			OptionLogLevel,
 			OptionPassword,
+			OptionMode,
+			OptionECSRoleName,
+			OptionTokenTimeout,
+			OptionRamRoleArn,
+			OptionRoleSessionName,
+			OptionReadTimeout,
+			OptionConnectTimeout,
+			OptionSTSRegion,
 		},
 	},
 }

oss/lib/bucket_encryption.go

@@ -135,6 +135,14 @@ var bucketEncryptionCommand = BucketEncryptionCommand{
 			OptionKMSMasterKeyID,
 			OptionKMSDataEncryption,
 			OptionPassword,
+			OptionMode,
+			OptionECSRoleName,
+			OptionTokenTimeout,
+			OptionRamRoleArn,
+			OptionRoleSessionName,
+			OptionReadTimeout,
+			OptionConnectTimeout,
+			OptionSTSRegion,
 		},
 	},
 }

oss/lib/bucket_inventory.go

@@ -207,6 +207,14 @@ var bucketInventoryCommand = BucketInventoryCommand{
 			OptionMethod,
 			OptionMarker,
 			OptionPassword,
+			OptionMode,
+			OptionECSRoleName,
+			OptionTokenTimeout,
+			OptionRamRoleArn,
+			OptionRoleSessionName,
+			OptionReadTimeout,
+			OptionConnectTimeout,
+			OptionSTSRegion,
 		},
 	},
 }

oss/lib/bucket_lifecycle.go

@@ -165,6 +165,14 @@ var bucketLifeCycleCommand = BucketLifeCycleCommand{
 			OptionLogLevel,
 			OptionMethod,
 			OptionPassword,
+			OptionMode,
+			OptionECSRoleName,
+			OptionTokenTimeout,
+			OptionRamRoleArn,
+			OptionRoleSessionName,
+			OptionReadTimeout,
+			OptionConnectTimeout,
+			OptionSTSRegion,
 		},
 	},
 }