zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-11-02 20:04:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring functions to no longer use uuid.

Browse Source
This commit is contained in:
Aleksandr Melnikov
2020-04-22 11:59:43 -07:00
parent 74b3043db1
commit 8130d44ced
2 changed files with 9 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
pkg/workflow_execution.go
View File

@@ -8,7 +8,6 @@ import (
"fmt"
sq "github.com/Masterminds/squirrel"
"github.com/ghodss/yaml"
"github.com/hashicorp/go-uuid"
"github.com/onepanelio/core/api"
"github.com/onepanelio/core/pkg/util/label"
"io"
@@ -238,31 +237,19 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateId *uint64, wf
return nil, err
}
wfExecUid, err := uuid.GenerateUUID()
if err != nil {
return nil, err
}
err = InjectExitHandlerWorkflowExecutionStatistic(wf, namespace, wfExecUid, workflowTemplateId)
err = InjectExitHandlerWorkflowExecutionStatistic(wf, namespace, workflowTemplateId)
if err != nil {
return nil, err
}
//Create an entry for workflow_executions statistic
//CURL code will hit the API endpoint that will update the db row
err = c.InsertPreWorkflowExecutionStatistic(namespace, wfExecUid, int64(*workflowTemplateId), time.Now())
if err != nil {
return nil, err
}
createdWorkflow, err = c.ArgoprojV1alpha1().Workflows(namespace).Create(wf)
if err != nil {
//Remove the workflow execution statistic entry, because this workflow never ran
err = c.DeletePreWorkflowExecutionStatistic(wfExecUid)
if err != nil {
return nil, err
}
return nil, err
}
err = c.AddNameToWorkflowExecutionStatisticPostCreation(createdWorkflow.Name, wfExecUid)
//Create an entry for workflow_executions statistic
//CURL code will hit the API endpoint that will update the db row
err = c.InsertPreWorkflowExecutionStatistic(namespace, createdWorkflow.Name, int64(*workflowTemplateId), time.Now())
if err != nil {
return nil, err
}
@@ -404,48 +391,6 @@ func (c *Client) InsertPreWorkflowExecutionStatistic(namespace, name string, wor
return err
}
func (c *Client) AddNameToWorkflowExecutionStatisticPostCreation(name, uid string) error {
tx, err := c.DB.Begin()
if err != nil {
return err
}
defer tx.Rollback()
updateMap := sq.Eq{
"name": name,
}
_, err = sb.Update("workflow_executions").
SetMap(updateMap).Where(sq.Eq{"uid": uid}).RunWith(tx).Exec()
if err != nil {
return err
}
err = tx.Commit()
if err != nil {
return err
}
return err
}
func (c *Client) DeletePreWorkflowExecutionStatistic(uid string) error {
tx, err := c.DB.Begin()
if err != nil {
return err
}
defer tx.Rollback()
_, err = sb.Delete("workflow_executions").Where(
sq.Eq{"uid": uid}).RunWith(tx).Exec()
if err != nil {
return err
}
err = tx.Commit()
if err != nil {
return err
}
return err
}
func (c *Client) FinishWorkflowExecutionStatisticViaExitHandler(namespace, name string, workflowTemplateID int64, workflowOutcomeIsSuccess bool) (err error) {
tx, err := c.DB.Begin()
if err != nil {