diff --git a/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go b/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go index 1561d85f8..cf99f981f 100644 --- a/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go +++ b/pkg/core/certmgr/providers/ucloud-ulb/ucloud_ulb.go @@ -190,8 +190,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint, region string) } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId - cfg.Region = region + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint @@ -199,6 +200,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint, region string) cfg.BaseUrl = "https://" + endpoint } } + if region != "" { + cfg.Region = region + } credential := auth.NewCredential() credential.PrivateKey = privateKey diff --git a/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go b/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go index d9d18ebad..cd49e07cd 100644 --- a/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go +++ b/pkg/core/certmgr/providers/ucloud-upathx/ucloud_upathx.go @@ -187,7 +187,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint string) (*ucloud } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint diff --git a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go index d2eb3af6d..0172edeac 100644 --- a/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go +++ b/pkg/core/certmgr/providers/ucloud-ussl/ucloud_ussl.go @@ -241,7 +241,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint string) (*ucloud } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint diff --git a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go index 8ac241cd5..18c7d1c90 100644 --- a/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go +++ b/pkg/core/deployer/providers/ucloud-ualb/ucloud_ualb.go @@ -317,8 +317,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint, region string) } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId - cfg.Region = region + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint @@ -326,6 +327,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint, region string) cfg.BaseUrl = "https://" + endpoint } } + if region != "" { + cfg.Region = region + } credential := auth.NewCredential() credential.PrivateKey = privateKey diff --git a/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go b/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go index f02bbd341..f2ed86ece 100644 --- a/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go +++ b/pkg/core/deployer/providers/ucloud-ucdn/ucloud_ucdn.go @@ -134,7 +134,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint string) (*ucloud } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint diff --git a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go index f95fa97af..4ef9256a3 100644 --- a/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go +++ b/pkg/core/deployer/providers/ucloud-uclb/ucloud_uclb.go @@ -263,8 +263,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint, region string) } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId - cfg.Region = region + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint @@ -272,6 +273,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint, region string) cfg.BaseUrl = "https://" + endpoint } } + if region != "" { + cfg.Region = region + } credential := auth.NewCredential() credential.PrivateKey = privateKey diff --git a/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf.go b/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf.go index 6659d7b18..e7adef3ba 100644 --- a/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf.go +++ b/pkg/core/deployer/providers/ucloud-uewaf/ucloud_uewaf.go @@ -107,7 +107,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint string) (*ucloud } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint diff --git a/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go b/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go index adca97c0d..374bbec33 100644 --- a/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go +++ b/pkg/core/deployer/providers/ucloud-upathx/ucloud_upathx.go @@ -122,7 +122,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint string) (*ucloud } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint diff --git a/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go b/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go index 2bcdf9ba4..b0b632a31 100644 --- a/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go +++ b/pkg/core/deployer/providers/ucloud-us3/ucloud_us3.go @@ -124,8 +124,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint, region string) } cfg := ucloud.NewConfig() - cfg.ProjectId = projectId - cfg.Region = region + if projectId != "" { + cfg.ProjectId = projectId + } if endpoint != "" { if strings.Contains(endpoint, "://") { cfg.BaseUrl = endpoint @@ -133,6 +134,9 @@ func createSDKClient(privateKey, publicKey, projectId, endpoint, region string) cfg.BaseUrl = "https://" + endpoint } } + if region != "" { + cfg.Region = region + } credential := auth.NewCredential() credential.PrivateKey = privateKey