@@ -218,8 +218,13 @@ func TestAWSGetCredentials_shouldError(t *testing.T) {
218218 defer resetEnv ()
219219 cfg := Config {}
220220
221- c := GetCredentials (& cfg )
222- _ , err := c .Get ()
221+ c , err := GetCredentials (& cfg )
222+ if awsErr , ok := err .(awserr.Error ); ok {
223+ if awsErr .Code () != "NoCredentialProviders" {
224+ t .Fatalf ("Expected NoCredentialProviders error" )
225+ }
226+ }
227+ _ , err = c .Get ()
223228 if awsErr , ok := err .(awserr.Error ); ok {
224229 if awsErr .Code () != "NoCredentialProviders" {
225230 t .Fatalf ("Expected NoCredentialProviders error" )
@@ -251,10 +256,13 @@ func TestAWSGetCredentials_shouldBeStatic(t *testing.T) {
251256 Token : c .Token ,
252257 }
253258
254- creds := GetCredentials (& cfg )
259+ creds , err := GetCredentials (& cfg )
255260 if creds == nil {
256261 t .Fatalf ("Expected a static creds provider to be returned" )
257262 }
263+ if err != nil {
264+ t .Fatalf ("Error gettings creds: %s" , err )
265+ }
258266 v , err := creds .Get ()
259267 if err != nil {
260268 t .Fatalf ("Error gettings creds: %s" , err )
@@ -286,11 +294,13 @@ func TestAWSGetCredentials_shouldIAM(t *testing.T) {
286294 // An empty config, no key supplied
287295 cfg := Config {}
288296
289- creds := GetCredentials (& cfg )
297+ creds , err := GetCredentials (& cfg )
290298 if creds == nil {
291299 t .Fatalf ("Expected a static creds provider to be returned" )
292300 }
293-
301+ if err != nil {
302+ t .Fatalf ("Error gettings creds: %s" , err )
303+ }
294304 v , err := creds .Get ()
295305 if err != nil {
296306 t .Fatalf ("Error gettings creds: %s" , err )
@@ -335,10 +345,13 @@ func TestAWSGetCredentials_shouldIgnoreIAM(t *testing.T) {
335345 Token : c .Token ,
336346 }
337347
338- creds := GetCredentials (& cfg )
348+ creds , err := GetCredentials (& cfg )
339349 if creds == nil {
340350 t .Fatalf ("Expected a static creds provider to be returned" )
341351 }
352+ if err != nil {
353+ t .Fatalf ("Error gettings creds: %s" , err )
354+ }
342355 v , err := creds .Get ()
343356 if err != nil {
344357 t .Fatalf ("Error gettings creds: %s" , err )
@@ -362,7 +375,10 @@ func TestAWSGetCredentials_shouldErrorWithInvalidEndpoint(t *testing.T) {
362375 ts := invalidAwsEnv (t )
363376 defer ts ()
364377
365- creds := GetCredentials (& Config {})
378+ creds , err := GetCredentials (& Config {})
379+ if err != nil {
380+ t .Fatalf ("Error gettings creds: %s" , err )
381+ }
366382 v , err := creds .Get ()
367383 if err == nil {
368384 t .Fatal ("Expected error returned when getting creds w/ invalid EC2 endpoint" )
@@ -380,7 +396,10 @@ func TestAWSGetCredentials_shouldIgnoreInvalidEndpoint(t *testing.T) {
380396 ts := invalidAwsEnv (t )
381397 defer ts ()
382398
383- creds := GetCredentials (& Config {AccessKey : "accessKey" , SecretKey : "secretKey" })
399+ creds , err := GetCredentials (& Config {AccessKey : "accessKey" , SecretKey : "secretKey" })
400+ if err != nil {
401+ t .Fatalf ("Error gettings creds: %s" , err )
402+ }
384403 v , err := creds .Get ()
385404 if err != nil {
386405 t .Fatalf ("Getting static credentials w/ invalid EC2 endpoint failed: %s" , err )
@@ -406,10 +425,13 @@ func TestAWSGetCredentials_shouldCatchEC2RoleProvider(t *testing.T) {
406425 ts := awsEnv (t )
407426 defer ts ()
408427
409- creds := GetCredentials (& Config {})
428+ creds , err := GetCredentials (& Config {})
410429 if creds == nil {
411430 t .Fatalf ("Expected an EC2Role creds provider to be returned" )
412431 }
432+ if err != nil {
433+ t .Fatalf ("Error gettings creds: %s" , err )
434+ }
413435 v , err := creds .Get ()
414436 if err != nil {
415437 t .Fatalf ("Expected no error when getting creds: %s" , err )
@@ -452,10 +474,13 @@ func TestAWSGetCredentials_shouldBeShared(t *testing.T) {
452474 t .Fatalf ("Error resetting env var AWS_SHARED_CREDENTIALS_FILE: %s" , err )
453475 }
454476
455- creds := GetCredentials (& Config {Profile : "myprofile" , CredsFilename : file .Name ()})
477+ creds , err := GetCredentials (& Config {Profile : "myprofile" , CredsFilename : file .Name ()})
456478 if creds == nil {
457479 t .Fatalf ("Expected a provider chain to be returned" )
458480 }
481+ if err != nil {
482+ t .Fatalf ("Error gettings creds: %s" , err )
483+ }
459484 v , err := creds .Get ()
460485 if err != nil {
461486 t .Fatalf ("Error gettings creds: %s" , err )
@@ -479,10 +504,13 @@ func TestAWSGetCredentials_shouldBeENV(t *testing.T) {
479504 defer resetEnv ()
480505
481506 cfg := Config {}
482- creds := GetCredentials (& cfg )
507+ creds , err := GetCredentials (& cfg )
483508 if creds == nil {
484509 t .Fatalf ("Expected a static creds provider to be returned" )
485510 }
511+ if err != nil {
512+ t .Fatalf ("Error gettings creds: %s" , err )
513+ }
486514 v , err := creds .Get ()
487515 if err != nil {
488516 t .Fatalf ("Error gettings creds: %s" , err )
0 commit comments