From 54af9951a8377fde7c1637ea8fc5fea2f191f125 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 25 Jan 2019 13:00:21 +0100 Subject: [PATCH] make guard clauses to clearly see success pass --- builder/amazon/common/access_config.go | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index d9a115be3..3270ed0d4 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -84,24 +84,24 @@ func (c *AccessConfig) Session() (*session.Session, error) { } } - if sess, err := session.NewSessionWithOptions(opts); err != nil { + sess, err := session.NewSessionWithOptions(opts) + if err != nil { return nil, err - } else { - log.Printf("Found region %s", *sess.Config.Region) - c.session = sess - - cp, err := c.session.Config.Credentials.Get() - if err != nil { - if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "NoCredentialProviders" { - return nil, fmt.Errorf("No valid credential sources found for AWS Builder. " + - "Please see https://www.packer.io/docs/builders/amazon.html#specifying-amazon-credentials " + - "for more information on providing credentials for the AWS Builder.") - } else { - return nil, fmt.Errorf("Error loading credentials for AWS Provider: %s", err) - } + } + log.Printf("Found region %s", *sess.Config.Region) + c.session = sess + + cp, err := c.session.Config.Credentials.Get() + if err != nil { + if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "NoCredentialProviders" { + return nil, fmt.Errorf("No valid credential sources found for AWS Builder. " + + "Please see https://www.packer.io/docs/builders/amazon.html#specifying-amazon-credentials " + + "for more information on providing credentials for the AWS Builder.") + } else { + return nil, fmt.Errorf("Error loading credentials for AWS Provider: %s", err) } - log.Printf("[INFO] AWS Auth provider used: %q", cp.ProviderName) } + log.Printf("[INFO] AWS Auth provider used: %q", cp.ProviderName) if c.DecodeAuthZMessages { DecodeAuthZMessages(c.session)