Merge pull request #250 from devedse/master

Fixed issue: 249 + implemented multiple filters
mariotoffia · May 30, 2022 · 462153d · 462153d
2 parents 2e94090 + ba08d12
commit 462153d
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 16 deletions.
diff --git a/Ductus.FluentDocker.Tests/ServiceTests/ContainerServiceBasicTests.cs b/Ductus.FluentDocker.Tests/ServiceTests/ContainerServiceBasicTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -406,5 +406,41 @@ public void GetContainersShallWork()
                                                      && JsonConvert.SerializeObject(c) == JsonConvert.SerializeObject(container2)));
       }
     }
+
+    [TestMethod]
+    public void GetContainersShallWorkWithFilterWhenThereIsNoResults()
+    {
+      // Arrange
+      using (var container = _host.Create("postgres:9.6-alpine"))
+      using (var container2 = _host.Create("postgres:14.2-alpine"))
+      {
+        container.Start();
+
+        // Act
+        var result = _host.GetContainers(true, "ancestor==somethingnotexisting");
+
+        // Assert
+        Assert.AreEqual(0, result.Count);
+      }
+    }
+
+    [TestMethod]
+    public void GetContainersShallWorkWithFilterWhenThereIsResults()
+    {
+      // Arrange
+      using (var container = _host.Create("postgres:9.6-alpine"))
+      using (var container2 = _host.Create("postgres:14.2-alpine"))
+      {
+        container.Start();
+
+        // Act
+        var result = _host.GetContainers(true, "ancestor==postgres:14.2-alpine");
+
+        // Assert
+        Assert.AreEqual(1, result.Count);
+        Assert.IsNotNull(result.SingleOrDefault(c => c.Id == container2.Id
+                                             && JsonConvert.SerializeObject(c) == JsonConvert.SerializeObject(container2)));
+      }
+    }
   }
 }
diff --git a/Ductus.FluentDocker/Commands/Client.cs b/Ductus.FluentDocker/Commands/Client.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Ductus.FluentDocker.Executors;
@@ -99,13 +99,17 @@ public static CommandResponse<IList<string>> Build(this DockerUri host, string n
           $"{host.RenderBaseArgs(certificates)} build {options} {workdir}").Execute();
     }
 
-    public static CommandResponse<IList<DockerImageRowResponse>> Images(this DockerUri host, string filter = null,
-      ICertificatePaths certificates = null)
+    public static CommandResponse<IList<DockerImageRowResponse>> Images(this DockerUri host, ICertificatePaths certificates = null,
+      params string[] filters)
     {
       var options = "--quiet --no-trunc --format \"{{.ID}};{{.Repository}};{{.Tag}}\"";
-      if (!string.IsNullOrEmpty(filter))
+
+      foreach (var filter in filters)
       {
-        options += $" --filter=\"{filter}\"";
+        if (!string.IsNullOrEmpty(filter))
+        {
+          options += $" --filter=\"{filter}\"";
+        }
       }
 
       return

diff --git a/Ductus.FluentDocker/Services/IHostService.cs b/Ductus.FluentDocker/Services/IHostService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using Ductus.FluentDocker.Common;
@@ -43,9 +43,9 @@ public interface IHostService : IService
     /// </remarks>
     IList<IContainerService> GetRunningContainers();
 
-    IList<IContainerService> GetContainers(bool all = true, string filter = null);
+    IList<IContainerService> GetContainers(bool all = true, params string[] filters);
 
-    IList<IContainerImageService> GetImages(bool all = true, string filer = null);
+    IList<IContainerImageService> GetImages(bool all = true, params string[] filters);
 
     /// <summary>
     ///   Creates a new container (not started).

diff --git a/Ductus.FluentDocker/Services/Impl/DockerHostService.cs b/Ductus.FluentDocker/Services/Impl/DockerHostService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -129,17 +129,20 @@ public IList<IContainerService> GetRunningContainers()
       return GetContainers(false);
     }
 
-    public IList<IContainerService> GetContainers(bool all = true, string filter = null)
+    public IList<IContainerService> GetContainers(bool all = true, params string[] filters)
     {
       var options = string.Empty;
       if (all)
         options += " --all";
 
-      if (!string.IsNullOrEmpty(filter))
-        options += $" --filter {filter}";
+      foreach (var filter in filters)
+      {
+        if (!string.IsNullOrEmpty(filter))
+          options += $" --filter {filter}";
+      }
 
       var psResult = Host.Ps(options, Certificates);
-      if (!psResult.Success)
+      if (!psResult.Success || psResult.Data.Count == 0)
         return new List<IContainerService>();
 
       var ids = psResult.Data.ToArray();
@@ -155,9 +158,9 @@ public IList<IContainerService> GetContainers(bool all = true, string filter = n
         .Cast<IContainerService>().ToList();
     }
 
-    public IList<IContainerImageService> GetImages(bool all = true, string filter = null)
+    public IList<IContainerImageService> GetImages(bool all = true, params string[] filters)
     {
-      var images = Host.Images(filter, Certificates);
+      var images = Host.Images(Certificates, filters);
       if (!images.Success)
         return new List<IContainerImageService>();