From 55bbc85619e440682178bb9137d4a6ccce99cbac Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Jacquier <15922119+pierre-emmanuelJ@users.noreply.github.com> Date: Fri, 22 Dec 2023 16:10:39 +0000 Subject: [PATCH] fixup! Misc Signed-off-by: Pierre-Emmanuel Jacquier <15922119+pierre-emmanuelJ@users.noreply.github.com> --- v3/credentials/credentials.go | 3 +-- v3/credentials/env.go | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/v3/credentials/credentials.go b/v3/credentials/credentials.go index 4f2669348..a999b49b5 100644 --- a/v3/credentials/credentials.go +++ b/v3/credentials/credentials.go @@ -16,8 +16,7 @@ type Value struct { APISecret string } -// HasKeys returns if the credentials Value has both AccessKeyID and -// SecretAccessKey value set. +// HasKeys returns true if the credentials Value has both APIKey and APISecret. func (v Value) HasKeys() bool { return v.APIKey != "" && v.APISecret != "" } diff --git a/v3/credentials/env.go b/v3/credentials/env.go index 8d0ef7f17..23d881f7d 100644 --- a/v3/credentials/env.go +++ b/v3/credentials/env.go @@ -14,18 +14,17 @@ func NewEnvCredentials() *Credentials { func (e *EnvProvider) Retrieve() (Value, error) { e.retrieved = false - key := os.Getenv("AWS_ACCESS_KEY_ID") - secret := os.Getenv("AWS_SECRET_ACCESS_KEY") + v := Value{ + APIKey: os.Getenv("EXOSCALE_API_KEY"), + APISecret: os.Getenv("EXOSCALE_API_SECRET"), + } - if key == "" || secret == "" { + if !v.HasKeys() { return Value{}, ErrMissingIncomplete } e.retrieved = true - return Value{ - APIKey: key, - APISecret: secret, - }, nil + return v, nil } // IsExpired returns if the credentials have been retrieved.