Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor fixes to Linux Consumption #133

Merged
merged 2 commits into from
Aug 23, 2020
Merged

Minor fixes to Linux Consumption #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24fa04a
Enable /Error Endpoint;
Aug 20, 2020
8fc0bb2
Fix async endpoint
Aug 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Kudu.Services.Web/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public IActionResult Info()
/// <returns>Expect 202 when receives the first call, otherwise, returns 409</returns>
[HttpPost]
[Authorize(Policy = AuthPolicyNames.AdminAuthLevel)]
public async Task<IActionResult> AssignAsync([FromBody] EncryptedHostAssignmentContext encryptedAssignmentContext)
public IActionResult Assign([FromBody] EncryptedHostAssignmentContext encryptedAssignmentContext)
{
var containerKey = System.Environment.GetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey);
var assignmentContext = encryptedAssignmentContext.Decrypt(containerKey);
Expand Down
3 changes: 2 additions & 1 deletion Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public class LinuxConsumptionRouteMiddleware
"/api/settings",
"/admin/instance",
"/deployments",
"/zipdeploy"
"/zipdeploy",
"/Error"
};

private readonly RequestDelegate _next;
Expand Down