补齐旧 DNS 账户幂等导入
启动时登记旧 DNS 配置并保持用户修改,增加冲突保护和回归测试。
This commit is contained in:
1 parent
92b499979f
commit
920b318cf0
3 files changed
+133
No files matched your search
@@ -14,6 +14,7 @@ import (
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/database"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/deployment"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/dnsprovider"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/domain"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/firewall"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/httpapi"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/httpchallenge"
|
||||
@@ -105,6 +106,25 @@ func NewWithConfigPath(ctx context.Context, cfg config.Config, configPath string
|
||||
return nil, fmt.Errorf("初始化超级管理员用户失败:%w", err)
|
||||
}
|
||||
}
|
||||
if cfg.DNS.CredentialRef != "" && cfg.DNS.Provider != "" {
|
||||
legacyProjectID := cfg.DNS.ProjectID
|
||||
if legacyProjectID == "" {
|
||||
legacyProjectID = domain.DefaultProjectID
|
||||
}
|
||||
legacyOwnerID := cfg.DNS.OwnerUserID
|
||||
if legacyOwnerID == "" {
|
||||
legacyOwnerID = "primary-super-admin"
|
||||
}
|
||||
legacyImporter := repository.NewSQLProjectMemberRepository(db.DB, runtimeDatabaseConfig.Driver)
|
||||
if err := legacyImporter.ImportLegacyDNSAccount(ctx, domain.DNSAccount{
|
||||
ID: "legacy-system-dns", Name: "旧系统 DNS 账户", ProjectID: legacyProjectID,
|
||||
OwnerUserID: legacyOwnerID, Provider: cfg.DNS.Provider, CredentialRef: cfg.DNS.CredentialRef,
|
||||
}); err != nil {
|
||||
_ = db.Close()
|
||||
_ = logger.Close()
|
||||
return nil, fmt.Errorf("导入旧 DNS 账户失败:%w", err)
|
||||
}
|
||||
}
|
||||
taskRepo := repository.NewSQLTaskRepository(db.DB, runtimeDatabaseConfig.Driver)
|
||||
transactionRepo := repository.NewSQLDeploymentTransactionRepository(db.DB, runtimeDatabaseConfig.Driver)
|
||||
deploymentService := deployment.NewServiceWithJournal(deployment.SSHFactory{Secrets: secretStore}, transactionRepo)
|
||||
|
||||
Reference in new issue
Block a user