PR comments

Author: GarrettBeatty

Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Extensions/ApiGatewayResponseExtensions.cs

@@ -260,13 +260,11 @@ private static void SetContentTypeAndStatusCodeV2(HttpResponse response, IDictio
         }
         else
         {
-            // Assume for now that when status code is not set (we are assuming 0 means not set) then set the default to application/json
-            // Tehnically if the user were to return statusCode = 0 explicity in the response body, api gateway should internal server error, but since we don't
-            // have a way to differentiate it and not returning status code is more common, we will do this way for now.
-            // API Gateway 2.0 format version assumptions
-            response.StatusCode = 200;
+            response.StatusCode = 500;
             response.ContentType = "application/json";
-            // Note: IsBase64Encoded is assumed to be false, which is already the default behavior
+            var errorBytes = Encoding.UTF8.GetBytes("{\"message\":\"Internal Server Error\"}");
+            response.Body = new MemoryStream(errorBytes);
+            response.ContentLength = errorBytes.Length;
         }
     }
 }

Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/ApiGatewayResponseExtensionsAdditionalTests.cs

@@ -22,48 +22,24 @@ public ApiGatewayResponseExtensionsAdditionalTests(ApiGatewayIntegrationTestFixt
             _httpClient = new HttpClient();
         }
 
-        [Fact]
-        public async Task V2_SetsContentTypeApplicationJsonWhenNoStatusProvided()
-        {
-            var testResponse = new APIGatewayHttpApiV2ProxyResponse
-            {
-                Body = "Hello from lambda"
-            };
-
-            var httpContext = new DefaultHttpContext();
-            testResponse.ToHttpResponse(httpContext);
-            var actualResponse = await _httpClient.PostAsync(_fixture.ReturnRawRequestBodyHttpApiV2Url, new StringContent("Hello from lambda"));
-
-            await _fixture.ApiGatewayTestHelper.AssertResponsesEqual(actualResponse, httpContext.Response);
-            Assert.Equal(200, (int)actualResponse.StatusCode);
-            Assert.Equal("application/json", actualResponse.Content.Headers.ContentType?.ToString());
-            var content = await actualResponse.Content.ReadAsStringAsync();
-            Assert.Equal("Hello from lambda", content);
-        }
-
-        [Fact]
-        public async Task V2_SetsContentTypeApplicationJsonWhenNoStatusProvidedAndDoesntUseOtherType()
-        {
-            var payload = "{\"key\" : \"value\", \"headers\" : {\"content-type\": \"application/xml\"}}";
-
-            var testResponse = new APIGatewayHttpApiV2ProxyResponse
-            {
-                Body = payload
-            };
-
-            var httpContext = new DefaultHttpContext();
-            testResponse.ToHttpResponse(httpContext);
-
-            var actualResponse = await _httpClient.PostAsync(_fixture.ReturnRawRequestBodyHttpApiV2Url, new StringContent(payload));
-
-            await _fixture.ApiGatewayTestHelper.AssertResponsesEqual(actualResponse, httpContext.Response);
-            Assert.Equal(200, (int)actualResponse.StatusCode);
-            Assert.Equal("application/json", actualResponse.Content.Headers.ContentType?.ToString());
-            var content = await actualResponse.Content.ReadAsStringAsync();
-
-            var responsePayload = JsonSerializer.Deserialize<Dictionary<string, object>>(content);
-            Assert.Equal("value", responsePayload?["key"].ToString());
-        }
+        //[Fact]
+        //public async Task V2_SetsContentTypeApplicationJsonWhenNoStatusProvided()
+        //{
+        //    var testResponse = new APIGatewayHttpApiV2ProxyResponse
+        //    {
+        //        Body = "Hello from lambda"
+        //    };
+
+        //    var httpContext = new DefaultHttpContext();
+        //    testResponse.ToHttpResponse(httpContext);
+        //    var actualResponse = await _httpClient.PostAsync(_fixture.ReturnRawRequestBodyHttpApiV2Url, new StringContent("Hello from lambda"));
+
+        //    await _fixture.ApiGatewayTestHelper.AssertResponsesEqual(actualResponse, httpContext.Response);
+        //    Assert.Equal(200, (int)actualResponse.StatusCode);
+        //    Assert.Equal("application/json", actualResponse.Content.Headers.ContentType?.ToString());
+        //    var content = await actualResponse.Content.ReadAsStringAsync();
+        //    Assert.Equal("Hello from lambda", content);
+        //}
 
 
         [Fact]

Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Extensions/ApiGatewayResponseExtensionsTests.cs

@@ -51,28 +51,6 @@ public void ToHttpResponse_ConvertsCorrectlyV2(string testName, ApiGatewayRespon
             testCase.Assertions(httpContext.Response, ApiGatewayEmulatorMode.HttpV2);
         }
 
-        [Fact]
-        public void ToHttpResponse_APIGatewayHttpApiV2ProxyResponse_InfersResponseFormatWhenStatusCodeNotSet()
-        {
-            var jsonBody = "{\"key\":\"value\"}";
-            var apiResponse = new APIGatewayHttpApiV2ProxyResponse
-            {
-                Body = jsonBody,
-                StatusCode = 0 // No status code set
-            };
-
-            var httpContext = new DefaultHttpContext();
-            apiResponse.ToHttpResponse(httpContext);
-
-            Assert.Equal(200, httpContext.Response.StatusCode);
-            Assert.Equal("application/json", httpContext.Response.ContentType);
-
-            httpContext.Response.Body.Seek(0, SeekOrigin.Begin);
-            using var reader = new StreamReader(httpContext.Response.Body);
-            var bodyContent = reader.ReadToEnd();
-            Assert.Equal(jsonBody, bodyContent);
-        }
-
         [Theory]
         [InlineData(ApiGatewayEmulatorMode.HttpV1)]
         [InlineData(ApiGatewayEmulatorMode.Rest)]

Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Extensions/ApiGatewayResponseTestCases.cs

@@ -482,6 +482,48 @@ public static IEnumerable<object[]> V2TestCases()
             }
         };
 
+        yield return new object[]
+        {
+            "V2_HandlesZeroStatusCode",
+            new ApiGatewayResponseTestCase
+            {
+                Response = new APIGatewayHttpApiV2ProxyResponse
+                {
+                    StatusCode = 0,
+                    Body = "{\"key\":\"This body should be replaced\"}"
+                },
+                Assertions = (response, emulatorMode) =>
+                {
+                    string error;
+                    int contentLength;
+                    int statusCode;
+                    error = "\"Internal Server Error\"}";
+                    contentLength = 35;
+                    statusCode = 500;
+                    Assert.Equal(statusCode, response.StatusCode);
+                    Assert.Equal("application/json", response.ContentType);
+                    Assert.Equal("{\"message\":"+error, ReadResponseBody(response));
+                    Assert.Equal(contentLength, response.ContentLength);
+                },
+                IntegrationAssertions = async (response, emulatorMode) =>
+                {
+                    string error;
+                    int contentLength;
+                    int statusCode;
+
+                    error = "\"Internal Server Error\"}";
+                    contentLength = 35;
+                    statusCode = 500;
+                    Assert.Equal(statusCode, (int)response.StatusCode);
+                    Assert.Equal("application/json", response.Content.Headers.ContentType?.ToString());
+                    var content = await response.Content.ReadAsStringAsync();
+                    Assert.Equal("{\"message\":"+error, content);
+                    Assert.Equal(contentLength, response.Content.Headers.ContentLength);
+                    await Task.CompletedTask;
+                }
+            }
+        };
+
         yield return new object[]
         {
             "V2_SetsHeaders",