Add assign2

Author: Manikanta Nallagatla

src/WebJobs.Script.WebHost/Controllers/InstanceController.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
@@ -41,27 +41,23 @@ public async Task<IActionResult> Assign([FromBody] EncryptedHostAssignmentContex
 
             var assignmentContext = _startupContextProvider.SetContext(encryptedAssignmentContext);
 
-            // before starting the assignment we want to perform as much
-            // up front validation on the context as possible
-            string error = await _instanceManager.ValidateContext(assignmentContext);
-            if (error != null)
-            {
-                return StatusCode(StatusCodes.Status400BadRequest, error);
-            }
+            return await AssignInternal(assignmentContext);
+        }
 
-            // Wait for Sidecar specialization to complete before returning ok.
-            // This shouldn't take too long so ok to do this sequentially.
-            error = await _instanceManager.SpecializeMSISidecar(assignmentContext);
-            if (error != null)
+        [HttpPost]
+        [Route("admin/instance/assign2")]
+        [Authorize(Policy = PolicyNames.AdminAuthLevel)]
+        public async Task<IActionResult> Assign2([FromBody] FunctionsWorkerContainerAssignmentContext workerAssignmentContext)
+        {
+            if (workerAssignmentContext?.AssignmentContext == null || workerAssignmentContext.AssignmentContext == null)
             {
-                return StatusCode(StatusCodes.Status500InternalServerError, error);
+                return BadRequest("Assignment context is missing.");
             }
 
-            var succeeded = _instanceManager.StartAssignment(assignmentContext);
+            _logger.LogDebug($"Starting container assignment for host : {Request?.Host}");
+            var assignmentContext = _startupContextProvider.SetContext(workerAssignmentContext.AssignmentContext);
 
-            return succeeded
-                ? Accepted()
-                : StatusCode(StatusCodes.Status409Conflict, "Instance already assigned");
+            return await AssignInternal(assignmentContext);
         }
 
         [HttpGet]
@@ -79,5 +75,30 @@ public IActionResult GetHttpHealthStatus()
             // Reaching here implies that http health of the container is ok.
             return Ok();
         }
+
+        private async Task<IActionResult> AssignInternal(HostAssignmentContext assignmentContext)
+        {
+            // before starting the assignment we want to perform as much
+            // up front validation on the context as possible
+            string error = await _instanceManager.ValidateContext(assignmentContext);
+            if (error != null)
+            {
+                return StatusCode(StatusCodes.Status400BadRequest, error);
+            }
+
+            // Wait for Sidecar specialization to complete before returning ok.
+            // This shouldn't take too long so ok to do this sequentially.
+            error = await _instanceManager.SpecializeMSISidecar(assignmentContext);
+            if (error != null)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError, error);
+            }
+
+            var succeeded = _instanceManager.StartAssignment(assignmentContext);
+
+            return succeeded
+                ? Accepted()
+                : StatusCode(StatusCodes.Status409Conflict, "Instance already assigned");
+        }
     }
 }

src/WebJobs.Script.WebHost/Models/FunctionsWorkerContainerAssignmentContext.cs

@@ -0,0 +1,14 @@
+// -----------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// -----------------------------------------------------------
+
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.WebJobs.Script.WebHost.Models
+{
+    public class FunctionsWorkerContainerAssignmentContext
+    {
+        [JsonProperty("assignmentContext")]
+        public HostAssignmentContext AssignmentContext { get; private set; }
+    }
+}

src/WebJobs.Script.WebHost/StartupContextProvider.cs

@@ -142,6 +142,11 @@ public virtual HostAssignmentContext SetContext(EncryptedHostAssignmentContext e
             string decryptedContext = EncryptionHelper.Decrypt(encryptedContext.EncryptedContext, environment: _environment);
             var hostAssignmentContext = JsonConvert.DeserializeObject<HostAssignmentContext>(decryptedContext);
 
+            return SetContext(hostAssignmentContext);
+        }
+
+        public virtual HostAssignmentContext SetContext(HostAssignmentContext hostAssignmentContext)
+        {
             // Don't update StartupContext for warmup requests
             if (!hostAssignmentContext.IsWarmupRequest)
             {