Skip to content

Commit 32e5b07

Browse files
committed
merge develop
1 parent 7f42451 commit 32e5b07

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

pkg/deployment/trigger/devtronApps/HandlerService.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
"github.com/devtron-labs/devtron/pkg/app/status"
3939
"github.com/devtron-labs/devtron/pkg/attributes"
4040
"github.com/devtron-labs/devtron/pkg/auth/user"
41+
userBean "github.com/devtron-labs/devtron/pkg/auth/user/bean"
4142
"github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/read"
4243
pipeline2 "github.com/devtron-labs/devtron/pkg/build/pipeline"
4344
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
@@ -94,7 +95,7 @@ type HandlerService interface {
9495

9596
TriggerStageForBulk(triggerRequest bean.TriggerRequest) error
9697

97-
ManualCdTrigger(triggerContext bean.TriggerContext, overrideRequest *bean3.ValuesOverrideRequest) (int, string, *bean4.ManifestPushTemplate, error)
98+
ManualCdTrigger(triggerContext bean.TriggerContext, overrideRequest *bean3.ValuesOverrideRequest, userMetadata *userBean.UserMetadata) (int, string, *bean4.ManifestPushTemplate, error)
9899
TriggerAutomaticDeployment(request bean.TriggerRequest) error
99100

100101
TriggerRelease(ctx context.Context, overrideRequest *bean3.ValuesOverrideRequest, envDeploymentConfig *bean9.DeploymentConfig, triggeredAt time.Time, triggeredBy int32) (releaseNo int, manifestPushTemplate *bean4.ManifestPushTemplate, err error)

pkg/deployment/trigger/devtronApps/deployStageHandlerCode.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ import (
3636
"github.com/devtron-labs/devtron/pkg/app"
3737
bean4 "github.com/devtron-labs/devtron/pkg/app/bean"
3838
statusBean "github.com/devtron-labs/devtron/pkg/app/status/bean"
39-
"github.com/devtron-labs/devtron/pkg/attributes"
40-
"github.com/devtron-labs/devtron/pkg/auth/user"
4139
userBean "github.com/devtron-labs/devtron/pkg/auth/user/bean"
4240
bean2 "github.com/devtron-labs/devtron/pkg/bean"
4341
"github.com/devtron-labs/devtron/pkg/deployment/common"

0 commit comments

Comments
 (0)