Update the .NET Core project template

samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Function.cs

@@ -1,9 +1,7 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using Newtonsoft.Json;
 
 using Amazon.Lambda.Core;
@@ -25,20 +23,19 @@ private static async Task<string> GetCallingIP()
             client.DefaultRequestHeaders.Accept.Clear();
             client.DefaultRequestHeaders.Add("User-Agent", "AWS Lambda .Net Client");
 
-            var stringTask = client.GetStringAsync("http://checkip.amazonaws.com/").ConfigureAwait(continueOnCapturedContext:false);
+            var msg = await client.GetStringAsync("http://checkip.amazonaws.com/").ConfigureAwait(continueOnCapturedContext:false);
 
-            var msg = await stringTask;
             return msg.Replace("\n","");
         }
 
-        public APIGatewayProxyResponse FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)
+        public async Task<APIGatewayProxyResponse> FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)
         {
 
-            string location = GetCallingIP().Result;
-            Dictionary<string, string> body = new Dictionary<string, string>
+            var location = await GetCallingIP();
+            var body = new Dictionary<string, string>
             {
                 { "message", "hello world" },
-                { "location", location },
+                { "location", location }
             };
 
             return new APIGatewayProxyResponse

samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/FunctionTest.cs

@@ -3,11 +3,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Net.Http;
-using System.Net.Http.Headers;
-
 using Newtonsoft.Json;
 using Xunit;
-using Amazon.Lambda.Core;
 using Amazon.Lambda.TestUtilities;
 using Amazon.Lambda.APIGatewayEvents;
 
@@ -29,37 +26,33 @@ private static async Task<string> GetCallingIP()
     }
 
     [Fact]
-    public void TestHelloWorldFunctionHandler()
+    public async Task TestHelloWorldFunctionHandler()
     {
-            TestLambdaContext context;
-            APIGatewayProxyRequest request;
-            APIGatewayProxyResponse response;
-
-            request = new APIGatewayProxyRequest();
-            context = new TestLambdaContext();
+            var request = new APIGatewayProxyRequest();
+            var context = new TestLambdaContext();
             string location = GetCallingIP().Result;
             Dictionary<string, string> body = new Dictionary<string, string>
             {
                 { "message", "hello world" },
                 { "location", location },
             };
 
-            var ExpectedResponse = new APIGatewayProxyResponse
+            var expectedResponse = new APIGatewayProxyResponse
             {
                 Body = JsonConvert.SerializeObject(body),
                 StatusCode = 200,
                 Headers = new Dictionary<string, string> { { "Content-Type", "application/json" } }
             };
 
             var function = new Function();
-            response = function.FunctionHandler(request, context);
+            var response = await function.FunctionHandler(request, context);
 
             Console.WriteLine("Lambda Response: \n" + response.Body);
-            Console.WriteLine("Expected Response: \n" + ExpectedResponse.Body);
+            Console.WriteLine("Expected Response: \n" + expectedResponse.Body);
 
-            Assert.Equal(ExpectedResponse.Body, response.Body);
-            Assert.Equal(ExpectedResponse.Headers, response.Headers);
-            Assert.Equal(ExpectedResponse.StatusCode, response.StatusCode);
+            Assert.Equal(expectedResponse.Body, response.Body);
+            Assert.Equal(expectedResponse.Headers, response.Headers);
+            Assert.Equal(expectedResponse.StatusCode, response.StatusCode);
     }
   }
 }