继续初始化测试前保存启动链路与页面迁移检查点
This commit is contained in:
1 parent
34d1fb88e5
commit
199d727ecc
20 files changed
+891
-67
No files matched your search
@@ -11,11 +11,19 @@ import (
|
||||
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/app"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/config"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/certificate"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/dnsprovider"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/firewall"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/httpapi"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/secretstore"
|
||||
"git.pcux.cn/xuans/Scert/backend/internal/setup"
|
||||
)
|
||||
|
||||
type Runtime struct {
|
||||
core *app.App
|
||||
cancel context.CancelFunc
|
||||
initial http.Handler
|
||||
initialDNS *setup.DNSVerificationManager
|
||||
}
|
||||
|
||||
func Open(configPath, baseDir string) (*Runtime, error) {
|
||||
@@ -43,6 +51,27 @@ func Open(configPath, baseDir string) (*Runtime, error) {
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
if !cfg.SetupReady {
|
||||
// 桌面端保留本机向导,但不再为初始化预先创建正式数据库和后台任务。
|
||||
store, err := secretstore.Open(cfg.Paths.Config)
|
||||
if err != nil { cancel(); return nil, err }
|
||||
dns := setup.NewDNSVerificationManager(dnsprovider.NewTester(dnsprovider.NewLegoFactory()), store)
|
||||
issuer := certificate.NewService(cfg, nil, store, dnsprovider.NewLegoFactory(), certificate.NewAccountRepository(store))
|
||||
issuer.SetDNSAuthorizationChecker(dnsprovider.NewAliyunAuthorizationChecker())
|
||||
server := httpapi.New(httpapi.Dependencies{
|
||||
Config: cfg, ConfigPath: configPath, SetupDNS: dns, Secrets: store,
|
||||
Firewall: firewall.NewManager(), IssueSetupCertificate: issuer.IssueForSetup,
|
||||
RollbackSetupCertificate: certificate.RollbackSavedResource,
|
||||
})
|
||||
handler := http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
|
||||
if request.URL.Path == "/api/v1/setup" || strings.HasPrefix(request.URL.Path, "/api/v1/setup/") {
|
||||
server.Handler().ServeHTTP(writer, request)
|
||||
return
|
||||
}
|
||||
http.NotFound(writer, request)
|
||||
})
|
||||
return &Runtime{cancel: cancel, initial: handler, initialDNS: dns}, nil
|
||||
}
|
||||
core, err := app.NewWithConfigPath(ctx, cfg, configPath)
|
||||
if err != nil {
|
||||
cancel()
|
||||
@@ -55,6 +84,7 @@ func Open(configPath, baseDir string) (*Runtime, error) {
|
||||
}
|
||||
|
||||
func (r *Runtime) Handler() http.Handler {
|
||||
if r != nil && r.initial != nil { return r.initial }
|
||||
if r == nil || r.core == nil || r.core.HTTP == nil {
|
||||
return http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) {
|
||||
http.Error(writer, "Scert 核心服务未初始化", http.StatusServiceUnavailable)
|
||||
@@ -70,6 +100,7 @@ func (r *Runtime) Close() error {
|
||||
if r.cancel != nil {
|
||||
r.cancel()
|
||||
}
|
||||
if r.initialDNS != nil { r.initialDNS.DiscardAll() }
|
||||
if r.core != nil {
|
||||
return r.core.Close()
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@ func TestOpenCreatesUninitializedRuntime(t *testing.T) {
|
||||
t.Fatalf("打开桌面核心服务失败:%v", err)
|
||||
}
|
||||
defer runtime.Close()
|
||||
if runtime.core != nil { t.Fatal("桌面首次初始化不应创建正式应用") }
|
||||
if _, err := os.Stat(defaultConfig(baseDir).Database.DSN); !os.IsNotExist(err) { t.Fatalf("桌面初始化提前创建数据库:%v", err) }
|
||||
|
||||
request, err := http.NewRequest(http.MethodGet, "http://127.0.0.1/api/v1/setup/status", nil)
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user