Parse more defensively

Ductus.FluentDocker.Tests/ProcessResponseParsersTests/NetworkLsResponseParserTests.cs

@@ -38,11 +38,6 @@ public void ProcessShallParseResponse()
       // Assert
       Assert.AreEqual(id, result.Id);
       Assert.AreEqual(name, result.Name);
-      Assert.AreEqual(driver, result.Driver);
-      Assert.AreEqual(scope, result.Scope);
-      Assert.AreEqual(ipv6, result.IPv6);
-      Assert.AreEqual(isInternal, result.Internal);
-      Assert.AreEqual(created, result.Created.ToUniversalTime());
     }
 
 
@@ -76,11 +71,6 @@ public void ProcessShallParseResponseWithNegativeTimezone()
       // Assert
       Assert.AreEqual(id, result.Id);
       Assert.AreEqual(name, result.Name);
-      Assert.AreEqual(driver, result.Driver);
-      Assert.AreEqual(scope, result.Scope);
-      Assert.AreEqual(ipv6, result.IPv6);
-      Assert.AreEqual(isInternal, result.Internal);
-      Assert.AreEqual(created, result.Created.AddMinutes(-1 * DateTimeOffset.Now.Offset.TotalMinutes).AddHours(tzShift));
     }
   }
 }

Ductus.FluentDocker/Common/JsonArrayOrSingleConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Ductus.FluentDocker.Common
+{
+  public class JsonArrayOrSingleConverter<T> : JsonConverter
+  {
+    public override bool CanConvert(Type objectType)
+    {
+      return objectType == typeof(T[]);
+    }
+
+    public override object ReadJson(
+      JsonReader reader,
+      Type objectType,
+      object existingValue,
+      JsonSerializer serializer)
+    {
+      var token = JToken.Load(reader);
+      if (token.Type == JTokenType.Array)
+      {
+        return token.ToObject<T[]>();
+      }
+
+      return new[] {token.ToObject<T>()};
+    }
+
+    public override bool CanWrite => false;
+
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
+      throw new NotImplementedException();
+  }
+}

Ductus.FluentDocker/Executors/Parsers/NetworkLsResponseParser.cs

@@ -7,7 +7,7 @@ namespace Ductus.FluentDocker.Executors.Parsers
 {
   public sealed class NetworkLsResponseParser : IProcessResponseParser<IList<NetworkRow>>
   {
-    public const string Format = "{{.ID}};{{.Name}};{{.Driver}};{{.Scope}};{{.IPv6}};{{.Internal}};{{.CreatedAt}}";
+    public const string Format = "{{.ID}};{{.Name}}";
 
     public CommandResponse<IList<NetworkRow>> Response { get; private set; }
 
@@ -30,33 +30,13 @@ public IProcessResponse<IList<NetworkRow>> Process(ProcessExecutionResult respon
       foreach (var row in response.StdOutAsArray)
       {
         var items = row.Split(';');
-        if (items.Length < 4)
+        if (items.Length < 2)
           continue;
 
-        var created = DateTime.MinValue;
-        var ipv6 = false;
-        var intern = false;
-
-        if (items.Length > 4)
-          bool.TryParse(items[4], out ipv6);
-        if (items.Length > 5)
-          bool.TryParse(items[5], out intern);
-        if (items.Length > 6)
-        {
-          var split = items[6].Split(" ".ToCharArray());
-          var normalizedStr = $"{split[0]} {split[1]} {split[2].Insert(3, ":")}";
-          DateTime.TryParse(normalizedStr, out created);
-        }
-
         result.Add(new NetworkRow
         {
           Id = items[0],
           Name = items[1],
-          Driver = items[2],
-          Scope = items[3],
-          IPv6 = ipv6,
-          Internal = intern,
-          Created = created
         });
       }
 

Ductus.FluentDocker/Model/Containers/ContainerConfig.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using Ductus.FluentDocker.Common;
+using Newtonsoft.Json;
 
 namespace Ductus.FluentDocker.Model.Containers
 {
@@ -26,6 +28,7 @@ public string Domainname
     public string Image { get; set; }
     public IDictionary<string, VolumeMount> Volumes { get; set; }
     public string WorkingDir { get; set; }
+    [JsonConverter(typeof(JsonArrayOrSingleConverter<string>))]
     public string[] EntryPoint { get; set; }
     public IDictionary<string, string> Labels { get; set; }
     public string StopSignal { get; set; }

Ductus.FluentDocker/Model/Containers/Health.cs

@@ -2,7 +2,7 @@ namespace Ductus.FluentDocker.Model.Containers
 {
   public class Health
   {
-    public HealthState Status { get; set; }
+    public HealthState? Status { get; set; }
     public int FailingStreak { get; set; }
   }
 }

Ductus.FluentDocker/Model/Containers/ProcessRow.cs

@@ -25,17 +25,7 @@ public sealed class ProcessRow
     private const string StartConst = "START";
     private const string CmdConstWin = "Name";
 
-    public string User { get; internal set; }
-    public long Pid { get; internal set; }
-    public long ProcessPid { get; internal set; }
     public string Command { get; internal set; }
-    public string Tty { get; internal set; }
-    public TimeSpan Time { get; internal set; }
-    public TimeSpan Started { get; internal set; }
-    public string Status { get; internal set; }
-    public float PercentCpuUtilization { get; internal set; }
-    public TimeSpan Cpu { get; private set; }
-    public float PercentMemoryUtilization { get; internal set; }
     public IList<string> FullRow { get; internal set; }
 
     internal static ProcessRow ToRow(IList<string> columns, IList<string> fullRow)
@@ -53,39 +43,6 @@ internal static ProcessRow ToRow(IList<string> columns, IList<string> fullRow)
           case CmdConstWin:
             row.Command = fullRow[i];
             break;
-          case UserConst:
-          case UidConst:
-            row.User = fullRow[i];
-            break;
-          case PidConst:
-            row.Pid = long.Parse(fullRow[i]);
-            break;
-          case PpidConst:
-            row.ProcessPid = long.Parse(fullRow[i]);
-            break;
-          case StartConst:
-          case StartTimeConst:
-            row.Started = TimeSpan.Parse(fullRow[i]);
-            break;
-          case TimeConst:
-            row.Time = TimeSpan.Parse(fullRow[i]);
-            break;
-          case TerminalConst:
-            row.Tty = fullRow[i];
-            break;
-          case StatConst:
-            row.Status = fullRow[i];
-            break;
-          case CpuTime:
-            if (TimeSpan.TryParse(fullRow[i], out var cpuTime))
-              row.Cpu = cpuTime;
-            break;
-          case PercentCpuConst:
-            row.PercentCpuUtilization = float.Parse(fullRow[i], CultureInfo.InvariantCulture.NumberFormat);
-            break;
-          case PercentMemoryConst:
-            row.PercentMemoryUtilization = float.Parse(fullRow[i], CultureInfo.InvariantCulture.NumberFormat);
-            break;
         }
       }
 

Ductus.FluentDocker/Model/Networks/NetworkRow.cs

@@ -6,13 +6,5 @@ public sealed class NetworkRow
   {
     public string Id { get; set; }
     public string Name { get; set; }
-    public string Driver { get; set; }
-    public string Scope { get; set; }
-
-    // ReSharper disable once InconsistentNaming
-    public bool IPv6 { get; set; }
-
-    public bool Internal { get; set; }
-    public DateTime Created { get; set; }
   }
 }