Merge pull request #13 from input-output-hk/scheduling-opts

Adds missing scheduling opts
input-output-hk · Apr 30, 2021 · 9f5727b · 9f5727b
2 parents f820a91 + 1ff929e
commit 9f5727b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/iogo/src/nomad_event.rs b/iogo/src/nomad_event.rs
@@ -590,12 +590,12 @@ pub struct Job {
     pub all_at_once: bool,
     #[serde(rename = "Datacenters")]
     pub datacenters: Vec<String>,
-    #[serde(rename = "Constraints")]
-    pub constraints: Vec<Option<serde_json::Value>>,
     #[serde(rename = "Affinities")]
-    pub affinities: Option<serde_json::Value>,
+    pub affinities: Option<Vec<Option<serde_json::Value>>>,
+    #[serde(rename = "Constraints")]
+    pub constraints: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Spreads")]
-    pub spreads: Option<serde_json::Value>,
+    pub spreads: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "TaskGroups")]
     pub task_groups: Vec<TaskGroup>,
     #[serde(rename = "Update")]
@@ -663,9 +663,11 @@ pub struct TaskGroup {
     #[serde(rename = "ReschedulePolicy")]
     pub reschedule_policy: ReschedulePolicy,
     #[serde(rename = "Affinities")]
-    pub affinities: Vec<Option<serde_json::Value>>,
+    pub affinities: Option<Vec<Option<serde_json::Value>>>,
+    #[serde(rename = "Constraints")]
+    pub constraints: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Spreads")]
-    pub spreads: Option<serde_json::Value>,
+    pub spreads: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Networks")]
     pub networks: Vec<Network>,
     #[serde(rename = "Services")]
@@ -846,10 +848,10 @@ pub struct TaskElement {
     pub vault: Option<Vault>,
     #[serde(rename = "Templates")]
     pub templates: Vec<Template>,
-    #[serde(rename = "Constraints")]
-    pub constraints: Vec<Option<serde_json::Value>>,
     #[serde(rename = "Affinities")]
-    pub affinities: Vec<Option<serde_json::Value>>,
+    pub affinities: Option<Vec<Option<serde_json::Value>>>,
+    #[serde(rename = "Constraints")]
+    pub constraints: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Resources")]
     pub resources: Resources,
     #[serde(rename = "RestartPolicy")]

diff --git a/lib/src/nomad.rs b/lib/src/nomad.rs
@@ -674,12 +674,12 @@ pub struct Job {
     pub all_at_once: bool,
     #[serde(rename = "Datacenters")]
     pub datacenters: Vec<String>,
+    #[serde(rename = "Affinities")]
+    pub affinities: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Constraints")]
     pub constraints: Option<Vec<Option<serde_json::Value>>>,
-    #[serde(rename = "Affinities")]
-    pub affinities: Option<serde_json::Value>,
     #[serde(rename = "Spreads")]
-    pub spreads: Option<serde_json::Value>,
+    pub spreads: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "TaskGroups")]
     pub task_groups: Vec<TaskGroup>,
     #[serde(rename = "Update")]
@@ -732,8 +732,12 @@ pub struct TaskGroup {
     pub update: Update,
     #[serde(rename = "Migrate")]
     pub migrate: Migrate,
+    #[serde(rename = "Affinities")]
+    pub affinities: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Constraints")]
-    pub constraints: Vec<Constraint>,
+    pub constraints: Option<Vec<Option<serde_json::Value>>>,
+    #[serde(rename = "Spreads")]
+    pub spreads: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Scaling")]
     pub scaling: Option<serde_json::Value>,
     #[serde(rename = "RestartPolicy")]
@@ -746,10 +750,6 @@ pub struct TaskGroup {
     pub meta: Option<HashMap<String, String>>,
     #[serde(rename = "ReschedulePolicy")]
     pub reschedule_policy: ReschedulePolicy,
-    #[serde(rename = "Affinities")]
-    pub affinities: Option<Vec<Option<serde_json::Value>>>,
-    #[serde(rename = "Spreads")]
-    pub spreads: Option<serde_json::Value>,
     #[serde(rename = "Networks")]
     pub networks: Vec<Network>,
     #[serde(rename = "Services")]
@@ -922,10 +922,10 @@ pub struct TaskElement {
     pub vault: Option<Vault>,
     #[serde(rename = "Templates")]
     pub templates: Vec<Template>,
-    #[serde(rename = "Constraints")]
-    pub constraints: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Affinities")]
     pub affinities: Option<Vec<Option<serde_json::Value>>>,
+    #[serde(rename = "Constraints")]
+    pub constraints: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Resources")]
     pub resources: Resources,
     #[serde(rename = "RestartPolicy")]

diff --git a/lib/src/types.rs b/lib/src/types.rs
@@ -401,8 +401,12 @@ pub struct Job {
     pub datacenters: Vec<String>,
     #[serde(rename = "TaskGroups")]
     pub task_groups: Vec<Option<serde_json::Value>>,
+    #[serde(rename = "Affinities")]
+    pub affinities: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "Constraints")]
-    pub constraints: Vec<Option<serde_json::Value>>,
+    pub constraints: Option<Vec<Option<serde_json::Value>>>,
+    #[serde(rename = "Spreads")]
+    pub spreads: Option<Vec<Option<serde_json::Value>>>,
     #[serde(rename = "ConsulToken")]
     pub consul_token: Option<String>,
     #[serde(rename = "VaultToken")]