working on tests #2

Cargo.toml

@@ -3,7 +3,13 @@ name = "autodok"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "autodok"
+path = "src/lib.rs"
+
+[[bin]]
+name = "autodok"
+path = "src/main.rs"
 
 [dependencies]
 axum = "0.7.7"
@@ -25,3 +31,4 @@ base64 = "0.22"
 chrono = "0.4.38"
 tar = "0.4.43"
 bytes = "1.9.0"
+reqwest = { version = "0.12", default-features = false, features = ["http2", "json"] }

Dockerfile.test

@@ -1,9 +1,17 @@
 FROM rust:slim AS builder
 
+ENV PACKAGE_PATH=/usr/src/autodok
 WORKDIR /usr/src
 
 RUN USER=root cargo new autodok
 RUN rustup target add x86_64-unknown-linux-musl
-COPY Cargo.toml Cargo.lock /usr/src/autodok/
-WORKDIR /usr/src/autodok
-RUN cargo test
+COPY Cargo.toml Cargo.lock $PACKAGE_PATH/
+WORKDIR $PACKAGE_PATH
+RUN touch $PACKAGE_PATH/src/lib.rs
+RUN cargo test
+RUN rm $PACKAGE_PATH/src/lib.rs
+
+COPY . $PACKAGE_PATH
+
+RUN touch $PACKAGE_PATH/src/lib.rs
+RUN touch $PACKAGE_PATH/src/main.rs

Makefile

@@ -19,7 +19,10 @@ prod: docker_build docker_push
 ### Tests
 
 test: _start_test_docker_server _build_test
-	docker compose -f compose.test.yml run --rm test cargo test -- --nocapture
+	docker compose -f compose.test.yml run --rm test bash -c "touch src/main.rs && cargo test -- --nocapture"
+
+test_down:
+	docker compose -f compose.test.yml down -v -t 1
 
 test_bash: _start_test_docker_server
 	docker compose -f compose.test.yml run --rm -it test bash

compose.test.yml

@@ -19,12 +19,11 @@ services:
       dockerfile: Dockerfile.test
     environment:
       DOCKER_HOST: https://docker:2376
+      DOCKER_TLS_CERTDIR: /certs
     depends_on:
       - server
     volumes:
       - docker_certs_client:/certs/client:ro
-      - ./src/:/usr/src/autodok/src
-      - ./tests/:/usr/src/autodok/tests
     networks:
       - docker_network
 

src/docker.rs

@@ -1,4 +1,4 @@
-use crate::error::AutodokError;
+use crate::error::{AutodokError, ImageParseError};
 use bollard::{
     container::{Config, CreateContainerOptions, NetworkingConfig, StartContainerOptions},
     image::CreateImageOptions,
@@ -11,34 +11,39 @@ use futures_util::stream::StreamExt;
 use log::{debug, info};
 use std::collections::HashMap;
 
-pub async fn update_image_and_container(
+pub async fn pull_image_and_update_container(
     docker: &Docker,
     container: &str,
-    image: &str,
+    image: Option<String>,
     wait: Option<bool>,
     pull: Option<bool>,
-) -> Result<(), AutodokError> {
-    docker.inspect_container(container, None).await?;
+) -> Result<String, AutodokError> {
+    let inspect = docker.inspect_container(container, None).await?;
+
+    // use the provided image, or try to access the containers image from the docker api
+    let image = image
+        .or_else(|| inspect.config.and_then(|config| config.image))
+        .ok_or(AutodokError::Input(ImageParseError::EmptyImage))?;
 
-    if let Some(true) = wait {
-        do_the_deed(docker, container, image, pull).await?;
+    if wait.unwrap_or(false) {
+        do_the_deed(docker, container, image.clone(), pull).await?;
     } else {
         tokio::spawn({
             let docker = docker.clone();
             let container = container.to_string();
-            let image = image.to_string();
+            let image = image.clone();
             async move {
-                do_the_deed(&docker, &container, &image, pull).await.unwrap();
+                do_the_deed(&docker, &container, image, pull).await.unwrap();
             }
         });
     }
-    Ok(())
+    Ok(image)
 }
 
 async fn do_the_deed(
     docker: &Docker,
     container: &str,
-    image: &str,
+    image: String,
     pull: Option<bool>,
 ) -> Result<(), AutodokError> {
     if let Some(true) = pull {
@@ -77,7 +82,9 @@ async fn stop_start_container(
     // stop and remove old container
     info!("  Restarting container...");
     docker.stop_container(&container, None).await?;
-    docker.remove_container(&container, None).await?;
+    if docker.inspect_container(&container, None).await.is_ok() {
+        docker.remove_container(&container, None).await?;
+    }
 
     // build general options for new container
     let create_options = Some(CreateContainerOptions {

src/error.rs

@@ -27,7 +27,7 @@ impl Error for ImageParseError {}
 impl fmt::Display for ImageParseError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            Self::EmptyImage => write!(f, "image missing"),
+            Self::EmptyImage => write!(f, "image not specified"),
             Self::EmptyPart(image) => write!(f, "invalid image: {image}"),
         }
     }