🚧 depth 1 of jenkins api for richer types

src/action/maven.rs

@@ -27,6 +27,11 @@ pub struct Artifact {
     /// Version
     pub version: String,
 }
+impl Default for Artifact {
+    fn default() -> Self {
+        unimplemented!()
+    }
+}
 
 /// Short Maven Artifact Record that is returned when getting a maven build
 #[derive(Deserialize, Debug)]

src/action/mod.rs

@@ -47,14 +47,26 @@ tagged_enum_or_default!(
         },
         /// An action from pipelines
         FlowGraphAction (_class = "org.jenkinsci.plugins.workflow.job.views.FlowGraphAction" ) {
+            /// Nodes of the pipeline
+            nodes: Vec<PipelineNode>,
         },
         /// An action with maven artifacts
         MavenArtifactRecord (_class = "hudson.maven.reporters.MavenArtifactRecord" ) {
             /// URL to the artifacts
             url: String,
+            /// List of the artifacts
+            attached_artifacts: Vec<maven::Artifact>,
+            /// Main artifact
+            main_artifact: maven::Artifact,
+            /// Parent build
+            parent: ::build::ShortBuild,
+            /// POM artifact
+            pom_artifact: maven::Artifact,
         },
         /// An action with maven artifacts
         MavenAggregatedArtifactRecord (_class = "hudson.maven.reporters.MavenAggregatedArtifactRecord" ) {
+            /// List of artifact records
+            module_records: Vec<maven::MavenArtifactRecord>,
         },
         /// An action with a surefire test report
         SurefireReport (_class = "hudson.maven.reporters.SurefireReport" ) {
@@ -77,6 +89,27 @@ tagged_enum_or_default!(
             total_count: u32,
             /// URL to the report
             url_name: String,
-        }
+        },
+        /// An action marking an approval on a pipeline
+        PipelineApproverAction (_class = "org.jenkinsci.plugins.workflow.support.steps.input.ApproverAction" ) {
+            /// User ID
+            user_id: String,
+        },
+    }
+);
+
+tagged_enum_or_default!(
+    /// A node of a pipeline
+    pub enum PipelineNode {
+        /// Beginning of a flow
+        FlowStartNode (_class = "org.jenkinsci.plugins.workflow.graph.FlowStartNode") {},
+        /// Beginning of a step
+        StepStartNode (_class = "org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode") {},
+        /// A step
+        StepAtomNode (_class = "org.jenkinsci.plugins.workflow.cps.nodes.StepAtomNode") {},
+        /// End of a step
+        StepEndNode (_class = "org.jenkinsci.plugins.workflow.cps.nodes.StepEndNode") {},
+        /// End of a flow
+        FlowEndNode (_class = "org.jenkinsci.plugins.workflow.graph.FlowEndNode") {},
     }
 );

src/build.rs

@@ -32,6 +32,14 @@ impl ShortBuild {
         }
     }
 }
+impl Default for ShortBuild {
+    fn default() -> Self {
+        ShortBuild {
+            url: "".to_string(),
+            number: 0,
+        }
+    }
+}
 
 /// Status of a build
 #[derive(Debug, Deserialize, Clone, Copy, PartialEq)]

src/client/csrf.rs

@@ -60,7 +60,7 @@ mod tests {
     fn get_invalid_crumb() {
         let jenkins_client = ::JenkinsBuilder::new(JENKINS_URL).build().unwrap();
 
-        let _mock = mockito::mock("GET", "/crumbIssuer/api/json")
+        let _mock = mockito::mock("GET", "/crumbIssuer/api/json?depth=1")
             .with_body(
                 r#"
 {

src/client/mod.rs

@@ -57,8 +57,7 @@ impl Jenkins {
     }
 
     pub(crate) fn get(&self, path: &Path) -> Result<Response, failure::Error> {
-        let query = self.client.get(&self.url_api_json(&path.to_string()));
-        Ok(Self::error_for_status(self.send(query)?)?)
+        self.get_with_params(path, &[("depth", "1")])
     }
 
     pub(crate) fn get_with_params(

src/job.rs

@@ -452,15 +452,25 @@ tagged_enum_or_default!(
     /// An SCM
     pub enum SCM {
         /// No SCM
-        NullSCM (_class = "hudson.scm.NullSCM") {},
+        NullSCM (_class = "hudson.scm.NullSCM") {
+            /// Browser
+            browser: Option<Browser>,
+        },
         /// Git SCM
-        GitSCM (_class = "hudson.plugins.git.GitSCM") {},
+        GitSCM (_class = "hudson.plugins.git.GitSCM") {
+            /// Browser
+            browser: Option<Browser>,
+            /// Merge options
+            merge_options: MergeOptions,
+        },
     }
 );
 
 impl Default for SCM {
     fn default() -> Self {
-        SCM::NullSCM {}
+        SCM::NullSCM {
+            browser: None,
+        }
     }
 }
 
@@ -475,3 +485,31 @@ tagged_enum_or_default!(
         BuildDiscarderProperty (_class = "jenkins.model.BuildDiscarderProperty") {},
     }
 );
+
+tagged_enum_or_default!(
+    /// A browser
+    pub enum Browser {
+        /// Github web browser
+        GithubWeb (_class = "hudson.plugins.git.browser.GithubWeb") {},
+    }
+);
+
+impl Default for Browser {
+    fn default() -> Self {
+        Browser::Unknown { class: None }
+    }
+}
+
+/// SCM merge options
+#[derive(Default, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct MergeOptions {
+    /// Merge strategy
+    merge_strategy: String,
+    /// Fast forward mode
+    fast_forward_mode: String,
+    /// Merge target
+    merge_target: Option<String>,
+    /// Remote branch
+    remote_branch_name: Option<String>,
+}

tests/client.rs

@@ -41,7 +41,7 @@ fn should_be_forbidden() {
     assert_eq!(
         format!("{:?}", response),
         format!(
-            "Err(Error {{ kind: ClientError(Unauthorized), url: Some(\"{}/api/json\") }})",
+            "Err(Error {{ kind: ClientError(Unauthorized), url: Some(\"{}/api/json?depth=1\") }})",
             JENKINS_URL
         )
     );
@@ -79,7 +79,7 @@ fn should_get_view_not_found() {
     assert_eq!(
         format!("{:?}", response),
         format!(
-            "Err(Error {{ kind: ClientError(NotFound), url: Some(\"{}/view/zut/api/json\") }})",
+            "Err(Error {{ kind: ClientError(NotFound), url: Some(\"{}/view/zut/api/json?depth=1\") }})",
             JENKINS_URL
         )
     );