do not break workflow deletion when webhook deletion is failed (#171)

Signed-off-by: lou <[email protected]>
koderover · Aug 12, 2021 · f1bcf1c · f1bcf1c
1 parent 2edded4
commit f1bcf1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pkg/microservice/aslan/core/common/service/webhook/controller.go b/pkg/microservice/aslan/core/common/service/webhook/controller.go
@@ -143,6 +143,8 @@ func removeWebhook(t *task, logger *zap.Logger) {
 		t.doneCh <- struct{}{}
 		return
 	}
+
+	logger = logger.With(zap.String("hookID", webhook.HookID))
 	logger.Info("Removing webhook")
 	updated, err := coll.RemoveReference(t.owner, t.repo, t.address, t.ref)
 	if err != nil {
@@ -212,12 +214,12 @@ func addWebhook(t *task, logger *zap.Logger) {
 		if err = coll.Delete(t.owner, t.repo, t.address); err != nil {
 			logger.Error("Failed to delete webhook record in db", zap.Error(err))
 		}
-	}
-
-	if hookID != "" {
-		if err = coll.Update(t.owner, t.repo, t.address, hookID); err != nil {
-			t.err = err
-			logger.Error("Failed to update webhook", zap.Error(err))
+	} else {
+		if hookID != "" {
+			if err = coll.Update(t.owner, t.repo, t.address, hookID); err != nil {
+				t.err = err
+				logger.Error("Failed to update webhook", zap.Error(err))
+			}
 		}
 	}
 

diff --git a/pkg/microservice/aslan/core/common/service/workflow.go b/pkg/microservice/aslan/core/common/service/workflow.go
@@ -89,7 +89,6 @@ func DeleteWorkflow(workflowName, requestID string, isDeletingProductTmpl bool,
 	err = ProcessWebhook(nil, workflow.HookCtl.Items, webhook.WorkflowPrefix+workflow.Name, log)
 	if err != nil {
 		log.Errorf("Failed to process webhook, err: %s", err)
-		return e.ErrUpsertWorkflow.AddDesc(err.Error())
 	}
 
 	go gerrit.DeleteGerritWebhook(workflow, log)