1717package hook
1818
1919import (
20- "github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
21- repository4 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
22- "github.com/devtron-labs/devtron/pkg/pipeline/types"
2320 "github.com/devtron-labs/devtron/pkg/workflow/trigger/audit/bean"
2421 "github.com/devtron-labs/devtron/pkg/workflow/trigger/audit/service"
2522 "go.uber.org/zap"
@@ -28,19 +25,10 @@ import (
2825// TriggerAuditHook provides common hooks for auditing workflow triggers
2926type TriggerAuditHook interface {
3027 // AuditCiTrigger audits CI trigger
31- AuditCiTrigger (workflowId int , pipeline * pipelineConfig.CiPipeline , workflowRequest * types.WorkflowRequest ,
32- triggerType string , triggeredBy int32 ,
33- infraConfigTriggerHistoryId int ) error
28+ AuditCiTrigger (ciTriggerAuditRequest * bean.CiTriggerAuditRequest ) error
3429
35- // AuditPreCdTrigger audits Pre-CD trigger
36- AuditPreCdTrigger (workflowRunnerId int , pipeline * pipelineConfig.Pipeline , environment * repository4.Environment ,
37- workflowRequest * types.WorkflowRequest ,
38- triggerType string , triggeredBy int32 , infraConfigTriggerHistoryId int ) error
39-
40- // AuditPostCdTrigger audits Post-CD trigger
41- AuditPostCdTrigger (workflowRunnerId int , pipeline * pipelineConfig.Pipeline , environment * repository4.Environment ,
42- workflowRequest * types.WorkflowRequest ,
43- triggerType string , triggeredBy int32 , infraConfigTriggerHistoryId int ) error
30+ // AuditPrePostCdTrigger audits Pre-CD trigger
31+ AuditPrePostCdTrigger (cdTriggerAuditRequest * bean.CdTriggerAuditRequest ) error
4432
4533 // GetRetriggerConfig gets configuration for retrigger
4634 //GetRetriggerConfig(auditId int) (*bean.RetriggerWorkflowConfig, error)
@@ -58,86 +46,54 @@ func NewTriggerAuditHookImpl(logger *zap.SugaredLogger, workflowTriggerAuditServ
5846 }
5947}
6048
61- func (impl * TriggerAuditHookImpl ) AuditCiTrigger (workflowId int , pipeline * pipelineConfig.CiPipeline ,
62- workflowRequest * types.WorkflowRequest , triggerType string , triggeredBy int32 , infraConfigTriggerHistoryId int ) error {
49+ func (impl * TriggerAuditHookImpl ) AuditCiTrigger (ciTriggerAuditRequest * bean.CiTriggerAuditRequest ) error {
6350
64- impl .logger .Infow ("auditing CI trigger" , "workflowId" , workflowId , "pipelineId" , pipeline . Id , "triggeredBy" , triggeredBy )
51+ impl .logger .Infow ("auditing CI trigger" , "workflowId" , ciTriggerAuditRequest . WorkflowId , "pipelineId" , ciTriggerAuditRequest . PipelineId , "triggeredBy" , ciTriggerAuditRequest . TriggeredBy )
6552
66- request := & bean.CiTriggerAuditRequest {
67- WorkflowId : workflowId ,
68- Pipeline : pipeline ,
69- CommonAuditRequest : & bean.CommonAuditRequest {
70- WorkflowRequest : workflowRequest ,
71- TriggerType : triggerType ,
72- TriggeredBy : triggeredBy ,
73- InfraConfigTriggerHistoryId : infraConfigTriggerHistoryId ,
74- },
75- }
53+ //request := &bean.CiTriggerAuditRequest{
54+ // WorkflowId: workflowId,
55+ // Pipeline: pipeline,
56+ // CommonAuditRequest: &bean.CommonAuditRequest{
57+ // WorkflowRequest: workflowRequest,
58+ // TriggerType: triggerType,
59+ // TriggeredBy: triggeredBy,
60+ // },
61+ //}
7662
77- _ , err := impl .workflowTriggerAuditService .SaveCiTriggerAudit (request )
63+ _ , err := impl .workflowTriggerAuditService .SaveCiTriggerAudit (ciTriggerAuditRequest )
7864 if err != nil {
79- impl .logger .Errorw ("error in auditing CI trigger" , "err" , err , "workflowId" , workflowId )
80- // Don't fail the trigger if audit fails, just log the error
81- return nil
65+ impl .logger .Errorw ("error in auditing CI trigger" , "workflowId" , ciTriggerAuditRequest .WorkflowId , "err" , err )
66+ // Don't fail/return the trigger if audit fails, just log the error
8267 }
8368
84- impl .logger .Infow ("successfully audited CI trigger" , "workflowId" , workflowId , "pipelineId" , pipeline . Id )
69+ impl .logger .Infow ("successfully audited CI trigger" , "workflowId" , ciTriggerAuditRequest . WorkflowId , "pipelineId" , ciTriggerAuditRequest . PipelineId )
8570 return nil
8671}
8772
88- func (impl * TriggerAuditHookImpl ) AuditPreCdTrigger (workflowRunnerId int , pipeline * pipelineConfig.Pipeline ,
89- environment * repository4.Environment , workflowRequest * types.WorkflowRequest , triggerType string , triggeredBy int32 , infraConfigTriggerHistoryId int ) error {
90-
91- impl .logger .Infow ("auditing Pre-CD trigger" , "workflowRunnerId" , workflowRunnerId , "pipelineId" , pipeline .Id , "triggeredBy" , triggeredBy )
92-
93- request := & bean.CdTriggerAuditRequest {
94- WorkflowRunnerId : workflowRunnerId ,
95- Pipeline : pipeline ,
96- Environment : environment ,
97- CommonAuditRequest : & bean.CommonAuditRequest {
98- WorkflowRequest : workflowRequest ,
99- TriggerType : triggerType ,
100- TriggeredBy : triggeredBy ,
101- InfraConfigTriggerHistoryId : infraConfigTriggerHistoryId ,
102- },
103- }
73+ func (impl * TriggerAuditHookImpl ) AuditPrePostCdTrigger (cdTriggerAuditRequest * bean.CdTriggerAuditRequest ) error {
10474
105- _ , err := impl .workflowTriggerAuditService .SavePreCdTriggerAudit (request )
106- if err != nil {
107- impl .logger .Errorw ("error in auditing Pre-CD trigger" , "err" , err , "workflowRunnerId" , workflowRunnerId )
108- // Don't fail the trigger if audit fails, just log the error
109- return nil
110- }
75+ impl .logger .Infow ("auditing Pre/Post-CD trigger" , "workflowRunnerId" , cdTriggerAuditRequest .WorkflowRunnerId , "pipelineId" , cdTriggerAuditRequest .PipelineId , "workflowType" , cdTriggerAuditRequest .WorkflowType , "triggeredBy" , cdTriggerAuditRequest .TriggeredBy )
11176
112- impl .logger .Infow ("successfully audited Pre-CD trigger" , "workflowRunnerId" , workflowRunnerId , "pipelineId" , pipeline .Id )
113- return nil
114- }
115-
116- func (impl * TriggerAuditHookImpl ) AuditPostCdTrigger (workflowRunnerId int , pipeline * pipelineConfig.Pipeline ,
117- environment * repository4.Environment , workflowRequest * types.WorkflowRequest , triggerType string , triggeredBy int32 , infraConfigTriggerHistoryId int ) error {
118-
119- impl .logger .Infow ("auditing Post-CD trigger" , "workflowRunnerId" , workflowRunnerId , "pipelineId" , pipeline .Id , "triggeredBy" , triggeredBy )
120-
121- request := & bean.CdTriggerAuditRequest {
122- WorkflowRunnerId : workflowRunnerId ,
123- Pipeline : pipeline ,
124- Environment : environment ,
125- CommonAuditRequest : & bean.CommonAuditRequest {
126- WorkflowRequest : workflowRequest ,
127- TriggerType : triggerType ,
128- TriggeredBy : triggeredBy ,
129- InfraConfigTriggerHistoryId : infraConfigTriggerHistoryId ,
130- },
131- }
77+ //request := &bean.CdTriggerAuditRequest{
78+ // WorkflowRunnerId: workflowRunnerId,
79+ // Pipeline: pipeline,
80+ // Environment: environment,
81+ // WorkflowType: workflowType,
82+ // CommonAuditRequest: &bean.CommonAuditRequest{
83+ // WorkflowRequest: workflowRequest,
84+ // TriggerType: triggerType,
85+ // TriggeredBy: triggeredBy,
86+ // },
87+ //}
13288
133- _ , err := impl .workflowTriggerAuditService .SavePostCdTriggerAudit ( request )
89+ _ , err := impl .workflowTriggerAuditService .SaveCdTriggerAudit ( cdTriggerAuditRequest )
13490 if err != nil {
135- impl .logger .Errorw ("error in auditing Post-CD trigger" , "err " , err , "workflowRunnerId " , workflowRunnerId )
136- // Don't fail the trigger if audit fails, just log the error
91+ impl .logger .Errorw ("error in auditing Pre/ Post-CD trigger" , "workflowRunnerId " , cdTriggerAuditRequest . WorkflowRunnerId , "err " , err )
92+ // Don't fail/return the trigger if audit fails, just log the error
13793 return nil
13894 }
13995
140- impl .logger .Infow ("successfully audited Post-CD trigger" , "workflowRunnerId" , workflowRunnerId , "pipelineId" , pipeline . Id )
96+ impl .logger .Infow ("successfully audited Pre/ Post-CD trigger" , "workflowRunnerId" , cdTriggerAuditRequest . WorkflowRunnerId , "pipelineId" , cdTriggerAuditRequest . PipelineId )
14197 return nil
14298}
14399
0 commit comments