From 935a320100957ee37c41ba574a759ebb4cd7b544 Mon Sep 17 00:00:00 2001 From: belier Date: Fri, 25 Oct 2024 14:45:48 +0800 Subject: [PATCH] feat: keep qiniu cdn https configuration --- internal/deployer/qiniu_cdn.go | 8 ++++---- internal/deployer/qiniu_cdn_test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/deployer/qiniu_cdn.go b/internal/deployer/qiniu_cdn.go index fa74a0cb..c17c5241 100644 --- a/internal/deployer/qiniu_cdn.go +++ b/internal/deployer/qiniu_cdn.go @@ -59,7 +59,7 @@ func (d *QiniuCDNDeployer) Deploy(ctx context.Context) error { if domainInfo.Https != nil && domainInfo.Https.CertID != "" { // 启用了 https // 修改域名证书 - err = d.modifyDomainCert(certId) + err = d.modifyDomainCert(certId, domainInfo.Https.ForceHttps, domainInfo.Https.Http2Enable) if err != nil { return fmt.Errorf("modifyDomainCert failed: %w", err) } @@ -166,14 +166,14 @@ type qiniuModifyDomainCertReq struct { Http2Enable bool `json:"http2Enable"` } -func (d *QiniuCDNDeployer) modifyDomainCert(certId string) error { +func (d *QiniuCDNDeployer) modifyDomainCert(certId string, forceHttps, http2Enable bool) error { domain := d.option.DeployConfig.GetDomain() path := fmt.Sprintf("/domain/%s/httpsconf", domain) body := &qiniuModifyDomainCertReq{ CertID: certId, - ForceHttps: true, - Http2Enable: true, + ForceHttps: forceHttps, + Http2Enable: http2Enable, } bodyBytes, err := json.Marshal(body) diff --git a/internal/deployer/qiniu_cdn_test.go b/internal/deployer/qiniu_cdn_test.go index 396f6546..ca236550 100644 --- a/internal/deployer/qiniu_cdn_test.go +++ b/internal/deployer/qiniu_cdn_test.go @@ -79,7 +79,7 @@ func Test_qiuniu_modifyDomainCert(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { q, _ := NewQiniuCDNDeployer(tt.fields.option) - if err := q.modifyDomainCert(tt.args.certId); (err != nil) != tt.wantErr { + if err := q.modifyDomainCert(tt.args.certId, true, true); (err != nil) != tt.wantErr { t.Errorf("qiuniu.modifyDomainCert() error = %v, wantErr %v", err, tt.wantErr) } })