Save and display execution records

This commit is contained in:
yoan
2024-11-20 15:47:51 +08:00
parent 03b2a9da66
commit 2d10fa0218
18 changed files with 405 additions and 54 deletions

View File

@@ -2,6 +2,7 @@ package nodeprocessor
import (
"context"
"time"
"github.com/usual2970/certimate/internal/applicant"
"github.com/usual2970/certimate/internal/domain"
@@ -45,8 +46,16 @@ func (a *applyNode) Run(ctx context.Context) error {
}
if output != nil && output.Succeed {
a.AddOutput(ctx, a.node.Name, "已申请过")
return nil
cert, err := a.outputRepo.GetCertificate(ctx, a.node.Id)
if err != nil {
a.AddOutput(ctx, a.node.Name, "获取证书失败", err.Error())
return err
}
if time.Until(cert.ExpireAt) > domain.ValidityDuration {
a.AddOutput(ctx, a.node.Name, "已申请过证书,且证书在有效期内")
return nil
}
}
// 获取Applicant
@@ -65,12 +74,18 @@ func (a *applyNode) Run(ctx context.Context) error {
a.AddOutput(ctx, a.node.Name, "申请成功")
// 记录申请结果
// 保持一个节点只有一个输出
outputId := ""
if output != nil {
outputId = output.Id
}
output = &domain.WorkflowOutput{
Workflow: GetWorkflowId(ctx),
NodeId: a.node.Id,
Node: a.node,
Succeed: true,
Output: a.node.Output,
Meta: domain.Meta{Id: outputId},
}
cert, err := x509.ParseCertificateFromPEM(certificate.Certificate)

View File

@@ -4,7 +4,6 @@ import (
"context"
"github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/utils/xtime"
)
type conditionNode struct {
@@ -21,7 +20,7 @@ func NewConditionNode(node *domain.WorkflowNode) *conditionNode {
// 条件节点没有任何操作
func (c *conditionNode) Run(ctx context.Context) error {
c.AddOutput(ctx, xtime.BeijingTimeStr(),
c.AddOutput(ctx,
c.node.Name,
"完成",
)

View File

@@ -32,10 +32,6 @@ func (d *deployNode) Run(ctx context.Context) error {
d.AddOutput(ctx, d.node.Name, "查询部署记录失败", err.Error())
return err
}
if output != nil && output.Succeed {
d.AddOutput(ctx, d.node.Name, "已部署过")
return nil
}
// 获取部署对象
// 获取证书
certSource := d.node.GetConfigString("certificate")
@@ -52,6 +48,15 @@ func (d *deployNode) Run(ctx context.Context) error {
return err
}
// 未部署过,开始部署
// 部署过但是证书更新了,重新部署
// 部署过且证书未更新,直接返回
if d.deployed(output) && cert.Created.Before(output.Updated) {
d.AddOutput(ctx, d.node.Name, "已部署过且证书未更新")
return nil
}
accessRepo := repository.NewAccessRepository()
access, err := accessRepo.GetById(context.Background(), d.node.GetConfigString("access"))
if err != nil {
@@ -86,11 +91,16 @@ func (d *deployNode) Run(ctx context.Context) error {
d.AddOutput(ctx, d.node.Name, "部署成功")
// 记录部署结果
outputId := ""
if output != nil {
outputId = output.Id
}
output = &domain.WorkflowOutput{
Workflow: GetWorkflowId(ctx),
NodeId: d.node.Id,
Node: d.node,
Succeed: true,
Meta: domain.Meta{Id: outputId},
}
if err := d.outputRepo.Save(ctx, output, nil, nil); err != nil {
@@ -102,3 +112,7 @@ func (d *deployNode) Run(ctx context.Context) error {
return nil
}
func (d *deployNode) deployed(output *domain.WorkflowOutput) bool {
return output != nil && output.Succeed
}

View File

@@ -8,51 +8,38 @@ import (
"github.com/usual2970/certimate/internal/utils/xtime"
)
type RunLog struct {
NodeName string `json:"node_name"`
Err string `json:"err"`
Outputs []RunLogOutput `json:"outputs"`
}
type RunLogOutput struct {
Time string `json:"time"`
Title string `json:"title"`
Content string `json:"content"`
Error string `json:"error"`
}
type NodeProcessor interface {
Run(ctx context.Context) error
Log(ctx context.Context) *RunLog
Log(ctx context.Context) *domain.RunLog
AddOutput(ctx context.Context, title, content string, err ...string)
}
type Logger struct {
log *RunLog
log *domain.RunLog
}
func NewLogger(node *domain.WorkflowNode) *Logger {
return &Logger{
log: &RunLog{
log: &domain.RunLog{
NodeName: node.Name,
Outputs: make([]RunLogOutput, 0),
Outputs: make([]domain.RunLogOutput, 0),
},
}
}
func (l *Logger) Log(ctx context.Context) *RunLog {
func (l *Logger) Log(ctx context.Context) *domain.RunLog {
return l.log
}
func (l *Logger) AddOutput(ctx context.Context, title, content string, err ...string) {
output := RunLogOutput{
output := domain.RunLogOutput{
Time: xtime.BeijingTimeStr(),
Title: title,
Content: content,
}
if len(err) > 0 {
output.Error = err[0]
l.log.Err = err[0]
l.log.Error = err[0]
}
l.log.Outputs = append(l.log.Outputs, output)
}

View File

@@ -4,7 +4,6 @@ import (
"context"
"github.com/usual2970/certimate/internal/domain"
"github.com/usual2970/certimate/internal/utils/xtime"
)
type startNode struct {
@@ -21,7 +20,7 @@ func NewStartNode(node *domain.WorkflowNode) *startNode {
// 开始节点没有任何操作
func (s *startNode) Run(ctx context.Context) error {
s.AddOutput(ctx, xtime.BeijingTimeStr(),
s.AddOutput(ctx,
s.node.Name,
"完成",
)

View File

@@ -8,15 +8,20 @@ import (
type workflowProcessor struct {
workflow *domain.Workflow
logs []RunLog
logs []domain.RunLog
}
func NewWorkflowProcessor(workflow *domain.Workflow) *workflowProcessor {
return &workflowProcessor{
workflow: workflow,
logs: make([]domain.RunLog, 0),
}
}
func (w *workflowProcessor) Log(ctx context.Context) []domain.RunLog {
return w.logs
}
func (w *workflowProcessor) Run(ctx context.Context) error {
ctx = WithWorkflowId(ctx, w.workflow.Id)
return w.runNode(ctx, w.workflow.Content)