Merge branch 'bug_fix' into rewrite/unmanaged_node

Author: chkeita

src/ApiService/ApiService/Functions/AgentCanSchedule.cs

@@ -56,8 +56,7 @@ private async Async.Task<HttpResponseData> Post(HttpRequestData req) {
 
         if (workStopped) {
             _log.Info($"Work stopped for: {canScheduleRequest.MachineId:Tag:MachineId} and {canScheduleRequest.TaskId:Tag:TaskId}");
-            allowed = false;
-            reason = "Work stopped";
+            return await RequestHandling.Ok(req, new CanSchedule(Allowed: false, WorkStopped: workStopped, Reason: "Work stopped"));
         }
 
         var scp = await _context.NodeOperations.AcquireScaleInProtection(node);

src/deny.toml

@@ -17,6 +17,8 @@ yanked = "deny"
 ignore = [
     "RUSTSEC-2022-0048", # xml-rs is unmaintained
     "RUSTSEC-2021-0139", # ansi_term is unmaintained
+    "RUSTSEC-2021-0145", # atty bug: we are unaffected (no custom allocator)
+]
 ]
 
 [bans]

src/deployment/deploy.py

@@ -1237,7 +1237,7 @@ def expand_agent(f: str) -> List[str]:
                             "--name",
                             self.application_name,
                             "--resource-group",
-                            self.application_name,
+                            self.resource_group,
                             "--settings",
                         ]
                         + python_settings,
@@ -1254,7 +1254,7 @@ def expand_agent(f: str) -> List[str]:
                             "--name",
                             self.application_name + DOTNET_APPLICATION_SUFFIX,
                             "--resource-group",
-                            self.application_name,
+                            self.resource_group,
                             "--settings",
                         ]
                         + dotnet_settings,