Skip to content

Update deployment commit id #7479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abeizn merged 4 commits into from
May 17, 2024
Merged

Update deployment commit id #7479

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd3804d
fix(apikey): abort request if api key doesn't match
d4x1 May 15, 2024
8476a5e
Merge branch 'main' into dev-1
d4x1 May 16, 2024
c68bd9b
Merge branch 'main' into dev-1
d4x1 May 17, 2024
6279bce
feat(webhook): update deployment commit id
d4x1 May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions backend/plugins/webhook/api/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ type DeploymentCommit struct {
CommitMsg string `mapstructure:"commit_msg"`
}

func generateDeploymentCommitId(connectionId uint64, repoUrl string, commitSha string) string {
func GenerateDeploymentCommitId(connectionId uint64, pipelineId string, repoUrl string, commitSha string) string {
urlHash16 := fmt.Sprintf("%x", md5.Sum([]byte(repoUrl)))[:16]
return fmt.Sprintf("%s:%d:%s:%s", "webhook", connectionId, urlHash16, commitSha)
return fmt.Sprintf("%s:%d:%s:%s:%s", "webhook", connectionId, pipelineId, urlHash16, commitSha)
}

func CreateDeploymentAndDeploymentCommits(connection *models.WebhookConnection, request *WebhookDeployTaskRequest, tx dal.Transaction, logger log.Logger) errors.Error {
Expand Down Expand Up @@ -122,7 +122,7 @@ func CreateDeploymentAndDeploymentCommits(connection *models.WebhookConnection,
// create a deployment_commit record
deploymentCommit := &devops.CicdDeploymentCommit{
DomainEntity: domainlayer.DomainEntity{
Id: generateDeploymentCommitId(connection.ID, request.RepoUrl, request.CommitSha),
Id: GenerateDeploymentCommitId(connection.ID, request.PipelineId, request.RepoUrl, request.CommitSha),
},
CicdDeploymentId: request.PipelineId,
CicdScopeId: scopeId,
Expand Down Expand Up @@ -157,7 +157,7 @@ func CreateDeploymentAndDeploymentCommits(connection *models.WebhookConnection,
// create a deployment_commit record
deploymentCommit := &devops.CicdDeploymentCommit{
DomainEntity: domainlayer.DomainEntity{
Id: generateDeploymentCommitId(connection.ID, commit.RepoUrl, commit.CommitSha),
Id: GenerateDeploymentCommitId(connection.ID, request.PipelineId, commit.RepoUrl, commit.CommitSha),
},
CicdDeploymentId: request.PipelineId,
CicdScopeId: scopeId,
Expand Down