From 2a498edef7031eff5ef06c9bcda504a3af420eee Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Tue, 24 Jun 2025 10:26:58 +0800 Subject: [PATCH] chore(deps): upgrade gomod dependencies --- go.mod | 8 +- go.sum | 8 ++ .../tencentcloud_ssl_update.go | 84 ++++++++++--------- 3 files changed, 55 insertions(+), 45 deletions(-) diff --git a/go.mod b/go.mod index 489284dc..f9bd4fb6 100644 --- a/go.mod +++ b/go.mod @@ -49,13 +49,13 @@ require ( github.com/pocketbase/pocketbase v0.28.4 github.com/povsister/scp v0.0.0-20250504051308-e467f71ea63c github.com/qiniu/go-sdk/v7 v7.25.4 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1187 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1193 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1188 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1192 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1193 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.1163 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1192 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1193 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf v1.0.1172 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1189 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1193 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1191 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.1183 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1182 diff --git a/go.sum b/go.sum index 7da97356..e574635c 100644 --- a/go.sum +++ b/go.sum @@ -831,6 +831,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1187 h1:x2q6BAFm2f+9YaE7/lGPWXL7HzRkovjoqOMbdtRdpBw= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1187/go.mod h1:GoIHP0ayv0QOWN4c9aUEaKi74lY/tbeJz7h5i8y2gdU= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1193 h1:zOWZKDVA3kvA5/b+AwKzDtz5ewdiibeKxVqtCFJSTNI= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1193/go.mod h1:ufxDBGyS3X/9QKkZzuOFKLNra9FmSfgAHBO/FlFZaTU= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1188 h1:zzaIE12soTfyAgRvBYhb5bYxFXRCelvYXDEfvtkT5Y4= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1188/go.mod h1:qIWFhWbmMuUaWCCKVSkdJ1BzKEOqkMeo+uKYS6jJimQ= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1128/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= @@ -844,16 +846,22 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1189/go.mod github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1191/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1192 h1:3K6aJXXkjBLxqFYnBqAqFW5YqxmwMT0HR2F4gxQiNMU= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1192/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1193 h1:anxhOjL4WrQDqUcX7eT8VEaQITiKWllKwsH1fEt6lBw= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1193/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1128 h1:mrJ5Fbkd7sZIJ5F6oRfh5zebPQaudPH9Y0+GUmFytYU= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1128/go.mod h1:zbsYIBT+VTX4z4ocjTAdLBIWyNYj3z0BRqd0iPdnjsk= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.1163 h1:putqrH5n1SVRqFWHOylVqYI5yLQUjRTkHqZPLT2yeVY= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.1163/go.mod h1:aEWRXlAvovPUUoS3kVB/LVWEQ19WqzTj2lXGvR1YArY= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1192 h1:2430drceaOXASJZyVZ+e7QSzgBfgwSjDEDM5rh4046M= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1192/go.mod h1:JHZLo95Fde/0et2Ag2E5P6VmCZQIq74MClUtanJ4JcY= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1193 h1:VtXqRnzGz3KheXu2msNPvA/fUYQGsVVRC30WgyAUEqg= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.1193/go.mod h1:42I1OwaedHR6Yvg7J6UYoOjNYUYfFqwaeEkvx3x+NZc= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf v1.0.1172 h1:6SUO0hTie3zxnUEMxmhnS1iRIXpAukSZV27Nrx4NwIk= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf v1.0.1172/go.mod h1:tmN4zfu70SD0iee3qfpc09NRLel30zGoAuzIs4X0Kfs= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1189 h1:Db7gmkey7On70PAohvrna6RMLZzLHRjbALxPlH5JC3c= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1189/go.mod h1:x+WlMCjbePO7M3R0qzKmrpmieUWrtsRpcKBDpxJNQ5A= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1193 h1:tmACSthp5JLjrdxzng6XFs4gfQcZHBTTVlXR0tO6hSk= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.1193/go.mod h1:LWf5UPUl41EQICrq0jswgQEO/BtRQY+CxAI6X+i709o= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1191 h1:4l1Db+yFh9HgqNynYbG93khxLtXSBwnXZgNmc88jOE0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1191/go.mod h1:y8if4wInFJoO6PU0/741VEYREHPtfxljhJ5HFD2ZkEA= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.1183 h1:3fvxkF/R1WaO937Wrx5ZCYoIof1X9sqSDXL218uRfJY= diff --git a/pkg/core/ssl-deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go b/pkg/core/ssl-deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go index e12f894f..2fff2992 100644 --- a/pkg/core/ssl-deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go +++ b/pkg/core/ssl-deployer/providers/tencentcloud-ssl-update/tencentcloud_ssl_update.go @@ -189,7 +189,7 @@ func (d *SSLDeployerProvider) executeUpdateCertificateInstance(ctx context.Conte func (d *SSLDeployerProvider) executeUploadUpdateCertificateInstance(ctx context.Context, certPEM string, privkeyPEM string) error { // 更新证书内容并更新关联的云资源 // REF: https://cloud.tencent.com/document/product/400/119791 - // var deployRecordId string + var deployRecordId int64 for { select { case <-ctx.Done(): @@ -212,56 +212,58 @@ func (d *SSLDeployerProvider) executeUploadUpdateCertificateInstance(ctx context if uploadUpdateCertificateInstanceResp.Response.DeployStatus == nil { return errors.New("unexpected deployment job status") } else if *uploadUpdateCertificateInstanceResp.Response.DeployStatus == 1 { - // deployRecordId = fmt.Sprintf("%d", *uploadUpdateCertificateInstanceResp.Response.DeployRecordId) + deployRecordId = int64(*uploadUpdateCertificateInstanceResp.Response.DeployRecordId) break } time.Sleep(time.Second * 5) } - // // 循环查询证书云资源更新记录详情，等待任务状态变更 - // for { - // select { - // case <-ctx.Done(): - // return ctx.Err() - // default: - // } + // 循环查询证书云资源更新记录详情，等待任务状态变更 + // REF: https://cloud.tencent.com/document/product/400/120056 + for { + select { + case <-ctx.Done(): + return ctx.Err() + default: + } - // describeHostUploadUpdateRecordDetailReq := tcssl.NewDescribeHostUploadUpdateRecordDetailRequest() - // describeHostUploadUpdateRecordDetailReq.DeployRecordId = common.StringPtr(deployRecordId) - // describeHostUploadUpdateRecordDetailResp, err := d.sdkClient.DescribeHostUpdateRecord(describeHostUploadUpdateRecordDetailReq) - // d.logger.Debug("sdk request 'ssl.DescribeHostUploadUpdateRecordDetail'", slog.Any("request", describeHostUploadUpdateRecordDetailReq), slog.Any("response", describeHostUploadUpdateRecordDetailResp)) - // if err != nil { - // return fmt.Errorf("failed to execute sdk request 'ssl.DescribeHostUploadUpdateRecordDetail': %w", err) - // } + describeHostUploadUpdateRecordDetailReq := tcssl.NewDescribeHostUploadUpdateRecordDetailRequest() + describeHostUploadUpdateRecordDetailReq.DeployRecordId = common.Int64Ptr(deployRecordId) + describeHostUploadUpdateRecordDetailReq.Limit = common.Int64Ptr(200) + describeHostUploadUpdateRecordDetailResp, err := d.sdkClient.DescribeHostUploadUpdateRecordDetail(describeHostUploadUpdateRecordDetailReq) + d.logger.Debug("sdk request 'ssl.DescribeHostUploadUpdateRecordDetail'", slog.Any("request", describeHostUploadUpdateRecordDetailReq), slog.Any("response", describeHostUploadUpdateRecordDetailResp)) + if err != nil { + return fmt.Errorf("failed to execute sdk request 'ssl.DescribeHostUploadUpdateRecordDetail': %w", err) + } - // var runningCount, succeededCount, failedCount, totalCount int64 - // if describeHostUploadUpdateRecordDetailResp.Response.TotalCount == nil { - // return errors.New("unexpected deployment job status") - // } else { - // for _, record := range describeHostUploadUpdateRecordDetailResp.Response.DeployRecordDetail { - // if record.RunningTotalCount != nil { - // runningCount = *record.RunningTotalCount - // } - // if record.SuccessTotalCount != nil { - // succeededCount = *record.SuccessTotalCount - // } - // if record.FailedTotalCount != nil { - // failedCount = *record.FailedTotalCount - // } - // if record.TotalCount != nil { - // totalCount = *record.TotalCount - // } - // } + var runningCount, succeededCount, failedCount, totalCount int64 + if describeHostUploadUpdateRecordDetailResp.Response.DeployRecordDetail == nil { + return errors.New("unexpected deployment job status") + } else { + for _, record := range describeHostUploadUpdateRecordDetailResp.Response.DeployRecordDetail { + if record.RunningTotalCount != nil { + runningCount = *record.RunningTotalCount + } + if record.SuccessTotalCount != nil { + succeededCount = *record.SuccessTotalCount + } + if record.FailedTotalCount != nil { + failedCount = *record.FailedTotalCount + } + if record.TotalCount != nil { + totalCount = *record.TotalCount + } + } - // if succeededCount+failedCount == totalCount { - // break - // } - // } + if succeededCount+failedCount == totalCount { + break + } + } - // d.logger.Info(fmt.Sprintf("waiting for deployment job completion (running: %d, succeeded: %d, failed: %d, total: %d) ...", runningCount, succeededCount, failedCount, totalCount)) - // time.Sleep(time.Second * 5) - // } + d.logger.Info(fmt.Sprintf("waiting for deployment job completion (running: %d, succeeded: %d, failed: %d, total: %d) ...", runningCount, succeededCount, failedCount, totalCount)) + time.Sleep(time.Second * 5) + } return nil }