Merge pull request #1430 from flanksource/feat/webhook-without-schedule

feat: persist webhook checks even if there's no schedule
flanksource · Nov 7, 2023 · 0cb077f · 0cb077f
2 parents 0472e34 + dadca0a
commit 0cb077f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/fixtures/external/alertmanager.yaml b/fixtures/external/alertmanager.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     "Expected-Fail": "true"
 spec:
-  schedule: "@every 1m"
+  # schedule: "@every 1m" # (Not required for webhook checks)
   webhook:
     name: my-webhook
     token:

diff --git a/pkg/jobs/canary/canary_jobs.go b/pkg/jobs/canary/canary_jobs.go
@@ -113,10 +113,6 @@ func (j CanaryJob) Run(ctx dutyjob.JobRuntime) error {
 	}
 	span.End()
 
-	if canaryCtx.Canary.Spec.Webhook != nil {
-		results = append(results, pkg.Success(canaryCtx.Canary.Spec.Webhook, canaryCtx.Canary))
-	}
-
 	// Get transformed checks before and after, and then delete the olds ones that are not in new set
 	existingTransformedChecks, _ := db.GetTransformedCheckIDs(ctx.Context, canaryID)
 	var transformedChecksCreated []string
@@ -317,6 +313,12 @@ func SyncCanaryJob(ctx context.Context, dbCanary pkg.Canary) error {
 		return err
 	}
 
+	if canary.Spec.Webhook != nil {
+		// Webhook checks can be persisted immediately as they do not require scheduling & running.
+		result := pkg.Success(canary.Spec.Webhook, *canary)
+		_ = cache.PostgresCache.Add(pkg.FromV1(*canary, canary.Spec.Webhook), pkg.CheckStatusFromResult(*result))
+	}
+
 	if canary.Spec.GetSchedule() == "@never" {
 		DeleteCanaryJob(canary.GetPersistedID())
 		return nil