Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add retry for autentication failures #2248

Merged
merged 1 commit into from
Feb 10, 2021
Merged

Add retry for autentication failures #2248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 68 additions & 36 deletions ibm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"log"
"net"
gohttp "net/http"
"os"
"strings"
Expand Down Expand Up @@ -76,6 +77,7 @@ import (
"github.com/IBM-Cloud/bluemix-go/api/schematics"
"github.com/IBM-Cloud/bluemix-go/api/usermanagement/usermanagementv2"
"github.com/IBM-Cloud/bluemix-go/authentication"
"github.com/IBM-Cloud/bluemix-go/bmxerror"
"github.com/IBM-Cloud/bluemix-go/http"
"github.com/IBM-Cloud/bluemix-go/rest"
bxsession "github.com/IBM-Cloud/bluemix-go/session"
Expand Down Expand Up @@ -902,21 +904,45 @@ func (c *Config) ClientSession() (interface{}, error) {
if sess.BluemixSession.Config.BluemixAPIKey != "" {
err = authenticateAPIKey(sess.BluemixSession)
if err != nil {
session.bmxUserFetchErr = fmt.Errorf("Error occured while fetching account user details: %q", err)
session.functionConfigErr = fmt.Errorf("Error occured while fetching auth key for function: %q", err)
session.powerConfigErr = fmt.Errorf("Error occured while fetching the auth key for power iaas: %q", err)
session.ibmpiConfigErr = fmt.Errorf("Error occured while fetching the auth key for power iaas: %q", err)
for count := c.RetryCount; count >= 0; count-- {
if err == nil || !isRetryable(err) {
break
}
err = authenticateAPIKey(sess.BluemixSession)
}
if err != nil {
session.bmxUserFetchErr = fmt.Errorf("Error occured while fetching auth key for account user details: %q", err)
session.functionConfigErr = fmt.Errorf("Error occured while fetching auth key for function: %q", err)
session.powerConfigErr = fmt.Errorf("Error occured while fetching the auth key for power iaas: %q", err)
session.ibmpiConfigErr = fmt.Errorf("Error occured while fetching the auth key for power iaas: %q", err)
}
}
err = authenticateCF(sess.BluemixSession)
if err != nil {
session.functionConfigErr = fmt.Errorf("Error occured while fetching auth key for function: %q", err)
for count := c.RetryCount; count >= 0; count-- {
if err == nil || !isRetryable(err) {
break
}
err = authenticateCF(sess.BluemixSession)
}
if err != nil {
session.functionConfigErr = fmt.Errorf("Error occured while fetching auth key for function: %q", err)
}
}
}

if sess.BluemixSession.Config.IAMAccessToken != "" && sess.BluemixSession.Config.BluemixAPIKey == "" {
err := refreshToken(sess.BluemixSession)
if err != nil {
return nil, err
for count := c.RetryCount; count >= 0; count-- {
if err == nil || !isRetryable(err) {
break
}
err = refreshToken(sess.BluemixSession)
}
if err != nil {
return nil, err
}
}

}
Expand Down Expand Up @@ -1172,18 +1198,9 @@ func (c *Config) ClientSession() (interface{}, error) {

session.ibmpiSession = ibmpisession

bluemixToken := ""
if strings.HasPrefix(sess.BluemixSession.Config.IAMAccessToken, "Bearer") {
bluemixToken = sess.BluemixSession.Config.IAMAccessToken[7:len(sess.BluemixSession.Config.IAMAccessToken)]
} else {
bluemixToken = sess.BluemixSession.Config.IAMAccessToken
}

dnsOptions := &dns.DnsSvcsV1Options{
URL: envFallBack([]string{"IBMCLOUD_PRIVATE_DNS_API_ENDPOINT"}, "https://api.dns-svcs.cloud.ibm.com/v1"),
Authenticator: &core.BearerTokenAuthenticator{
BearerToken: bluemixToken,
},
URL: envFallBack([]string{"IBMCLOUD_PRIVATE_DNS_API_ENDPOINT"}, "https://api.dns-svcs.cloud.ibm.com/v1"),
Authenticator: authenticator,
}

session.pDNSClient, session.pDNSErr = dns.NewDnsSvcsV1(dnsOptions)
Expand All @@ -1193,11 +1210,9 @@ func (c *Config) ClientSession() (interface{}, error) {
version := time.Now().Format("2006-01-02")

directlinkOptions := &dl.DirectLinkV1Options{
URL: envFallBack([]string{"IBMCLOUD_DL_API_ENDPOINT"}, "https://directlink.cloud.ibm.com/v1"),
Authenticator: &core.BearerTokenAuthenticator{
BearerToken: bluemixToken,
},
Version: &version,
URL: envFallBack([]string{"IBMCLOUD_DL_API_ENDPOINT"}, "https://directlink.cloud.ibm.com/v1"),
Authenticator: authenticator,
Version: &version,
}

session.directlinkAPI, session.directlinkErr = dl.NewDirectLinkV1(directlinkOptions)
Expand All @@ -1207,23 +1222,19 @@ func (c *Config) ClientSession() (interface{}, error) {

//Direct link provider
directLinkProviderV2Options := &dlProviderV2.DirectLinkProviderV2Options{
URL: envFallBack([]string{"IBMCLOUD_DL_PROVIDER_API_ENDPOINT"}, "https://directlink.cloud.ibm.com/provider/v2"),
Authenticator: &core.BearerTokenAuthenticator{
BearerToken: bluemixToken,
},
Version: &version,
URL: envFallBack([]string{"IBMCLOUD_DL_PROVIDER_API_ENDPOINT"}, "https://directlink.cloud.ibm.com/provider/v2"),
Authenticator: authenticator,
Version: &version,
}

session.dlProviderAPI, session.dlProviderErr = dlProviderV2.NewDirectLinkProviderV2(directLinkProviderV2Options)
if session.dlProviderErr != nil {
session.dlProviderErr = fmt.Errorf("Error occured while configuring Direct Link Provider Service: %s", session.dlProviderErr)
}
transitgatewayOptions := &tg.TransitGatewayApisV1Options{
URL: envFallBack([]string{"IBMCLOUD_TG_API_ENDPOINT"}, "https://transit.cloud.ibm.com/v1"),
Authenticator: &core.BearerTokenAuthenticator{
BearerToken: bluemixToken,
},
Version: CreateVersionDate(),
URL: envFallBack([]string{"IBMCLOUD_TG_API_ENDPOINT"}, "https://transit.cloud.ibm.com/v1"),
Authenticator: authenticator,
Version: CreateVersionDate(),
}

session.transitgatewayAPI, session.transitgatewayErr = tg.NewTransitGatewayApisV1(transitgatewayOptions)
Expand All @@ -1233,10 +1244,8 @@ func (c *Config) ClientSession() (interface{}, error) {

cfcurl := fmt.Sprintf("https://%s.functions.cloud.ibm.com/api/v1", c.Region)
ibmCloudFunctionsNamespaceOptions := &ns.IbmCloudFunctionsNamespaceOptions{
URL: envFallBack([]string{"IBMCLOUD_NAMESPACE_API_ENDPOINT"}, cfcurl),
Authenticator: &core.BearerTokenAuthenticator{
BearerToken: bluemixToken,
},
URL: envFallBack([]string{"IBMCLOUD_NAMESPACE_API_ENDPOINT"}, cfcurl),
Authenticator: authenticator,
}

session.iamNamespaceAPI, err = ns.NewIbmCloudFunctionsNamespaceAPIV1(ibmCloudFunctionsNamespaceOptions)
Expand Down Expand Up @@ -1758,3 +1767,26 @@ func DefaultTransport() gohttp.RoundTripper {
}
return transport
}

func isRetryable(err error) bool {
if bmErr, ok := err.(bmxerror.RequestFailure); ok {
switch bmErr.StatusCode() {
case 408, 504, 599, 429, 500, 502, 520, 503:
return true
}
}

if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
return true
}

if netErr, ok := err.(*net.OpError); ok && netErr.Timeout() {
return true
}

if netErr, ok := err.(net.UnknownNetworkError); ok && netErr.Timeout() {
return true
}

return false
}