修复证书部署重试自冲突并补充真实装配回归

This commit is contained in:
xuans committed 2026-10-01 16:54:53 +08:00
1 parent f2574e9508
commit 302111c8af
8 files changed
+245 -27

No files matched your search

+27 -23
View File
@@ -40,29 +40,31 @@ type readinessSecretReader interface {
}
type Dependencies struct {
Config config.Config
ConfigPath string
FrontendDir string
Logger *logging.Logger
Repository repository.DomainRepository
Servers repository.ServerRepository
Users repository.UserRepository
ProjectMembers repository.ProjectMemberRepository
ProjectDirectory repository.ProjectDirectoryRepository
ProjectLifecycle repository.ProjectLifecycleRepository
ProjectResources repository.ProjectResourceReader
ProjectBindings repository.ProjectBindingRepository
ProjectDomains repository.ProjectDomainRepository
SSHKeys *sshkey.Service
DeploymentFactory deployment.ClientFactory
SetupDNS setupDNSVerifier
Secrets setupSecretWriter
Firewall firewall.Manager
IssueCertificate func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
IssueSetupCertificate func(context.Context, certificate.SetupCertificateRequest) (certificate.SavedResource, error)
RollbackSetupCertificate func(context.Context, certificate.SavedResource) error
ImportCertificate func(context.Context, certificate.ImportRequest) (certificate.IssueResult, deployment.Report, error)
DeployCertificate func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
Config config.Config
ConfigPath string
FrontendDir string
Logger *logging.Logger
Repository repository.DomainRepository
Servers repository.ServerRepository
Users repository.UserRepository
ProjectMembers repository.ProjectMemberRepository
ProjectDirectory repository.ProjectDirectoryRepository
ProjectLifecycle repository.ProjectLifecycleRepository
ProjectResources repository.ProjectResourceReader
ProjectBindings repository.ProjectBindingRepository
ProjectDomains repository.ProjectDomainRepository
SSHKeys *sshkey.Service
DeploymentFactory deployment.ClientFactory
SetupDNS setupDNSVerifier
Secrets setupSecretWriter
Firewall firewall.Manager
IssueCertificate func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
IssueSetupCertificate func(context.Context, certificate.SetupCertificateRequest) (certificate.SavedResource, error)
RollbackSetupCertificate func(context.Context, certificate.SavedResource) error
ImportCertificate func(context.Context, certificate.ImportRequest) (certificate.IssueResult, deployment.Report, error)
DeployCertificate func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
// DeployCertificateTask 执行已有任务,不得重复创建任务或尝试记录。
DeployCertificateTask func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
RestoreCertificateVersion func(context.Context, string, string) (certificate.IssueResult, error)
ValidateCertificate func(context.Context, string) (certificate.IssueResult, certificate.ValidationResult, error)
@@ -101,6 +103,7 @@ type Server struct {
rollbackSetupCertificate func(context.Context, certificate.SavedResource) error
importCertificate func(context.Context, certificate.ImportRequest) (certificate.IssueResult, deployment.Report, error)
deployCertificate func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
deployCertificateTask func(context.Context, string) (certificate.IssueResult, deployment.Report, error)
restoreVersion func(context.Context, string, string) (certificate.IssueResult, error)
validateCertificateWorkflow func(context.Context, string) (certificate.IssueResult, certificate.ValidationResult, error)
@@ -165,6 +168,7 @@ func New(deps Dependencies) *Server {
rollbackSetupCertificate: deps.RollbackSetupCertificate,
importCertificate: deps.ImportCertificate,
deployCertificate: deps.DeployCertificate,
deployCertificateTask: deps.DeployCertificateTask,
restoreVersion: deps.RestoreCertificateVersion,
validateCertificateWorkflow: deps.ValidateCertificate,
runRenewal: deps.RunRenewal,
+2 -2
View File
@@ -141,7 +141,7 @@ func (s *Server) executeCertificateIssueTask(c *gin.Context, task repository.Tas
}
func (s *Server) executeCertificateDeployTask(c *gin.Context, task repository.Task, attempt repository.TaskAttempt, auditAction string) {
s.executeCertificateTask(c, task, attempt, auditAction, s.deployCertificate, "certificate_deploy", "正在部署证书", "证书部署完成")
s.executeCertificateTask(c, task, attempt, auditAction, s.deployCertificateTask, "certificate_deploy", "正在部署证书", "证书部署完成")
}
func (s *Server) executeCertificateTask(c *gin.Context, task repository.Task, attempt repository.TaskAttempt, auditAction string, operation func(context.Context, string) (certificate.IssueResult, deployment.Report, error), stage, runningMessage, successMessage string) {
@@ -423,7 +423,7 @@ func (s *Server) retryTask(c *gin.Context) {
}
var runTask func(*gin.Context, repository.Task, repository.TaskAttempt, string)
if item.TaskType == "certificate_deploy" {
if s.deployCertificate == nil {
if s.deployCertificateTask == nil {
s.writeError(c, http.StatusNotImplemented, "证书部署接口尚未配置", errors.New("证书部署工作流未配置"))
return
}
+32 -2
View File
@@ -749,7 +749,7 @@ func TestTaskAPIRetriesFailedCertificateDeploymentWithoutDNSCredential(t *testin
return certificate.IssueResult{}, deployment.Report{}, nil
})
defer closeDB()
server.deployCertificate = func(_ context.Context, id string) (certificate.IssueResult, deployment.Report, error) {
server.deployCertificateTask = func(_ context.Context, id string) (certificate.IssueResult, deployment.Report, error) {
calls++
return certificate.IssueResult{DomainID: id}, deployment.Report{Status: "success"}, nil
}
@@ -792,12 +792,42 @@ func TestTaskAPIRetriesFailedCertificateDeploymentWithoutDNSCredential(t *testin
}
}
func TestTaskAPIDeployRetryRequiresUntrackedExecutor(t *testing.T) {
server, tasks, _, closeDB := newTaskAPITestServer(t, nil)
defer closeDB()
server.deployCertificate = func(context.Context, string) (certificate.IssueResult, deployment.Report, error) {
t.Fatal("已有任务不得回退到创建新任务的部署入口")
return certificate.IssueResult{}, deployment.Report{}, nil
}
item := repository.Task{
HistoryScope: repository.HistoryScope{ScopeType: repository.ScopeProject, ProjectID: domain.DefaultProjectID},
ID: "deploy-missing-executor", DomainID: "domain-1", TaskType: "certificate_deploy",
Status: "failed", Stage: "certificate_deploy",
}
if err := tasks.CreateTask(t.Context(), item); err != nil {
t.Fatal(err)
}
response := httptest.NewRecorder()
serveAdminHTTP(server, response, httptest.NewRequest(http.MethodPost, "/api/v1/tasks/"+item.ID+"/retry", nil))
if response.Code != http.StatusNotImplemented {
t.Fatalf("缺少已有任务执行器时应拒绝重试:%d %s", response.Code, response.Body.String())
}
stored, err := tasks.GetTask(t.Context(), item.ID)
if err != nil || stored.Status != "failed" {
t.Fatalf("执行器未配置时不应改变任务状态:%+v %v", stored, err)
}
attempts, err := tasks.ListAttempts(t.Context(), item.ID)
if err != nil || len(attempts) != 0 {
t.Fatalf("执行器未配置时不应增加尝试:%+v %v", attempts, err)
}
}
func TestTaskAPIRetriesPartialCertificateDeployment(t *testing.T) {
server, taskRepo, _, closeDB := newTaskAPITestServer(t, func(context.Context, string) (certificate.IssueResult, deployment.Report, error) {
return certificate.IssueResult{}, deployment.Report{}, nil
})
defer closeDB()
server.deployCertificate = func(_ context.Context, id string) (certificate.IssueResult, deployment.Report, error) {
server.deployCertificateTask = func(_ context.Context, id string) (certificate.IssueResult, deployment.Report, error) {
return certificate.IssueResult{DomainID: id}, deployment.Report{Status: "success"}, nil
}
finished := time.Now().UTC()