Merge pull request #1536 from huww98/passthrough-scheme

passthrough ALICLOUD_CLIENT_SCHEME

Author: k8s-ci-robot

pkg/bmcpfs/controllerserver.go

@@ -204,13 +204,13 @@ func newEfloClient(region string) (*efloclient.Client, error) {
 		config = config.SetEndpoint(fmt.Sprintf("eflo-controller-vpc.%s.aliyuncs.com", region))
 	}
 	// set protocol
-	scheme := strings.ToUpper(os.Getenv("ALICLOUD_CLIENT_SCHEME"))
+	scheme := "HTTPS"
 	if strings.Contains(region, "test") {
 		// must use HTTP in lingjun test regions
 		scheme = "HTTP"
 	}
-	if scheme != "HTTP" {
-		scheme = "HTTPS"
+	if e := os.Getenv("ALICLOUD_CLIENT_SCHEME"); e != "" {
+		scheme = e
 	}
 	config = config.SetProtocol(scheme)
 	// init client

pkg/disk/utils.go

@@ -118,8 +118,8 @@ var ecsEndpointOnce sync.Once
 
 func newEcsClient(regionID string, cred credentials.CredentialsProvider) (ecsClient *ecs.Client) {
 	scheme := "HTTPS"
-	if os.Getenv("ALICLOUD_CLIENT_SCHEME") == "HTTP" {
-		scheme = "HTTP"
+	if e := os.Getenv("ALICLOUD_CLIENT_SCHEME"); e != "" {
+		scheme = e
 	}
 	config := sdk.NewConfig().WithScheme(scheme).WithUserAgent(KubernetesAlicloudIdentity)
 

pkg/nas/cloud/nas_client_v1.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk"
 	aliyunep "github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints"
@@ -34,9 +33,9 @@ func newNasClientV1(region string) (interfaces.NasV1Interface, error) {
 	if config == nil {
 		config = sdk.NewConfig()
 	}
-	scheme := strings.ToUpper(os.Getenv("ALICLOUD_CLIENT_SCHEME"))
-	if scheme != "HTTP" {
-		scheme = "HTTPS"
+	scheme := "HTTPS"
+	if e := os.Getenv("ALICLOUD_CLIENT_SCHEME"); e != "" {
+		scheme = e
 	}
 	config = config.WithScheme(scheme).WithUserAgent(KubernetesAlicloudIdentity)
 	headers := utilshttp.MustParseHeaderEnv("NAS_HEADERS")

pkg/nas/cloud/nas_client_v2.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"strings"
 
 	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
 	sdk "github.com/alibabacloud-go/nas-20170626/v4/client"
@@ -49,9 +48,9 @@ func NewNasClientV2(region string) (*sdk.Client, error) {
 	}
 	config = config.SetEndpoint(ep)
 	// set protocol
-	scheme := strings.ToUpper(os.Getenv("ALICLOUD_CLIENT_SCHEME"))
-	if scheme != "HTTP" {
-		scheme = "HTTPS"
+	scheme := "HTTPS"
+	if e := os.Getenv("ALICLOUD_CLIENT_SCHEME"); e != "" {
+		scheme = e
 	}
 	config = config.SetProtocol(scheme)
 	// init client

pkg/utils/auth.go

@@ -93,8 +93,8 @@ func ValidatePath(path string) (bool, error) {
 func getManagedAddonToken() AccessControl {
 	tokens := getManagedToken()
 	scheme := "https"
-	if os.Getenv("ALICLOUD_CLIENT_SCHEME") == "HTTP" {
-		scheme = "http"
+	if e := os.Getenv("ALICLOUD_CLIENT_SCHEME"); e != "" {
+		scheme = e
 	}
 	config := sdk.NewConfig().WithScheme(scheme)
 	credent := &cre.StsTokenCredential{
@@ -146,8 +146,8 @@ func GetEnvAK() AccessControl {
 	accessSecret = os.Getenv("ACCESS_KEY_SECRET")
 
 	scheme := "https"
-	if os.Getenv("ALICLOUD_CLIENT_SCHEME") == "HTTP" {
-		scheme = "http"
+	if e := os.Getenv("ALICLOUD_CLIENT_SCHEME"); e != "" {
+		scheme = e
 	}
 	config := sdk.NewConfig().WithScheme(scheme)
 
@@ -161,8 +161,8 @@ func GetEnvAK() AccessControl {
 // GetStsToken get STS token and token from ecs meta server
 func getStsToken() AccessControl {
 	scheme := "https"
-	if os.Getenv("ALICLOUD_CLIENT_SCHEME") == "HTTP" {
-		scheme = "http"
+	if e := os.Getenv("ALICLOUD_CLIENT_SCHEME"); e != "" {
+		scheme = e
 	}
 	config := sdk.NewConfig().WithScheme(scheme)
 	return AccessControl{UseMode: Credential, Config: config, Credential: cre.NewEcsRamRoleCredential("")}
@@ -202,8 +202,8 @@ func getCredentialAK() AccessControl {
 		}
 	}
 	scheme := "https"
-	if os.Getenv("ALICLOUD_CLIENT_SCHEME") == "HTTP" {
-		scheme = "http"
+	if e := os.Getenv("ALICLOUD_CLIENT_SCHEME"); e != "" {
+		scheme = e
 	}
 	config := sdk.NewConfig().WithScheme(scheme)
 	return AccessControl{Config: config, Credential: credential, UseMode: Credential}