完成初始化证书事务和远程部署互斥并纳入发布构建脚本
This commit is contained in:
1 parent
05e05a1a23
commit
a4dffb04d4
27 files changed
+1294
-25
No files matched your search
@@ -120,7 +120,8 @@ func Apply(cfg *config.Config, input Input) error {
|
||||
cfg.Web.Enabled = input.WebEnabled
|
||||
cfg.Web.Hostname = strings.TrimSpace(input.WebHostname)
|
||||
cfg.Web.PublicIP = strings.TrimSpace(input.WebPublicIP)
|
||||
cfg.Web.InitReady = true
|
||||
// 配置输入通过不等于初始化完成;调用方必须先取得并校验管理后台证书。
|
||||
cfg.Web.InitReady = false
|
||||
cfg.Paths.Certificate = strings.TrimSpace(input.CertificateRoot)
|
||||
cfg.DNS.Provider = strings.TrimSpace(input.DNSProvider)
|
||||
cfg.DNS.CredentialRef = strings.TrimSpace(input.DNSCredentialRef)
|
||||
@@ -179,7 +180,7 @@ func Apply(cfg *config.Config, input Input) error {
|
||||
if len(cfg.Notification.Recipients) == 0 {
|
||||
cfg.Notification.Recipients = []string{adminEmail}
|
||||
}
|
||||
cfg.SetupReady = true
|
||||
cfg.SetupReady = false
|
||||
if cfg.Notification.SMTPEnabled && strings.TrimSpace(cfg.Notification.SMTPCredentialRef) == "" {
|
||||
return fmt.Errorf("启用 SMTP 通知后必须配置加密凭据引用")
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ func TestApplyRequiresVerifiedDNS(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestApplyBuildsReadyConfig(t *testing.T) {
|
||||
func TestApplyBuildsPendingConfig(t *testing.T) {
|
||||
cfg := config.Default(t.TempDir())
|
||||
err := Apply(&cfg, Input{
|
||||
AdminUsername: "admin", AdminEmail: "admin@example.com", AdminPassword: "password123", ServerPort: 8080,
|
||||
@@ -33,7 +33,7 @@ func TestApplyBuildsReadyConfig(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("初始化配置失败:%v", err)
|
||||
}
|
||||
if !cfg.SetupReady || cfg.DNS.VerificationState != "verified" || cfg.Admin.Username != "admin" {
|
||||
if cfg.SetupReady || cfg.Web.InitReady || cfg.DNS.VerificationState != "verified" || cfg.Admin.Username != "admin" {
|
||||
t.Fatalf("初始化状态不正确:%+v", cfg)
|
||||
}
|
||||
if len(cfg.Notification.Recipients) != 2 {
|
||||
|
||||
Reference in new issue
Block a user