Minimum required changes for working tests (#481)

* Updated models and fixed tests

* Discarded model

* Failing tests on CI/CD

* Debugging tests on CI/CD

* Applied PR suggested changes

* error when running tests on CI/CD pipeline

* Implemented approach from PR #343 for cancelling streamReader

* Tests case is behaving differently while it runs on CI/CD pipeline

* Merged changes from author fork

* Error on CI/CD pipeline due to new Message.Status. Discarted Message.Status condition to validate event monitoring

* Serialization for IList<byte> to base64

* PR suggestions by @galvesriverio

* Updated test for DockerService_IsRunning

* Renamed process name in tests

* Updated version for Nerdbank.GitVersioning

* Updated ProcesName in test

Co-authored-by: timt <timt@spgcontrols.com>

Author: dgvives

src/Directory.Build.props

@@ -30,7 +30,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91">
+        <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

src/Docker.DotNet/Endpoints/StreamUtil.cs

@@ -4,11 +4,14 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Docker.DotNet.Models
 {
     internal static class StreamUtil
     {
+        private static Newtonsoft.Json.JsonSerializer _serializer = new Newtonsoft.Json.JsonSerializer();
+
         internal static async Task MonitorStreamAsync(Task<Stream> streamTask, DockerClient client, CancellationToken cancel, IProgress<string> progress)
         {
             using (var stream = await streamTask)
@@ -31,29 +34,13 @@ internal static async Task MonitorStreamAsync(Task<Stream> streamTask, DockerCli
         internal static async Task MonitorStreamForMessagesAsync<T>(Task<Stream> streamTask, DockerClient client, CancellationToken cancel, IProgress<T> progress)
         {
             using (var stream = await streamTask)
+            using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
+            using (var jsonReader = new JsonTextReader(reader) { SupportMultipleContent = true })
             {
-                // ReadLineAsync must be cancelled by closing the whole stream.
-                using (cancel.Register(() => stream.Dispose()))
+                while (await jsonReader.ReadAsync().WithCancellation(cancel))
                 {
-                    using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
-                    {
-                        string line;
-                        try
-                        {
-                            while ((line = await reader.ReadLineAsync()) != null)
-                            {
-                                var prog = client.JsonSerializer.DeserializeObject<T>(line);
-                                if (prog == null) continue;
-
-                                progress.Report(prog);
-                            }
-                        }
-                        catch (ObjectDisposedException)
-                        {
-                            // The subsequent call to reader.ReadLineAsync() after cancellation
-                            // will fail because we disposed the stream. Just ignore here.
-                        }
-                    }
+                    var ev = _serializer.Deserialize<T>(jsonReader);
+                    progress?.Report(ev);
                 }
             }
         }
@@ -92,5 +79,19 @@ internal static async Task MonitorResponseForMessagesAsync<T>(Task<HttpResponseM
                 }
             }
         }
+
+        private static async Task<T> WithCancellation<T>(this Task<T> task, CancellationToken cancellationToken)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+            using (cancellationToken.Register(s => ((TaskCompletionSource<bool>)s).TrySetResult(true), tcs))
+            {
+                if (task != await Task.WhenAny(task, tcs.Task))
+                {
+                    throw new OperationCanceledException(cancellationToken);
+                }
+            }
+
+            return await task;
+        }
     }
-}
+}

src/Docker.DotNet/Endpoints/SwarmOperations.cs

@@ -156,7 +156,7 @@ async Task<ServiceUpdateResponse> ISwarmOperations.UpdateServiceAsync(string id,
             return this._client.JsonSerializer.DeserializeObject<ServiceUpdateResponse>(response.Body);
         }
 
-        async Task ISwarmOperations.UpdateSwarmAsync(SwarmUpdateParameters parameters, CancellationToken cancellationToken)
+       async Task ISwarmOperations.UpdateSwarmAsync(SwarmUpdateParameters parameters, CancellationToken cancellationToken)
         {
             var query = new QueryString<SwarmUpdateParameters>(parameters ?? throw new ArgumentNullException(nameof(parameters)));
             var body = new JsonRequestContent<Spec>(parameters.Spec ?? throw new ArgumentNullException(nameof(parameters.Spec)), this._client.JsonSerializer);

src/Docker.DotNet/JsonBase64Converter.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Docker.DotNet
+{
+    internal class JsonBase64Converter : JsonConverter
+    {
+        private static readonly Type _byteListType = typeof(IList<byte>);
+        public override bool CanRead => true;
+
+        public override bool CanWrite => false;
+
+        public override void WriteJson(JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer)
+        {
+            var strVal = reader.Value as string;
+
+            return Convert.FromBase64String(strVal);
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == _byteListType;
+        }
+    }
+}

src/Docker.DotNet/JsonSerializer.cs

@@ -17,7 +17,8 @@ internal class JsonSerializer
                 new JsonVersionConverter(),
                 new StringEnumConverter(),
                 new TimeSpanSecondsConverter(),
-                new TimeSpanNanosecondsConverter()
+                new TimeSpanNanosecondsConverter(),
+                new JsonBase64Converter()
             }
         };
 

src/Docker.DotNet/Models/ContainerExecInspectResponse.Generated.cs

@@ -5,7 +5,7 @@ namespace Docker.DotNet.Models
     [DataContract]
     public class ContainerExecInspectResponse // (types.ContainerExecInspect)
     {
-        [DataMember(Name = "ExecID", EmitDefaultValue = false)]
+        [DataMember(Name = "ID", EmitDefaultValue = false)]
         public string ExecID { get; set; }
 
         [DataMember(Name = "ContainerID", EmitDefaultValue = false)]

src/Docker.DotNet/Models/ContainerSpec.Generated.cs

@@ -78,7 +78,13 @@ public class ContainerSpec // (swarm.ContainerSpec)
         [DataMember(Name = "Sysctls", EmitDefaultValue = false)]
         public IDictionary<string, string> Sysctls { get; set; }
 
-        [DataMember(Name = "Capabilities", EmitDefaultValue = false)]
-        public IList<string> Capabilities { get; set; }
+        [DataMember(Name = "CapabilityAdd", EmitDefaultValue = false)]
+        public IList<string> CapabilityAdd { get; set; }
+
+        [DataMember(Name = "CapabilityDrop", EmitDefaultValue = false)]
+        public IList<string> CapabilityDrop { get; set; }
+
+        [DataMember(Name = "Ulimits", EmitDefaultValue = false)]
+        public IList<Ulimit> Ulimits { get; set; }
     }
 }

src/Docker.DotNet/Models/GlobalJob.Generated.cs

@@ -0,0 +1,9 @@
+using System.Runtime.Serialization;
+
+namespace Docker.DotNet.Models
+{
+    [DataContract]
+    public class GlobalJob // (swarm.GlobalJob)
+    {
+    }
+}

src/Docker.DotNet/Models/HostConfig.Generated.cs

@@ -81,9 +81,6 @@ public HostConfig(Resources Resources)
         [DataMember(Name = "CapDrop", EmitDefaultValue = false)]
         public IList<string> CapDrop { get; set; }
 
-        [DataMember(Name = "Capabilities", EmitDefaultValue = false)]
-        public IList<string> Capabilities { get; set; }
-
         [DataMember(Name = "CgroupnsMode", EmitDefaultValue = false)]
         public string CgroupnsMode { get; set; }
 

src/Docker.DotNet/Models/ImagesListParameters.Generated.cs

@@ -6,9 +6,6 @@ namespace Docker.DotNet.Models
     [DataContract]
     public class ImagesListParameters // (main.ImagesListParameters)
     {
-        [QueryStringParameter("filter", false)]
-        public string MatchName { get; set; }
-
         [QueryStringParameter("all", false, typeof(BoolQueryStringConverter))]
         public bool? All { get; set; }