refactor: Add BuildContextBuilder to replace public copy::*

Signed-off-by: mbodmer <marc.bodmer@email.ch>

Author: mbodmer

testcontainers/src/buildables/generic.rs

@@ -1,40 +1,43 @@
 use std::path::PathBuf;
 
-use crate::{core::copy::CopyToContainerCollection, BuildableImage, CopyToContainer, GenericImage};
+use crate::{
+    core::{copy::CopyToContainerCollection, BuildContextBuilder},
+    BuildableImage, GenericImage,
+};
 
 #[derive(Debug)]
 pub struct GenericBuildableImage {
     name: String,
     tag: String,
-    build_context: CopyToContainerCollection,
+    build_context_builder: BuildContextBuilder,
 }
 
 impl GenericBuildableImage {
     pub fn new(name: impl Into<String>, tag: impl Into<String>) -> Self {
         Self {
             name: name.into(),
             tag: tag.into(),
-            build_context: CopyToContainerCollection::new(vec![]),
+            build_context_builder: BuildContextBuilder::default(),
         }
     }
 
-    pub fn with_dockerfile(self, source: impl Into<PathBuf>) -> Self {
-        self.with_file(source.into(), "Dockerfile")
+    pub fn with_dockerfile(mut self, source: impl Into<PathBuf>) -> Self {
+        self.build_context_builder = self.build_context_builder.with_dockerfile(source);
+        self
     }
 
-    pub fn with_dockerfile_string(self, content: impl Into<String>) -> Self {
-        self.with_data(content.into(), "Dockerfile")
+    pub fn with_dockerfile_string(mut self, content: impl Into<String>) -> Self {
+        self.build_context_builder = self.build_context_builder.with_dockerfile_string(content);
+        self
     }
 
     pub fn with_file(mut self, source: impl Into<PathBuf>, target: impl Into<String>) -> Self {
-        self.build_context
-            .add(CopyToContainer::new(source.into(), target));
+        self.build_context_builder = self.build_context_builder.with_file(source, target);
         self
     }
 
     pub fn with_data(mut self, data: impl Into<Vec<u8>>, target: impl Into<String>) -> Self {
-        self.build_context
-            .add(CopyToContainer::new(data.into(), target));
+        self.build_context_builder = self.build_context_builder.with_data(data, target);
         self
     }
 }
@@ -43,7 +46,7 @@ impl BuildableImage for GenericBuildableImage {
     type Built = GenericImage;
 
     fn build_context(&self) -> CopyToContainerCollection {
-        self.build_context.clone()
+        self.build_context_builder.as_copy_to_container_collection()
     }
 
     fn descriptor(&self) -> String {

testcontainers/src/core.rs

@@ -1,6 +1,7 @@
 #[cfg(feature = "reusable-containers")]
 pub use self::image::ReuseDirective;
 pub use self::{
+    build_context::BuildContextBuilder,
     buildable::BuildableImage,
     containers::*,
     copy::{CopyDataSource, CopyToContainer, CopyToContainerCollection, CopyToContainerError},
@@ -14,6 +15,7 @@ mod buildable;
 mod image;
 
 pub(crate) mod async_drop;
+pub(crate) mod build_context;
 pub mod client;
 pub(crate) mod containers;
 pub(crate) mod copy;

testcontainers/src/core/build_context.rs

@@ -0,0 +1,38 @@
+use std::path::PathBuf;
+
+use crate::{core::copy::CopyToContainerCollection, CopyToContainer};
+
+#[derive(Debug, Default, Clone)]
+pub struct BuildContextBuilder {
+    build_context_parts: Vec<CopyToContainer>,
+}
+
+impl BuildContextBuilder {
+    pub fn with_dockerfile(self, source: impl Into<PathBuf>) -> Self {
+        self.with_file(source.into(), "Dockerfile")
+    }
+
+    pub fn with_dockerfile_string(self, content: impl Into<String>) -> Self {
+        self.with_data(content.into(), "Dockerfile")
+    }
+
+    pub fn with_file(mut self, source: impl Into<PathBuf>, target: impl Into<String>) -> Self {
+        self.build_context_parts
+            .push(CopyToContainer::new(source.into(), target));
+        self
+    }
+
+    pub fn with_data(mut self, data: impl Into<Vec<u8>>, target: impl Into<String>) -> Self {
+        self.build_context_parts
+            .push(CopyToContainer::new(data.into(), target));
+        self
+    }
+
+    pub fn collect(self) -> CopyToContainerCollection {
+        CopyToContainerCollection::new(self.build_context_parts)
+    }
+
+    pub fn as_copy_to_container_collection(&self) -> CopyToContainerCollection {
+        CopyToContainerCollection::new(self.build_context_parts.clone())
+    }
+}