Merge pull request #127 from fussybeaver/ND-info-route

Info API
fussybeaver · Nov 19, 2020 · 0dcfd24 · 0dcfd24
2 parents b0c98c9 + eee1baa
commit 0dcfd24
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   test_ssl:
     docker:
-      - image: docker:19.03.13
+      - image: docker:20.10.0-rc1
     steps:
       - checkout
       - setup_remote_docker
@@ -15,7 +15,7 @@ jobs:
       - run: docker run -ti -e DOCKER_CERT_PATH=/certs -e DOCKER_HOST='tcp://test.example.com:2376' --volumes-from certs --rm --link test-docker-daemon:docker bollard cargo test --features test_ssl -- --test test_version_ssl
   test_http:
     docker:
-      - image: docker:19.03.13
+      - image: docker:20.10.0-rc1
     steps:
       - checkout
       - setup_remote_docker
@@ -24,31 +24,31 @@ jobs:
       - run: docker run -ti -e DOCKER_HOST='tcp://test.example.com:2375' --rm --link test-docker-daemon:docker bollard cargo test --features test_http -- --test test_version_http
   test_unix:
     docker:
-      - image: docker:19.03.13
+      - image: docker:20.10.0-rc1
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
       - run: dockerfiles/bin/run_integration_tests.sh
   test_doc:
     docker:
-      - image: docker:19.03.13
+      - image: docker:20.10.0-rc1
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
       - run: docker run -ti --rm bollard cargo test --target x86_64-unknown-linux-gnu --doc
   test_clippy:
     docker:
-      - image: docker:19.03.13
+      - image: docker:20.10.0-rc1
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
       - run: docker run -ti --rm bollard bash -c "rustup component add clippy && cargo clippy"
   test_audit:
     docker:
-      - image: docker:19.03.13
+      - image: docker:20.10.0-rc1
     steps:
       - checkout
       - setup_remote_docker

diff --git a/src/system.rs b/src/system.rs
@@ -176,6 +176,34 @@ impl Docker {
         self.process_into_value(req).await
     }
 
+    /// ---
+    ///
+    /// # Info
+    ///
+    /// Returns Docker client and server information that is running.
+    ///
+    /// # Returns
+    ///
+    ///  - [Info](system/struct.Info.html), wrapped in a Future.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// # use bollard::Docker;
+    /// # let docker = Docker::connect_with_http_defaults().unwrap();
+    /// docker.info();
+    /// ```
+    pub async fn info(&self) -> Result<SystemInfo, Error> {
+        let req = self.build_request(
+            "/info",
+            Builder::new().method(Method::GET),
+            None::<String>,
+            Ok(Body::empty()),
+        );
+
+        self.process_into_value(req).await
+    }
+
     /// ---
     ///
     /// # Ping

diff --git a/tests/system_test.rs b/tests/system_test.rs
@@ -131,6 +131,7 @@ async fn events_until_forever_test(docker: Docker) -> Result<(), Error> {
 
     Ok(())
 }
+
 async fn df_test(docker: Docker) -> Result<(), Error> {
     create_image_hello_world(&docker).await?;
 
@@ -149,6 +150,20 @@ async fn df_test(docker: Docker) -> Result<(), Error> {
     Ok(())
 }
 
+async fn info_test(docker: Docker) -> Result<(), Error> {
+
+    let res = &docker.info().await?;
+    let os_type = if cfg!(windows) {
+        "windows"
+    } else {
+        "linux"
+    };
+
+    assert_eq!(os_type, res.os_type.as_ref().unwrap());
+
+    Ok(())
+}
+
 #[test]
 fn integration_test_events() {
     connect_to_docker_and_run!(events_test);
@@ -164,3 +179,8 @@ fn integration_test_events_until_forever() {
 fn integration_test_df() {
     connect_to_docker_and_run!(df_test);
 }
+
+#[test]
+fn integration_test_info() {
+    connect_to_docker_and_run!(info_test);
+}