Handle Reponse Error when building image (#590)

* Handle Reponse Error when building image * Change formatting * Add a test * Removed redundant async/await * Fix failed unit tests affected by the new logic * Improve event monitoring test
dotnet · Sep 23, 2022 · 4119439 · 4119439
1 parent 6c26b02
commit 4119439
Show file tree

Hide file tree

Showing 3 changed files with 326 additions and 295 deletions.
diff --git a/src/Docker.DotNet/DockerClient.cs b/src/Docker.DotNet/DockerClient.cs
@@ -283,15 +283,18 @@ await HandleIfErrorResponseAsync(response.StatusCode, response, errorHandlers)
                 .ConfigureAwait(false);
         }
 
-        internal Task<HttpResponseMessage> MakeRequestForRawResponseAsync(
+        internal async Task<HttpResponseMessage> MakeRequestForRawResponseAsync(
             HttpMethod method,
             string path,
             IQueryString queryString,
             IRequestContent body,
             IDictionary<string, string> headers,
             CancellationToken token)
         {
-            return PrivateMakeRequestAsync(SInfiniteTimeout, HttpCompletionOption.ResponseHeadersRead, method, path, queryString, headers, body, token);
+            var response = await  PrivateMakeRequestAsync(SInfiniteTimeout, HttpCompletionOption.ResponseHeadersRead, method, path, queryString, headers, body, token).ConfigureAwait(false);
+            await HandleIfErrorResponseAsync(response.StatusCode, response)
+                .ConfigureAwait(false);
+            return response;
         }
 
         internal async Task<DockerApiStreamedResponse> MakeRequestForStreamedResponseAsync(

diff --git a/test/Docker.DotNet.Tests/IImageOperationsTests.cs b/test/Docker.DotNet.Tests/IImageOperationsTests.cs
@@ -69,6 +69,17 @@ await _dockerClient.Images.TagImageAsync(
             Assert.True(createImageTask.IsCanceled);
         }
 
+        [Fact]
+        public Task CreateImageAsync_ErrorResponse_ThrowsDockerApiException()
+        {
+            return Assert.ThrowsAsync<DockerApiException>(() => _dockerClient.Images.CreateImageAsync(
+                new ImagesCreateParameters()
+                {
+                    FromImage = "1.2.3.Apparently&this$is+not-a_valid%repository//name",
+                    Tag = "ancient-one"
+                }, null, null));
+        }
+
         [Fact]
         public async Task DeleteImageAsync_RemovesImage()
         {