change protocol to return :ok

testcontainers · Nov 30, 2023 · a5ce752 · a5ce752
1 parent 923839a
commit a5ce752
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/lib/container.ex b/lib/container.ex
@@ -149,7 +149,7 @@ defmodule Testcontainers.Container do
 
     @impl true
     @spec is_starting(%Testcontainers.Container{}, %Testcontainers.Container{}, %Tesla.Env{}) ::
-            any()
-    def is_starting(_config, _container, _conn), do: nil
+            :ok
+    def is_starting(_config, _container, _conn), do: :ok
   end
 end
diff --git a/lib/container/cassandra_container.ex b/lib/container/cassandra_container.ex
@@ -82,7 +82,7 @@ defmodule Testcontainers.CassandraContainer do
     end
 
     @impl true
-    @spec is_starting(%CassandraContainer{}, %Container{}, %Tesla.Env{}) :: any()
-    def is_starting(_config, _container, _conn), do: nil
+    @spec is_starting(%CassandraContainer{}, %Container{}, %Tesla.Env{}) :: :ok
+    def is_starting(_config, _container, _conn), do: :ok
   end
 end
diff --git a/lib/container/ceph_container.ex b/lib/container/ceph_container.ex
@@ -232,8 +232,8 @@ defmodule Testcontainers.CephContainer do
     end
 
     @impl true
-    @spec is_starting(%CephContainer{}, %Container{}, %Tesla.Env{}) :: any()
-    def is_starting(_config, _container, _conn), do: nil
+    @spec is_starting(%CephContainer{}, %Container{}, %Tesla.Env{}) :: :ok
+    def is_starting(_config, _container, _conn), do: :ok
   end
 end
 

diff --git a/lib/container/minio_container.ex b/lib/container/minio_container.ex
@@ -76,7 +76,7 @@ defmodule Testcontainers.MinioContainer do
     end
 
     @impl true
-    @spec is_starting(%MinioContainer{}, %Container{}, %Tesla.Env{}) :: any()
-    def is_starting(_config, _container, _conn), do: nil
+    @spec is_starting(%MinioContainer{}, %Container{}, %Tesla.Env{}) :: :ok
+    def is_starting(_config, _container, _conn), do: :ok
   end
 end
diff --git a/lib/container/mysql_container.ex b/lib/container/mysql_container.ex
@@ -207,8 +207,8 @@ defmodule Testcontainers.MySqlContainer do
     end
 
     @impl true
-    @spec is_starting(%MySqlContainer{}, %Container{}, %Tesla.Env{}) :: any()
-    def is_starting(_config, _container, _conn), do: nil
+    @spec is_starting(%MySqlContainer{}, %Container{}, %Tesla.Env{}) :: :ok
+    def is_starting(_config, _container, _conn), do: :ok
   end
 
   @doc false

diff --git a/lib/container/postgres_container.ex b/lib/container/postgres_container.ex
@@ -213,8 +213,8 @@ defmodule Testcontainers.PostgresContainer do
     end
 
     @impl true
-    @spec is_starting(%PostgresContainer{}, %Container{}, %Tesla.Env{}) :: any()
-    def is_starting(_config, _container, _conn), do: nil
+    @spec is_starting(%PostgresContainer{}, %Container{}, %Tesla.Env{}) :: :ok
+    def is_starting(_config, _container, _conn), do: :ok
   end
 
   @doc false

diff --git a/lib/container/protocols/container_builder.ex b/lib/container/protocols/container_builder.ex
@@ -5,6 +5,6 @@ defprotocol Testcontainers.ContainerBuilder do
   @spec build(t()) :: %Testcontainers.Container{}
   def build(builder)
 
-  @spec is_starting(t(), %Testcontainers.Container{}, %Tesla.Env{}) :: any()
+  @spec is_starting(t(), %Testcontainers.Container{}, %Tesla.Env{}) :: :ok
   def is_starting(builder, container, connection)
 end
diff --git a/lib/container/redis_container.ex b/lib/container/redis_container.ex
@@ -141,8 +141,8 @@ defmodule Testcontainers.RedisContainer do
     end
 
     @impl true
-    @spec is_starting(%RedisContainer{}, %Container{}, %Tesla.Env{}) :: any()
-    def is_starting(_config, _container, _conn), do: nil
+    @spec is_starting(%RedisContainer{}, %Container{}, %Tesla.Env{}) :: :ok
+    def is_starting(_config, _container, _conn), do: :ok
   end
 end
 

diff --git a/lib/container/selenium_container.ex b/lib/container/selenium_container.ex
@@ -70,8 +70,8 @@ defmodule Testcontainers.SeleniumContainer do
     end
 
     @impl true
-    @spec is_starting(%SeleniumContainer{}, %Container{}, %Tesla.Env{}) :: any()
-    def is_starting(_config, _container, _conn), do: nil
+    @spec is_starting(%SeleniumContainer{}, %Container{}, %Tesla.Env{}) :: :ok
+    def is_starting(_config, _container, _conn), do: :ok
   end
 end
 

diff --git a/lib/testcontainers.ex b/lib/testcontainers.ex
@@ -215,7 +215,7 @@ defmodule Testcontainers do
          {:ok, id} <- Api.create_container(config, state.conn),
          :ok <- Api.start_container(id, state.conn),
          {:ok, container} <- Api.get_container(id, state.conn),
-         _ <- ContainerBuilder.is_starting(config_builder, container, state.conn),
+         :ok <- ContainerBuilder.is_starting(config_builder, container, state.conn),
          :ok <- wait_for_container(container, config.wait_strategies || [], state.conn) do
       {:ok, container}
     end

diff --git a/test/support/nginx_container.ex b/test/support/nginx_container.ex
@@ -13,12 +13,12 @@ defmodule Test.NginxContainer do
     end
 
     @impl true
-    @spec is_starting(%Test.NginxContainer{}, %Testcontainers.Container{}, %Tesla.Env{}) :: any()
+    @spec is_starting(%Test.NginxContainer{}, %Testcontainers.Container{}, %Tesla.Env{}) :: :ok
     def is_starting(_config, container, conn) do
-      {:ok, _} =
-        Docker.Api.put_file(container.container_id, conn, "/tmp", "foo.txt", "Hello foo bar")
-
-      nil
+      with {:ok, _} <-
+             Docker.Api.put_file(container.container_id, conn, "/tmp", "foo.txt", "Hello foo bar") do
+        :ok
+      end
     end
   end
 end