diff --git a/credentials/credential.go b/credentials/credential.go index 32aa2a9..9135969 100644 --- a/credentials/credential.go +++ b/credentials/credential.go @@ -245,7 +245,6 @@ func NewCredential(config *Config) (credential Credential, err error) { tea.StringValue(config.AccessKeySecret), tea.StringValue(config.SecurityToken)) case "ecs_ram_role": - checkEcsRAMRole(config) runtime := &utils.Runtime{ Host: tea.StringValue(config.Host), Proxy: tea.StringValue(config.Proxy), @@ -317,7 +316,7 @@ func NewCredential(config *Config) (credential Credential, err error) { } credential = newBearerTokenCredential(tea.StringValue(config.BearerToken)) default: - err = errors.New("Invalid type option, support: access_key, sts, ecs_ram_role, ram_role_arn, rsa_key_pair") + err = errors.New("invalid type option, support: access_key, sts, ecs_ram_role, ram_role_arn, rsa_key_pair") return } return credential, nil @@ -371,10 +370,6 @@ func checkRAMRoleArn(config *Config) (err error) { return } -func checkEcsRAMRole(config *Config) (err error) { - return -} - func checkSTS(config *Config) (err error) { if tea.StringValue(config.AccessKeyId) == "" { err = errors.New("AccessKeyId cannot be empty") diff --git a/credentials/credential_test.go b/credentials/credential_test.go index 263149e..891d645 100644 --- a/credentials/credential_test.go +++ b/credentials/credential_test.go @@ -38,7 +38,7 @@ func TestNewCredentialWithNil(t *testing.T) { os.Unsetenv(EnvVarAccessKeySecret) cred, err = NewCredential(nil) assert.NotNil(t, err) - assert.Equal(t, "No credential found", err.Error()) + assert.Equal(t, "no credential found", err.Error()) assert.Nil(t, cred) } @@ -252,7 +252,7 @@ func TestNewCredentialWithInvalidType(t *testing.T) { config.SetType("sdk") cred, err := NewCredential(config) assert.NotNil(t, err) - assert.Equal(t, "Invalid type option, support: access_key, sts, ecs_ram_role, ram_role_arn, rsa_key_pair", err.Error()) + assert.Equal(t, "invalid type option, support: access_key, sts, ecs_ram_role, ram_role_arn, rsa_key_pair", err.Error()) assert.Nil(t, cred) } diff --git a/credentials/ecs_ram_role.go b/credentials/ecs_ram_role.go index f88a279..69da093 100644 --- a/credentials/ecs_ram_role.go +++ b/credentials/ecs_ram_role.go @@ -179,7 +179,7 @@ func (e *EcsRAMRoleCredential) updateCredential() (err error) { if e.EnableIMDSv2 { err = e.getMetadataToken() if err != nil { - return fmt.Errorf("Failed to get token from ECS Metadata Service: %s", err.Error()) + return fmt.Errorf("failed to get token from ECS Metadata Service: %s", err.Error()) } request.Headers["X-aliyun-ecs-metadata-token"] = e.metadataToken } diff --git a/credentials/ecs_ram_role_test.go b/credentials/ecs_ram_role_test.go index 676b443..39f9652 100644 --- a/credentials/ecs_ram_role_test.go +++ b/credentials/ecs_ram_role_test.go @@ -53,7 +53,7 @@ func Test_EcsRAmRoleCredential(t *testing.T) { } } auth.RoleName = "" - accesskeyId, err = auth.GetAccessKeyId() + _, err = auth.GetAccessKeyId() assert.NotNil(t, err) assert.Equal(t, "refresh Ecs sts token err: httpStatus: 400, message = role", err.Error()) @@ -62,7 +62,7 @@ func Test_EcsRAmRoleCredential(t *testing.T) { return mockResponse(200, `role`, nil) } } - accesskeyId, err = auth.GetAccessKeyId() + _, err = auth.GetAccessKeyId() assert.NotNil(t, err) assert.Equal(t, "refresh Ecs sts token err: Json Unmarshal fail: invalid character 'r' looking for beginning of value", err.Error()) hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) { @@ -155,13 +155,13 @@ func Test_EcsRAmRoleCredentialEnableIMDSv2(t *testing.T) { auth = newEcsRAMRoleCredentialWithEnableIMDSv2("go sdk", true, 0, 0.5, nil) accesskeyId, err = auth.GetAccessKeyId() assert.NotNil(t, err) - assert.Equal(t, "Failed to get token from ECS Metadata Service: sdk test", err.Error()) + assert.Equal(t, "failed to get token from ECS Metadata Service: sdk test", err.Error()) assert.Equal(t, "", *accesskeyId) auth = newEcsRAMRoleCredentialWithEnableIMDSv2("go sdk", true, 180, 0.5, nil) accesskeyId, err = auth.GetAccessKeyId() assert.NotNil(t, err) - assert.Equal(t, "Failed to get token from ECS Metadata Service: sdk test", err.Error()) + assert.Equal(t, "failed to get token from ECS Metadata Service: sdk test", err.Error()) assert.Equal(t, "", *accesskeyId) hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) { @@ -171,7 +171,7 @@ func Test_EcsRAmRoleCredentialEnableIMDSv2(t *testing.T) { } accesskeyId, err = auth.GetAccessKeyId() assert.NotNil(t, err) - assert.Equal(t, "Failed to get token from ECS Metadata Service: httpStatus: 300, message = ", err.Error()) + assert.Equal(t, "failed to get token from ECS Metadata Service: httpStatus: 300, message = ", err.Error()) assert.Equal(t, "", *accesskeyId) hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) { @@ -180,7 +180,7 @@ func Test_EcsRAmRoleCredentialEnableIMDSv2(t *testing.T) { } } auth.RoleName = "" - accesskeyId, err = auth.GetAccessKeyId() + _, err = auth.GetAccessKeyId() assert.NotNil(t, err) assert.Equal(t, "refresh Ecs sts token err: httpStatus: 400, message = role", err.Error()) @@ -189,7 +189,7 @@ func Test_EcsRAmRoleCredentialEnableIMDSv2(t *testing.T) { return mockResponse(200, `role`, nil) } } - accesskeyId, err = auth.GetAccessKeyId() + _, err = auth.GetAccessKeyId() assert.NotNil(t, err) assert.Equal(t, "refresh Ecs sts token err: Json Unmarshal fail: invalid character 'r' looking for beginning of value", err.Error()) hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) { diff --git a/credentials/profile_provider.go b/credentials/profile_provider.go index de02c3d..9326276 100644 --- a/credentials/profile_provider.go +++ b/credentials/profile_provider.go @@ -100,21 +100,21 @@ func (p *profileProvider) resolve() (*Config, error) { } return config, nil default: - return nil, errors.New("Invalid type option, support: access_key, sts, ecs_ram_role, ram_role_arn, rsa_key_pair") + return nil, errors.New("invalid type option, support: access_key, sts, ecs_ram_role, ram_role_arn, rsa_key_pair") } } func getRSAKeyPair(section *ini.Section) (*Config, error) { publicKeyId, err := section.GetKey("public_key_id") if err != nil { - return nil, errors.New("Missing required public_key_id option in profile for rsa_key_pair") + return nil, errors.New("missing required public_key_id option in profile for rsa_key_pair") } if publicKeyId.String() == "" { return nil, errors.New("public_key_id cannot be empty") } privateKeyFile, err := section.GetKey("private_key_file") if err != nil { - return nil, errors.New("Missing required private_key_file option in profile for rsa_key_pair") + return nil, errors.New("missing required private_key_file option in profile for rsa_key_pair") } if privateKeyFile.String() == "" { return nil, errors.New("private_key_file cannot be empty") @@ -143,28 +143,28 @@ func getRSAKeyPair(section *ini.Section) (*Config, error) { func getRAMRoleArn(section *ini.Section) (*Config, error) { accessKeyId, err := section.GetKey("access_key_id") if err != nil { - return nil, errors.New("Missing required access_key_id option in profile for ram_role_arn") + return nil, errors.New("missing required access_key_id option in profile for ram_role_arn") } if accessKeyId.String() == "" { return nil, errors.New("access_key_id cannot be empty") } accessKeySecret, err := section.GetKey("access_key_secret") if err != nil { - return nil, errors.New("Missing required access_key_secret option in profile for ram_role_arn") + return nil, errors.New("missing required access_key_secret option in profile for ram_role_arn") } if accessKeySecret.String() == "" { return nil, errors.New("access_key_secret cannot be empty") } roleArn, err := section.GetKey("role_arn") if err != nil { - return nil, errors.New("Missing required role_arn option in profile for ram_role_arn") + return nil, errors.New("missing required role_arn option in profile for ram_role_arn") } if roleArn.String() == "" { return nil, errors.New("role_arn cannot be empty") } roleSessionName, err := section.GetKey("role_session_name") if err != nil { - return nil, errors.New("Missing required role_session_name option in profile for ram_role_arn") + return nil, errors.New("missing required role_session_name option in profile for ram_role_arn") } if roleSessionName.String() == "" { return nil, errors.New("role_session_name cannot be empty") @@ -210,7 +210,7 @@ func getEcsRAMRole(section *ini.Section) (*Config, error) { func getBearerToken(section *ini.Section) (*Config, error) { bearerToken, err := section.GetKey("bearer_token") if err != nil { - return nil, errors.New("Missing required bearer_token option in profile for bearer") + return nil, errors.New("missing required bearer_token option in profile for bearer") } if bearerToken.String() == "" { return nil, errors.New("bearer_token cannot be empty") @@ -225,21 +225,21 @@ func getBearerToken(section *ini.Section) (*Config, error) { func getSTS(section *ini.Section) (*Config, error) { accesskeyid, err := section.GetKey("access_key_id") if err != nil { - return nil, errors.New("Missing required access_key_id option in profile for sts") + return nil, errors.New("missing required access_key_id option in profile for sts") } if accesskeyid.String() == "" { return nil, errors.New("access_key_id cannot be empty") } accessKeySecret, err := section.GetKey("access_key_secret") if err != nil { - return nil, errors.New("Missing required access_key_secret option in profile for sts") + return nil, errors.New("missing required access_key_secret option in profile for sts") } if accessKeySecret.String() == "" { return nil, errors.New("access_key_secret cannot be empty") } securityToken, err := section.GetKey("security_token") if err != nil { - return nil, errors.New("Missing required security_token option in profile for sts") + return nil, errors.New("missing required security_token option in profile for sts") } if securityToken.String() == "" { return nil, errors.New("security_token cannot be empty") @@ -256,14 +256,14 @@ func getSTS(section *ini.Section) (*Config, error) { func getAccessKey(section *ini.Section) (*Config, error) { accesskeyid, err := section.GetKey("access_key_id") if err != nil { - return nil, errors.New("Missing required access_key_id option in profile for access_key") + return nil, errors.New("missing required access_key_id option in profile for access_key") } if accesskeyid.String() == "" { return nil, errors.New("access_key_id cannot be empty") } accessKeySecret, err := section.GetKey("access_key_secret") if err != nil { - return nil, errors.New("Missing required access_key_secret option in profile for access_key") + return nil, errors.New("missing required access_key_secret option in profile for access_key") } if accessKeySecret.String() == "" { return nil, errors.New("access_key_secret cannot be empty") @@ -289,7 +289,7 @@ func getType(path, profile string) (*ini.Key, *ini.Section, error) { value, err := section.GetKey("type") if err != nil { - return nil, nil, errors.New("Missing required type option " + err.Error()) + return nil, nil, errors.New("missing required type option " + err.Error()) } return value, section, nil } @@ -312,7 +312,7 @@ func getHomePath() string { func checkDefaultPath() (path string, err error) { path = getHomePath() if path == "" { - return "", errors.New("The default credential file path is invalid") + return "", errors.New("the default credential file path is invalid") } path = strings.Replace("~/.alibabacloud/credentials", "~", path, 1) _, err = hookState(os.Stat(path)) @@ -333,14 +333,14 @@ func setRuntimeToConfig(config *Config, section *ini.Section) error { if rawConnectTimeout != nil { connectTimeout, err := rawConnectTimeout.Int() if err != nil { - return fmt.Errorf("Please set connect_timeout with an int value") + return fmt.Errorf("please set connect_timeout with an int value") } config.ConnectTimeout = tea.Int(connectTimeout) } if rawTimeout != nil { timeout, err := rawTimeout.Int() if err != nil { - return fmt.Errorf("Please set timeout with an int value") + return fmt.Errorf("please set timeout with an int value") } config.Timeout = tea.Int(timeout) } diff --git a/credentials/profile_provider_test.go b/credentials/profile_provider_test.go index 00e603d..3bdf5b8 100644 --- a/credentials/profile_provider_test.go +++ b/credentials/profile_provider_test.go @@ -11,91 +11,91 @@ import ( ) var inistr = ` -[default] -enable = true -type = access_key -access_key_id = foo -access_key_secret = bar - -[notype] -access_key_id = foo +[default] +enable = true +type = access_key +access_key_id = foo +access_key_secret = bar + +[notype] +access_key_id = foo access_key_secret = bar [noak] -type = access_key -access_key_secret = bar +type = access_key +access_key_secret = bar [emptyak] -type = access_key -access_key_id = -access_key_secret = bar +type = access_key +access_key_id = +access_key_secret = bar [noaksecret] -type = access_key -access_key_id = bar +type = access_key +access_key_id = bar [emptyaksecret] -type = access_key -access_key_id = bar -access_key_secret = +type = access_key +access_key_id = bar +access_key_secret = -[ecs] -type = ecs_ram_role +[ecs] +type = ecs_ram_role role_name = EcsRamRoleTest [noecs] -type = ecs_ram_role +type = ecs_ram_role -[emptyecs] -type = ecs_ram_role -role_name = +[emptyecs] +type = ecs_ram_role +role_name = -[invalidRuntimeEcs] -type = ecs_ram_role +[invalidRuntimeEcs] +type = ecs_ram_role role_name = EcsRamRoleTest timeout = a -[ram] -type = ram_role_arn +[ram] +type = ram_role_arn access_key_id = foo access_key_secret = bar role_arn = role_arn -role_session_name = session_name +role_session_name = session_name -[noramak] -type = ram_role_arn +[noramak] +type = ram_role_arn access_key_secret = bar role_arn = role_arn -role_session_name = session_name +role_session_name = session_name -[emptyramak] -type = ram_role_arn -access_key_id = +[emptyramak] +type = ram_role_arn +access_key_id = access_key_secret = bar role_arn = role_arn role_session_name = session_name -[noramsecret] -type = ram_role_arn -access_key_id = id +[noramsecret] +type = ram_role_arn +access_key_id = id role_arn = role_arn role_session_name = session_name -[emptyramsecret] -type = ram_role_arn +[emptyramsecret] +type = ram_role_arn access_key_id = id access_key_secret = role_arn = role_arn role_session_name = session_name -[noramarn] +[noramarn] type = ram_role_arn -access_key_id = id +access_key_id = id access_key_secret = bar -role_session_name = session_name +role_session_name = session_name -[emptyramarn] -type = ram_role_arn +[emptyramarn] +type = ram_role_arn access_key_id = id access_key_secret = bar role_arn = @@ -189,45 +189,45 @@ timeout = 10 connect_timeout = 10 host = www.aliyun.com -[norsaprivate] -type = rsa_key_pair -public_key_id = publicKeyId +[norsaprivate] +type = rsa_key_pair +public_key_id = publicKeyId -[emptyrsaprivate] -type = rsa_key_pair -public_key_id = publicKeyId +[emptyrsaprivate] +type = rsa_key_pair +public_key_id = publicKeyId private_key_file = -[norsapublic] -type = rsa_key_pair -private_key_file = ./pk.pem +[norsapublic] +type = rsa_key_pair +private_key_file = ./pk.pem -[emptyrsapublic] -type = rsa_key_pair -public_key_id = +[emptyrsapublic] +type = rsa_key_pair +public_key_id = private_key_file = ./pk.pem -[invalidexpirationrsa] -type = rsa_key_pair -public_key_id = publicKeyId +[invalidexpirationrsa] +type = rsa_key_pair +public_key_id = publicKeyId private_key_file = ./pk.pem session_expiration = a -[invalidTimeoutrsa] -type = rsa_key_pair -public_key_id = publicKeyId +[invalidTimeoutrsa] +type = rsa_key_pair +public_key_id = publicKeyId private_key_file = ./pk.pem timeout = a -[invalidConnectTimeoutrsa] -type = rsa_key_pair -public_key_id = publicKeyId +[invalidConnectTimeoutrsa] +type = rsa_key_pair +public_key_id = publicKeyId private_key_file = ./pk.pem connect_timeout = a -[error_type] -type = error_type -public_key_id = publicKeyId +[error_type] +type = error_type +public_key_id = publicKeyId private_key_file = ./pk_error.pem ` @@ -246,7 +246,7 @@ func TestProfileProvider(t *testing.T) { p := newProfileProvider() c, err := p.resolve() assert.Nil(t, c) - assert.EqualError(t, err, "The default credential file path is invalid") + assert.EqualError(t, err, "the default credential file path is invalid") originFilePath := os.Getenv(ENVCredentialFile) os.Setenv(ENVCredentialFile, "") @@ -295,13 +295,13 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("NonExist") c, err = p.resolve() assert.Nil(t, c) - assert.Contains(t, err.Error(), "ERROR: Can not load section section", "does not exist") + assert.Contains(t, err.Error(), "ERROR: Can not load section section") // testcase 6, credential type does not set p = newProfileProvider("notype") c, err = p.resolve() assert.Nil(t, c) - assert.Contains(t, err.Error(), "Missing required type option error when getting key of section", "not exists") + assert.Contains(t, err.Error(), "missing required type option error when getting key of section") // testcase 7, normal AK p = newProfileProvider() @@ -312,7 +312,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("noak") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required access_key_id option in profile for access_key", err.Error()) + assert.Equal(t, "missing required access_key_id option in profile for access_key", err.Error()) // testcase 9, access_key_id value is empty p = newProfileProvider("emptyak") c, err = p.resolve() @@ -322,7 +322,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("noaksecret") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required access_key_secret option in profile for access_key", err.Error()) + assert.Equal(t, "missing required access_key_secret option in profile for access_key", err.Error()) // testcase 11, access_key_secret value is empty p = newProfileProvider("emptyaksecret") c, err = p.resolve() @@ -338,7 +338,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("invalidRuntimeEcs") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Please set timeout with an int value", err.Error()) + assert.Equal(t, "please set timeout with an int value", err.Error()) //testcase 16, normal RamRoleArn p = newProfileProvider("ram") @@ -349,7 +349,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("noramak") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required access_key_id option in profile for ram_role_arn", err.Error()) + assert.Equal(t, "missing required access_key_id option in profile for ram_role_arn", err.Error()) //testcase 18, access_key_id value is empty p = newProfileProvider("emptyramak") c, err = p.resolve() @@ -359,7 +359,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("noramsecret") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required access_key_secret option in profile for ram_role_arn", err.Error()) + assert.Equal(t, "missing required access_key_secret option in profile for ram_role_arn", err.Error()) //testcase 20, access_key_secret value is empty p = newProfileProvider("emptyramsecret") c, err = p.resolve() @@ -369,7 +369,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("noramarn") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required role_arn option in profile for ram_role_arn", err.Error()) + assert.Equal(t, "missing required role_arn option in profile for ram_role_arn", err.Error()) //testcase 22, role_arn value is empty p = newProfileProvider("emptyramarn") c, err = p.resolve() @@ -379,7 +379,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("noramsessionname") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required role_session_name option in profile for ram_role_arn", err.Error()) + assert.Equal(t, "missing required role_session_name option in profile for ram_role_arn", err.Error()) //testcase 24, role_session_name value is empty p = newProfileProvider("emptyramsessionname") c, err = p.resolve() @@ -394,7 +394,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("invalidRuntimeram") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Please set timeout with an int value", err.Error()) + assert.Equal(t, "please set timeout with an int value", err.Error()) //testase 27, normal RsaKeyPair file, err = os.Create("./pk.pem") @@ -412,7 +412,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("norsaprivate") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required private_key_file option in profile for rsa_key_pair", err.Error()) + assert.Equal(t, "missing required private_key_file option in profile for rsa_key_pair", err.Error()) //testcase 29, private_key_file value is empty p = newProfileProvider("emptyrsaprivate") c, err = p.resolve() @@ -422,7 +422,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("norsapublic") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required public_key_id option in profile for rsa_key_pair", err.Error()) + assert.Equal(t, "missing required public_key_id option in profile for rsa_key_pair", err.Error()) //testcase 31, public_key_id value is empty p = newProfileProvider("emptyrsapublic") c, err = p.resolve() @@ -437,12 +437,12 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("invalidTimeoutrsa") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Please set timeout with an int value", err.Error()) + assert.Equal(t, "please set timeout with an int value", err.Error()) //testcase 34, connect_timeout is not int p = newProfileProvider("invalidConnectTimeoutrsa") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Please set connect_timeout with an int value", err.Error()) + assert.Equal(t, "please set connect_timeout with an int value", err.Error()) //testcase 35, normal RamRoleArn p = newProfileProvider("sts") @@ -453,7 +453,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("nostskey") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required access_key_id option in profile for sts", err.Error()) + assert.Equal(t, "missing required access_key_id option in profile for sts", err.Error()) //testcase 37, access_key_id value is empty p = newProfileProvider("emptystskey") c, err = p.resolve() @@ -463,7 +463,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("nostssecret") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required access_key_secret option in profile for sts", err.Error()) + assert.Equal(t, "missing required access_key_secret option in profile for sts", err.Error()) //testcase 39, access_key_secret value is empty p = newProfileProvider("emptystssecret") c, err = p.resolve() @@ -473,7 +473,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("noststoken") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required security_token option in profile for sts", err.Error()) + assert.Equal(t, "missing required security_token option in profile for sts", err.Error()) //testcase 41, security_token value is empty p = newProfileProvider("emptyststoken") c, err = p.resolve() @@ -489,7 +489,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("nobearer") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Missing required bearer_token option in profile for bearer", err.Error()) + assert.Equal(t, "missing required bearer_token option in profile for bearer", err.Error()) //testcase 44, value is empty p = newProfileProvider("emptybearer") c, err = p.resolve() @@ -500,7 +500,7 @@ func TestProfileProvider(t *testing.T) { p = newProfileProvider("error_type") c, err = p.resolve() assert.Nil(t, c) - assert.Equal(t, "Invalid type option, support: access_key, sts, ecs_ram_role, ram_role_arn, rsa_key_pair", err.Error()) + assert.Equal(t, "invalid type option, support: access_key, sts, ecs_ram_role, ram_role_arn, rsa_key_pair", err.Error()) } func TestHookOS(t *testing.T) { diff --git a/credentials/provider_chain.go b/credentials/provider_chain.go index a694d5c..e433886 100644 --- a/credentials/provider_chain.go +++ b/credentials/provider_chain.go @@ -27,6 +27,6 @@ func (p *providerChain) resolve() (*Config, error) { } return config, err } - return nil, errors.New("No credential found") + return nil, errors.New("no credential found") } diff --git a/credentials/provider_chain_test.go b/credentials/provider_chain_test.go index 7018105..e303193 100644 --- a/credentials/provider_chain_test.go +++ b/credentials/provider_chain_test.go @@ -43,7 +43,7 @@ func TestProviderChain(t *testing.T) { c, err = pc.resolve() assert.Nil(t, c) - assert.EqualError(t, err, "No credential found") + assert.EqualError(t, err, "no credential found") } func TestDefaultChainNoCred(t *testing.T) { @@ -76,7 +76,7 @@ func TestDefaultChainNoCred(t *testing.T) { chain, err := defaultChain.resolve() assert.Nil(t, chain) - assert.Equal(t, "No credential found", err.Error()) + assert.Equal(t, "no credential found", err.Error()) } func TestDefaultChainHasCred(t *testing.T) { diff --git a/go.sum b/go.sum index c4d4f5b..f0fbc4f 100644 --- a/go.sum +++ b/go.sum @@ -9,11 +9,13 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -62,6 +64,7 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=