fix(notifications-catalog): Add nil check for on-deployed trigger (#1…

…5363) Signed-off-by: Fs02 <[email protected]> Co-authored-by: pasha-codefresh <[email protected]>
argoproj · Sep 6, 2023 · 0de579d · 0de579d
1 parent ec2d3f6
commit 0de579d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/notifications_catalog/install.yaml b/notifications_catalog/install.yaml
@@ -499,11 +499,11 @@ data:
       when: app.metadata.deletionTimestamp != nil
   trigger.on-deployed: |
     - description: Application is synced and healthy. Triggered once per commit.
-      oncePer: app.status.operationState.syncResult.revision
+      oncePer: app.status.operationState?.syncResult?.revision
       send:
       - app-deployed
-      when: app.status.operationState.phase in ['Succeeded'] and app.status.health.status
-        == 'Healthy'
+      when: app.status.operationState != nil and app.status.operationState.phase in ['Succeeded']
+        and app.status.health.status == 'Healthy'
   trigger.on-health-degraded: |
     - description: Application has degraded
       send:

diff --git a/notifications_catalog/triggers/on-deployed.yaml b/notifications_catalog/triggers/on-deployed.yaml
@@ -1,4 +1,4 @@
-- when: app.status.operationState.phase in ['Succeeded'] and app.status.health.status == 'Healthy'
+- when: app.status.operationState != nil and app.status.operationState.phase in ['Succeeded'] and app.status.health.status == 'Healthy'
   description: Application is synced and healthy. Triggered once per commit.
   send: [app-deployed]
-  oncePer: app.status.operationState.syncResult.revision
+  oncePer: app.status.operationState?.syncResult?.revision