From 18a7bf0d66a114d2a3c11e2e978ec1156c02176d Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 21 Oct 2024 15:10:14 +0800 Subject: [PATCH] feat: set default region when applying certificates by huaweicloud --- internal/applicant/huaweicloud.go | 7 ++++++- internal/deployer/huaweicloud_cdn.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/applicant/huaweicloud.go b/internal/applicant/huaweicloud.go index 94f72c7f..47776400 100644 --- a/internal/applicant/huaweicloud.go +++ b/internal/applicant/huaweicloud.go @@ -24,7 +24,12 @@ func (t *huaweicloud) Apply() (*Certificate, error) { access := &domain.HuaweiCloudAccess{} json.Unmarshal([]byte(t.option.Access), access) - os.Setenv("HUAWEICLOUD_REGION", access.Region) // 华为云的 SDK 要求必须传一个区域，实际上 DNS-01 流程里用不到，但不传会报错 + region := access.Region + if region == "" { + region = "cn-north-1" + } + + os.Setenv("HUAWEICLOUD_REGION", region) // 华为云的 SDK 要求必须传一个区域，实际上 DNS-01 流程里用不到，但不传会报错 os.Setenv("HUAWEICLOUD_ACCESS_KEY_ID", access.AccessKeyId) os.Setenv("HUAWEICLOUD_SECRET_ACCESS_KEY", access.SecretAccessKey) os.Setenv("HUAWEICLOUD_PROPAGATION_TIMEOUT", fmt.Sprintf("%d", t.option.Timeout)) diff --git a/internal/deployer/huaweicloud_cdn.go b/internal/deployer/huaweicloud_cdn.go index 2458f800..b6429be3 100644 --- a/internal/deployer/huaweicloud_cdn.go +++ b/internal/deployer/huaweicloud_cdn.go @@ -122,7 +122,7 @@ func (d *HuaweiCloudCDNDeployer) createClient(region, accessKeyId, secretAccessK } if region == "" { - region = "cn-north-1" // CDN 服务默认区域：华北北京一 + region = "cn-north-1" // CDN 服务默认区域：华北一北京 } hcRegion, err := cdnRegion.SafeValueOf(region)