fix: unable to get accessKeyID from env

Author: night556

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### Master
 
+- fix: unable to get accessKeyID from environment variable
+
 ### 3.0.40
 
 - update: meta data

config/profile.go

@@ -159,11 +159,11 @@ func (cp *Profile) OverwriteWithFlags(ctx *cli.Context) {
 	if cp.AccessKeySecret == "" {
 		switch {
 		case os.Getenv("ALIBABACLOUD_ACCESS_KEY_SECRET") != "":
-			cp.AccessKeyId = os.Getenv("ALIBABACLOUD_ACCESS_KEY_SECRET")
+			cp.AccessKeySecret = os.Getenv("ALIBABACLOUD_ACCESS_KEY_SECRET")
 		case os.Getenv("ALICLOUD_ACCESS_KEY_SECRET") != "":
-			cp.AccessKeyId = os.Getenv("ALICLOUD_ACCESS_KEY_SECRET")
+			cp.AccessKeySecret = os.Getenv("ALICLOUD_ACCESS_KEY_SECRET")
 		case os.Getenv("ACCESS_KEY_SECRET") != "":
-			cp.AccessKeyId = os.Getenv("ACCESS_KEY_SECRET")
+			cp.AccessKeySecret = os.Getenv("ACCESS_KEY_SECRET")
 		}
 	}
 

config/profile_test.go

@@ -151,6 +151,18 @@ func TestProfile(t *testing.T) {
 	p.OverwriteWithFlags(ctx)
 	assert.Equal(t, Profile{Name: "default", Mode: EcsRamRole, RamRoleArn: "----", RamRoleName: "RamRoleName", OutputFormat: "json", RetryCount: 0, ReadTimeout: 0, Language: "en"}, p)
 
+	p.Mode = AK
+	p.AccessKeyId = ""
+	p.AccessKeySecret = ""
+	os.Setenv("ACCESS_KEY_ID", "accessKeyID")
+	os.Setenv("ACCESS_KEY_SECRET", "accessKeySecret")
+	p.OverwriteWithFlags(ctx)
+	assert.Equal(t, Profile{Name: "default", Mode: AK, AccessKeyId: "accessKeyID", AccessKeySecret: "accessKeySecret", RamRoleName: "RamRoleName", RamRoleArn: "----", OutputFormat: "json", RetryCount: 0, ReadTimeout: 0, Language: "en"}, p)
+	os.Setenv("ACCESS_KEY_ID", "")
+	os.Setenv("ACCESS_KEY_SECRET", "")
+	p.AccessKeyId = ""
+	p.AccessKeySecret = ""
+
 	//GetClient
 	p.ReadTimeout = 1
 	p.RetryCount = 1

go.sum

@@ -80,6 +80,7 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=