From 4ee0376b6cc2c03c1db1a6857e6931af11c49f3c Mon Sep 17 00:00:00 2001
From: Hanzhang Zeng <48038149+Hazhzeng@users.noreply.github.com>
Date: Sun, 23 Aug 2020 12:11:14 -0700
Subject: [PATCH] Minor fixes to Linux Consumption (#133)
* Enable /Error Endpoint;
* Fix async endpoint
---
Kudu.Services.Web/Startup.cs | 2 +-
.../LinuxConsumptionInstanceAdminController.cs | 2 +-
.../LinuxConsumptionRouteMiddleware.cs | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index bef24d42..c6aff643 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -503,7 +503,7 @@ public void Configure(IApplicationBuilder app,
new {controller = "LinuxConsumptionInstanceAdmin", action = "Info"},
new {verb = new HttpMethodRouteConstraint("GET")});
routes.MapRoute("admin-instance-assign", "admin/instance/assign",
- new {controller = "LinuxConsumptionInstanceAdmin", action = "AssignAsync" },
+ new {controller = "LinuxConsumptionInstanceAdmin", action = "Assign" },
new {verb = new HttpMethodRouteConstraint("POST")});
// Live Command Line
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
index 75f81631..c398def0 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
@@ -62,7 +62,7 @@ public IActionResult Info()
/// Expect 202 when receives the first call, otherwise, returns 409
[HttpPost]
[Authorize(Policy = AuthPolicyNames.AdminAuthLevel)]
- public async Task AssignAsync([FromBody] EncryptedHostAssignmentContext encryptedAssignmentContext)
+ public IActionResult Assign([FromBody] EncryptedHostAssignmentContext encryptedAssignmentContext)
{
var containerKey = System.Environment.GetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey);
var assignmentContext = encryptedAssignmentContext.Decrypt(containerKey);
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
index ef2fddf9..ab6003d5 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
@@ -31,7 +31,8 @@ public class LinuxConsumptionRouteMiddleware
"/api/settings",
"/admin/instance",
"/deployments",
- "/zipdeploy"
+ "/zipdeploy",
+ "/Error"
};
private readonly RequestDelegate _next;