From ea6c47e2d6e8506055dc0629ae9b4ce05db34574 Mon Sep 17 00:00:00 2001 From: Jackson Tian Date: Tue, 26 Mar 2024 10:48:35 +0800 Subject: [PATCH] lib: do not update default client configuration --- sdk/auth/credentials/provider/instance_credentials.go | 5 +++-- sdk/auth/credentials/provider/provider_chain.go | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sdk/auth/credentials/provider/instance_credentials.go b/sdk/auth/credentials/provider/instance_credentials.go index 074f6350b..b843a8669 100644 --- a/sdk/auth/credentials/provider/instance_credentials.go +++ b/sdk/auth/credentials/provider/instance_credentials.go @@ -68,8 +68,9 @@ func (p *InstanceCredentialsProvider) Resolve() (auth.Credential, error) { } func get(url string) (status int, content []byte, err error) { - httpClient := http.DefaultClient - httpClient.Timeout = 1 * time.Second + httpClient := &http.Client{ + Timeout: 1 * time.Second, + } resp, err := httpClient.Get(url) if err != nil { return diff --git a/sdk/auth/credentials/provider/provider_chain.go b/sdk/auth/credentials/provider/provider_chain.go index 3f9315d13..243d31a96 100644 --- a/sdk/auth/credentials/provider/provider_chain.go +++ b/sdk/auth/credentials/provider/provider_chain.go @@ -24,9 +24,12 @@ func (p *ProviderChain) Resolve() (auth.Credential, error) { creds, err := provider.Resolve() if err != nil { return nil, err - } else if err == nil && creds == nil { + } + + if creds == nil { continue } + return creds, err } return nil, errors.New("No credential found")