From eb3fec1ac06e7c120db37c6623f24b664c90c653 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 8 Jan 2025 16:05:02 +0800 Subject: [PATCH] fix: incorrect nil check logic in tencentcloud cdn and ecdn deployment --- internal/deployer/providers.go | 2 +- internal/domain/provider.go | 2 +- .../deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go | 2 +- .../deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/deployer/providers.go b/internal/deployer/providers.go index be2feb32..62cc1313 100644 --- a/internal/deployer/providers.go +++ b/internal/deployer/providers.go @@ -210,7 +210,7 @@ func createDeployer(provider domain.DeployProviderType, accessConfig string, dep return deployer, logger, err } - case domain.DeployProviderTypeK8sSecret: + case domain.DeployProviderTypeKubernetesSecret: { access := &domain.AccessConfigForKubernetes{} if err := json.Unmarshal([]byte(accessConfig), access); err != nil { diff --git a/internal/domain/provider.go b/internal/domain/provider.go index a196d2c3..b0f9c05b 100644 --- a/internal/domain/provider.go +++ b/internal/domain/provider.go @@ -51,7 +51,7 @@ const ( DeployProviderTypeDogeCloudCDN = DeployProviderType("dogecloud-cdn") DeployProviderTypeHuaweiCloudCDN = DeployProviderType("huaweicloud-cdn") DeployProviderTypeHuaweiCloudELB = DeployProviderType("huaweicloud-elb") - DeployProviderTypeK8sSecret = DeployProviderType("k8s-secret") + DeployProviderTypeKubernetesSecret = DeployProviderType("k8s-secret") DeployProviderTypeLocal = DeployProviderType("local") DeployProviderTypeQiniuCDN = DeployProviderType("qiniu-cdn") DeployProviderTypeSSH = DeployProviderType("ssh") diff --git a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go index fac9dbae..7aee8434 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-cdn/tencentcloud_cdn.go @@ -147,7 +147,7 @@ func (d *TencentCloudCDNDeployer) getDomainsByCertificateId(cloudCertId string) } domains := make([]string, 0) - if describeCertDomainsResp.Response.Domains == nil { + if describeCertDomainsResp.Response.Domains != nil { for _, domain := range describeCertDomainsResp.Response.Domains { domains = append(domains, *domain) } diff --git a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go index e8cbdbb3..29f6e33c 100644 --- a/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go +++ b/internal/pkg/core/deployer/providers/tencentcloud-ecdn/tencentcloud_ecdn.go @@ -130,7 +130,7 @@ func (d *TencentCloudECDNDeployer) getDomainsByCertificateId(cloudCertId string) } domains := make([]string, 0) - if describeCertDomainsResp.Response.Domains == nil { + if describeCertDomainsResp.Response.Domains != nil { for _, domain := range describeCertDomainsResp.Response.Domains { domains = append(domains, *domain) }