Template-less Triggers

backend/graph-proxy/src/graphql/triggers.rs

@@ -46,7 +46,7 @@ enum TriggerError {
 struct TriggerSpec {
     /// The name of a ClusterTriggerTemplate that the Trigger is created from
     #[serde(rename = "templateRef")]
-    template_ref: String,
+    template_ref: Option<String>,
 }
 
 /// A Trigger for creating automated workflows
@@ -56,7 +56,7 @@ struct TriggerGQL {
     /// The name of the Trigger
     name: Option<String>,
     /// The name of a ClusterTriggerTemplate that the Trigger is created from
-    template_ref: String,
+    template_ref: Option<String>,
     /// The beamline that the Trigger monitors
     beamline: Option<String>,
 }
@@ -211,7 +211,9 @@ impl TriggerMutation {
                 )])),
                 ..Default::default()
             },
-            spec: TriggerSpec { template_ref },
+            spec: TriggerSpec {
+                template_ref: Some(template_ref),
+            },
         };
 
         match api.create(&PostParams::default(), &trigger).await {

charts/events/Chart.yaml

@@ -3,7 +3,7 @@ name: events
 description: Data Analysis event triggering
 type: application
 
-version: 0.3.1
+version: 0.3.2
 
 dependencies:
   - name: argo-events

charts/events/crds/trigger-crds.yaml

@@ -113,7 +113,6 @@ spec:
                           - required: [name, path]
                           - required: [name, default]
               required:
-                - templateRef
                 - workflow
                 - eventName
           required:

charts/events/templates/populate-trigger-clusterpolicy.yaml

@@ -26,6 +26,12 @@ spec:
             urlPath: "/apis/workflows.diamond.ac.uk/v1alpha1/clustertriggertemplates/{{`{{templateRef}}`}}"
             method: GET
 
+      preconditions:
+        all:
+          - key: "{{`{{ templateRef }}`}}"
+            operator: NotEquals
+            value: ""
+
       mutate:
         patchStrategicMerge:
           metadata: