From eb5329d2fcf1c2df7914d51fee5244cc97279ab7 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 14 Dec 2018 13:34:23 -0800
Subject: [PATCH 001/245] Added API endpoints to update and get Container Stats
 from kudu

---
 Kudu.Core/Infrastructure/ContainerInfo.cs     | 155 +++++++++++++++
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    |  11 +-
 Kudu.Services.Web/Startup.cs                  |   2 -
 Kudu.Services.Web/Util.cs                     |   6 -
 .../Diagnostics/ContainerInfoController.cs    | 182 ++++++++++++++++++
 Kudu.Services/ExceptionResponse.cs            |  18 ++
 6 files changed, 365 insertions(+), 9 deletions(-)
 create mode 100644 Kudu.Core/Infrastructure/ContainerInfo.cs
 create mode 100644 Kudu.Services/Diagnostics/ContainerInfoController.cs
 create mode 100644 Kudu.Services/ExceptionResponse.cs

diff --git a/Kudu.Core/Infrastructure/ContainerInfo.cs b/Kudu.Core/Infrastructure/ContainerInfo.cs
new file mode 100644
index 00000000..66189a56
--- /dev/null
+++ b/Kudu.Core/Infrastructure/ContainerInfo.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+
+namespace Kudu.Core.Infrastructure
+{
+
+    public class SiteInstanceStats
+    {
+        [JsonProperty(PropertyName = "containers")]
+        public Dictionary<string,ContainerInfo> appContainersOnThisInstance = new Dictionary<string, ContainerInfo>();
+    }
+    
+    public class ContainerInfo
+    {
+
+        [JsonProperty(PropertyName = "read")] 
+        public DateTime CurrentTimeStamp { get; set; }
+
+        [JsonProperty(PropertyName = "preread")]
+        public DateTime PreviousTimeStamp { get; set; }
+
+        [JsonProperty(PropertyName = "cpu_stats")]
+        public ContainerCpuStatistics CurrentCpuStats { get; set; }
+
+        [JsonProperty(PropertyName = "precpu_stats")]
+        public ContainerCpuStatistics PreviousCpuStats { get; set; }
+
+        [JsonProperty(PropertyName = "memory_stats")]
+        public ContainerMemoryStatistics MemoryStats { get; set; }
+
+        [JsonProperty(PropertyName = "name")] public string Name { get; set; }
+
+        [JsonProperty(PropertyName = "id")] public string Id { get; set; }
+
+        [JsonProperty(PropertyName = "eth0")] public ContainerNetworkInterfaceStatistics Eth0 { get; set; }
+
+        public string GetSiteName()
+        {
+            if (String.IsNullOrWhiteSpace(this.Name))
+            {
+                return "";
+            }
+            var startIndex = this.Name[0] == '/' ? 1 : 0;
+            // Remove the last _0 or something from the container name
+            var siteName = Regex.Replace(this.Name.Substring(startIndex), @"_\d+$", "");
+            return siteName;
+        }
+
+    }
+
+    public class ContainerCpuUsage
+        {
+            [JsonProperty(PropertyName = "total_usage")]
+            public long TotalUsage { get; set; }
+
+            [JsonProperty(PropertyName = "percpu_usage")]
+            public List<long> PerCpuUsage { get; set; }
+
+            [JsonProperty(PropertyName = "usage_in_kernelmode")]
+            public long KernelModeUsage { get; set; }
+
+            [JsonProperty(PropertyName = "usage_in_usermode")]
+            public long UserModeUsage { get; set; }
+        }
+
+    public class ContainerThrottlingData
+        {
+            [JsonProperty(PropertyName = "periods")]
+            public int Periods { get; set; }
+
+            [JsonProperty(PropertyName = "throttled_periods")]
+            public int ThrolltledPeriods { get; set; }
+
+            [JsonProperty(PropertyName = "throttled_time")]
+            public int ThrottledTime { get; set; }
+        }
+
+    public class ContainerCpuStatistics
+        {
+            [JsonProperty(PropertyName = "cpu_usage")]
+            public ContainerCpuUsage CpuUsage { get; set; }
+
+            [JsonProperty(PropertyName = "system_cpu_usage")]
+            public long SystemCpuUsage { get; set; }
+
+            [JsonProperty(PropertyName = "online_cpus")]
+            public int OnlineCpuCount { get; set; }
+
+            public ContainerThrottlingData ThrottlingData { get; set; }
+        }
+
+    public class ContainerMemoryStatistics
+        {
+            [JsonProperty(PropertyName = "usage")] public long Usage { get; set; }
+
+            [JsonProperty(PropertyName = "max_usage")]
+            public long MaxUsage { get; set; }
+
+            [JsonProperty(PropertyName = "limit")] public long Limit { get; set; }
+        }
+
+    public class ContainerNetworkInterfaceStatistics
+        {
+            [JsonProperty(PropertyName = "rx_bytes")]
+            public long RxBytes { get; set; }
+
+            [JsonProperty(PropertyName = "rx_packets")]
+            public long RxPackets { get; set; }
+
+            [JsonProperty(PropertyName = "rx_errors")]
+            public long RxErrors { get; set; }
+
+            [JsonProperty(PropertyName = "rx_dropped")]
+            public long RxDropped { get; set; }
+
+            [JsonProperty(PropertyName = "tx_bytes")]
+            public long TxBytes { get; set; }
+
+            [JsonProperty(PropertyName = "tx_packets")]
+            public long TxPackets { get; set; }
+
+            [JsonProperty(PropertyName = "tx_errors")]
+            public long TxErrors { get; set; }
+
+            [JsonProperty(PropertyName = "tx_dropped")]
+            public long TxDropped { get; set; }
+        }
+
+
+    public class ContainerSimpleStatus
+        {
+            [JsonProperty(PropertyName = "TimeStamp")]
+            public DateTime TimeStamp { get; set; }
+
+            [JsonProperty(PropertyName = "name")] public string Name { get; set; }
+
+            [JsonProperty(PropertyName = "cpuUsage")]
+            public long CpuUsage { get; set; }
+
+            [JsonProperty(PropertyName = "systemCpuUsage")]
+            public long SystemCpuUsage { get; set; }
+
+            [JsonProperty(PropertyName = "memoryUsage")]
+            public long MemoryUsage { get; set; }
+
+            [JsonProperty(PropertyName = "maxMemoryUsage")]
+            public long MaxMemoryUsage { get; set; }
+
+            [JsonProperty(PropertyName = "memoryLimit")]
+            public long MemoryLimit { get; set; }
+        }
+
+}
\ No newline at end of file
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index e8cc224e..d9a54ba7 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -50,7 +50,16 @@
             <div class="row align-middle" style="margin-left: 1px">
                 <h3>Kudu<span style="font-weight: 200">Lite</span></h3>@version</div>
             <small>Site UpTime: <i class="fas fa-circle" style="color: #26C281; font-size: x-small; margin-right: 5px"></i>@Tracing.TraceMiddleware.UpTime.ToString(@"dd\.hh\:mm\:ss") | Site Folder: @PathResolver.ResolveRootPath() | Temp Folder: @System.IO.Path.GetTempPath()</small>
-            <br> <small onclick="clickLink(this)" id="curr-instance" title="@workerIdHash">Kudu Attached to Instance: &nbsp;<i class="fas fa-desktop fa-style"></i>&nbsp;<a href="#">@workerIdShortHash </a>| <i class="fas fa-network-wired fa-style"></i> <a href="#"> Switch Instance</a></small>
+            <br> <small onclick="clickLink(this)" id="curr-instance" title="@workerIdHash">Kudu Attached to Instance: &nbsp;<i class="fas fa-desktop fa-style"></i>&nbsp;<a href="#">@workerIdShortHash </a>| <span class="dropdown">
+                <button class="btn btn-sm dropdown-toggle" type="button" style="background-color: rgb(244, 245, 247);border: none" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <i class="fas fa-network-wired fa-style"></i> <a href="#"> Switch Instance</a>
+                </button>
+                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                    <a class="dropdown-item" href="#">Instance 1</a>
+                    <a class="dropdown-item" href="#">Instance 2</a>
+                    <a class="dropdown-item" href="#">Instance 3</a>
+                </div>
+            </span> </small>
         </div>
         <div class="col-md-5" id="is-deploying-banner" style="display: none">
             <div>
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 71c74e55..d365b943 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -304,8 +304,6 @@ public void Configure(IApplicationBuilder app,
             Console.WriteLine("\nConfigure : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
 
             loggerFactory.AddEventSourceLogger();
-            
-            app.UseMvcWithDefaultRoute();
 
             if (_hostingEnvironment.IsDevelopment())
             {
diff --git a/Kudu.Services.Web/Util.cs b/Kudu.Services.Web/Util.cs
index 3e0fd30c..0f842f3e 100644
--- a/Kudu.Services.Web/Util.cs
+++ b/Kudu.Services.Web/Util.cs
@@ -236,12 +236,6 @@ public static void PrependFoldersToPath(IEnvironment environment)
 
         public static void EnsureDotNetCoreEnvironmentVariable(IEnvironment environment)
         {
-            // CORE TODO: Moved to DockerFile 
-            // Skip this as it causes huge files to be downloaded to the temp folder
-            // SetEnvironmentVariableIfNotYetSet("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "true");
-
-            // Don't download xml comments, as they're large and provide no benefits outside of a dev machine
-            // SetEnvironmentVariableIfNotYetSet("NUGET_XMLDOC_MODE", "skip");
 
             if (Core.Environment.IsAzureEnvironment())
             {
diff --git a/Kudu.Services/Diagnostics/ContainerInfoController.cs b/Kudu.Services/Diagnostics/ContainerInfoController.cs
new file mode 100644
index 00000000..44365a30
--- /dev/null
+++ b/Kudu.Services/Diagnostics/ContainerInfoController.cs
@@ -0,0 +1,182 @@
+using System;
+using Kudu.Core.Infrastructure;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Kudu.Services.Diagnostics
+{
+    /// <inheritdoc />
+    /// <summary>
+    /// API endpoint to GET, Update and Delete Container network, memory, cpu usage and disk usage stats. 
+    /// </summary>
+    [Route("/api/stats")]
+    public class ContainerInfoController : Controller
+    {
+        private static SiteInstanceStats _siteInstanceStats = new SiteInstanceStats();
+        private static readonly object SiteInstStatsLock = new object();
+
+        /// <summary>
+        /// Updates all/particular stat for a container.
+        /// Can only be called by an authorized metering service.
+        /// <param name="containerId">ContainerId whose stats are to be purged</param>
+        /// </summary>
+        /// <param name="data">Valid JSON Object containing the data to be updated</param>
+        /// <param name="containerId">ContainerId whose stats are to be updated</param>
+        /// <param name="filterName">Filter for a container whose stats are to be updated, if null all the old stats are
+        ///  purged and stats in this request are added</param>
+        /// <returns></returns>
+        [HttpPost("{containerId=all}/{filterName=all}")]
+        public IActionResult UpdateLog(
+            [FromBody] JObject data,
+            string containerId,
+            string filterName)
+        {
+            try
+            {
+                lock (SiteInstStatsLock)
+                {
+                    if (containerId.Equals("all"))
+                    {
+                        var siteInstStats =
+                            Newtonsoft.Json.JsonConvert.DeserializeObject<Kudu.Core.Infrastructure.SiteInstanceStats>(
+                                data.ToString(Formatting.None));
+                        _siteInstanceStats = siteInstStats;
+                    }
+                    else
+                    {
+                        if (filterName.Equals("all"))
+                        {
+                            var cntInfo =
+                                Newtonsoft.Json.JsonConvert.DeserializeObject<Kudu.Core.Infrastructure.ContainerInfo>(
+                                    data.ToString(Formatting.None));
+                            _siteInstanceStats.appContainersOnThisInstance[cntInfo.Id] = cntInfo;
+                        }
+                        else
+                        {
+                            // CORE TODO:                             
+                        }
+                    }
+
+                    return Ok("Container stats updated");
+                }
+            }
+            catch (Exception ex)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError,
+                    JsonConvert.SerializeObject(new ExceptionResponse(ex.Message, ex.StackTrace)));
+            }
+        }
+
+
+        /// <summary>
+        /// Deletes all the stats for a container.
+        /// Can only be called by an authorized metering service.
+        /// This happens when a container is killed/it stops running
+        /// </summary>
+        /// <param name="containerId">ContainerId whose stats are to be purged</param>
+        [HttpDelete("{containerId}")]
+        public IActionResult GetLog(string containerId)
+        {
+            try
+            {
+                lock (SiteInstStatsLock)
+                {
+                    if (!_siteInstanceStats.appContainersOnThisInstance.ContainsKey(containerId))
+                        return BadRequest("ContainerId " + containerId + " not found.");
+                    _siteInstanceStats.appContainersOnThisInstance.Remove(containerId);
+                    return Ok("Stats updated successfully");
+                }
+            }
+            catch (Exception ex)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError);
+            }
+        }
+
+        /// <summary>
+        /// Returns a list of containers for a webapp and it's memory/cpu stats.
+        /// This stats can be filtered by giving the api URL as /api/stats/(container-id)/(filter-id)
+        /// <list type="bullet">  
+        ///     <listheader>  
+        ///         <term>Possible filters are</term>  
+        ///     </listheader>  
+        ///     <item>  
+        ///         <term>eth0</term>
+        ///         <description>Network statistics</description>
+        ///     </item>
+        ///     <item>  
+        ///         <term>memory_stats</term>
+        ///         <description>Memory usage statistics</description>
+        ///     </item>
+        ///     <item>  
+        ///         <term>cpu_stats</term>
+        ///         <description>CPU usage statistics</description>
+        ///     </item>
+        /// </list>  
+        /// </summary>
+        /// <param name="containerId">ContainerId whose stats are to be retrieved</param>
+        /// <param name="filterName"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception">Filter for a particular containerId are to be retrieved</exception>
+        [HttpGet("{containerId=all}/{filterName=all}")]
+        public IActionResult GetLog(string instance,
+            string containerId,
+            string filterName)
+        {
+            try
+            {
+                lock (SiteInstStatsLock)
+                {
+                    if (_siteInstanceStats == null) throw new Exception("Metering stats not available right now.");
+                    if (containerId.Equals("all"))
+                    {
+                        return Ok(JsonConvert.SerializeObject(_siteInstanceStats));
+                    }
+                    else
+                    {
+                        var areContainerStatsAvailable =
+                            _siteInstanceStats.appContainersOnThisInstance.ContainsKey(containerId);
+                        if (areContainerStatsAvailable)
+                        {
+                            if (filterName.Equals("all"))
+                            {
+                                return Ok(JsonConvert.SerializeObject(
+                                    _siteInstanceStats.appContainersOnThisInstance[containerId]));
+                            }
+
+                            switch (filterName)
+                            {
+                                case "eth0":
+                                    return Ok(JsonConvert.SerializeObject(
+                                        _siteInstanceStats.appContainersOnThisInstance[containerId].Eth0));
+                                case "memory_stats":
+                                    return Ok(JsonConvert.SerializeObject(
+                                        _siteInstanceStats.appContainersOnThisInstance[containerId].MemoryStats));
+                                case "precpu_stats":
+                                    return Ok(JsonConvert.SerializeObject(
+                                        _siteInstanceStats.appContainersOnThisInstance[containerId].PreviousCpuStats));
+                                case "cpu_stats":
+                                    return Ok(JsonConvert.SerializeObject(
+                                        _siteInstanceStats.appContainersOnThisInstance[containerId].CurrentCpuStats));
+                                default:
+                                    return BadRequest("Stats for filter " + filterName + " for container " +
+                                                      containerId + " not found.");
+                            }
+                        }
+                        else
+                        {
+                            return BadRequest("Stats for container " + containerId + " not found.");
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError,
+                    JsonConvert.SerializeObject(new ExceptionResponse(ex.Message, ex.StackTrace)));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Kudu.Services/ExceptionResponse.cs b/Kudu.Services/ExceptionResponse.cs
new file mode 100644
index 00000000..5c719e24
--- /dev/null
+++ b/Kudu.Services/ExceptionResponse.cs
@@ -0,0 +1,18 @@
+namespace Kudu.Services
+{
+    /// <summary>
+    /// Contract to return JSON Exception response
+    /// when calls are made to the REST APIs
+    /// </summary>
+    public class ExceptionResponse
+    {
+        string exceptionMessage;
+        string exceptionStackTrace;
+
+        public ExceptionResponse(string exceptionMessage, string exceptionStackTrace)
+        {
+            this.exceptionMessage = exceptionMessage;
+            this.exceptionStackTrace = exceptionStackTrace;
+        }
+    }
+}
\ No newline at end of file

From 4d1e1e1556f52d509beef53ba586a43742638ba0 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 2 Jan 2019 10:32:34 -0800
Subject: [PATCH 002/245] Added some comments, initial support for swagger
 docs, added patch to ensure smooth transition btw mono kudu and kudu lite, 10
 seconds to restart message for deployments in newui

---
 Common/Constants.cs                           |   2 +-
 .../Infrastructure/RouteBuilderExtensions.cs  |  33 +-
 Kudu.Services.Web/Kudu.Services.Web.csproj    |  13 +-
 Kudu.Services.Web/KuduWebUtil.cs              | 454 ++++++++++++++
 Kudu.Services.Web/Pages/Index.cshtml          |   3 -
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    |  63 +-
 Kudu.Services.Web/PathResolver.cs             |  22 +-
 Kudu.Services.Web/Program.cs                  |   9 -
 .../Services/DeploymentEnvironment.cs         |  60 +-
 .../Services/ServiceExtensions.cs             |  49 +-
 Kudu.Services.Web/Startup.cs                  | 557 ++++++++++--------
 Kudu.Services.Web/Tracing/TraceMiddleware.cs  | 147 +++--
 Kudu.Services.Web/Tracing/TraceServices.cs    |  41 +-
 Kudu.Services.Web/Util.cs                     | 297 ----------
 .../wwwroot/Content/Scripts/jsonTree.js       |  14 +-
 .../Diagnostics/ContainerInfoController.cs    |  30 +-
 Kudu.Services/ExceptionResponse.cs            |  20 +-
 Kudu.Services/Kudu.Services.csproj            |   3 +
 .../Util/RetrictToLocalHostAttribute.cs       |  23 +
 README.md                                     |   4 +-
 20 files changed, 1069 insertions(+), 775 deletions(-)
 create mode 100644 Kudu.Services.Web/KuduWebUtil.cs
 delete mode 100644 Kudu.Services.Web/Util.cs
 create mode 100644 Kudu.Services/Util/RetrictToLocalHostAttribute.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 662e2010..f4135d8a 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -129,6 +129,6 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string SitePackages = "SitePackages";
         public const string SiteVersionTxt = "siteversion.txt";
         public const string PackageNameTxt = "packagename.txt";
-        public const string KuduBuild = "1.0.0.5";
+        public const string KuduBuild = "1.0.0.6";
     }
 }
\ No newline at end of file
diff --git a/Kudu.Services.Web/Infrastructure/RouteBuilderExtensions.cs b/Kudu.Services.Web/Infrastructure/RouteBuilderExtensions.cs
index 71ad6cf0..b6b0e498 100644
--- a/Kudu.Services.Web/Infrastructure/RouteBuilderExtensions.cs
+++ b/Kudu.Services.Web/Infrastructure/RouteBuilderExtensions.cs
@@ -1,12 +1,11 @@
 using System;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Routing;
 
 namespace Kudu.Services.Web.Infrastructure
 {
-
     // CORE NOTE This was renamed/reworked from RouteCollectionExtensions
-    
+
     /// <summary>
     /// 
     /// </summary>
@@ -16,34 +15,42 @@ public static class RouteBuilderExtensions
     {
         public const string DeprecatedKey = "deprecated";
 
-        public static void MapHttpWebJobsRoute(this IRouteBuilder routes, string name, string jobType, string routeTemplate, object defaults, object constraints = null)
+        public static void MapHttpWebJobsRoute(this IRouteBuilder routes, string name, string jobType,
+            string routeTemplate, object defaults, object constraints = null)
         {
             // e.g. api/continuouswebjobs/foo
-            routes.MapHttpRoute(name, String.Format("api/{0}webjobs{1}", jobType, routeTemplate), defaults, constraints, deprecated: false);
+            routes.MapHttpRoute(name, String.Format("api/{0}webjobs{1}", jobType, routeTemplate), defaults, constraints,
+                deprecated: false);
 
             // e.g. api/triggeredjobs/foo/history/17
-            routes.MapHttpRoute(name + "-dep", String.Format("api/{0}jobs{1}", jobType, routeTemplate), defaults, constraints, deprecated: true);
+            routes.MapHttpRoute(name + "-dep", String.Format("api/{0}jobs{1}", jobType, routeTemplate), defaults,
+                constraints, deprecated: true);
 
             // e.g. jobs/triggered/foo/history/17 and api/jobs/triggered/foo/history/17
-            routes.MapHttpRouteDual(name + "-old", String.Format("jobs/{0}{1}", jobType, routeTemplate), defaults, constraints, bothDeprecated: true);
+            routes.MapHttpRouteDual(name + "-old", String.Format("jobs/{0}{1}", jobType, routeTemplate), defaults,
+                constraints, bothDeprecated: true);
         }
 
-        public static void MapHttpProcessesRoute(this IRouteBuilder routes, string name, string routeTemplate, object defaults, object constraints = null)
+        public static void MapHttpProcessesRoute(this IRouteBuilder routes, string name, string routeTemplate,
+            object defaults, object constraints = null)
         {
             // e.g. api/processes/3958/dump
-            routes.MapHttpRoute(name + "-direct", "api/processes" + routeTemplate, defaults, constraints, deprecated: false);
+            routes.MapHttpRoute(name + "-direct", "api/processes" + routeTemplate, defaults, constraints,
+                deprecated: false);
 
             // e.g. api/diagnostics/processes/4845
             routes.MapHttpRouteDual(name, "diagnostics/processes" + routeTemplate, defaults, constraints);
         }
 
-        public static void MapHttpRouteDual(this IRouteBuilder routes, string name, string routeTemplate, object defaults, object constraints = null, bool bothDeprecated = false)
+        public static void MapHttpRouteDual(this IRouteBuilder routes, string name, string routeTemplate,
+            object defaults, object constraints = null, bool bothDeprecated = false)
         {
             routes.MapHttpRoute(name + "-dep", routeTemplate, defaults, constraints, deprecated: true);
             routes.MapHttpRoute(name, "api/" + routeTemplate, defaults, constraints, deprecated: bothDeprecated);
         }
 
-        public static void MapHttpRoute(this IRouteBuilder routes, string name, string routeTemplate, object defaults, object constraints, bool deprecated)
+        public static void MapHttpRoute(this IRouteBuilder routes, string name, string routeTemplate, object defaults,
+            object constraints, bool deprecated)
         {
             // CORE TODO Note that the only place that the deprecated datatoken is used, it only checks to see
             // if the key is *there*, not the bool value of it, so this is a little awkward looking due to the way
@@ -51,7 +58,7 @@ public static void MapHttpRoute(this IRouteBuilder routes, string name, string r
             if (deprecated)
             {
                 name += "-dep";
-                routes.MapRoute(name, routeTemplate, defaults, constraints, new { DeprecatedKey = true });
+                routes.MapRoute(name, routeTemplate, defaults, constraints, new {DeprecatedKey = true});
             }
             else
             {
@@ -79,4 +86,4 @@ public static void MapHandler<THandler>(this IRouteBuilder routes, IKernel kerne
         }
         */
     }
-}
+}
\ No newline at end of file
diff --git a/Kudu.Services.Web/Kudu.Services.Web.csproj b/Kudu.Services.Web/Kudu.Services.Web.csproj
index 2e86f400..8a3dc344 100644
--- a/Kudu.Services.Web/Kudu.Services.Web.csproj
+++ b/Kudu.Services.Web/Kudu.Services.Web.csproj
@@ -8,6 +8,8 @@
     <NoWarn>$(NoWarn);NU1608</NoWarn>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
     <NoWarn>$(NoWarn);NU1604</NoWarn>
+    <NoWarn>$(NoWarn);NU1591</NoWarn>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
   <PropertyGroup>
@@ -20,12 +22,14 @@
     <Message Importance="High" Text="%0a+++ Building KuduLite +++%0a%0a" />
   </Target>
   <ItemGroup>
+    <PackageReference Include="AspNetCore.RouteAnalyzer" Version="0.5.3" />
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.App"/>
+    <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Proxy"/>
-    <PackageReference Include="Microsoft.Diagnostics.Runtime"/>
+    <PackageReference Include="Microsoft.AspNetCore.Proxy" />
+    <PackageReference Include="Microsoft.Diagnostics.Runtime" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
   </ItemGroup>
   <Target Name="_IncludePrePublishGeneratedContent" BeforeTargets="GetCopyToPublishDirectoryItems" Condition=" '$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true' " />
@@ -37,14 +41,11 @@
     <!-- Odds and ends for the Scripts\ directory -->
     <ContentWithTargetPath Include="$(NuGetPackageRoot)KuduSync.NET\**\tools\*" TargetPath="Scripts\%(FileName)%(Extension)" CopyToOutputDirectory="Always" />
     <ContentWithTargetPath Include="$(NuGetPackageRoot)KuduHandles\**\KuduHandles.exe" TargetPath="Scripts\KuduHandles.exe" CopyToOutputDirectory="Always" />
-    <!-- TODO this relative path may change -->
   </ItemGroup>
   <ItemGroup>
     <Folder Include="wwwroot\Content\Styles\" />
     <Folder Include="wwwroot\Content\Scripts\" />
   </ItemGroup>
-  <!-- CORE TODO this used to have a "BuildOutputsUpdated" condition that used compile timestamps. Not sure if they're still available. -->
-  <!-- CORE TODO I think the best way to make this work right with publish is to restore to the source folder and then add a dynamic ContentWithTargetPath -->
   <!-- Run updateNodeModules to install kuduscript -->  
   <Target Name="PutNodeModulesInBinDir" AfterTargets="Build">    
 	  <Exec Command="$(ProjectDir)\updateNodeModules.cmd &quot;$(PublishDir)&quot;" Condition="'$(OS)' == 'Windows_NT' AND  '$(Configuration)'=='Release'" />
diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
new file mode 100644
index 00000000..30171753
--- /dev/null
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -0,0 +1,454 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Kudu.Contracts.Infrastructure;
+using Kudu.Contracts.Settings;
+using Kudu.Contracts.Tracing;
+using Kudu.Core;
+using Kudu.Core.Deployment;
+using Kudu.Core.Helpers;
+using Kudu.Core.Infrastructure;
+using Kudu.Core.Settings;
+using Kudu.Core.Tracing;
+using Kudu.Services.Infrastructure;
+using Kudu.Services.Web.Tracing;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Environment = Kudu.Core.Environment;
+
+namespace Kudu.Services.Web
+{
+    internal static class KuduWebUtil
+    {
+        private const string KuduConsoleFilename = "kudu.dll";
+        private const string KuduConsoleRelativePath = "KuduConsole";
+
+        private static Dictionary<string, IOperationLock> _namedLocks;
+
+        private static DeploymentLockFile _deploymentLock;
+
+        // <summary>
+        // This method initializes status,ssh,hooks & deployment locks used by Kudu to ensure
+        // synchronized operations. This method creates a dictionary of locks which is injected
+        // into various controllers to resolve the locks they need.
+        // <list type="bullet">  
+        //     <listheader>  
+        //         <term>Locks used by Kudu:</term>  
+        //     </listheader>  
+        //     <item>  
+        //         <term>Status Lock</term>  
+        //         <description>Used by DeploymentStatusManager</description>  
+        //     </item> 
+        //     <item>  
+        //         <term>SSH Lock</term>  
+        //         <description>Used by SSHKeyController</description>  
+        //     </item> 
+        //     <item>  
+        //         <term>Hooks Lock</term>  
+        //         <description>Used by WebHooksManager</description>  
+        //     </item> 
+        //     <item>  
+        //         <term>Deployment Lock</term>  
+        //         <description>
+        //             Used by DeploymentController, DeploymentManager, SettingsController, 
+        //             FetchDeploymentManager, LiveScmController, ReceivePackHandlerMiddleware
+        //         </description>  
+        //     </item> 
+        // </list>  
+        // </summary>
+        // <remarks>
+        //     Uses File watcher.
+        //     This originally used Ninject's "WhenInjectedInto" in .Net project for specific instances. IServiceCollection
+        //     doesn't support this concept, or anything similar like named instances. There are a few possibilities, 
+        //     but the hack solution for now is just injecting a dictionary of locks and letting each dependent resolve 
+        //     the one it needs.
+        // </remarks>
+        private static void SetupLocks(ITraceFactory traceFactory, IEnvironment environment)
+        {
+            var lockPath = Path.Combine(environment.SiteRootPath, Constants.LockPath);
+            var deploymentLockPath = Path.Combine(lockPath, Constants.DeploymentLockFile);
+            var statusLockPath = Path.Combine(lockPath, Constants.StatusLockFile);
+            var sshKeyLockPath = Path.Combine(lockPath, Constants.SSHKeyLockFile);
+            var hooksLockPath = Path.Combine(lockPath, Constants.HooksLockFile);
+            _deploymentLock = DeploymentLockFile.GetInstance(deploymentLockPath, traceFactory);
+            _deploymentLock.InitializeAsyncLocks();
+
+            var statusLock = new LockFile(statusLockPath, traceFactory);
+            statusLock.InitializeAsyncLocks();
+            var sshKeyLock = new LockFile(sshKeyLockPath, traceFactory);
+            sshKeyLock.InitializeAsyncLocks();
+            var hooksLock = new LockFile(hooksLockPath, traceFactory);
+            hooksLock.InitializeAsyncLocks();
+
+            _namedLocks = new Dictionary<string, IOperationLock>
+            {
+                {"status", statusLock},
+                {"ssh", sshKeyLock},
+                {"hooks", hooksLock},
+                {"deployment", _deploymentLock}
+            };
+        }
+
+
+        internal static void SetupFileServer(IApplicationBuilder app, IEnvironment webAppRuntimeEnvironment)
+        {
+            // Set up custom content types - associating file extension to MIME type
+            var provider = new FileExtensionContentTypeProvider
+            {
+                Mappings =
+                {
+                    [".py"] = "text/html",
+                    [".env"] = "text/html",
+                    [".cshtml"] = "text/html",
+                    [".image"] = "image/png"
+                }
+            };
+
+            app.UseFileServer(new FileServerOptions
+            {
+                FileProvider = new PhysicalFileProvider(
+                    webAppRuntimeEnvironment.WebRootPath),
+                RequestPath = "/wwwroot",
+                EnableDirectoryBrowsing = true,
+                StaticFileOptions = {ContentTypeProvider = provider}
+            });
+        }
+
+        /// <summary>
+        /// Returns absolute URL for a request including host, path and the query string
+        /// </summary>
+        /// <param name="httpContext">
+        /// Object encapsulating all HTTP-specific information about an individual HTTP request.
+        /// </param>
+        /// <returns></returns>
+        internal static Uri GetAbsoluteUri(HttpContext httpContext)
+        {
+            var request = httpContext.Request;
+            var uriBuilder = new UriBuilder
+            {
+                Scheme = request.Scheme,
+                Host = request.Host.Host,
+                Path = request.Path.ToString(),
+                Query = request.QueryString.ToString()
+            };
+            return uriBuilder.Uri;
+        }
+
+        /// <summary>
+        /// Returns the tracer objects for request tracing
+        /// </summary>
+        internal static ITracer GetTracer(IServiceProvider serviceProvider)
+        {
+            var environment = serviceProvider.GetRequiredService<IEnvironment>();
+            var level = serviceProvider.GetRequiredService<IDeploymentSettingsManager>().GetTraceLevel();
+            var contextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
+            var httpContext = contextAccessor.HttpContext;
+            var requestTraceFile = TraceServices.GetRequestTraceFile(httpContext);
+            if (level <= TraceLevel.Off || requestTraceFile == null) return NullTracer.Instance;
+            var textPath = Path.Combine(environment.TracePath, requestTraceFile);
+            return new CascadeTracer(new XmlTracer(environment.TracePath, level),
+                new TextTracer(textPath, level));
+        }
+
+        /// <summary>
+        /// Returns the name of the trace file. Each request is associated with a Tracing GUID, returns this guid.
+        /// </summary>
+        internal static string GetRequestTraceFile(IServiceProvider serviceProvider)
+        {
+            var traceLevel = serviceProvider.GetRequiredService<IDeploymentSettingsManager>().GetTraceLevel();
+            if (traceLevel <= TraceLevel.Off) return null;
+            var contextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
+            var httpContext = contextAccessor.HttpContext;
+            return TraceServices.GetRequestTraceFile(httpContext);
+        }
+
+
+        /// <summary>
+        /// Ensures smooth transition between mono based Kudu and KuduLite.
+        /// <remarks>
+        /// <list type="bullet">
+        ///     <item>
+        ///         POST Receive GitHook File:This file was previously hard coded with mono path to launch kudu console.
+        ///     </item>
+        ///     <item>
+        ///         We will would use the OryxBuild in future for deployments, as a safety measure we clear
+        ///         the deployment script.
+        ///     </item>
+        /// </list>
+        /// </remarks>
+        /// </summary>
+        /// <param name="environment"></param>
+        internal static void MigrateToNetCorePatch(IEnvironment environment)
+        {
+            var gitPostReceiveHookFile = Path.Combine(environment.RepositoryPath, ".git", "hooks", "post-receive");
+            if (FileSystemHelpers.FileExists(gitPostReceiveHookFile))
+            {
+                var fileText = "";
+                if ((fileText = FileSystemHelpers.ReadAllText(gitPostReceiveHookFile)).Contains("/usr/bin/mono"))
+                {
+                    FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("/usr/bin/mono", "dotnet"));
+                }
+            }
+
+            if (FileSystemHelpers.DirectoryExists(Path.Combine(environment.RootPath, ".mono"))
+                && FileSystemHelpers.FileExists(Path.Combine(environment.DeploymentToolsPath, "deploy.sh")))
+            {
+                FileSystemHelpers.DeleteFileSafe(Path.Combine(environment.DeploymentToolsPath, "deploy.sh"));
+            }
+        }
+
+
+        internal static void TraceShutdown(IEnvironment environment, IDeploymentSettingsManager settings)
+        {
+            ITracer tracer = GetTracerWithoutContext(environment, settings);
+            var attribs = new Dictionary<string, string>();
+
+            // Add an attribute containing the process, AppDomain and Thread ids to help debugging
+            attribs.Add("pid", String.Format("{0},{1},{2}",
+                Process.GetCurrentProcess().Id,
+                AppDomain.CurrentDomain.Id.ToString(),
+                Thread.CurrentThread.ManagedThreadId));
+
+            attribs.Add("uptime", TraceMiddleware.UpTime.ToString());
+
+            attribs.Add("lastrequesttime", TraceMiddleware.LastRequestTime.ToString());
+
+            tracer.Trace(XmlTracer.ProcessShutdownTrace, attribs);
+
+            OperationManager.SafeExecute(() =>
+            {
+                KuduEventSource.Log.GenericEvent(
+                    ServerConfiguration.GetApplicationName(),
+                    string.Format("Shutdown pid:{0}, domain:{1}", Process.GetCurrentProcess().Id,
+                        AppDomain.CurrentDomain.Id),
+                    string.Empty,
+                    string.Empty,
+                    string.Empty,
+                    string.Empty);
+            });
+        }
+
+        internal static ITracer GetTracerWithoutContext(IEnvironment environment, IDeploymentSettingsManager settings)
+        {
+            // when file system has issue, this can throw (environment.TracePath calls EnsureDirectory).
+            // prefer no-op tracer over outage.  
+            return OperationManager.SafeExecute(() =>
+            {
+                var traceLevel = settings.GetTraceLevel();
+                return traceLevel > TraceLevel.Off
+                    ? new XmlTracer(environment.TracePath, traceLevel)
+                    : NullTracer.Instance;
+            }) ?? NullTracer.Instance;
+        }
+
+        /// <summary>
+        /// Returns the ILogger object to log deployments
+        /// </summary>
+        internal static ILogger GetDeploymentLogger(IServiceProvider serviceProvider)
+        {
+            var environment = serviceProvider.GetRequiredService<IEnvironment>();
+            var level = serviceProvider.GetRequiredService<IDeploymentSettingsManager>().GetTraceLevel();
+            var contextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
+            var httpContext = contextAccessor.HttpContext;
+            var requestTraceFile = TraceServices.GetRequestTraceFile(httpContext);
+            if (level <= TraceLevel.Off || requestTraceFile == null) return NullLogger.Instance;
+            var textPath = Path.Combine(environment.DeploymentTracePath, requestTraceFile);
+            return new TextLogger(textPath);
+        }
+
+        /// <summary>
+        /// Returns a specified environment configuration as the current webapp's
+        /// default configuration during the runtime.
+        /// </summary>
+        internal static IEnvironment GetEnvironment(IHostingEnvironment hostingEnvironment,
+            IDeploymentSettingsManager settings = null,
+            IHttpContextAccessor httpContextAccessor = null)
+        {
+            var root = PathResolver.ResolveRootPath();
+            var siteRoot = Path.Combine(root, Constants.SiteFolder);
+            var repositoryPath = Path.Combine(siteRoot,
+                settings == null ? Constants.RepositoryPath : settings.GetRepositoryPath());
+            var binPath = AppContext.BaseDirectory;
+            var requestId = httpContextAccessor?.HttpContext.Request.GetRequestId();
+            var kuduConsoleFullPath =
+                Path.Combine(AppContext.BaseDirectory, KuduConsoleRelativePath, KuduConsoleFilename);
+            return new Environment(root, EnvironmentHelper.NormalizeBinPath(binPath), repositoryPath, requestId,
+                kuduConsoleFullPath, httpContextAccessor);
+        }
+
+        /// <summary>
+        /// Ensures %HOME% is correctly set
+        /// </summary>
+        internal static void EnsureHomeEnvironmentVariable()
+        {
+            // PlatformServices.Default and the injected IHostingEnvironment have at runtime.
+            if (Directory.Exists(System.Environment.ExpandEnvironmentVariables(@"%HOME%"))) return;
+
+            //For Debug
+            System.Environment.SetEnvironmentVariable("HOME", OSDetector.IsOnWindows() ? @"F:\kudu-debug" : "/home");
+
+            /*
+            // If MapPath("/_app") returns a valid folder, set %HOME% to that, regardless of
+            // it current value. This is the non-Azure code path.
+            string path = HostingEnvironment.MapPath(Constants.MappedSite);
+            if (Directory.Exists(path))
+            {
+                path = Path.GetFullPath(path);
+                System.Environment.SetEnvironmentVariable("HOME", path);
+            }
+            */
+        }
+
+        /// <summary>
+        /// Ensures valid /home/site/deployments/settings.xml is loaded, deletes
+        /// corrupt settings.xml file
+        /// </summary>
+        /// <param name="environment">
+        /// IEnvironment object that maintains paths used by kudu 
+        /// </param>
+        internal static void EnsureValidDeploymentXmlSettings(IEnvironment environment)
+        {
+            var path = GetSettingsPath(environment);
+            if (!FileSystemHelpers.FileExists(path)) return;
+            try
+            {
+                var settings = new DeploymentSettingsManager(new XmlSettings.Settings(path));
+                settings.GetValue(SettingsKeys.TraceLevel);
+            }
+            catch (Exception ex)
+            {
+                DateTime lastWriteTimeUtc = DateTime.MinValue;
+                OperationManager.SafeExecute(() => lastWriteTimeUtc = File.GetLastWriteTimeUtc(path));
+                // trace initialization error
+                KuduEventSource.Log.KuduException(
+                    ServerConfiguration.GetApplicationName(),
+                    "Startup.cs",
+                    string.Empty,
+                    string.Empty,
+                    string.Format("Invalid '{0}' is detected and deleted.  Last updated time was {1}.", path,
+                        lastWriteTimeUtc),
+                    ex.ToString());
+                File.Delete(path);
+            }
+        }
+
+        internal static void PrependFoldersToPath(IEnvironment environment)
+        {
+            var folders = PathUtilityFactory.Instance.GetPathFolders(environment);
+
+            var path = System.Environment.GetEnvironmentVariable("PATH");
+            // Ignore any folder that doesn't actually exist
+            var additionalPaths =
+                string.Join(Path.PathSeparator.ToString(), folders.Where(Directory.Exists));
+
+            // Make sure we haven't already added them. This can happen if the Kudu appdomain restart (since it's still same process)
+            if (path != null && path.Contains(additionalPaths)) return;
+            path = additionalPaths + Path.PathSeparator + path;
+
+            // PHP 7 was mistakenly added to the path unconditionally on Azure. To work around, if we detect
+            // some PHP v5.x anywhere on the path, we yank the unwanted PHP 7
+            // TODO: remove once the issue is fixed on Azure
+            if (path.Contains(@"PHP\v5"))
+            {
+                path = path.Replace(@"D:\Program Files (x86)\PHP\v7.0" + Path.PathSeparator, String.Empty);
+            }
+
+            System.Environment.SetEnvironmentVariable("PATH", path);
+        }
+
+        /// <summary>
+        /// Sets the environment variables for Net Core CLI. 
+        /// </summary>
+        /// <remarks>
+        /// This method previously included environment variables to optimize net core runtime to run in a container.
+        /// But they have been moved to the Kudu Dockerfile
+        /// </remarks>>
+        /// <param name="environment">
+        /// IEnvironment object that maintains references to al the paths used by Kudu during runtime.
+        /// </param>
+        internal static void EnsureDotNetCoreEnvironmentVariable(IEnvironment environment)
+        {
+            if (Environment.IsAzureEnvironment())
+            {
+                // On Azure, restore nuget packages to d:\home\.nuget so they're persistent. It also helps
+                // work around https://github.com/projectkudu/kudu/issues/2056.
+                // Note that this only applies to project.json scenarios (not packages.config)
+                SetEnvironmentVariableIfNotYetSet("NUGET_PACKAGES", Path.Combine(environment.RootPath, ".nuget"));
+
+                // Set the telemetry environment variable
+                SetEnvironmentVariableIfNotYetSet("DOTNET_CLI_TELEMETRY_PROFILE", "AzureKudu");
+            }
+            else
+            {
+                // Set it slightly differently if outside of Azure to differentiate
+                SetEnvironmentVariableIfNotYetSet("DOTNET_CLI_TELEMETRY_PROFILE", "Kudu");
+            }
+        }
+
+        /// <summary>
+        /// Returns the singleton Deployment Lock Object
+        /// </summary>
+        /// <param name="traceFactory"></param>
+        /// <param name="environment"></param>
+        /// <returns></returns>
+        internal static DeploymentLockFile GetDeploymentLock(ITraceFactory traceFactory, IEnvironment environment)
+        {
+            if (_namedLocks == null || _deploymentLock == null)
+            {
+                GetNamedLocks(traceFactory, environment);
+            }
+
+            return _deploymentLock;
+        }
+
+        /// <summary>
+        /// Returns a dictionary containing references to all the singleton lock objects. Initialises these locks
+        /// if they have not been initialised 
+        /// </summary>
+        /// <param name="traceFactory"></param>
+        /// <param name="environment"></param>
+        /// <returns></returns>
+        internal static Dictionary<string, IOperationLock> GetNamedLocks(ITraceFactory traceFactory,
+            IEnvironment environment)
+        {
+            if (_namedLocks == null)
+            {
+                SetupLocks(traceFactory, environment);
+            }
+
+            return _namedLocks;
+        }
+
+        // <summary>
+        // Adds an environment variable for site bitness. Can be "AMD64" or "x86";
+        // </summary>
+        internal static void EnsureSiteBitnessEnvironmentVariable()
+        {
+            SetEnvironmentVariableIfNotYetSet("SITE_BITNESS",
+                System.Environment.Is64BitProcess ? Constants.X64Bit : Constants.X86Bit);
+        }
+
+        private static void SetEnvironmentVariableIfNotYetSet(string name, string value)
+        {
+            if (System.Environment.GetEnvironmentVariable(name) == null)
+            {
+                System.Environment.SetEnvironmentVariable(name, value);
+            }
+        }
+
+        /// <summary>
+        /// Returns the path to the settings.xml file in the deployments directory
+        /// </summary>
+        internal static string GetSettingsPath(IEnvironment environment)
+        {
+            return Path.Combine(environment.DeploymentsPath, Constants.DeploySettingsPath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Kudu.Services.Web/Pages/Index.cshtml b/Kudu.Services.Web/Pages/Index.cshtml
index d7b1a1b7..51e23afd 100644
--- a/Kudu.Services.Web/Pages/Index.cshtml
+++ b/Kudu.Services.Web/Pages/Index.cshtml
@@ -30,7 +30,6 @@
         Assembly assembly;
         try
         {
-            //return "test";
             assembly = Assembly.Load("Microsoft.Web.Hosting, Version=7.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
             var fileVersionInfo = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
             return fileVersionInfo.ProductVersion;
@@ -48,7 +47,6 @@
 </style>
 <div class="container">
     @{
-        //string commitFile = Server.MapPath("~/commit.txt");
         string commitFile = System.IO.Path.Combine(hostingEnvironment.WebRootPath, "commit.txt");
         string sha = System.IO.File.Exists(commitFile) ? System.IO.File.ReadAllText(commitFile).Trim() : null;
         var version = typeof(Kudu.Services.Web.Tracing.TraceMiddleware).Assembly.GetName().Version;
@@ -86,7 +84,6 @@
         </div>
         <div>
             @Kudu.Services.Web.Tracing.TraceMiddleware.UpTime.ToString(@"dd\.hh\:mm\:ss")
-            12345
         </div>
     </div>
     <div class="row">
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index d9a54ba7..d21a3d15 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -33,9 +33,6 @@
 </script>
 
 @{
-    //string commitFile = Server.MapPath("~/commit.txt");
-    var commitFile = System.IO.Path.Combine(hostingEnvironment.WebRootPath, "commit.txt");
-    var sha = System.IO.File.Exists(commitFile) ? System.IO.File.ReadAllText(commitFile).Trim() : null;
     var workerIdHash = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
     var workerIdShortHash = workerIdHash?.Substring(0, 12);
     const string version = Constants.KuduBuild;
@@ -76,16 +73,23 @@
             <div class="progress" style="margin-left: 15px; margin-right: 10px">
                 <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%; background-color: #26C281"></div>
             </div>
-        </div>
+        </div>     
         <div class="col-md-5" id="just-deployed-banner" style="display: none">
-            <div class="col-md-9 row-fluid">
-                Deployment Successful
-            </div>
-            <div class="col-md-3 row-fluid">
-                <div class="centering text-center">
-                    <h2 style="font-weight: 300"> <i class="fas fa-check-circle" style="color: #26c281"></i></h2>
+            
+            <div class="col-md-10 row-fluid">
+                <h6 style="font-weight: 400; margin-bottom: -10px">
+                    Deployment &nbsp;
+                    <p class="badge badge-secondary inconsolata align-left" style="background-color: #343a40; color: #fafafa"> Successful <i class="fas fa-check-circle" style="color: #26C281;"></i>&nbsp;</p>
+                </h6>
+                <div class="row-fluid">
+                    <small style="color: #42526e"> Performing an Overlapped Recycle of your WebApp. Your changes would reflect in <span id="timer2"></span> seconds</small>
                 </div>
             </div>
+            <div class="col-md-2 row-fluid" style="margin: 0px">
+                <button type="button" class="btn btn-primary btn-sm">
+                    <i class="fas fa-recycle"></i> <span id="timer" class="badge badge-light"></span> Seconds
+                </button>
+            </div>
         </div>
         <div class="col-md-5" id="last-deployed-banner" style="@lastDeployedDisplayVal">
             <div class="col-md-9 row-fluid" style="height: 100%">
@@ -106,18 +110,13 @@
         </div>
         <div class="col-md-5" id="appsvc-welcome-banner" style="@welcomeBannerDisplayVal">
             <div class="container" style="height: 100%; width: 100%; display: flex; align-items: center; vertical-align: middle">
-                <div class="row text-center">
-                    <div class="col-sm-12 col-md-4 col-md-offset-0">
+                <div class="row-fluid">
+                    <div class="col-md-6 text-center">
                         <div class="wrapper">
                             <a class="btn btn-primary btn-sm" href="#" role="button"><i class="fas fa-cloud-upload-alt"></i>Deploy your first app</a>
                         </div>
                     </div>
-                    <div class="col-sm-12 col-md-4 col-md-offset-0">
-                        <div class="wrapper">
-                            <a class="btn btn-primary btn-sm align-middle bkg-light-gray border-0" href="#" role="button" style="margin-left: -10px"><i class="fab fa-wikipedia-w"></i> Read Kudu Wiki</a>
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-4 col-md-offset-0">
+                    <div class="col-sm-12 col-md-6 text-center">
                         <div class="wrapper">
                             <a class="btn btn-primary btn-sm align-middle bkg-light-gray border-0" href="#" role="button" style="margin-left: -10px"> Learn Node <i class="fab fa-node-js"></i> Development</a>
                         </div>
@@ -251,15 +250,14 @@
                 }
                 console.log("API call done "+wasDeploying);
                 $("#appsvc-welcome-banner").css("display", "none");
-
+                $("#just-deployed-banner").css("display", "none");
+                $("#diagnose-btn").css("display","none");
                 if (!wasDeploying) {
                     $("#last-deployed-banner").css("display", "block");
                     if (data["status"] === 4) {
                         $("#latest-deployment-id")
                             .html("Successful &nbsp;<i class=\"fas fa-check-circle\" style=\"color: #26C281;\"></i>")
                             .prop('title', 'Deployment Status');
-                        $("#investigate-deployment")
-                            .html("<i class=\"fab fa-searchengin\"></i> Analyze on AppLens");
                     } else if (data["status"] === 1 || data["status"] === 2) {
                         $("#latest-deployment-id")
                             .html("Pending &nbsp;<i class=\"fas fa-exclamation-circle\" style=\"color: #ff5e57;\"></i>")
@@ -288,15 +286,34 @@
                         "/newui/jsonviewer?view_url=/api/deployments/" + data["id"] + "/log");
 
                     $("#latest-deployment-deployer").prop("title", "Deployed by " + data["author"]);
-                } else {
-                    
+                } else {           
                     $("#just-deployed-banner").css("display", "inline-block");
+                    setTimeout(timer, 1000);
                     wasDeploying = false;
                 }
             }
         });
     };
 
+    var count = 10;
+    function timer()
+    {
+        count=count-1;
+        if (count <= 0)
+        {
+            //clearInterval(counter);
+            console.log("counter overrrrrrrrr ");
+            count = 10;
+            document.getElementById("timer").innerHTML="0"; 
+            document.getElementById("timer2").innerHTML="0"; 
+            setTimeout(UpdateLatestDeploymentStatus, 1000);
+            return;
+        }
+        document.getElementById("timer").innerHTML=count; 
+        document.getElementById("timer2").innerHTML=count; 
+        setTimeout(timer, 1000);
+    }
+
     UpdateLatestDeploymentStatus();
 
     function timeSince(date) {
diff --git a/Kudu.Services.Web/PathResolver.cs b/Kudu.Services.Web/PathResolver.cs
index de18ba1d..4120fad9 100644
--- a/Kudu.Services.Web/PathResolver.cs
+++ b/Kudu.Services.Web/PathResolver.cs
@@ -8,21 +8,19 @@ public static class PathResolver
         public static string ResolveRootPath()
         {
             // The HOME path should always be set correctly
-            string path = Environment.ExpandEnvironmentVariables(@"%HOME%");
-            if (Directory.Exists(path))
+            var path = Environment.ExpandEnvironmentVariables(@"%HOME%");
+            if (!Directory.Exists(path))
+                // We should never get here
+                throw new DirectoryNotFoundException("The site's home directory could not be located");
+            // For users running Windows Azure Pack 2 (WAP2), %HOME% actually points to the site folder,
+            // which we don't want here. So yank that segment if we detect it.
+            if (Path.GetFileName(path).Equals(Constants.SiteFolder, StringComparison.OrdinalIgnoreCase))
             {
-                // For users running Windows Azure Pack 2 (WAP2), %HOME% actually points to the site folder,
-                // which we don't want here. So yank that segment if we detect it.
-                if (Path.GetFileName(path).Equals(Constants.SiteFolder, StringComparison.OrdinalIgnoreCase))
-                {
-                    path = Path.GetDirectoryName(path);
-                }
-
-                return path;
+                path = Path.GetDirectoryName(path);
             }
 
-            // We should never get here
-            throw new DirectoryNotFoundException("The site's home directory could not be located");
+            return path;
+            
         }
     }
 }
\ No newline at end of file
diff --git a/Kudu.Services.Web/Program.cs b/Kudu.Services.Web/Program.cs
index 4ede7fde..042b0c85 100644
--- a/Kudu.Services.Web/Program.cs
+++ b/Kudu.Services.Web/Program.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Reflection;
-using System.Xml;
 using log4net;
 using log4net.Config;
 using Microsoft.AspNetCore;
@@ -12,14 +11,6 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            
-            /*
-            XmlDocument log4netConfig = new XmlDocument();
-            log4netConfig.Load(File.OpenRead("log4net.config"));
-            var repo = log4net.LogManager.CreateRepository(Assembly.GetEntryAssembly(),
-                typeof(log4net.Repository.Hierarchy.Hierarchy));
-            log4net.Config.XmlConfigurator.Configure(repo, log4netConfig["log4net"]);
-            */
             var logRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
             XmlConfigurator.Configure(logRepository, new FileInfo("log4net.config"));
             CreateWebHostBuilder(args).Build().Run();
diff --git a/Kudu.Services.Web/Services/DeploymentEnvironment.cs b/Kudu.Services.Web/Services/DeploymentEnvironment.cs
index 471ee958..eb6d3197 100644
--- a/Kudu.Services.Web/Services/DeploymentEnvironment.cs
+++ b/Kudu.Services.Web/Services/DeploymentEnvironment.cs
@@ -1,36 +1,24 @@
-using System.IO;	
-using Kudu.Core;	
-using Kudu.Core.Deployment;	
-namespace Kudu.Services.Web.Services	
-{	
-    public class DeploymentEnvironment : IDeploymentEnvironment	
-    {	
-        private readonly IEnvironment _environment;	
-        public DeploymentEnvironment(IEnvironment environment)	
-        {	
-            _environment = environment;	
-        }	
-        public string ExePath	
-        {	
-            get	
-            {	
-                return _environment.KuduConsoleFullPath;	
-            }	
-        }	
-        public string ApplicationPath	
-        {	
-            get	
-            {	
-                return _environment.SiteRootPath;	
-            }	
-        }	
-        public string MSBuildExtensionsPath	
-        {	
-            get	
-            {	
-                // CORE TODO What is this?	
-                return Path.Combine(System.AppContext.BaseDirectory, "msbuild");	
-            }	
-        }	
-    }	
-} 
\ No newline at end of file
+using System;
+using System.IO;
+using Kudu.Core;
+using Kudu.Core.Deployment;
+
+namespace Kudu.Services.Web.Services
+{
+    public class DeploymentEnvironment : IDeploymentEnvironment
+    {
+        private readonly IEnvironment _environment;
+
+        public DeploymentEnvironment(IEnvironment environment)
+        {
+            _environment = environment;
+        }
+
+        public string ExePath => _environment.KuduConsoleFullPath;
+
+        public string ApplicationPath => _environment.SiteRootPath;
+
+        // CORE TODO: Where is this used?
+        public string MSBuildExtensionsPath => Path.Combine(AppContext.BaseDirectory, "msbuild");
+    }
+}
\ No newline at end of file
diff --git a/Kudu.Services.Web/Services/ServiceExtensions.cs b/Kudu.Services.Web/Services/ServiceExtensions.cs
index 62b34bd0..8659a38f 100644
--- a/Kudu.Services.Web/Services/ServiceExtensions.cs
+++ b/Kudu.Services.Web/Services/ServiceExtensions.cs
@@ -1,26 +1,29 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
+using System.IO;
+using System.IO.Compression;
+using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.Settings;
-using Kudu.Core.Settings;
-using XmlSettings;
+using Kudu.Contracts.SourceControl;
+using Kudu.Contracts.Tracing;
 using Kudu.Core;
-using Kudu.Contracts.Infrastructure;
-using Kudu.Core.Tracing;
 using Kudu.Core.Deployment;
 using Kudu.Core.Deployment.Generator;
 using Kudu.Core.Hooks;
-using Kudu.Contracts.SourceControl;
-using Kudu.Services.ServiceHookHandlers;
+using Kudu.Core.Settings;
 using Kudu.Core.SourceControl.Git;
+using Kudu.Core.Tracing;
+using Kudu.Services.Performance;
+using Kudu.Services.ServiceHookHandlers;
 using Kudu.Services.Web.Services;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.ResponseCompression;
-using Microsoft.Azure.Web.DataProtection;
+using Microsoft.Extensions.DependencyInjection;
+using XmlSettings;
 
 namespace Kudu.Services.Web
-{ 
+{
     public static class ServiceExtensions
     {
-        public static void AddGitServiceHookParsers(this IServiceCollection services)
+        internal static void AddGitServiceHookParsers(this IServiceCollection services)
         {
             services.AddScoped<IServiceHookHandler, GenericHandler>();
             services.AddScoped<IServiceHookHandler, GitHubHandler>();
@@ -35,8 +38,21 @@ public static void AddGitServiceHookParsers(this IServiceCollection services)
             services.AddScoped<IServiceHookHandler, VSOHandler>();
             services.AddScoped<IServiceHookHandler, OneDriveHandler>();
         }
+
+        internal static void AddLogStreamService(this IServiceCollection services, 
+            IEnvironment environment, 
+            ITraceFactory traceFactory)
+        {
+            var logStreamManagerLock = KuduWebUtil.GetNamedLocks(traceFactory, environment)["hooks"];
+
+            services.AddTransient(sp => new LogStreamManager(Path.Combine(environment.RootPath, Constants.LogFilesPath),
+                sp.GetRequiredService<IEnvironment>(),
+                sp.GetRequiredService<IDeploymentSettingsManager>(),
+                sp.GetRequiredService<ITracer>(),
+                logStreamManagerLock));
+        }
         
-        public static void AddGitServer(this IServiceCollection services, IOperationLock deploymentLock)
+        internal static void AddGitServer(this IServiceCollection services, IOperationLock deploymentLock)
         {
             services.AddTransient<IDeploymentEnvironment, DeploymentEnvironment>();
             services.AddScoped<IGitServer>(sp =>
@@ -50,13 +66,14 @@ public static void AddGitServer(this IServiceCollection services, IOperationLock
                     sp.GetRequiredService<ITraceFactory>()));
         }
 
-        public static void AddGZipCompression(this IServiceCollection services)
+        internal static void AddGZipCompression(this IServiceCollection services)
         {
-            services.Configure<GzipCompressionProviderOptions>(options => options.Level = System.IO.Compression.CompressionLevel.Optimal);
+            services.Configure<GzipCompressionProviderOptions>(options =>
+                options.Level = CompressionLevel.Optimal);
             services.AddResponseCompression();
         }
 
-        public static void AddWebJobsDependencies(this IServiceCollection services)
+        internal static void AddWebJobsDependencies(this IServiceCollection services)
         {
             //IContinuousJobsManager continuousJobManager = new AggregateContinuousJobsManager(
             //    etwTraceFactory,
@@ -71,7 +88,7 @@ public static void AddWebJobsDependencies(this IServiceCollection services)
             //                     .InTransientScope();
         }
 
-        public static void AddDeployementServices(this IServiceCollection services, IEnvironment environment)
+        internal static void AddDeploymentServices(this IServiceCollection services, IEnvironment environment)
         {
             services.AddScoped<ISettings>(sp => new XmlSettings.Settings(KuduWebUtil.GetSettingsPath(environment)));
             services.AddScoped<IDeploymentSettingsManager, DeploymentSettingsManager>();
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index d365b943..b413dc9f 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -1,38 +1,41 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Routing.Constraints;
-using Kudu.Contracts.Settings;
-using Kudu.Core.Settings;
-using Kudu.Core;
 using System.IO;
+using System.Net;
 using System.Net.Http.Formatting;
 using System.Reflection;
-using Microsoft.AspNetCore.Http;
-using Kudu.Core.Helpers;
-using Kudu.Core.Infrastructure;
+using AspNetCore.RouteAnalyzer;
 using Kudu.Contracts.Infrastructure;
-using Kudu.Core.Tracing;
+using Kudu.Contracts.Settings;
+using Kudu.Contracts.SourceControl;
 using Kudu.Contracts.Tracing;
-using Kudu.Services.Web.Infrastructure;
+using Kudu.Core;
+using Kudu.Core.Commands;
 using Kudu.Core.Deployment;
-using Kudu.Contracts.SourceControl;
+using Kudu.Core.Helpers;
+using Kudu.Core.Infrastructure;
+using Kudu.Core.Settings;
 using Kudu.Core.SourceControl;
-using Kudu.Services.GitServer;
-using Kudu.Core.Commands;
-using Newtonsoft.Json.Serialization;
-using Kudu.Services.Web.Tracing;
 using Kudu.Core.SSHKey;
+using Kudu.Core.Tracing;
 using Kudu.Services.Diagnostics;
+using Kudu.Services.GitServer;
 using Kudu.Services.Performance;
 using Kudu.Services.TunnelServer;
+using Kudu.Services.Web.Infrastructure;
+using Kudu.Services.Web.Tracing;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Extensions.FileProviders;
+using Microsoft.AspNetCore.Routing.Constraints;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Serialization;
+using Swashbuckle.AspNetCore.Swagger;
+using Environment = Kudu.Core.Environment;
 using ILogger = Kudu.Core.Deployment.ILogger;
 
 namespace Kudu.Services.Web
@@ -40,15 +43,15 @@ namespace Kudu.Services.Web
     public class Startup
     {
         private readonly IHostingEnvironment _hostingEnvironment;
-        private IEnvironment _webAppEnvironment;
-        private IHttpContextAccessor _httpContextAccessor;
-        private static readonly ServerConfiguration serverConfiguration = new ServerConfiguration();
+        private IEnvironment _webAppRuntimeEnvironment;
+        private IDeploymentSettingsManager _noContextDeploymentsSettingsManager;
+        private static readonly ServerConfiguration ServerConfiguration = new ServerConfiguration();
 
         public Startup(IConfiguration configuration, IHostingEnvironment hostingEnvironment)
         {
-            Console.WriteLine("\nStartup : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
+            Console.WriteLine(@"Startup : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
             Configuration = configuration;
-            this._hostingEnvironment = hostingEnvironment;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         private IConfiguration Configuration { get; }
@@ -59,25 +62,25 @@ public Startup(IConfiguration configuration, IHostingEnvironment hostingEnvironm
         /// to the container. It uses the Extension pattern.
         /// </summary>
         /// <todo>
-        ///   CORE TODO Remove initializing contextAccessor : This is new. See if over time we can refactor away the need for this?
+        ///   CORE TODO Remove initializing contextAccessor : See if over time we can refactor away the need for this?
         ///   It's kind of a quick hack/compatibility shim. Ideally you want to get the request context only from where
         ///   it's specifically provided to you (Request.HttpContext in a controller, or as an Invoke() parameter in
         ///   a middleware) and pass it wherever its needed.
         /// </todo>
         public void ConfigureServices(IServiceCollection services)
         {
+            Console.WriteLine(@"Configure Services : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
 
-            Console.WriteLine("\nConfigure Services : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
-            
             services.Configure<FormOptions>(options =>
             {
                 options.MultipartBodyLengthLimit = 52428800;
                 options.ValueCountLimit = 500000;
                 options.KeyLengthLimit = 500000;
             });
-           
-            // Controllers are in a separate project, this ensures this can 
-            //
+
+            services.AddRouteAnalyzer();
+
+            // Kudu.Services contains all the Controllers 
             var kuduServicesAssembly = Assembly.Load("Kudu.Services");
 
             services.AddMvcCore()
@@ -85,7 +88,18 @@ public void ConfigureServices(IServiceCollection services)
                 .AddAuthorization()
                 .AddJsonFormatters()
                 .AddJsonOptions(options => options.SerializerSettings.ContractResolver = new DefaultContractResolver())
-                .AddApplicationPart(kuduServicesAssembly).AddControllersAsServices();            
+                .AddApplicationPart(kuduServicesAssembly).AddControllersAsServices()
+                .AddApiExplorer();
+
+
+            services.AddSwaggerGen(c =>
+            {
+                c.SwaggerDoc("v1", new Info {Title = "Kudu API Docs"});
+                // Setting the comments path for the Swagger JSON and UI.
+                var xmlFile = $"Kudu.Services.xml";
+                var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+                c.IncludeXmlComments(xmlPath);
+            });
 
             services.AddGZipCompression();
 
@@ -101,9 +115,7 @@ public void ConfigureServices(IServiceCollection services)
                         .AddConsole();
                 });
 
-            var contextAccessor = new HttpContextAccessor();
-            this._httpContextAccessor = contextAccessor;
-            services.AddSingleton<IHttpContextAccessor>(contextAccessor);
+            services.AddSingleton<IHttpContextAccessor>(new HttpContextAccessor());
 
             KuduWebUtil.EnsureHomeEnvironmentVariable();
 
@@ -111,48 +123,49 @@ public void ConfigureServices(IServiceCollection services)
 
             IEnvironment environment = KuduWebUtil.GetEnvironment(_hostingEnvironment);
 
-            _webAppEnvironment = environment;
+            _webAppRuntimeEnvironment = environment;
 
             KuduWebUtil.EnsureDotNetCoreEnvironmentVariable(environment);
-            
-            //CORE TODO Check this
+
+            // CORE TODO Check this
             // fix up invalid /home/site/deployments/settings.xml
             KuduWebUtil.EnsureValidDeploymentXmlSettings(environment);
 
             // Add various folders that never change to the process path. All child processes will inherit this
             KuduWebUtil.PrependFoldersToPath(environment);
-            
+
             // General
-            services.AddSingleton<IServerConfiguration>(serverConfiguration);
+            services.AddSingleton<IServerConfiguration>(ServerConfiguration);
 
             // CORE TODO Looks like this doesn't ever actually do anything, can refactor out?
             services.AddSingleton<IBuildPropertyProvider>(new BuildPropertyProvider());
 
-            IDeploymentSettingsManager noContextDeploymentsSettingsManager =
+            _noContextDeploymentsSettingsManager =
                 new DeploymentSettingsManager(new XmlSettings.Settings(KuduWebUtil.GetSettingsPath(environment)));
-            TraceServices.TraceLevel = noContextDeploymentsSettingsManager.GetTraceLevel();
+            TraceServices.TraceLevel = _noContextDeploymentsSettingsManager.GetTraceLevel();
 
             // Per request environment
-            services.AddScoped<IEnvironment>(sp => KuduWebUtil.GetEnvironment(_hostingEnvironment, sp.GetRequiredService<IDeploymentSettingsManager>()));
+            services.AddScoped(sp =>
+                KuduWebUtil.GetEnvironment(_hostingEnvironment, sp.GetRequiredService<IDeploymentSettingsManager>()));
 
-            services.AddDeployementServices(environment);
+            services.AddDeploymentServices(environment);
 
             /*
-             * CORE TODO all this business around ITracerFactory/ITracer/GetTracer()/
+             * CORE TODO Refactor ITracerFactory/ITracer/GetTracer()/
              * ILogger needs serious refactoring:
              * - Names should be changed to make it clearer that ILogger is for deployment
-             * logging and ITracer and friends are for Kudu tracing
+             *   logging and ITracer and friends are for Kudu tracing
              * - ILogger is a first-class citizen in .NET core and has it's own meaning. We should be using it
              *   where appropriate (and not name-colliding with it)
              * - ITracer vs. ITraceFactory is redundant and confusing.
-             * - All this stuff with funcs and factories and TraceServices is overcomplicated.
-             * TraceServices only serves to confuse stuff now that we're avoiding
+             * - TraceServices only serves to confuse stuff now that we're avoiding
              */
-            Func<IServiceProvider, ITracer> resolveTracer = sp => KuduWebUtil.GetTracer(sp);
+            Func<IServiceProvider, ITracer> resolveTracer = KuduWebUtil.GetTracer;
             ITracer CreateTracerThunk() => resolveTracer(services.BuildServiceProvider());
 
             // First try to use the current request profiler if any, otherwise create a new one
-            var traceFactory = new TracerFactory(() => {
+            var traceFactory = new TracerFactory(() =>
+            {
                 var sp = services.BuildServiceProvider();
                 var context = sp.GetRequiredService<IHttpContextAccessor>().HttpContext;
                 return TraceServices.GetRequestTracer(context) ?? resolveTracer(sp);
@@ -168,93 +181,69 @@ public void ConfigureServices(IServiceCollection services)
 
             TraceServices.SetTraceFactory(CreateTracerThunk);
 
-            services.AddSingleton<IDictionary<string, IOperationLock>>(KuduWebUtil.GetNamedLocks(traceFactory,environment));
+            services.AddSingleton<IDictionary<string, IOperationLock>>(
+                KuduWebUtil.GetNamedLocks(traceFactory, environment));
 
             // CORE TODO ShutdownDetector, used by LogStreamManager.
             //var shutdownDetector = new ShutdownDetector();
             //shutdownDetector.Initialize()
 
-            var noContextTraceFactory = new TracerFactory(() => KuduWebUtil.GetTracerWithoutContext(environment, noContextDeploymentsSettingsManager));
-            var etwTraceFactory = new TracerFactory(() => new ETWTracer(string.Empty, string.Empty));
+            var noContextTraceFactory = new TracerFactory(() =>
+                KuduWebUtil.GetTracerWithoutContext(environment, _noContextDeploymentsSettingsManager));
 
             services.AddTransient<IAnalytics>(sp => new Analytics(sp.GetRequiredService<IDeploymentSettingsManager>(),
-                                                                  sp.GetRequiredService<IServerConfiguration>(),
-                                                                  noContextTraceFactory));
-            
-            // CORE TODO Trace unhandled exceptions
-            //AppDomain.CurrentDomain.UnhandledException += (sender, args) =>
-            //{
-            //    var ex = args.ExceptionObject as Exception;
-            //    if (ex != null)
-            //    {
-            //        kernel.Get<IAnalytics>().UnexpectedException(ex);
-            //    }
-            //};
+                sp.GetRequiredService<IServerConfiguration>(),
+                noContextTraceFactory));
 
             // CORE TODO
             // Trace shutdown event
             // Cannot use shutdownDetector.Token.Register because of race condition
             // with NinjectServices.Stop via WebActivator.ApplicationShutdownMethodAttribute
-            //Shutdown += () => TraceShutdown(environment, noContextDeploymentsSettingsManager);
+            // Shutdown += () => TraceShutdown(environment, noContextDeploymentsSettingsManager);
 
             // LogStream service
-            // The hooks and log stream start endpoint are low traffic end-points. Re-using it to avoid creating another lock
-            var logStreamManagerLock = KuduWebUtil.GetNamedLocks(traceFactory, environment)["hooks"];
-
-            services.AddTransient(sp => new LogStreamManager(Path.Combine(environment.RootPath, Constants.LogFilesPath),
-                                                             sp.GetRequiredService<IEnvironment>(),
-                                                             sp.GetRequiredService<IDeploymentSettingsManager>(),
-                                                             sp.GetRequiredService<ITracer>(),
-                                                             logStreamManagerLock));
-            
+            services.AddLogStreamService(_webAppRuntimeEnvironment,traceFactory);
+
             // Deployment Service
             services.AddWebJobsDependencies();
 
-            services.AddScoped<ILogger>(sp => KuduWebUtil.GetLogger(sp));
+            services.AddScoped<ILogger>(KuduWebUtil.GetDeploymentLogger);
 
             services.AddScoped<IDeploymentManager, DeploymentManager>();
+            
             services.AddScoped<IFetchDeploymentManager, FetchDeploymentManager>();
+            
             services.AddScoped<ISSHKeyManager, SSHKeyManager>();
 
             services.AddScoped<IRepositoryFactory>(
-                sp => KuduWebUtil.GetDeploymentLock(traceFactory,environment).RepositoryFactory = new RepositoryFactory(
-                sp.GetRequiredService<IEnvironment>(), sp.GetRequiredService<IDeploymentSettingsManager>(), sp.GetRequiredService<ITraceFactory>()));
+                sp => KuduWebUtil.GetDeploymentLock(traceFactory, environment).RepositoryFactory =
+                    new RepositoryFactory(
+                        sp.GetRequiredService<IEnvironment>(), sp.GetRequiredService<IDeploymentSettingsManager>(),
+                        sp.GetRequiredService<ITraceFactory>()));
 
-            // CORE NOTE This was previously wired up in Ninject with .InSingletonScope. I'm not sure how that worked,
-            // since it depends on an IEnvironment, which was set up with .PerRequestScope. I have made this per request.
             services.AddScoped<IApplicationLogsReader, ApplicationLogsReader>();
 
             // Git server
-            services.AddGitServer(KuduWebUtil.GetDeploymentLock(traceFactory,environment));
+            services.AddGitServer(KuduWebUtil.GetDeploymentLock(traceFactory, environment));
 
             // Git Servicehook Parsers
             services.AddGitServiceHookParsers();
 
-            // CORE TODO
-            // SiteExtensions
-            //kernel.Bind<ISiteExtensionManager>().To<SiteExtensionManager>().InRequestScope();
-
-            // CORE TODO
-            // Functions
-            //kernel.Bind<IFunctionManager>().To<FunctionManager>().InRequestScope();
-
             services.AddScoped<ICommandExecutor, CommandExecutor>();
 
-            // CORE TODO This stuff should probably go in a separate method
-            // (they don't really fit into "ConfigureServices"), and much of it is probably no longer needed
-            //MigrateSite(environment, noContextDeploymentsSettingsManager);
-            //RemoveOldTracePath(environment);
-            //RemoveTempFileFromUserDrive(environment);
+            // KuduWebUtil.MigrateSite(environment, noContextDeploymentsSettingsManager);
+            // RemoveOldTracePath(environment);
+            // RemoveTempFileFromUserDrive(environment);
 
-            //// Temporary fix for https://github.com/npm/npm/issues/5905
+            // CORE TODO Windows Fix: Temporary fix for https://github.com/npm/npm/issues/5905
             //EnsureNpmGlobalDirectory();
             //EnsureUserProfileDirectory();
 
             //// Skip SSL Certificate Validate
-            //if (Kudu.Core.Environment.SkipSslValidation)
-            //{
-            //     ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
-            //}
+            if (Environment.SkipSslValidation)
+            {
+                ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
+            }
 
             //// Make sure webpages:Enabled is true. Even though we set it in web.config, it could be overwritten by
             //// an Azure AppSetting that's supposed to be for the site only but incidently affects Kudu as well.
@@ -276,9 +265,9 @@ public void ConfigureServices(IServiceCollection services)
             //        kernel.Get<IAnalytics>(),
             //        kernel.Get<ITraceFactory>()));
             //GlobalConfiguration.Configuration.Filters.Add(new EnsureRequestIdHandlerAttribute());
-            
+
             //FileTarget target = LogManager.Configuration.FindTargetByName("file") as FileTarget;
-            //String logfile = _webAppEnvironment.LogFilesPath + "/.txt";
+            //String logfile = _webAppRuntimeEnvironment.LogFilesPath + "/.txt";
             //target.FileName = logfile;
         }
 
@@ -297,62 +286,57 @@ private static Uri GetAbsoluteUri(HttpContext httpContext)
             return uriBuilder.Uri;
         }
 
-        public void Configure(IApplicationBuilder app, 
+        public void Configure(IApplicationBuilder app,
             IApplicationLifetime applicationLifetime,
             ILoggerFactory loggerFactory)
         {
-            Console.WriteLine("\nConfigure : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
+            Console.WriteLine(@"Configure : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
 
             loggerFactory.AddEventSourceLogger();
 
+            KuduWebUtil.MigrateToNetCorePatch(_webAppRuntimeEnvironment);
+
             if (_hostingEnvironment.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                //app.UseBrowserLink();
             }
             else
             {
-                // CORE TODO
                 app.UseExceptionHandler("/Error");
             }
-            
+
             var containsRelativePath = new Func<HttpContext, bool>(i =>
                 i.Request.Path.Value.StartsWith("/Default", StringComparison.OrdinalIgnoreCase));
-            
+
             app.MapWhen(containsRelativePath, application => application.Run(async context =>
             {
                 //context.Response.StatusCode = StatusCodes.Status500InternalServerError;
                 await context.Response.WriteAsync("Kestrel Running");
             }));
-            
+
             var containsRelativePath2 = new Func<HttpContext, bool>(i =>
                 i.Request.Path.Value.StartsWith("/info", StringComparison.OrdinalIgnoreCase));
-            
-            app.MapWhen(containsRelativePath2, application => application.Run(async context =>
-            {
-                await context.Response.WriteAsync("{\"Version\":\""+Constants.KuduBuild+"\"}");
-            }));
-          
-            
+
+            app.MapWhen(containsRelativePath2,
+                application => application.Run(async context =>
+                {
+                    await context.Response.WriteAsync("{\"Version\":\"" + Constants.KuduBuild + "\"}");
+                }));
+
             app.UseResponseCompression();
-            
+
             var containsRelativePath3 = new Func<HttpContext, bool>(i =>
                 i.Request.Path.Value.StartsWith("/AppServiceTunnel/Tunnel.ashx", StringComparison.OrdinalIgnoreCase));
 
-            //app.Map("/api/debugext2", a => a.UseMiddleware<DebugExtensionMiddleware>());
             app.MapWhen(containsRelativePath3, builder => builder.UseMiddleware<DebugExtensionMiddleware>());
-            
+
             app.UseTraceMiddleware();
-            
-            applicationLifetime.ApplicationStopping.Register(OnShutdown);
-            
-            app.UseStaticFiles();
 
-            ProxyRequestsIfRelativeUrlMatch(@"/webssh", "http", "127.0.0.1", "3000", app);
+            applicationLifetime.ApplicationStopping.Register(OnShutdown);
 
-            //ProxyRequestsIfRelativeUrlMatch(@"/AppServiceTunnel/Tunnel.ashx", "http", "127.0.0.1", "5000", app);
+            app.UseStaticFiles();
 
-            //ProxyRequestsIfRelativeUrlMatch(@"/AppServiceTunnel/Tunnel.ashx", "http", "127.0.0.1", "5000", app);
+            ProxyRequestIfRelativeUrlMatches(@"/webssh", "http", "127.0.0.1", "3000", app);
 
             var configuration = app.ApplicationServices.GetRequiredService<IServerConfiguration>();
 
@@ -362,18 +346,15 @@ public void Configure(IApplicationBuilder app,
             //GlobalConfiguration.Configuration.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always;
 
             var jsonFormatter = new JsonMediaTypeFormatter();
-            //GlobalConfiguration.Configuration.Formatters.Add(jsonFormatter);
-            //GlobalConfiguration.Configuration.DependencyResolver = new NinjectWebApiDependencyResolver(kernel);
-            //GlobalConfiguration.Configuration.Filters.Add(new TraceExceptionFilterAttribute());
 
 
-            // CORE TODO concept of "deprecation" in routes for traces, Do we need this ?
+            // CORE TODO concept of "deprecation" in routes for traces, Do we need this for linux ?
 
             // Push url
-            foreach (var url in new[] { "/git-receive-pack", $"/{configuration.GitServerRoot}/git-receive-pack" })
+            foreach (var url in new[] {"/git-receive-pack", $"/{configuration.GitServerRoot}/git-receive-pack"})
             {
                 app.Map(url, appBranch => appBranch.RunReceivePackHandler());
-            };
+            }
 
             // Fetch hook
             app.Map("/deploy", appBranch => appBranch.RunFetchHandler());
@@ -381,161 +362,252 @@ public void Configure(IApplicationBuilder app,
             // Log streaming
             app.Map("/api/logstream", appBranch => appBranch.RunLogStreamHandler());
 
+
             // Clone url
-            foreach (var url in new[] { "/git-upload-pack", $"/{configuration.GitServerRoot}/git-upload-pack" })
+            foreach (var url in new[] {"/git-upload-pack", $"/{configuration.GitServerRoot}/git-upload-pack"})
             {
                 app.Map(url, appBranch => appBranch.RunUploadPackHandler());
-            };
+            }
 
-            // CORE TODO - Test this
             // Custom GIT repositories, which can be served from any directory that has a git repo
-            foreach (var url in new[] { "/git-custom-repository", "/git/{*path}" })
+            foreach (var url in new[] {"/git-custom-repository", "/git/{*path}"})
             {
                 app.Map(url, appBranch => appBranch.RunCustomGitRepositoryHandler());
-            };
-            
-            app.UseFileServer(new FileServerOptions
-            {
-                FileProvider = new PhysicalFileProvider(
-                    _webAppEnvironment.WebRootPath),
-                RequestPath = "/wwwroot",
-                EnableDirectoryBrowsing = true
-            });
-            
-            //app.UseStaticFiles();
+            }
+
+            // Sets up the file server to server web app's wwwroot
+            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment);
+
+            app.UseSwagger();
+
+            app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "Kudu API Docs"); });
+
             app.UseMvc(routes =>
             {
-                Console.WriteLine("\nSetting Up Routes : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
+                Console.WriteLine(@"Setting Up Routes : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
+                routes.MapRouteAnalyzer("/routes"); // Add
 
-                // CORE TODO Default route needed?
                 routes.MapRoute(
                     name: "default",
                     template: "{controller}/{action=Index}/{id?}");
-                
+
                 // Git Service
-                routes.MapRoute("git-info-refs-root", "info/refs", new { controller = "InfoRefs", action = "Execute" });
-                routes.MapRoute("git-info-refs", configuration.GitServerRoot + "/info/refs", new { controller = "InfoRefs", action = "Execute" });
+                routes.MapRoute("git-info-refs-root", "info/refs", new {controller = "InfoRefs", action = "Execute"});
+                routes.MapRoute("git-info-refs", configuration.GitServerRoot + "/info/refs",
+                    new {controller = "InfoRefs", action = "Execute"});
 
                 // Scm (deployment repository)
-                routes.MapHttpRouteDual("scm-info", "scm/info", new { controller = "LiveScm", action = "GetRepositoryInfo" });
-                routes.MapHttpRouteDual("scm-clean", "scm/clean", new { controller = "LiveScm", action = "Clean" });
-                routes.MapHttpRouteDual("scm-delete", "scm", new { controller = "LiveScm", action = "Delete" }, new { verb = new HttpMethodRouteConstraint("DELETE") });
+                routes.MapHttpRouteDual("scm-info", "scm/info",
+                    new {controller = "LiveScm", action = "GetRepositoryInfo"});
+                routes.MapHttpRouteDual("scm-clean", "scm/clean", new {controller = "LiveScm", action = "Clean"});
+                routes.MapHttpRouteDual("scm-delete", "scm", new {controller = "LiveScm", action = "Delete"},
+                    new {verb = new HttpMethodRouteConstraint("DELETE")});
 
 
                 // Scm files editor
-                routes.MapHttpRouteDual("scm-get-files", "scmvfs/{*path}", new { controller = "LiveScmEditor", action = "GetItem" }, new { verb = new HttpMethodRouteConstraint("GET", "HEAD") });
-                routes.MapHttpRouteDual("scm-put-files", "scmvfs/{*path}", new { controller = "LiveScmEditor", action = "PutItem" }, new { verb = new HttpMethodRouteConstraint("PUT") });
-                routes.MapHttpRouteDual("scm-delete-files", "scmvfs/{*path}", new { controller = "LiveScmEditor", action = "DeleteItem" }, new { verb = new HttpMethodRouteConstraint("DELETE") });
+                routes.MapHttpRouteDual("scm-get-files", "scmvfs/{*path}",
+                    new {controller = "LiveScmEditor", action = "GetItem"},
+                    new {verb = new HttpMethodRouteConstraint("GET", "HEAD")});
+                routes.MapHttpRouteDual("scm-put-files", "scmvfs/{*path}",
+                    new {controller = "LiveScmEditor", action = "PutItem"},
+                    new {verb = new HttpMethodRouteConstraint("PUT")});
+                routes.MapHttpRouteDual("scm-delete-files", "scmvfs/{*path}",
+                    new {controller = "LiveScmEditor", action = "DeleteItem"},
+                    new {verb = new HttpMethodRouteConstraint("DELETE")});
 
                 // Live files editor
-                routes.MapHttpRouteDual("vfs-get-files", "vfs/{*path}", new { controller = "Vfs", action = "GetItem" }, new { verb = new HttpMethodRouteConstraint("GET", "HEAD") });
-                routes.MapHttpRouteDual("vfs-put-files", "vfs/{*path}", new { controller = "Vfs", action = "PutItem" }, new { verb = new HttpMethodRouteConstraint("PUT") });
-                routes.MapHttpRouteDual("vfs-delete-files", "vfs/{*path}", new { controller = "Vfs", action = "DeleteItem" }, new { verb = new HttpMethodRouteConstraint("DELETE") });
-                
+                routes.MapHttpRouteDual("vfs-get-files", "vfs/{*path}", new {controller = "Vfs", action = "GetItem"},
+                    new {verb = new HttpMethodRouteConstraint("GET", "HEAD")});
+                routes.MapHttpRouteDual("vfs-put-files", "vfs/{*path}", new {controller = "Vfs", action = "PutItem"},
+                    new {verb = new HttpMethodRouteConstraint("PUT")});
+                routes.MapHttpRouteDual("vfs-delete-files", "vfs/{*path}",
+                    new {controller = "Vfs", action = "DeleteItem"},
+                    new {verb = new HttpMethodRouteConstraint("DELETE")});
+
                 // Zip file handler
-                routes.MapHttpRouteDual("zip-get-files", "zip/{*path}", new { controller = "Zip", action = "GetItem" }, new { verb = new HttpMethodRouteConstraint("GET", "HEAD") });
-                routes.MapHttpRouteDual("zip-put-files", "zip/{*path}", new { controller = "Zip", action = "PutItem" }, new { verb = new HttpMethodRouteConstraint("PUT") });
-                
+                routes.MapHttpRouteDual("zip-get-files", "zip/{*path}", new {controller = "Zip", action = "GetItem"},
+                    new {verb = new HttpMethodRouteConstraint("GET", "HEAD")});
+                routes.MapHttpRouteDual("zip-put-files", "zip/{*path}", new {controller = "Zip", action = "PutItem"},
+                    new {verb = new HttpMethodRouteConstraint("PUT")});
+
                 // Zip push deployment
-                routes.MapRoute("zip-push-deploy", "api/zipdeploy", new { controller = "PushDeployment", action = "ZipPushDeploy" }, new { verb = new HttpMethodRouteConstraint("POST") });
-                routes.MapRoute("zip-war-deploy", "api/wardeploy", new { controller = "PushDeployment", action = "WarPushDeploy" }, new { verb = new HttpMethodRouteConstraint("POST") });
-                
+                routes.MapRoute("zip-push-deploy", "api/zipdeploy",
+                    new {controller = "PushDeployment", action = "ZipPushDeploy"},
+                    new {verb = new HttpMethodRouteConstraint("POST")});
+                routes.MapRoute("zip-war-deploy", "api/wardeploy",
+                    new {controller = "PushDeployment", action = "WarPushDeploy"},
+                    new {verb = new HttpMethodRouteConstraint("POST")});
+
                 // Live Command Line
-                routes.MapHttpRouteDual("execute-command", "command", new { controller = "Command", action = "ExecuteCommand" }, new { verb = new HttpMethodRouteConstraint("POST") });
+                routes.MapHttpRouteDual("execute-command", "command",
+                    new {controller = "Command", action = "ExecuteCommand"},
+                    new {verb = new HttpMethodRouteConstraint("POST")});
 
                 // Deployments
-                routes.MapHttpRouteDual("all-deployments", "deployments", new { controller = "Deployment", action = "GetDeployResults" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpRouteDual("one-deployment-get", "deployments/{id}", new { controller = "Deployment", action = "GetResult" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpRouteDual("one-deployment-put", "deployments/{id?}", new { controller = "Deployment", action = "Deploy" }, new { verb = new HttpMethodRouteConstraint("PUT") });
-                routes.MapHttpRouteDual("one-deployment-delete", "deployments/{id}", new { controller = "Deployment", action = "Delete" }, new { verb = new HttpMethodRouteConstraint("DELETE")});
-                routes.MapHttpRouteDual("one-deployment-log", "deployments/{id}/log", new { controller = "Deployment", action = "GetLogEntry" });
-                routes.MapHttpRouteDual("one-deployment-log-details", "deployments/{id}/log/{logId}", new { controller = "Deployment", action = "GetLogEntryDetails" });
+                routes.MapHttpRouteDual("all-deployments", "deployments",
+                    new {controller = "Deployment", action = "GetDeployResults"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpRouteDual("one-deployment-get", "deployments/{id}",
+                    new {controller = "Deployment", action = "GetResult"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpRouteDual("one-deployment-put", "deployments/{id?}",
+                    new {controller = "Deployment", action = "Deploy"},
+                    new {verb = new HttpMethodRouteConstraint("PUT")});
+                routes.MapHttpRouteDual("one-deployment-delete", "deployments/{id}",
+                    new {controller = "Deployment", action = "Delete"},
+                    new {verb = new HttpMethodRouteConstraint("DELETE")});
+                routes.MapHttpRouteDual("one-deployment-log", "deployments/{id}/log",
+                    new {controller = "Deployment", action = "GetLogEntry"});
+                routes.MapHttpRouteDual("one-deployment-log-details", "deployments/{id}/log/{logId}",
+                    new {controller = "Deployment", action = "GetLogEntryDetails"});
 
                 // Deployment script
-                routes.MapRoute("get-deployment-script", "api/deploymentscript", new { controller = "Deployment", action = "GetDeploymentScript" }, new { verb = new HttpMethodRouteConstraint("GET") });
+                routes.MapRoute("get-deployment-script", "api/deploymentscript",
+                    new {controller = "Deployment", action = "GetDeploymentScript"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
 
                 // IsDeploying status 
-                routes.MapRoute("is-deployment-underway", "api/isDeploying", new { controller = "Deployment", action = "IsDeploying" }, new { verb = new HttpMethodRouteConstraint("GET") });
+                routes.MapRoute("is-deployment-underway", "api/isdeploying",
+                    new {controller = "Deployment", action = "IsDeploying"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
 
                 // SSHKey
-                routes.MapHttpRouteDual("get-sshkey", "api/sshkey", new { controller = "SSHKey", action = "GetPublicKey" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpRouteDual("put-sshkey", "api/sshkey", new { controller = "SSHKey", action = "SetPrivateKey" }, new { verb = new HttpMethodRouteConstraint("PUT") });
-                routes.MapHttpRouteDual("delete-sshkey", "api/sshkey", new { controller = "SSHKey", action = "DeleteKeyPair" }, new { verb = new HttpMethodRouteConstraint("DELETE") });
+                routes.MapHttpRouteDual("get-sshkey", "api/sshkey",
+                    new {controller = "SSHKey", action = "GetPublicKey"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpRouteDual("put-sshkey", "api/sshkey",
+                    new {controller = "SSHKey", action = "SetPrivateKey"},
+                    new {verb = new HttpMethodRouteConstraint("PUT")});
+                routes.MapHttpRouteDual("delete-sshkey", "api/sshkey",
+                    new {controller = "SSHKey", action = "DeleteKeyPair"},
+                    new {verb = new HttpMethodRouteConstraint("DELETE")});
 
                 // Environment
-                routes.MapHttpRouteDual("get-env", "environment", new { controller = "Environment", action = "Get" }, new { verb = new HttpMethodRouteConstraint("GET") });
+                routes.MapHttpRouteDual("get-env", "environment", new {controller = "Environment", action = "Get"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
 
                 // Settings
-                routes.MapHttpRouteDual("set-setting", "settings", new { controller = "Settings", action = "Set" }, new { verb = new HttpMethodRouteConstraint("POST") });
-                routes.MapHttpRouteDual("get-all-settings", "settings", new { controller = "Settings", action = "GetAll" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpRouteDual("get-setting", "settings/{key}", new { controller = "Settings", action = "Get" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpRouteDual("delete-setting", "settings/{key}", new { controller = "Settings", action = "Delete" }, new { verb = new HttpMethodRouteConstraint("DELETE") });
+                routes.MapHttpRouteDual("set-setting", "settings", new {controller = "Settings", action = "Set"},
+                    new {verb = new HttpMethodRouteConstraint("POST")});
+                routes.MapHttpRouteDual("get-all-settings", "settings",
+                    new {controller = "Settings", action = "GetAll"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpRouteDual("get-setting", "settings/{key}", new {controller = "Settings", action = "Get"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpRouteDual("delete-setting", "settings/{key}",
+                    new {controller = "Settings", action = "Delete"},
+                    new {verb = new HttpMethodRouteConstraint("DELETE")});
 
                 // Diagnostics
-                routes.MapHttpRouteDual("diagnostics", "dump", new { controller = "Diagnostics", action = "GetLog" });
-                routes.MapHttpRouteDual("diagnostics-set-setting", "diagnostics/settings", new { controller = "Diagnostics", action = "Set" }, new { verb = new HttpMethodRouteConstraint("POST") });
-                routes.MapHttpRouteDual("diagnostics-get-all-settings", "diagnostics/settings", new { controller = "Diagnostics", action = "GetAll" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpRouteDual("diagnostics-get-setting", "diagnostics/settings/{key}", new { controller = "Diagnostics", action = "Get" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpRouteDual("diagnostics-delete-setting", "diagnostics/settings/{key}", new { controller = "Diagnostics", action = "Delete" }, new { verb = new HttpMethodRouteConstraint("DELETE") });
+                routes.MapHttpRouteDual("diagnostics", "dump", new {controller = "Diagnostics", action = "GetLog"});
+                routes.MapHttpRouteDual("diagnostics-set-setting", "diagnostics/settings",
+                    new {controller = "Diagnostics", action = "Set"},
+                    new {verb = new HttpMethodRouteConstraint("POST")});
+                routes.MapHttpRouteDual("diagnostics-get-all-settings", "diagnostics/settings",
+                    new {controller = "Diagnostics", action = "GetAll"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpRouteDual("diagnostics-get-setting", "diagnostics/settings/{key}",
+                    new {controller = "Diagnostics", action = "Get"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpRouteDual("diagnostics-delete-setting", "diagnostics/settings/{key}",
+                    new {controller = "Diagnostics", action = "Delete"},
+                    new {verb = new HttpMethodRouteConstraint("DELETE")});
 
-                // CORE TODO - Works now , | shutdown logic left
                 // Logs
-                foreach (var url in new[] { "/logstream", "/logstream/{*path}" })
+                foreach (var url in new[] {"/logstream", "/logstream/{*path}"})
                 {
                     app.Map(url, appBranch => appBranch.RunLogStreamHandler());
-                };
-                //routes.MapHttpRouteDual<LogStreamHandler>(kernel, "logstream", "logstream/{*path}");
-                routes.MapHttpRouteDual("recent-logs", "api/logs/recent", new { controller = "Diagnostics", action = "GetRecentLogs" }, new { verb = new HttpMethodRouteConstraint("GET") });
+                }
+
+                routes.MapHttpRouteDual("recent-logs", "api/logs/recent",
+                    new {controller = "Diagnostics", action = "GetRecentLogs"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
 
                 // Enable these for Linux and Windows Containers.
                 if (!OSDetector.IsOnWindows() || (OSDetector.IsOnWindows() && EnvironmentHelper.IsWindowsContainers()))
                 {
-                    routes.MapRoute("current-docker-logs-zip", "api/logs/docker/zip", new { controller = "Diagnostics", action = "GetDockerLogsZip" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                    routes.MapRoute("current-docker-logs", "api/logs/docker", new { controller = "Diagnostics", action = "GetDockerLogs" }, new { verb = new HttpMethodRouteConstraint("GET") });
+                    routes.MapRoute("current-docker-logs-zip", "api/logs/docker/zip",
+                        new {controller = "Diagnostics", action = "GetDockerLogsZip"},
+                        new {verb = new HttpMethodRouteConstraint("GET")});
+                    routes.MapRoute("current-docker-logs", "api/logs/docker",
+                        new {controller = "Diagnostics", action = "GetDockerLogs"},
+                        new {verb = new HttpMethodRouteConstraint("GET")});
                 }
 
-                // CORE TODO
                 var processControllerName = OSDetector.IsOnWindows() ? "Process" : "LinuxProcess";
 
                 // Processes
-                routes.MapHttpProcessesRoute("all-processes", "", new { controller = processControllerName, action = "GetAllProcesses" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpProcessesRoute("one-process-get", "/{id}", new { controller = processControllerName, action = "GetProcess" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpProcessesRoute("one-process-delete", "/{id}", new { controller = processControllerName, action = "KillProcess" }, new { verb = new HttpMethodRouteConstraint("DELETE") });
-                routes.MapHttpProcessesRoute("one-process-dump", "/{id}/dump", new { controller = processControllerName, action = "MiniDump" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpProcessesRoute("start-process-profile", "/{id}/profile/start", new { controller = processControllerName, action = "StartProfileAsync" }, new { verb = new HttpMethodRouteConstraint("POST") });
-                routes.MapHttpProcessesRoute("stop-process-profile", "/{id}/profile/stop", new { controller = processControllerName, action = "StopProfileAsync" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpProcessesRoute("all-threads", "/{id}/threads", new { controller = processControllerName, action = "GetAllThreads" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpProcessesRoute("one-process-thread", "/{processId}/threads/{threadId}", new { controller = processControllerName, action = "GetThread" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpProcessesRoute("all-modules", "/{id}/modules", new { controller = processControllerName, action = "GetAllModules" }, new { verb = new HttpMethodRouteConstraint("GET") });
-                routes.MapHttpProcessesRoute("one-process-module", "/{id}/modules/{baseAddress}", new { controller = processControllerName, action = "GetModule" }, new { verb = new HttpMethodRouteConstraint("GET") });
+                routes.MapHttpProcessesRoute("all-processes", "",
+                    new {controller = processControllerName, action = "GetAllProcesses"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpProcessesRoute("one-process-get", "/{id}",
+                    new {controller = processControllerName, action = "GetProcess"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpProcessesRoute("one-process-delete", "/{id}",
+                    new {controller = processControllerName, action = "KillProcess"},
+                    new {verb = new HttpMethodRouteConstraint("DELETE")});
+                routes.MapHttpProcessesRoute("one-process-dump", "/{id}/dump",
+                    new {controller = processControllerName, action = "MiniDump"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpProcessesRoute("start-process-profile", "/{id}/profile/start",
+                    new {controller = processControllerName, action = "StartProfileAsync"},
+                    new {verb = new HttpMethodRouteConstraint("POST")});
+                routes.MapHttpProcessesRoute("stop-process-profile", "/{id}/profile/stop",
+                    new {controller = processControllerName, action = "StopProfileAsync"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpProcessesRoute("all-threads", "/{id}/threads",
+                    new {controller = processControllerName, action = "GetAllThreads"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpProcessesRoute("one-process-thread", "/{processId}/threads/{threadId}",
+                    new {controller = processControllerName, action = "GetThread"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpProcessesRoute("all-modules", "/{id}/modules",
+                    new {controller = processControllerName, action = "GetAllModules"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapHttpProcessesRoute("one-process-module", "/{id}/modules/{baseAddress}",
+                    new {controller = processControllerName, action = "GetModule"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
 
                 // Runtime
-                routes.MapHttpRouteDual("runtime", "diagnostics/runtime", new { controller = "Runtime", action = "GetRuntimeVersions" }, new { verb = new HttpMethodRouteConstraint("GET") });
+                routes.MapHttpRouteDual("runtime", "diagnostics/runtime",
+                    new {controller = "Runtime", action = "GetRuntimeVersions"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
 
                 // Docker Hook Endpoint
-                if (!OSDetector.IsOnWindows()|| (OSDetector.IsOnWindows() && EnvironmentHelper.IsWindowsContainers()))
+                if (!OSDetector.IsOnWindows() || (OSDetector.IsOnWindows() && EnvironmentHelper.IsWindowsContainers()))
                 {
-                    routes.MapHttpRouteDual("docker", "docker/hook", new { controller = "Docker", action = "ReceiveHook" }, new { verb = new HttpMethodRouteConstraint("POST") });
+                    routes.MapHttpRouteDual("docker", "docker/hook",
+                        new {controller = "Docker", action = "ReceiveHook"},
+                        new {verb = new HttpMethodRouteConstraint("POST")});
                 }
-                
+
                 // catch all unregistered url to properly handle not found
-                // this is to work arounf the issue in TraceModule where we see double OnBeginRequest call
-                // for the same request (404 and then 200 statusCode).
-                //routes.MapRoute("error-404", "{*path}", new { controller = "Error404", action = "Handle" });
+                // routes.MapRoute("error-404", "{*path}", new {controller = "Error404", action = "Handle"});
             });
-            Console.WriteLine("\nExiting Configure : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
+
+            Console.WriteLine(@"Exiting Configure : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
         }
 
         // <summary>
         // Used for Reverse Proxying. Forwards a request to another path based on a
         // relative path to Kestrel
         // </summary>
-        // <param name="app"></param>
-        // <param name="relativeUrl"></param>
-        // <param name="scheme"></param>
-        // <param name="host">The proxy server host</param>
-        // <param name="port">The proxy server port. This field is always required</param>
-        private static void ProxyRequestsIfRelativeUrlMatch(
+        // <param name="app">
+        // Object to configure an application's request pipeline.
+        // </param>
+        // <param name="relativeUrl">
+        // String is matched if the request URI path is prepended by it
+        // </param>
+        // <param name="scheme">
+        // A String that contains the scheme for the proxy URI
+        // </param>
+        // <param name="host">
+        //  A String that contains the host for the proxy URI
+        // </param>
+        // <param name="port">
+        //  A String that contains the host for the proxy URI. Cannot be null
+        // </param>
+        private static void ProxyRequestIfRelativeUrlMatches(
             string relativeUrl,
             string scheme,
             string host,
@@ -544,29 +616,46 @@ private static void ProxyRequestsIfRelativeUrlMatch(
         {
             var containsRelativePath = new Func<HttpContext, bool>(i =>
                 i.Request.Path.Value.StartsWith(relativeUrl, StringComparison.OrdinalIgnoreCase));
-                app.MapWhen(containsRelativePath, builder => builder.RunProxy(new ProxyOptions
-                {
-                    Scheme = scheme,
-                    Host = host,
-                    Port = port
-                }));
+            app.MapWhen(containsRelativePath, builder => builder.RunProxy(new ProxyOptions
+            {
+                Scheme = scheme,
+                Host = host,
+                Port = port
+            }));
         }
 
-        
-        private static HttpContext GetHttpContext(HttpContext httpContext) => httpContext;
-        
+        // <summary>
+        // Returns a lambda function that checks if an incoming request object's url path
+        // is prepended by a string
+        // </summary>
+        // <param name="relativeUrl">
+        // String keyword with which incoming request's path is matched
+        // </param>
+        // <param name="httpContext">
+        // The HttpContext object of an incoming request
+        // </param>
         private static Func<HttpContext, bool> ContainsRelativeUrl(string relativeUrl, HttpContext httpContext)
         {
             return x => httpContext.Request.Path.Value.StartsWith(relativeUrl, StringComparison.OrdinalIgnoreCase);
         }
-        
+
+        // <summary>
+        // Returns a lambda function that checks if an incoming request object's url path
+        // is prepended by a string
+        // </summary>
+        // <param name="relativeUrl">
+        // String keyword with which incoming request's path is matched
+        // </param>
+        // <param name="httpContext">
+        // The HttpContext object of an incoming request
+        // </param>
         private void OnShutdown()
         {
-            //Wait while the data is flushed
-            System.Threading.Thread.Sleep(1000);
-            Console.WriteLine("Removing Deployment Locks");
+            KuduWebUtil.TraceShutdown(_webAppRuntimeEnvironment, _noContextDeploymentsSettingsManager);
+            // Cleaning up deployment locks
+            Console.WriteLine(@"Removing Deployment Locks");
             FileSystemHelpers.DeleteDirectorySafe("/home/site/locks/deployment");
-            Console.WriteLine("Done!");
+            Console.WriteLine(@"Shutting Down!");
         }
     }
 }
\ No newline at end of file
diff --git a/Kudu.Services.Web/Tracing/TraceMiddleware.cs b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
index 652059c6..c9071898 100644
--- a/Kudu.Services.Web/Tracing/TraceMiddleware.cs
+++ b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
@@ -1,21 +1,21 @@
-using Kudu.Contracts.Settings;
-using Kudu.Contracts.Tracing;
-using Kudu.Core.Infrastructure;
-using Kudu.Core.Tracing;
-using Kudu.Services.Infrastructure;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Net;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Routing;
-using UriHelper = Kudu.Services.Infrastructure.UriHelper;
+using Kudu.Contracts.Settings;
+using Kudu.Contracts.Tracing;
+using Kudu.Core.Infrastructure;
+using Kudu.Core.Tracing;
+using Kudu.Services.Infrastructure;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
+using Environment = Kudu.Core.Environment;
 
 namespace Kudu.Services.Web.Tracing
 {
@@ -23,15 +23,15 @@ public class TraceMiddleware
     {
         private static readonly object _stepKey = new object();
         private static int _traceStartup;
-        
+
         private static readonly DateTime _startDateTime = DateTime.UtcNow;
         private static DateTime _lastRequestDateTime;
 
-        private static DateTime _nextHeartbeatDateTime = DateTime.MinValue; 
-        
+        private static DateTime _nextHeartbeatDateTime = DateTime.MinValue;
+
         private readonly RequestDelegate _next;
-        
-        private static readonly Lazy<string> _kuduVersion = new Lazy<string>(() =>
+
+        private static readonly Lazy<string> KuduVersion = new Lazy<string>(() =>
         {
             var assembly = Assembly.GetExecutingAssembly();
             var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
@@ -53,60 +53,52 @@ public async Task Invoke(HttpContext context)
             catch (Exception ex)
             {
                 await Task.Run(() => LogException(context, ex));
-                ExceptionDispatchInfo.Capture(ex.InnerException??ex).Throw();
+                ExceptionDispatchInfo.Capture(ex.InnerException ?? ex).Throw();
             }
+
             // At the end of the pipe
             EndRequest(context);
         }
 
-        
+
         private void LogException(HttpContext httpContext, Exception exception)
         {
             try
             {
                 var tracer = TraceServices.GetRequestTracer(httpContext);
-                var error = exception;
-                Console.WriteLine("Exception Message : "+exception.Message);
-                Console.WriteLine("Exception StackTrace : "+exception.StackTrace);
-                //LogErrorRequest(httpContext, error);
-               // _logger.LogCritical(exception.Message, exception);
-               // _logger.LogCritical(exception.Message, exception);
-
-                if (tracer != null || tracer.TraceLevel > TraceLevel.Off)
-                {
-                    Console.WriteLine(exception.Message);
-                    Console.WriteLine(exception.InnerException.StackTrace);
-                    tracer.TraceError(error);
-                }
+                Console.WriteLine(@"Exception Message : " + exception.Message);
+                Console.WriteLine(@"Exception StackTrace : " + exception.StackTrace);
+                tracer.TraceError(exception);
             }
             catch (Exception ex)
             {
                 Debug.WriteLine(ex.Message);
             }
+
             //return httpContext.Response.WriteAsync("Test Exception");
         }
-        
+
         private void BeginRequest(HttpContext httpContext)
         {
             var httpRequest = httpContext.Request;
-            
+
             _lastRequestDateTime = DateTime.UtcNow;
 
             /* CORE TODO missing functionality:
              * Disallow GET requests from CSM extensions bridge
              * Razor dummy extension for vfs - Do we need it for Linux Kudu?
              */
-            
+
             // Always trace the startup request.
             ITracer tracer = TraceStartup(httpContext);
-            
+
             LogBeginRequest(httpContext);
-            
+
             // Trace heartbeat periodically
             TraceHeartbeat();
-           
+
             TryConvertSpecialHeadersToEnvironmentVariable(httpRequest);
-            
+
             // Skip certain paths
             if (TraceExtensions.ShouldSkipRequest(httpRequest))
             {
@@ -115,7 +107,7 @@ private void BeginRequest(HttpContext httpContext)
                 // in Azure env, browser non-ajax requests and referer mismatch with host
                 // since browser uses referer for other scenarios (such as href, redirect), we may return 
                 // this header (benign) in such cases.
-                if (Core.Environment.IsAzureEnvironment() && !TraceExtensions.IsAjaxRequest(httpRequest) &&
+                if (Environment.IsAzureEnvironment() && !TraceExtensions.IsAjaxRequest(httpRequest) &&
                     TraceExtensions.MismatchedHostReferer(httpRequest))
                 {
                     httpContext.Response.Headers.Add("X-FRAME-OPTIONS", "DENY");
@@ -126,7 +118,7 @@ private void BeginRequest(HttpContext httpContext)
                     TraceServices.RemoveRequestTracer(httpContext);
 
                     // enable just ETW tracer
-                    tracer = TraceServices.EnsureETWTracer(httpContext);
+                    tracer = TraceServices.EnsureEtwTracer(httpContext);
                 }
             }
 
@@ -164,7 +156,7 @@ private void BeginRequest(HttpContext httpContext)
             httpContext.Items[_stepKey] = tracer.Step(XmlTracer.IncomingRequestTrace, attribs);
         }
 
-        private void EndRequest(HttpContext httpContext)
+        private static void EndRequest(HttpContext httpContext)
         {
             var tracer = TraceServices.GetRequestTracer(httpContext);
 
@@ -176,15 +168,15 @@ private void EndRequest(HttpContext httpContext)
             }
 
             var attribs = new Dictionary<string, string>
-                {
-                    { "type", "response" },
-                    { "statusCode", httpContext.Response.StatusCode.ToString() },
-                    { "statusText", GetStatusDescription(httpContext.Response.StatusCode) }
-                };
+            {
+                {"type", "response"},
+                {"statusCode", httpContext.Response.StatusCode.ToString()},
+                {"statusText", GetStatusDescription(httpContext.Response.StatusCode)}
+            };
 
             if (httpContext.Response.StatusCode >= 400)
             {
-                attribs[TraceExtensions.TraceLevelKey] = ((int)TraceLevel.Error).ToString();
+                attribs[TraceExtensions.TraceLevelKey] = ((int) TraceLevel.Error).ToString();
             }
             else
             {
@@ -193,7 +185,7 @@ private void EndRequest(HttpContext httpContext)
 
             tracer.Trace(XmlTracer.OutgoingResponseTrace, attribs);
 
-            var requestStep = (IDisposable)httpContext.Items[_stepKey];
+            var requestStep = (IDisposable) httpContext.Items[_stepKey];
 
             if (requestStep != null)
             {
@@ -204,7 +196,7 @@ private void EndRequest(HttpContext httpContext)
         // HACK quick hack to replace response.StatusDescription.
         private static string GetStatusDescription(int statusCode)
         {
-            return ((System.Net.HttpStatusCode)statusCode).ToString();
+            return ((HttpStatusCode) statusCode).ToString();
         }
 
         private static void LogEndRequest(HttpContext httpContext)
@@ -213,9 +205,9 @@ private static void LogEndRequest(HttpContext httpContext)
             {
                 var request = httpContext.Request;
                 var response = httpContext.Response;
-                var requestId = (string)httpContext.Items[Constants.RequestIdHeader];
-                var requestTime = (DateTime)httpContext.Items[Constants.RequestDateTimeUtc];
-                var latencyInMilliseconds = (long)(DateTime.UtcNow - requestTime).TotalMilliseconds;
+                var requestId = (string) httpContext.Items[Constants.RequestIdHeader];
+                var requestTime = (DateTime) httpContext.Items[Constants.RequestDateTimeUtc];
+                var latencyInMilliseconds = (long) (DateTime.UtcNow - requestTime).TotalMilliseconds;
                 KuduEventSource.Log.ApiEvent(
                     ServerConfiguration.GetApplicationName(),
                     "OnEndRequest",
@@ -235,7 +227,7 @@ private static void AddTraceLevel(HttpContext httpContext, Dictionary<string, st
             if (!rawUrl.StartsWith("/logstream", StringComparison.OrdinalIgnoreCase) &&
                 !rawUrl.StartsWith("/deployments", StringComparison.OrdinalIgnoreCase))
             {
-                attribs[TraceExtensions.TraceLevelKey] = ((int)TraceLevel.Info).ToString();
+                attribs[TraceExtensions.TraceLevelKey] = ((int) TraceLevel.Info).ToString();
             }
         }
 
@@ -244,24 +236,24 @@ private static string GetRawUrl(HttpRequest request)
             var uri = new Uri(request.GetDisplayUrl());
             return uri.PathAndQuery;
         }
-        
+
         private static string GetHostUrl(HttpRequest request)
         {
             var uri = new Uri(request.GetDisplayUrl());
             return uri.Host;
         }
-        
+
         public static TimeSpan LastRequestTime => DateTime.UtcNow - _lastRequestDateTime;
         public static TimeSpan UpTime => DateTime.UtcNow - _startDateTime;
 
         private static Dictionary<string, string> GetTraceAttributes(HttpContext httpContext)
         {
             var attribs = new Dictionary<string, string>
-                {
-                    { "url", GetRawUrl(httpContext.Request) },
-                    { "method", httpContext.Request.Method },
-                    { "type", "request" }
-                };
+            {
+                {"url", GetRawUrl(httpContext.Request)},
+                {"method", httpContext.Request.Method},
+                {"type", "request"}
+            };
 
             // Add an attribute containing the process, AppDomain and Thread ids to help debugging
             attribs.Add("pid", String.Join(",",
@@ -289,12 +281,12 @@ private static ITracer TraceStartup(HttpContext httpContext)
                     attribs[TraceExtensions.AlwaysTrace] = "1";
 
                     // Dump environment variables
-                    foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables())
+                    foreach (DictionaryEntry entry in System.Environment.GetEnvironmentVariables())
                     {
-                        var key = (string)entry.Key;
+                        var key = (string) entry.Key;
                         if (key.StartsWith("SCM", StringComparison.OrdinalIgnoreCase))
                         {
-                            attribs[key] = (string)entry.Value;
+                            attribs[key] = (string) entry.Value;
                         }
                     }
 
@@ -303,22 +295,23 @@ private static ITracer TraceStartup(HttpContext httpContext)
 
                 OperationManager.SafeExecute(() =>
                 {
-                    var requestId = (string)httpContext.Items[Constants.RequestIdHeader];
+                    var requestId = (string) httpContext.Items[Constants.RequestIdHeader];
                     var assembly = Assembly.GetExecutingAssembly();
                     var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
                     KuduEventSource.Log.GenericEvent(
                         ServerConfiguration.GetApplicationName(),
-                        string.Format("StartupRequest pid:{0}, domain:{1}", Process.GetCurrentProcess().Id, AppDomain.CurrentDomain.Id),
+                        string.Format("StartupRequest pid:{0}, domain:{1}", Process.GetCurrentProcess().Id,
+                            AppDomain.CurrentDomain.Id),
                         requestId,
-                        Environment.GetEnvironmentVariable(SettingsKeys.ScmType),
-                        Environment.GetEnvironmentVariable(SettingsKeys.WebSiteSku),
+                        System.Environment.GetEnvironmentVariable(SettingsKeys.ScmType),
+                        System.Environment.GetEnvironmentVariable(SettingsKeys.WebSiteSku),
                         fvi.FileVersion);
                 });
             }
 
             return tracer;
         }
-        
+
         private static void TraceHeartbeat()
         {
             var now = DateTime.UtcNow;
@@ -329,14 +322,15 @@ private static void TraceHeartbeat()
             {
                 KuduEventSource.Log.GenericEvent(
                     ServerConfiguration.GetApplicationName(),
-                    string.Format("Heartbeat pid:{0}, domain:{1}", Process.GetCurrentProcess().Id, AppDomain.CurrentDomain.Id),
+                    string.Format("Heartbeat pid:{0}, domain:{1}", Process.GetCurrentProcess().Id,
+                        AppDomain.CurrentDomain.Id),
                     string.Empty,
-                    Environment.GetEnvironmentVariable(SettingsKeys.ScmType),
-                    Environment.GetEnvironmentVariable(SettingsKeys.WebSiteSku),
-                    _kuduVersion.Value);
+                    System.Environment.GetEnvironmentVariable(SettingsKeys.ScmType),
+                    System.Environment.GetEnvironmentVariable(SettingsKeys.WebSiteSku),
+                    KuduVersion.Value);
             });
         }
-        
+
         private static void LogBeginRequest(HttpContext httpContext)
         {
             OperationManager.SafeExecute(() =>
@@ -356,16 +350,17 @@ private static void LogBeginRequest(HttpContext httpContext)
                     request.GetUserAgent());
             });
         }
-        
+
         private static void TryConvertSpecialHeadersToEnvironmentVariable(HttpRequest request)
         {
             try
             {
                 // RDBug 6738223 : AlwaysOn request again SCM has wrong Host Name to main site
                 // Ignore Always on request for now till bug is fixed
-                if (!string.Equals("AlwaysOn", request.Headers["User-Agent"].ToString(), StringComparison.OrdinalIgnoreCase))
+                if (!string.Equals("AlwaysOn", request.Headers["User-Agent"].ToString(),
+                    StringComparison.OrdinalIgnoreCase))
                 {
-                    Environment.SetEnvironmentVariable(Constants.HttpHost, GetHostUrl(request));
+                    System.Environment.SetEnvironmentVariable(Constants.HttpHost, GetHostUrl(request));
                 }
             }
             catch
diff --git a/Kudu.Services.Web/Tracing/TraceServices.cs b/Kudu.Services.Web/Tracing/TraceServices.cs
index 029bfc1b..d40a84d3 100644
--- a/Kudu.Services.Web/Tracing/TraceServices.cs
+++ b/Kudu.Services.Web/Tracing/TraceServices.cs
@@ -8,11 +8,11 @@ namespace Kudu.Services.Web.Tracing
 {
     public static class TraceServices
     {
-        private static readonly object _traceKey = new object();
-        private static readonly object _traceFileKey = new object();
+        private static readonly object TraceKey = new object();
+        private static readonly object TraceFileKey = new object();
 
         private static Func<ITracer> _traceFactory;
-        
+
         // CORE TODO The CurrentRequestTraceFile - Done and HttpMethod properties
         // were replaced with methods that require the caller to pass the context, as HttpContext.Current
         // no longer exists and is a bad practice anyway. CurrentRequestTracer was removed, as
@@ -20,12 +20,7 @@ public static class TraceServices
 
         internal static string GetRequestTraceFile(HttpContext context)
         {
-            if (context == null)
-            {
-                return null;
-            }
-
-            return context.Items[_traceFileKey] as string;
+            return context?.Items[TraceFileKey] as string;
         }
 
         internal static string GetHttpMethod(HttpContext context)
@@ -38,10 +33,7 @@ internal static string GetHttpMethod(HttpContext context)
             return context.Request.Method;
         }
 
-        internal static TraceLevel TraceLevel
-        {
-            get; set;
-        }
+        internal static TraceLevel TraceLevel { get; set; }
 
         public static void SetTraceFactory(Func<ITracer> traceFactory)
         {
@@ -51,37 +43,38 @@ public static void SetTraceFactory(Func<ITracer> traceFactory)
         internal static ITracer GetRequestTracer(HttpContext httpContext)
         {
             if (httpContext == null) return null;
-            return httpContext.Items[_traceKey] as ITracer;
+            return httpContext.Items[TraceKey] as ITracer;
         }
 
         internal static void RemoveRequestTracer(HttpContext httpContext)
         {
-            httpContext.Items.Remove(_traceKey);
-            httpContext.Items.Remove(_traceFileKey);
+            httpContext.Items.Remove(TraceKey);
+            httpContext.Items.Remove(TraceFileKey);
         }
 
-        internal static ITracer EnsureETWTracer(HttpContext httpContext)
+        internal static ITracer EnsureEtwTracer(HttpContext httpContext)
         {
-            var etwTracer = new ETWTracer((string)httpContext.Items[Constants.RequestIdHeader], httpContext.Request.Method);
+            var etwTracer = new ETWTracer((string) httpContext.Items[Constants.RequestIdHeader],
+                httpContext.Request.Method);
 
-            httpContext.Items[_traceKey] = etwTracer;
+            httpContext.Items[TraceKey] = etwTracer;
 
             return etwTracer;
         }
 
         internal static ITracer CreateRequestTracer(HttpContext httpContext)
         {
-            var tracer = (ITracer)httpContext.Items[_traceKey];
+            var tracer = (ITracer) httpContext.Items[TraceKey];
             if (tracer == null)
             {
-                httpContext.Items[_traceFileKey] = String.Format(Constants.TraceFileFormat, Environment.MachineName, Guid.NewGuid().ToString("D"));
+                httpContext.Items[TraceFileKey] = String.Format(Constants.TraceFileFormat, Environment.MachineName,
+                    Guid.NewGuid().ToString("D"));
 
                 tracer = _traceFactory();
-                httpContext.Items[_traceKey] = tracer;
+                httpContext.Items[TraceKey] = tracer;
             }
 
             return tracer;
         }
-        
     }
-}
+}
\ No newline at end of file
diff --git a/Kudu.Services.Web/Util.cs b/Kudu.Services.Web/Util.cs
deleted file mode 100644
index 0f842f3e..00000000
--- a/Kudu.Services.Web/Util.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-using Kudu.Contracts.Infrastructure;
-using Kudu.Contracts.Settings;
-using Kudu.Contracts.Tracing;
-using Kudu.Core;
-using Kudu.Core.Deployment;
-using Kudu.Core.Helpers;
-using Kudu.Core.Infrastructure;
-using Kudu.Core.Tracing;
-using Kudu.Services.Infrastructure;
-using Kudu.Services.Web.Tracing;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using Kudu.Core.Settings;
-using Environment = Kudu.Core.Environment;
-
-namespace Kudu.Services.Web
-{
-    public static class KuduWebUtil
-    {
-        private const string KuduConsoleFilename = "kudu.dll";
-        private const string KuduConsoleRelativePath = "KuduConsole";
-        private static Dictionary<string, IOperationLock> _namedLocks ;
-        // CORE TODO Is this still true?
-        // Due to a bug in Ninject we can't use Dispose to clean up WindowsLockFile so we shut it down manually
-        private static DeploymentLockFile _deploymentLock;
-
-
-        // <summary>
-        // This method initializes status,ssh,hooks & deployment locks used by Kudu to ensure
-        // synchronized operations. This method creates a dictionary of locks which is injected
-        // into various controllers to resolve the locks they need.
-        // <list type="bullet">  
-        //     <listheader>  
-        //         <term>Locks used by Kudu:</term>  
-        //     </listheader>  
-        //     <item>  
-        //         <term>Status Lock</term>  
-        //         <description>Used by DeploymentStatusManager</description>  
-        //     </item> 
-        //     <item>  
-        //         <term>SSH Lock</term>  
-        //         <description>Used by SSHKeyController</description>  
-        //     </item> 
-        //     <item>  
-        //         <term>Hooks Lock</term>  
-        //         <description>Used by WebHooksManager</description>  
-        //     </item> 
-        //     <item>  
-        //         <term>Deployment Lock</term>  
-        //         <description>
-        //             Used by DeploymentController, DeploymentManager, SettingsController, 
-        //             FetchDeploymentManager, LiveScmController, ReceivePackHandlerMiddleware
-        //         </description>  
-        //     </item> 
-        // </list>  
-        // </summary>
-        // <remarks>
-        //     Uses File watcher.
-        //     This originally used Ninject's "WhenInjectedInto" in .Net project for specific instances. IServiceCollection
-        //     doesn't support this concept, or anything similar like named instances. There are a few possibilities, 
-        //     but the hack solution for now is just injecting a dictionary of locks and letting each dependent resolve 
-        //     the one it needs.
-        // </remarks>
-        private static void SetupLocks(ITraceFactory traceFactory, IEnvironment environment)
-        {
-            var lockPath = Path.Combine(environment.SiteRootPath, Constants.LockPath);
-            var deploymentLockPath = Path.Combine(lockPath, Constants.DeploymentLockFile);
-            var statusLockPath = Path.Combine(lockPath, Constants.StatusLockFile);
-            var sshKeyLockPath = Path.Combine(lockPath, Constants.SSHKeyLockFile);
-            var hooksLockPath = Path.Combine(lockPath, Constants.HooksLockFile);
-            _deploymentLock = DeploymentLockFile.GetInstance(deploymentLockPath, traceFactory);
-            _deploymentLock.InitializeAsyncLocks();
-            
-            var statusLock = new LockFile(statusLockPath, traceFactory);
-            statusLock.InitializeAsyncLocks();
-            var sshKeyLock = new LockFile(sshKeyLockPath, traceFactory);
-            sshKeyLock.InitializeAsyncLocks();
-            var hooksLock = new LockFile(hooksLockPath, traceFactory);
-            hooksLock.InitializeAsyncLocks(); 
-            
-            _namedLocks = new Dictionary<string, IOperationLock>
-            {
-                { "status", statusLock },
-                { "ssh", sshKeyLock },
-                { "hooks", hooksLock },
-                { "deployment", _deploymentLock }
-            };
-        }
-
-        public static Uri GetAbsoluteUri(HttpContext httpContext)
-        {
-            var request = httpContext.Request;
-            UriBuilder uriBuilder = new UriBuilder();
-            uriBuilder.Scheme = request.Scheme;
-            uriBuilder.Host = request.Host.Host;
-            uriBuilder.Path = request.Path.ToString();
-            uriBuilder.Query = request.QueryString.ToString();
-            return uriBuilder.Uri;
-        }
-
-        public static ITracer GetTracer(IServiceProvider serviceProvider)
-        {
-            var environment = serviceProvider.GetRequiredService<IEnvironment>();
-            var level = serviceProvider.GetRequiredService<IDeploymentSettingsManager>().GetTraceLevel();
-            var contextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
-            var httpContext = contextAccessor.HttpContext;
-            var requestTraceFile = TraceServices.GetRequestTraceFile(httpContext);
-            if (level <= TraceLevel.Off || requestTraceFile == null) return NullTracer.Instance;
-            var textPath = Path.Combine(environment.TracePath, requestTraceFile);
-            return new CascadeTracer(new XmlTracer(environment.TracePath, level), 
-                new TextTracer(textPath, level));
-        }
-
-        public static string GetRequestTraceFile(IServiceProvider serviceProvider)
-        {
-            var traceLevel = serviceProvider.GetRequiredService<IDeploymentSettingsManager>().GetTraceLevel();
-            if (traceLevel <= TraceLevel.Off) return null;
-            var contextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
-            var httpContext = contextAccessor.HttpContext;
-            return TraceServices.GetRequestTraceFile(httpContext);
-        }
-
-        public static ITracer GetTracerWithoutContext(IEnvironment environment, IDeploymentSettingsManager settings)
-        {
-            // when file system has issue, this can throw (environment.TracePath calls EnsureDirectory).
-            // prefer no-op tracer over outage.  
-            return OperationManager.SafeExecute(() =>
-            {
-                var traceLevel = settings.GetTraceLevel();
-                return traceLevel > TraceLevel.Off ? new XmlTracer(environment.TracePath, traceLevel) : NullTracer.Instance;
-            }) ?? NullTracer.Instance;
-        }
-
-        public static ILogger GetLogger(IServiceProvider serviceProvider)
-        {
-            var environment = serviceProvider.GetRequiredService<IEnvironment>();
-            var level = serviceProvider.GetRequiredService<IDeploymentSettingsManager>().GetTraceLevel();
-            var contextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
-            var httpContext = contextAccessor.HttpContext;
-            var requestTraceFile = TraceServices.GetRequestTraceFile(httpContext);
-            if (level <= TraceLevel.Off || requestTraceFile == null) return NullLogger.Instance;
-            var textPath = Path.Combine(environment.DeploymentTracePath, requestTraceFile);
-            return new TextLogger(textPath);
-        }
-
-        public static IEnvironment GetEnvironment(IHostingEnvironment hostingEnvironment, IDeploymentSettingsManager settings = null, IHttpContextAccessor httpContextAccessor = null)
-        {
-            var root = PathResolver.ResolveRootPath();
-            var siteRoot = Path.Combine(root, Constants.SiteFolder);
-            var repositoryPath = Path.Combine(siteRoot, settings == null ? Constants.RepositoryPath : settings.GetRepositoryPath());
-            var binPath = AppContext.BaseDirectory;
-            var requestId = httpContextAccessor?.HttpContext.Request.GetRequestId();
-            var kuduConsoleFullPath = Path.Combine(AppContext.BaseDirectory, KuduConsoleRelativePath, KuduConsoleFilename);
-            return new Core.Environment(root, EnvironmentHelper.NormalizeBinPath(binPath), repositoryPath, requestId, kuduConsoleFullPath, httpContextAccessor);
-        }
-
-        /// <summary>
-        /// Ensures %HOME% is correctly set
-        /// </summary>
-        public static void EnsureHomeEnvironmentVariable()
-        {
-            // CORE TODO Hard-coding this for now while exploring. Have a look at what
-            // PlatformServices.Default and the injected IHostingEnvironment have at runtime.
-            if (Directory.Exists(System.Environment.ExpandEnvironmentVariables(@"%HOME%"))) return;
-
-            //For Debug
-            System.Environment.SetEnvironmentVariable("HOME", OSDetector.IsOnWindows() ? @"F:\kudu-debug" : "/home");
-
-            /*
-            // If MapPath("/_app") returns a valid folder, set %HOME% to that, regardless of
-            // it current value. This is the non-Azure code path.
-            string path = HostingEnvironment.MapPath(Constants.MappedSite);
-            if (Directory.Exists(path))
-            {
-                path = Path.GetFullPath(path);
-                System.Environment.SetEnvironmentVariable("HOME", path);
-            }
-            */
-        }
-        
-        public static void EnsureValidDeploymentXmlSettings(IEnvironment environment)
-        {
-            var path = GetSettingsPath(environment);
-            if (FileSystemHelpers.FileExists(path))
-            {
-                try
-                {
-                    var settings = new DeploymentSettingsManager(new XmlSettings.Settings(path));
-                    settings.GetValue(SettingsKeys.TraceLevel);
-                }
-                catch (Exception ex)
-                {
-                    DateTime lastWriteTimeUtc = DateTime.MinValue;
-                    OperationManager.SafeExecute(() => lastWriteTimeUtc = File.GetLastWriteTimeUtc(path));
-                    // trace initialization error
-                    KuduEventSource.Log.KuduException(
-                        ServerConfiguration.GetApplicationName(),
-                        "Startup.cs",
-                        string.Empty,
-                        string.Empty,
-                        string.Format("Invalid '{0}' is detected and deleted.  Last updated time was {1}.", path, lastWriteTimeUtc),
-                        ex.ToString());
-                    File.Delete(path);
-                }
-            }
-        }
-
-        public static void PrependFoldersToPath(IEnvironment environment)
-        {
-            var folders = PathUtilityFactory.Instance.GetPathFolders(environment);
-
-            var path = System.Environment.GetEnvironmentVariable("PATH");
-            // Ignore any folder that doesn't actually exist
-            string additionalPaths = String.Join(Path.PathSeparator.ToString(), folders.Where(dir => Directory.Exists(dir)));
-
-            // Make sure we haven't already added them. This can happen if the Kudu appdomain restart (since it's still same process)
-            if (path.Contains(additionalPaths)) return;
-            path = additionalPaths + Path.PathSeparator + path;
-
-            // PHP 7 was mistakenly added to the path unconditionally on Azure. To work around, if we detect
-            // some PHP v5.x anywhere on the path, we yank the unwanted PHP 7
-            // TODO: remove once the issue is fixed on Azure
-            if (path.Contains(@"PHP\v5"))
-            {
-                path = path.Replace(@"D:\Program Files (x86)\PHP\v7.0" + Path.PathSeparator, String.Empty);
-            }
-
-            System.Environment.SetEnvironmentVariable("PATH", path);
-        }
-
-        public static void EnsureDotNetCoreEnvironmentVariable(IEnvironment environment)
-        {
-
-            if (Core.Environment.IsAzureEnvironment())
-            {
-                // On Azure, restore nuget packages to d:\home\.nuget so they're persistent. It also helps
-                // work around https://github.com/projectkudu/kudu/issues/2056.
-                // Note that this only applies to project.json scenarios (not packages.config)
-                SetEnvironmentVariableIfNotYetSet("NUGET_PACKAGES", Path.Combine(environment.RootPath, ".nuget"));
-
-                // Set the telemetry environment variable
-                SetEnvironmentVariableIfNotYetSet("DOTNET_CLI_TELEMETRY_PROFILE", "AzureKudu");
-            }
-            else
-            {
-                // Set it slightly differently if outside of Azure to differentiate
-                SetEnvironmentVariableIfNotYetSet("DOTNET_CLI_TELEMETRY_PROFILE", "Kudu");
-            }
-        }
-
-        public static DeploymentLockFile GetDeploymentLock(ITraceFactory traceFactory, IEnvironment environment)
-        {
-            if (_namedLocks == null || _deploymentLock == null)
-            {
-                GetNamedLocks(traceFactory, environment);
-            }
-            return _deploymentLock;
-        }
-
-        public static Dictionary<string, IOperationLock> GetNamedLocks(ITraceFactory traceFactory, IEnvironment environment)
-        {
-            if (_namedLocks == null)
-            {
-                SetupLocks(traceFactory, environment);
-            }
-            return _namedLocks;
-        }
-
-        // <summary>
-        // 
-        // </summary>
-        public static void EnsureSiteBitnessEnvironmentVariable()
-        {
-            SetEnvironmentVariableIfNotYetSet("SITE_BITNESS", System.Environment.Is64BitProcess ? Constants.X64Bit : Constants.X86Bit);
-        }
-
-        public static void SetEnvironmentVariableIfNotYetSet(string name, string value)
-        {
-            if (System.Environment.GetEnvironmentVariable(name) == null)
-            {
-                System.Environment.SetEnvironmentVariable(name, value);
-            }
-        }
-
-        public static string GetSettingsPath(IEnvironment environment)
-        {
-            return Path.Combine(environment.DeploymentsPath, Constants.DeploySettingsPath);
-        }
-
-    }
-}
diff --git a/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js b/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
index e9638908..4324a823 100644
--- a/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
+++ b/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
@@ -379,9 +379,21 @@ var jsonTree = (function() {
      */
     function NodeString(label, val, isLast) {
         this.type = "string";
+        var fileExtsToWhiteList = [".log",".txt",".zip",".py",".js"];
         if(val!=null&&val.includes("/api/")){
             var urlStartIdx = val.indexOf("/api/");
-            val = "<span style=\"color:#953b39\"><a href=\"/newui/jsonviewer?view_url="+val.substring(urlStartIdx,val.length)+"\">"+val+"</a></span>";
+            var shouldShowJSONViewerURL = true;
+            for(ext in fileExtsToWhiteList){
+                if(val.endsWith(ext)){
+                    shouldShowJSONViewerURL = false;
+                    break;
+                }   
+            }
+            if(shouldShowJSONViewerURL) {
+                val = "<span style=\"color:#953b39\"><a href=\"/newui/jsonviewer?view_url=" + val.substring(urlStartIdx, val.length) + "\">" + val + "</a></span>";
+            }else{
+                val = "<span style=\"color:#953b39\"><a href=\""+val+"\">"+val+"</a></span>";
+            }
         }
         _NodeSimple.call(this, label, '"' + val + '"', isLast);
     }
diff --git a/Kudu.Services/Diagnostics/ContainerInfoController.cs b/Kudu.Services/Diagnostics/ContainerInfoController.cs
index 44365a30..ed877784 100644
--- a/Kudu.Services/Diagnostics/ContainerInfoController.cs
+++ b/Kudu.Services/Diagnostics/ContainerInfoController.cs
@@ -1,5 +1,7 @@
 using System;
 using Kudu.Core.Infrastructure;
+using Kudu.Core.Tracing;
+using Kudu.Services.Util;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -20,7 +22,6 @@ public class ContainerInfoController : Controller
         /// <summary>
         /// Updates all/particular stat for a container.
         /// Can only be called by an authorized metering service.
-        /// <param name="containerId">ContainerId whose stats are to be purged</param>
         /// </summary>
         /// <param name="data">Valid JSON Object containing the data to be updated</param>
         /// <param name="containerId">ContainerId whose stats are to be updated</param>
@@ -28,10 +29,11 @@ public class ContainerInfoController : Controller
         ///  purged and stats in this request are added</param>
         /// <returns></returns>
         [HttpPost("{containerId=all}/{filterName=all}")]
+        [RestrictToLocalhost]
         public IActionResult UpdateLog(
             [FromBody] JObject data,
-            string containerId,
-            string filterName)
+            [FromRoute] string containerId = "all",
+            [FromRoute] string filterName = "all")
         {
             try
             {
@@ -77,7 +79,8 @@ public IActionResult UpdateLog(
         /// </summary>
         /// <param name="containerId">ContainerId whose stats are to be purged</param>
         [HttpDelete("{containerId}")]
-        public IActionResult GetLog(string containerId)
+        [RestrictToLocalhost]
+        public IActionResult GetLog([FromRoute] string containerId = "all")
         {
             try
             {
@@ -97,8 +100,10 @@ public IActionResult GetLog(string containerId)
 
         /// <summary>
         /// Returns a list of containers for a webapp and it's memory/cpu stats.
-        /// This stats can be filtered by giving the api URL as /api/stats/(container-id)/(filter-id)
-        /// <list type="bullet">  
+        /// </summary>
+        /// <para>
+        /// These stats can be filtered by giving the api URL as /api/stats/(container-id)/(filter-id)
+        /// <list type="bullet">    
         ///     <listheader>  
         ///         <term>Possible filters are</term>  
         ///     </listheader>  
@@ -114,16 +119,15 @@ public IActionResult GetLog(string containerId)
         ///         <term>cpu_stats</term>
         ///         <description>CPU usage statistics</description>
         ///     </item>
-        /// </list>  
-        /// </summary>
+        /// </list>
+        /// </para>
         /// <param name="containerId">ContainerId whose stats are to be retrieved</param>
-        /// <param name="filterName"></param>
+        /// <param name="filterName">Filter for a container whose stats are to be required, if null all for that container 
+        /// are returned</param>
         /// <returns></returns>
-        /// <exception cref="Exception">Filter for a particular containerId are to be retrieved</exception>
         [HttpGet("{containerId=all}/{filterName=all}")]
-        public IActionResult GetLog(string instance,
-            string containerId,
-            string filterName)
+        public IActionResult GetLog([FromRoute] string containerId = "all",
+            [FromRoute] string filterName = "all")
         {
             try
             {
diff --git a/Kudu.Services/ExceptionResponse.cs b/Kudu.Services/ExceptionResponse.cs
index 5c719e24..095359ae 100644
--- a/Kudu.Services/ExceptionResponse.cs
+++ b/Kudu.Services/ExceptionResponse.cs
@@ -1,18 +1,20 @@
 namespace Kudu.Services
 {
-    /// <summary>
-    /// Contract to return JSON Exception response
-    /// when calls are made to the REST APIs
-    /// </summary>
-    public class ExceptionResponse
+    internal class ExceptionResponse
     {
-        string exceptionMessage;
-        string exceptionStackTrace;
+        private string _exceptionMessage;
+        private string _exceptionStackTrace;
 
+        /// <summary>
+        /// Contract to return JSON Exception response
+        /// when calls are made to the REST APIs
+        /// </summary>
+        /// <param name="exceptionMessage"></param>
+        /// <param name="exceptionStackTrace"></param>
         public ExceptionResponse(string exceptionMessage, string exceptionStackTrace)
         {
-            this.exceptionMessage = exceptionMessage;
-            this.exceptionStackTrace = exceptionStackTrace;
+            this._exceptionMessage = exceptionMessage;
+            this._exceptionStackTrace = exceptionStackTrace;
         }
     }
 }
\ No newline at end of file
diff --git a/Kudu.Services/Kudu.Services.csproj b/Kudu.Services/Kudu.Services.csproj
index 48ba8b0d..80deeed9 100644
--- a/Kudu.Services/Kudu.Services.csproj
+++ b/Kudu.Services/Kudu.Services.csproj
@@ -32,4 +32,7 @@
   <PropertyGroup>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
+  <PropertyGroup>
+    <DocumentationFile>/opt/Kudu/Kudu.Services.xml</DocumentationFile>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Kudu.Services/Util/RetrictToLocalHostAttribute.cs b/Kudu.Services/Util/RetrictToLocalHostAttribute.cs
new file mode 100644
index 00000000..e17bde6c
--- /dev/null
+++ b/Kudu.Services/Util/RetrictToLocalHostAttribute.cs
@@ -0,0 +1,23 @@
+using System.Net;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Kudu.Services.Util
+{
+    /// <inheritdoc />
+    /// <summary>
+    /// Allows a route to be accessed from the localhost only
+    /// </summary>
+    public class RestrictToLocalhostAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            var remoteIp = context.HttpContext.Connection.RemoteIpAddress;
+            if (!IPAddress.IsLoopback(remoteIp)) {
+                context.Result = new UnauthorizedResult();
+                return;
+            }
+            base.OnActionExecuting(context);
+        }
+    }
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index ddd012c7..fda40d43 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 <img src="http://azuredeploy.net/kudu.svg" height="100" width="100">
 
-### Kudu Lite
+### KuduLite
 
-Kudu Lite is the redevelopment of Kudu in .Net Core : the engine behind [git deployments in Azure App Service](https://azure.microsoft.com/en-us/documentation/articles/web-sites-publish-source-control/). It can also run outside of Azure.
+KuduLite is the redevelopment/port of Kudu in .Net Core : the engine behind [git deployments in Azure App Service](https://azure.microsoft.com/en-us/documentation/articles/web-sites-publish-source-control/). It can also run outside of Azure.
 
 ![KuduDebugConsole](https://cloud.githubusercontent.com/assets/6472374/18506877/99d39f24-7a76-11e6-86a7-f3ac62b0199c.png)
 

From ca2f4dcb549e1674ee66517e0907654a88fb5031 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 4 Jan 2019 09:13:17 -0800
Subject: [PATCH 003/245] Create LICENSE

---
 LICENSE | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..d9a10c0d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

From 6bd949c9a026a8783ea9a2f664b785301f7e4d00 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 4 Jan 2019 09:25:27 -0800
Subject: [PATCH 004/245] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fda40d43..d051326c 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ KuduLite is the redevelopment/port of Kudu in .Net Core : the engine behind [git
 
 ![KuduDebugConsole](https://cloud.githubusercontent.com/assets/6472374/18506877/99d39f24-7a76-11e6-86a7-f3ac62b0199c.png)
 
+This entrypoint to this engine is Kudu.Services.Web/Startup.cs
 
 ### Documentation
 

From ff5af13b75b9b753c196142370e6ef07e0c416d6 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 7 Jan 2019 10:07:52 -0800
Subject: [PATCH 005/245] Added custom tracing header to identify responses
 from KuduLite

---
 Kudu.Services.Web/Tracing/TraceMiddleware.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Kudu.Services.Web/Tracing/TraceMiddleware.cs b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
index c9071898..cebbc91e 100644
--- a/Kudu.Services.Web/Tracing/TraceMiddleware.cs
+++ b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
@@ -31,6 +31,8 @@ public class TraceMiddleware
 
         private readonly RequestDelegate _next;
 
+        private const string KuduLiteTrackingHeader = "X_KUDULITE_RESPONSE";
+
         private static readonly Lazy<string> KuduVersion = new Lazy<string>(() =>
         {
             var assembly = Assembly.GetExecutingAssembly();
@@ -44,7 +46,7 @@ public TraceMiddleware(RequestDelegate next)
         }
 
         public async Task Invoke(HttpContext context)
-        {
+        { 
             BeginRequest(context);
             try
             {
@@ -55,11 +57,14 @@ public async Task Invoke(HttpContext context)
                 await Task.Run(() => LogException(context, ex));
                 ExceptionDispatchInfo.Capture(ex.InnerException ?? ex).Throw();
             }
-
             // At the end of the pipe
             EndRequest(context);
         }
 
+        private static void AddTrackingHeader(HttpContext context)
+        {
+            context.Response.Headers.Add(KuduLiteTrackingHeader,"true");
+        }
 
         private void LogException(HttpContext httpContext, Exception exception)
         {
@@ -80,13 +85,13 @@ private void LogException(HttpContext httpContext, Exception exception)
 
         private void BeginRequest(HttpContext httpContext)
         {
-            var httpRequest = httpContext.Request;
-
+            var httpRequest = httpContext.Request; 
+           
             _lastRequestDateTime = DateTime.UtcNow;
 
             /* CORE TODO missing functionality:
              * Disallow GET requests from CSM extensions bridge
-             * Razor dummy extension for vfs - Do we need it for Linux Kudu?
+             * Razor dummy extension for vfs 
              */
 
             // Always trace the startup request.
@@ -154,12 +159,14 @@ private void BeginRequest(HttpContext httpContext)
             }
 
             httpContext.Items[_stepKey] = tracer.Step(XmlTracer.IncomingRequestTrace, attribs);
+            
+            AddTrackingHeader(httpContext);
         }
 
         private static void EndRequest(HttpContext httpContext)
         {
             var tracer = TraceServices.GetRequestTracer(httpContext);
-
+            
             LogEndRequest(httpContext);
 
             if (tracer == null || tracer.TraceLevel <= TraceLevel.Off)

From 704f5c72634db09eb9351488430f3e9da12dd2e6 Mon Sep 17 00:00:00 2001
From: Nick Lucas <nilucas@microsoft.com>
Date: Mon, 7 Jan 2019 18:27:40 -0800
Subject: [PATCH 006/245] Added detectors page from projectkudu

---
 .../Pages/Detectors/index.cshtml              | 35 +++++++++++++++++++
 .../Pages/Detectors/index.cshtml.cs           | 11 ++++++
 Kudu.Services.Web/Tracing/TraceMiddleware.cs  |  4 +--
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 Kudu.Services.Web/Pages/Detectors/index.cshtml
 create mode 100644 Kudu.Services.Web/Pages/Detectors/index.cshtml.cs

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
new file mode 100644
index 00000000..b97d3f93
--- /dev/null
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -0,0 +1,35 @@
+@page
+@model Kudu.Services.Web.Pages.Detectors.IndexModel
+@{
+    var ownerName = Environment.GetEnvironmentVariable("WEBSITE_OWNER_NAME") ?? "";
+    var subscriptionId = ownerName;
+    var resourceGroup = Environment.GetEnvironmentVariable("WEBSITE_RESOURCE_GROUP") ?? "";
+    var siteName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "";
+
+    var index = ownerName.IndexOf('+');
+    if (index >= 0)
+    {
+        subscriptionId = ownerName.Substring(0, index);
+    }
+
+    string detectorPath;
+    if (Kudu.Core.Helpers.OSDetector.IsOnWindows())
+    {
+        detectorPath = "diagnostics/availability/analysis";
+    }
+    else
+    {
+        detectorPath = "detectors/LinuxAppDown";
+    }
+
+    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath="
+            + detectorPath
+            + "#resource/subscriptions/" + subscriptionId
+            + "/resourceGroups/" + resourceGroup
+            + "/providers/Microsoft.Web/sites/"
+            + siteName
+            + "/troubleshoot";
+
+    Response.Redirect(detectorDeepLink);
+}
+
diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml.cs b/Kudu.Services.Web/Pages/Detectors/index.cshtml.cs
new file mode 100644
index 00000000..42bf45c2
--- /dev/null
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml.cs
@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Kudu.Services.Web.Pages.Detectors
+{
+    public class IndexModel : PageModel
+    {
+        public void OnGet()
+        {
+        }
+    }
+}
diff --git a/Kudu.Services.Web/Tracing/TraceMiddleware.cs b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
index cebbc91e..865e8d0d 100644
--- a/Kudu.Services.Web/Tracing/TraceMiddleware.cs
+++ b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
@@ -31,7 +31,7 @@ public class TraceMiddleware
 
         private readonly RequestDelegate _next;
 
-        private const string KuduLiteTrackingHeader = "X_KUDULITE_RESPONSE";
+        private const string KuduLiteTrackingHeader = "X-KUDULITE-RESPONSE";
 
         private static readonly Lazy<string> KuduVersion = new Lazy<string>(() =>
         {
@@ -385,4 +385,4 @@ public static IApplicationBuilder UseTraceMiddleware(this IApplicationBuilder bu
             return builder.UseMiddleware<TraceMiddleware>();
         }
     }
-}
\ No newline at end of file
+}

From 1ad562386e4e14f052f8fc6f7a676dea0250484e Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 8 Jan 2019 10:58:03 -0800
Subject: [PATCH 007/245] Fix kudu startup issue on linux

The type initializer for 'Microsoft.Win32.Registry' threw an exception. ---> System.PlatformNotSupportedException: Registry is not supported on this platform.
---
 Kudu.Services.Web/Startup.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index b413dc9f..dc40c8c9 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -240,10 +240,10 @@ public void ConfigureServices(IServiceCollection services)
             //EnsureUserProfileDirectory();
 
             //// Skip SSL Certificate Validate
-            if (Environment.SkipSslValidation)
-            {
-                ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
-            }
+            //if (Environment.SkipSslValidation)
+            //{
+            //    ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
+            //}
 
             //// Make sure webpages:Enabled is true. Even though we set it in web.config, it could be overwritten by
             //// an Azure AppSetting that's supposed to be for the site only but incidently affects Kudu as well.
@@ -658,4 +658,4 @@ private void OnShutdown()
             Console.WriteLine(@"Shutting Down!");
         }
     }
-}
\ No newline at end of file
+}

From efcff4a6d17aef34dfbd22e911508b38c6831017 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 8 Jan 2019 12:02:34 -0800
Subject: [PATCH 008/245] Update python build to not use virtual environment

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index b180f6ef..8cc730c5 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,19 +46,6 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
-
-                string virtualEnvName = "antenv";
-
-                if (version.StartsWith("3.6"))
-                {
-                    virtualEnvName = "antenv3.6";
-                }
-                else if (version.StartsWith("2.7"))
-                {
-                    virtualEnvName = "antenv2.7";
-                }
-
-                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)

From 84585f228173e1b9f640363714dbf19141ac72f2 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 9 Jan 2019 12:27:38 -0800
Subject: [PATCH 009/245] REvert previous change

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index b180f6ef..8cc730c5 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,19 +46,6 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
-
-                string virtualEnvName = "antenv";
-
-                if (version.StartsWith("3.6"))
-                {
-                    virtualEnvName = "antenv3.6";
-                }
-                else if (version.StartsWith("2.7"))
-                {
-                    virtualEnvName = "antenv2.7";
-                }
-
-                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)

From 9bf1349363c9d9b1980ea4235a8e19f0e2e26ea6 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 9 Jan 2019 12:30:27 -0800
Subject: [PATCH 010/245] Add virtual env for python

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 8cc730c5..381ff214 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,6 +46,18 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
+                string virtualEnvName = "antenv";
+
+                if (version.StartsWith("3.6"))
+                {
+                    virtualEnvName = "antenv3.6";
+                }
+                else if (version.StartsWith("2.7"))
+                {
+                    virtualEnvName = "antenv2.7";
+                }
+
+                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)

From 57df27dbf3e46394d0af149ff482eadb287bc023 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 9 Jan 2019 12:46:51 -0800
Subject: [PATCH 011/245] Enable virtualEnv for python 2.7 builds

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 381ff214..e17c529d 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,18 +46,12 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
-                string virtualEnvName = "antenv";
 
-                if (version.StartsWith("3.6"))
+                if (version.StartsWith("2.7"))
                 {
-                    virtualEnvName = "antenv3.6";
+                    string virtualEnvName = "antenv2.7";
+                    additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
                 }
-                else if (version.StartsWith("2.7"))
-                {
-                    virtualEnvName = "antenv2.7";
-                }
-
-                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)

From 7013ce3914d25ff5fa65363814a322f45b0d4f21 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 9 Jan 2019 14:27:03 -0800
Subject: [PATCH 012/245] Really remove virtual env based deployments for
 python

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index e17c529d..8cc730c5 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,12 +46,6 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
-
-                if (version.StartsWith("2.7"))
-                {
-                    string virtualEnvName = "antenv2.7";
-                    additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
-                }
             }
 
             if (runOryxBuild)

From db5d5fa211b3c6f66f2b7a79f98301bd5d8da478 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Jan 2019 16:15:40 -0800
Subject: [PATCH 013/245] Added Directory browser for Logs

---
 Kudu.Services.Web/KuduWebUtil.cs              |  6 ++---
 Kudu.Services.Web/Pages/Index.cshtml          | 23 +++++++++----------
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    |  3 +++
 Kudu.Services.Web/Pages/NewUI/logs.cshtml     | 23 +++++++++++++++++++
 Kudu.Services.Web/Startup.cs                  |  8 ++++---
 .../wwwroot/Content/Scripts/jsonTree.js       |  9 ++++++--
 6 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 Kudu.Services.Web/Pages/NewUI/logs.cshtml

diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 30171753..e8c65246 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -97,7 +97,7 @@ private static void SetupLocks(ITraceFactory traceFactory, IEnvironment environm
         }
 
 
-        internal static void SetupFileServer(IApplicationBuilder app, IEnvironment webAppRuntimeEnvironment)
+        internal static void SetupFileServer(IApplicationBuilder app, string fileDirectoryPath, string requestPath)
         {
             // Set up custom content types - associating file extension to MIME type
             var provider = new FileExtensionContentTypeProvider
@@ -114,8 +114,8 @@ internal static void SetupFileServer(IApplicationBuilder app, IEnvironment webAp
             app.UseFileServer(new FileServerOptions
             {
                 FileProvider = new PhysicalFileProvider(
-                    webAppRuntimeEnvironment.WebRootPath),
-                RequestPath = "/wwwroot",
+                    fileDirectoryPath),
+                RequestPath = requestPath,
                 EnableDirectoryBrowsing = true,
                 StaticFileOptions = {ContentTypeProvider = provider}
             });
diff --git a/Kudu.Services.Web/Pages/Index.cshtml b/Kudu.Services.Web/Pages/Index.cshtml
index 51e23afd..4aa3d4be 100644
--- a/Kudu.Services.Web/Pages/Index.cshtml
+++ b/Kudu.Services.Web/Pages/Index.cshtml
@@ -49,7 +49,8 @@
     @{
         string commitFile = System.IO.Path.Combine(hostingEnvironment.WebRootPath, "commit.txt");
         string sha = System.IO.File.Exists(commitFile) ? System.IO.File.ReadAllText(commitFile).Trim() : null;
-        var version = typeof(Kudu.Services.Web.Tracing.TraceMiddleware).Assembly.GetName().Version;
+        //var version = typeof(Kudu.Services.Web.Tracing.TraceMiddleware).Assembly.GetName().Version;
+        var version = Constants.KuduBuild;
     }
     <h3>Environment</h3>
     <div class="row">
@@ -67,17 +68,6 @@
                 }
         </div>
     </div>
-    @if (appServiceVersion != null)
-    {
-        <div class="row">
-            <div class="col-xs-2">
-                <strong>Azure App Service</strong>
-            </div>
-            <div>
-                @GetAppServiceVersion()
-            </div>
-        </div>
-    }
     <div class="row">
         <div class="col-xs-2">
             <strong>Site up time</strong>
@@ -120,5 +110,14 @@
             <a href="api/logs/docker">Current Docker logs</a> (<a href="api/logs/docker/zip">Download as zip</a>)
         </li>
     </ul>
+    <h3>Browse Directory</h3>
+    <ul>
+        <li>
+            <a href="logs">Logs</a>
+        </li>
+        <li>
+            <a href="wwwroot">Site wwwroot</a>
+        </li>
+    </ul>
     <h3>More information about Kudu can be found on the <a href="https://github.com/projectkudu/kudu/wiki">wiki</a>.</h3>
 </div>
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index d21a3d15..119f73dd 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -148,6 +148,9 @@
                             <li>
                                 <a href="/newui/jsonviewer?view_url=/api/vfs">Virtual File System API</a>
                             </li>
+                            <li>
+                                <a href="/newui/logs">Browse Logs Dir</a>
+                            </li>
                         </ul>
                     </small>
                 </div>
diff --git a/Kudu.Services.Web/Pages/NewUI/logs.cshtml b/Kudu.Services.Web/Pages/NewUI/logs.cshtml
new file mode 100644
index 00000000..ca979c09
--- /dev/null
+++ b/Kudu.Services.Web/Pages/NewUI/logs.cshtml
@@ -0,0 +1,23 @@
+@page
+<div class="row" style="margin-top: 20px;margin-top: 10px">
+    <div class="col-xs-offset 1 col-xs-11 col-sm-offset-2 col-sm-8 col-md-offset-3 col-md-6">
+        <div class="btn-toolbar" role="toolbar">
+            <div class="btn-group btn-group-justified" role="group">
+                <div class="btn-group" role="group">
+                    <button id="page-back-btn" class="btn btn-primary btn-primary" title="Go Back" onclick="goBack()"><i class="fas fa-arrow-left fa-lg" aria-hidden="true"></i></button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    function goBack() {
+        if (document.getElementById("wwwroot-files-frame").contentWindow.history.length) {
+            $("#page-back-btn").removeClass("disabled");
+            window.history.back();
+        } else {
+            $("#page-back-btn").addClass("disabled");
+        }
+    }
+</script>
+<iframe src="/logs" id="wwwroot-files-frame" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:100vh;"></iframe>
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index dc40c8c9..49442fdd 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -310,7 +310,6 @@ public void Configure(IApplicationBuilder app,
 
             app.MapWhen(containsRelativePath, application => application.Run(async context =>
             {
-                //context.Response.StatusCode = StatusCodes.Status500InternalServerError;
                 await context.Response.WriteAsync("Kestrel Running");
             }));
 
@@ -375,8 +374,11 @@ public void Configure(IApplicationBuilder app,
                 app.Map(url, appBranch => appBranch.RunCustomGitRepositoryHandler());
             }
 
-            // Sets up the file server to server web app's wwwroot
-            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment);
+            // Sets up the file server to web app's wwwroot
+            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.WebRootPath, "/wwwroot");
+            
+            // Sets up the file server to LogFiles
+            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.LogFilesPath, "/logs");
 
             app.UseSwagger();
 
diff --git a/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js b/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
index 4324a823..f1406434 100644
--- a/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
+++ b/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
@@ -379,16 +379,21 @@ var jsonTree = (function() {
      */
     function NodeString(label, val, isLast) {
         this.type = "string";
-        var fileExtsToWhiteList = [".log",".txt",".zip",".py",".js"];
+        var fileExtsToWhiteList = [".log",".txt",".zip",".py",".js",".xml"];
         if(val!=null&&val.includes("/api/")){
             var urlStartIdx = val.indexOf("/api/");
             var shouldShowJSONViewerURL = true;
+            /*
             for(ext in fileExtsToWhiteList){
-                if(val.endsWith(ext)){
+                if(val.includes(ext)){
                     shouldShowJSONViewerURL = false;
                     break;
                 }   
             }
+            */
+            if(val.length>3&&(val.charAt(val.length-3) === "." || val.charAt(val.length-4) === ".")){
+                shouldShowJSONViewerURL = false;
+            }
             if(shouldShowJSONViewerURL) {
                 val = "<span style=\"color:#953b39\"><a href=\"/newui/jsonviewer?view_url=" + val.substring(urlStartIdx, val.length) + "\">" + val + "</a></span>";
             }else{

From c7c096d5f194d6127499e597c99e879151c442ae Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 30 Jan 2019 13:50:51 -0800
Subject: [PATCH 014/245] fix detector deeplink

176d9290a7bb5e4ea93b3548f7e1fadd5fb9e6e6 from kudu to
---
 Kudu.Services.Web/Pages/Detectors/index.cshtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
index b97d3f93..92d62fde 100644
--- a/Kudu.Services.Web/Pages/Detectors/index.cshtml
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -15,14 +15,14 @@
     string detectorPath;
     if (Kudu.Core.Helpers.OSDetector.IsOnWindows())
     {
-        detectorPath = "diagnostics/availability/analysis";
+        detectorPath = "diagnostics%2Favailability%2Fanalysis";
     }
     else
     {
-        detectorPath = "detectors/LinuxAppDown";
+        detectorPath = "detectors%2FLinuxAppDown";
     }
 
-    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath="
+    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath%3D"
             + detectorPath
             + "#resource/subscriptions/" + subscriptionId
             + "/resourceGroups/" + resourceGroup

From f8c2a6b05df95ff523a4ac0b0ec53b7a4c904731 Mon Sep 17 00:00:00 2001
From: root
 <root@tuxedolinuxbuildvm.i1t5xd3p4kue5apare5pkznajf.cx.internal.cloudapp.net>
Date: Tue, 5 Feb 2019 21:43:49 +0000
Subject: [PATCH 015/245] trial fix

---
 Kudu.Services/Kudu.Services.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services/Kudu.Services.csproj b/Kudu.Services/Kudu.Services.csproj
index 80deeed9..914021d4 100644
--- a/Kudu.Services/Kudu.Services.csproj
+++ b/Kudu.Services/Kudu.Services.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Kudu.Contracts\Kudu.Contracts.csproj" />
@@ -35,4 +36,4 @@
   <PropertyGroup>
     <DocumentationFile>/opt/Kudu/Kudu.Services.xml</DocumentationFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

From 317cae90aa4a020920f59f7144c7c3c8cea7acd1 Mon Sep 17 00:00:00 2001
From: root
 <root@tuxedolinuxbuildvm.i1t5xd3p4kue5apare5pkznajf.cx.internal.cloudapp.net>
Date: Tue, 5 Feb 2019 22:55:26 +0000
Subject: [PATCH 016/245] Test fix 2

---
 Kudu.Services.Web/Startup.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 49442fdd..b7714d2e 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -305,6 +305,13 @@ public void Configure(IApplicationBuilder app,
                 app.UseExceptionHandler("/Error");
             }
 
+
+            var webSocketOptions = new WebSocketOptions()
+            {
+                KeepAliveInterval = TimeSpan.FromSeconds(15)
+            };
+            app.UseWebSockets(webSocketOptions);
+
             var containsRelativePath = new Func<HttpContext, bool>(i =>
                 i.Request.Path.Value.StartsWith("/Default", StringComparison.OrdinalIgnoreCase));
 

From 858985196678fdea7d385ad117e9ca591e69ab49 Mon Sep 17 00:00:00 2001
From: root
 <root@tuxedolinuxbuildvm.i1t5xd3p4kue5apare5pkznajf.cx.internal.cloudapp.net>
Date: Fri, 8 Feb 2019 16:25:53 +0000
Subject: [PATCH 017/245] Fixup post-receive for kudulite migration when
 SCM_REPOSITORY_PATH is set in settings file

---
 Kudu.Services.Web/KuduWebUtil.cs | 55 ++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index e8c65246..0457071a 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -187,7 +187,17 @@ internal static string GetRequestTraceFile(IServiceProvider serviceProvider)
         /// <param name="environment"></param>
         internal static void MigrateToNetCorePatch(IEnvironment environment)
         {
-            var gitPostReceiveHookFile = Path.Combine(environment.RepositoryPath, ".git", "hooks", "post-receive");
+	    // Get the repository path:
+            // Use value in the settings.xml file if it is present.
+            string repositoryPath = environment.RepositoryPath;
+            IDeploymentSettingsManager settings = GetDeploymentSettingsManager(environment);
+            if (settings != null)
+            {
+                var settingsRepoPath = DeploymentSettingsExtension.GetRepositoryPath(settings);
+                repositoryPath = Path.Combine(environment.SiteRootPath, settingsRepoPath);
+            }
+
+            var gitPostReceiveHookFile = Path.Combine(repositoryPath, ".git", "hooks", "post-receive");
             if (FileSystemHelpers.FileExists(gitPostReceiveHookFile))
             {
                 var fileText = "";
@@ -204,7 +214,6 @@ internal static void MigrateToNetCorePatch(IEnvironment environment)
             }
         }
 
-
         internal static void TraceShutdown(IEnvironment environment, IDeploymentSettingsManager settings)
         {
             ITracer tracer = GetTracerWithoutContext(environment, settings);
@@ -339,6 +348,46 @@ internal static void EnsureValidDeploymentXmlSettings(IEnvironment environment)
             }
         }
 
+	/// <summary>
+        /// Get Deploployment settings
+        /// </summary>
+        /// <param name="environment"></param>
+        private static IDeploymentSettingsManager GetDeploymentSettingsManager(IEnvironment environment)
+        {
+            var path = GetSettingsPath(environment);
+            if (!FileSystemHelpers.FileExists(path))
+            {
+                return null;
+            }
+
+            IDeploymentSettingsManager result = null;
+
+            try
+            {
+                var settings = new DeploymentSettingsManager(new XmlSettings.Settings(path));
+                settings.GetValue(SettingsKeys.TraceLevel);
+
+                result = settings;
+            }
+            catch (Exception ex)
+            {
+                DateTime lastWriteTimeUtc = DateTime.MinValue;
+                OperationManager.SafeExecute(() => lastWriteTimeUtc = File.GetLastWriteTimeUtc(path));
+                // trace initialization error
+                KuduEventSource.Log.KuduException(
+                    ServerConfiguration.GetApplicationName(),
+                    "Startup.cs",
+                    string.Empty,
+                    string.Empty,
+                    string.Format("Invalid '{0}' is detected and deleted.  Last updated time was {1}.", path,
+                        lastWriteTimeUtc),
+                    ex.ToString());
+                File.Delete(path);
+            }
+
+            return result;
+        }
+
         internal static void PrependFoldersToPath(IEnvironment environment)
         {
             var folders = PathUtilityFactory.Instance.GetPathFolders(environment);
@@ -451,4 +500,4 @@ internal static string GetSettingsPath(IEnvironment environment)
             return Path.Combine(environment.DeploymentsPath, Constants.DeploySettingsPath);
         }
     }
-}
\ No newline at end of file
+}

From 9b38786b3ca37deca25f1f06e96113b12b9ee917 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 12 Feb 2019 14:04:47 -0800
Subject: [PATCH 018/245] Fixed a bug where .log/unknown file types were not
 handled in the directory browser

---
 Kudu.Services.Web/KuduWebUtil.cs     | 12 +++++++++++-
 Kudu.Services.Web/Pages/Index.cshtml |  2 +-
 Kudu.Services.Web/Startup.cs         |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 0457071a..dbbca615 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -99,6 +99,10 @@ private static void SetupLocks(ITraceFactory traceFactory, IEnvironment environm
 
         internal static void SetupFileServer(IApplicationBuilder app, string fileDirectoryPath, string requestPath)
         {
+
+            // Create deployment logs directory if it doesn't exist
+            FileSystemHelpers.CreateDirectory(fileDirectoryPath);
+            
             // Set up custom content types - associating file extension to MIME type
             var provider = new FileExtensionContentTypeProvider
             {
@@ -107,6 +111,7 @@ internal static void SetupFileServer(IApplicationBuilder app, string fileDirecto
                     [".py"] = "text/html",
                     [".env"] = "text/html",
                     [".cshtml"] = "text/html",
+                    [".log"] = "text/html",
                     [".image"] = "image/png"
                 }
             };
@@ -117,7 +122,12 @@ internal static void SetupFileServer(IApplicationBuilder app, string fileDirecto
                     fileDirectoryPath),
                 RequestPath = requestPath,
                 EnableDirectoryBrowsing = true,
-                StaticFileOptions = {ContentTypeProvider = provider}
+                StaticFileOptions =
+                {
+                    ServeUnknownFileTypes = true,
+                    DefaultContentType = "text/plain",
+                    ContentTypeProvider = provider
+                }
             });
         }
 
diff --git a/Kudu.Services.Web/Pages/Index.cshtml b/Kudu.Services.Web/Pages/Index.cshtml
index 4aa3d4be..1cf11845 100644
--- a/Kudu.Services.Web/Pages/Index.cshtml
+++ b/Kudu.Services.Web/Pages/Index.cshtml
@@ -113,7 +113,7 @@
     <h3>Browse Directory</h3>
     <ul>
         <li>
-            <a href="logs">Logs</a>
+            <a href="deploymentlogs">Deployment Logs</a>
         </li>
         <li>
             <a href="wwwroot">Site wwwroot</a>
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index b7714d2e..363cadf5 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -385,7 +385,7 @@ public void Configure(IApplicationBuilder app,
             KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.WebRootPath, "/wwwroot");
             
             // Sets up the file server to LogFiles
-            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.LogFilesPath, "/logs");
+            KuduWebUtil.SetupFileServer(app, Path.Combine(_webAppRuntimeEnvironment.LogFilesPath,"kudu","deployment"), "/deploymentlogs");
 
             app.UseSwagger();
 

From 9cb0beef29e782e57f006c6bfa8e410991102333 Mon Sep 17 00:00:00 2001
From: Michimune Kohno <mikono@microsoft.com>
Date: Wed, 13 Feb 2019 17:06:34 -0800
Subject: [PATCH 019/245] Fix detectors link to the slot app

---
 .../Pages/Detectors/index.cshtml              | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
index 92d62fde..56dc510c 100644
--- a/Kudu.Services.Web/Pages/Detectors/index.cshtml
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -5,6 +5,7 @@
     var subscriptionId = ownerName;
     var resourceGroup = Environment.GetEnvironmentVariable("WEBSITE_RESOURCE_GROUP") ?? "";
     var siteName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "";
+    var hostName = Environment.GetEnvironmentVariable("HTTP_HOST") ?? "";
 
     var index = ownerName.IndexOf('+');
     if (index >= 0)
@@ -22,12 +23,36 @@
         detectorPath = "detectors%2FLinuxAppDown";
     }
 
+    var hostNameIndex = hostName.IndexOf('.');
+    if (hostNameIndex >= 0)
+    {
+        hostName = hostName.Substring(0, hostNameIndex);
+    }
+
+    var runtimeSuffxIndex = siteName.IndexOf("__");
+    if (runtimeSuffxIndex >= 0)
+    {
+        siteName = siteName.Substring(0, runtimeSuffxIndex);
+    }
+
+    // Get the slot name
+    if (!hostName.Equals(siteName, StringComparison.CurrentCultureIgnoreCase))
+    {
+        var slotNameIndex = siteName.Length;
+        if (hostName.Length > slotNameIndex && hostName[slotNameIndex] == '-')
+        {
+            // Fix up hostName by replacing "-SLOTNAME" with "/slots/SLOTNAME"
+            var slotName = hostName.Substring(slotNameIndex + 1);
+            hostName = hostName.Substring(0, slotNameIndex) + "/slots/" + slotName;
+        }
+    }
+
     var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath%3D"
             + detectorPath
             + "#resource/subscriptions/" + subscriptionId
             + "/resourceGroups/" + resourceGroup
             + "/providers/Microsoft.Web/sites/"
-            + siteName
+            + hostName
             + "/troubleshoot";
 
     Response.Redirect(detectorDeepLink);

From a082ca7fce616289832a99a49ebb28d7aa97a73b Mon Sep 17 00:00:00 2001
From: Michimune Kohno <mikono@microsoft.com>
Date: Thu, 14 Feb 2019 12:58:51 -0800
Subject: [PATCH 020/245] Refactor slot name handling

---
 Kudu.Services.Web/Pages/Detectors/index.cshtml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
index 56dc510c..8502e816 100644
--- a/Kudu.Services.Web/Pages/Detectors/index.cshtml
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -6,6 +6,7 @@
     var resourceGroup = Environment.GetEnvironmentVariable("WEBSITE_RESOURCE_GROUP") ?? "";
     var siteName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "";
     var hostName = Environment.GetEnvironmentVariable("HTTP_HOST") ?? "";
+    var slotName = "";
 
     var index = ownerName.IndexOf('+');
     if (index >= 0)
@@ -41,18 +42,21 @@
         var slotNameIndex = siteName.Length;
         if (hostName.Length > slotNameIndex && hostName[slotNameIndex] == '-')
         {
-            // Fix up hostName by replacing "-SLOTNAME" with "/slots/SLOTNAME"
-            var slotName = hostName.Substring(slotNameIndex + 1);
-            hostName = hostName.Substring(0, slotNameIndex) + "/slots/" + slotName;
+            // Fix up hostName by removing "-SLOTNAME"
+            slotName = hostName.Substring(slotNameIndex + 1);
+            hostName = hostName.Substring(0, slotNameIndex);
         }
     }
 
+    var isSlot = !String.IsNullOrWhiteSpace(slotName) && !slotName.Equals("production", StringComparison.CurrentCultureIgnoreCase);
+
     var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath%3D"
             + detectorPath
             + "#resource/subscriptions/" + subscriptionId
             + "/resourceGroups/" + resourceGroup
             + "/providers/Microsoft.Web/sites/"
             + hostName
+            + (isSlot ? "/slots/" + slotName : "")
             + "/troubleshoot";
 
     Response.Redirect(detectorDeepLink);

From 4c839108609a51010b2591e823f1e27d9c78e24f Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 8 Jan 2019 12:02:34 -0800
Subject: [PATCH 021/245] Update python build to not use virtual environment

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index b180f6ef..8cc730c5 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,19 +46,6 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
-
-                string virtualEnvName = "antenv";
-
-                if (version.StartsWith("3.6"))
-                {
-                    virtualEnvName = "antenv3.6";
-                }
-                else if (version.StartsWith("2.7"))
-                {
-                    virtualEnvName = "antenv2.7";
-                }
-
-                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)

From 3efccaf9f50ef63b40bf425b55dd237a4c99856c Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 9 Jan 2019 12:30:27 -0800
Subject: [PATCH 022/245] Add virtual env for python

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 8cc730c5..381ff214 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,6 +46,18 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
+                string virtualEnvName = "antenv";
+
+                if (version.StartsWith("3.6"))
+                {
+                    virtualEnvName = "antenv3.6";
+                }
+                else if (version.StartsWith("2.7"))
+                {
+                    virtualEnvName = "antenv2.7";
+                }
+
+                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)

From 953ed7bd12b129b751915fe84f728cc29de92f0d Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 9 Jan 2019 12:46:51 -0800
Subject: [PATCH 023/245] Enable virtualEnv for python 2.7 builds

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 381ff214..e17c529d 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,18 +46,12 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
-                string virtualEnvName = "antenv";
 
-                if (version.StartsWith("3.6"))
+                if (version.StartsWith("2.7"))
                 {
-                    virtualEnvName = "antenv3.6";
+                    string virtualEnvName = "antenv2.7";
+                    additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
                 }
-                else if (version.StartsWith("2.7"))
-                {
-                    virtualEnvName = "antenv2.7";
-                }
-
-                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)

From 2e2ee3caeead398fb70a96dddc18fce442fbf65b Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 9 Jan 2019 14:27:03 -0800
Subject: [PATCH 024/245] Really remove virtual env based deployments for
 python

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index e17c529d..8cc730c5 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,12 +46,6 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
-
-                if (version.StartsWith("2.7"))
-                {
-                    string virtualEnvName = "antenv2.7";
-                    additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
-                }
             }
 
             if (runOryxBuild)

From 9ce333e01497676733a466335b9ebcb2ad822491 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Jan 2019 16:15:40 -0800
Subject: [PATCH 025/245] Added Directory browser for Logs

---
 Kudu.Services.Web/KuduWebUtil.cs              |  6 ++---
 Kudu.Services.Web/Pages/Index.cshtml          | 23 +++++++++----------
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    |  3 +++
 Kudu.Services.Web/Pages/NewUI/logs.cshtml     | 23 +++++++++++++++++++
 Kudu.Services.Web/Startup.cs                  |  8 ++++---
 .../wwwroot/Content/Scripts/jsonTree.js       |  9 ++++++--
 6 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 Kudu.Services.Web/Pages/NewUI/logs.cshtml

diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 30171753..e8c65246 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -97,7 +97,7 @@ private static void SetupLocks(ITraceFactory traceFactory, IEnvironment environm
         }
 
 
-        internal static void SetupFileServer(IApplicationBuilder app, IEnvironment webAppRuntimeEnvironment)
+        internal static void SetupFileServer(IApplicationBuilder app, string fileDirectoryPath, string requestPath)
         {
             // Set up custom content types - associating file extension to MIME type
             var provider = new FileExtensionContentTypeProvider
@@ -114,8 +114,8 @@ internal static void SetupFileServer(IApplicationBuilder app, IEnvironment webAp
             app.UseFileServer(new FileServerOptions
             {
                 FileProvider = new PhysicalFileProvider(
-                    webAppRuntimeEnvironment.WebRootPath),
-                RequestPath = "/wwwroot",
+                    fileDirectoryPath),
+                RequestPath = requestPath,
                 EnableDirectoryBrowsing = true,
                 StaticFileOptions = {ContentTypeProvider = provider}
             });
diff --git a/Kudu.Services.Web/Pages/Index.cshtml b/Kudu.Services.Web/Pages/Index.cshtml
index 51e23afd..4aa3d4be 100644
--- a/Kudu.Services.Web/Pages/Index.cshtml
+++ b/Kudu.Services.Web/Pages/Index.cshtml
@@ -49,7 +49,8 @@
     @{
         string commitFile = System.IO.Path.Combine(hostingEnvironment.WebRootPath, "commit.txt");
         string sha = System.IO.File.Exists(commitFile) ? System.IO.File.ReadAllText(commitFile).Trim() : null;
-        var version = typeof(Kudu.Services.Web.Tracing.TraceMiddleware).Assembly.GetName().Version;
+        //var version = typeof(Kudu.Services.Web.Tracing.TraceMiddleware).Assembly.GetName().Version;
+        var version = Constants.KuduBuild;
     }
     <h3>Environment</h3>
     <div class="row">
@@ -67,17 +68,6 @@
                 }
         </div>
     </div>
-    @if (appServiceVersion != null)
-    {
-        <div class="row">
-            <div class="col-xs-2">
-                <strong>Azure App Service</strong>
-            </div>
-            <div>
-                @GetAppServiceVersion()
-            </div>
-        </div>
-    }
     <div class="row">
         <div class="col-xs-2">
             <strong>Site up time</strong>
@@ -120,5 +110,14 @@
             <a href="api/logs/docker">Current Docker logs</a> (<a href="api/logs/docker/zip">Download as zip</a>)
         </li>
     </ul>
+    <h3>Browse Directory</h3>
+    <ul>
+        <li>
+            <a href="logs">Logs</a>
+        </li>
+        <li>
+            <a href="wwwroot">Site wwwroot</a>
+        </li>
+    </ul>
     <h3>More information about Kudu can be found on the <a href="https://github.com/projectkudu/kudu/wiki">wiki</a>.</h3>
 </div>
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index d21a3d15..119f73dd 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -148,6 +148,9 @@
                             <li>
                                 <a href="/newui/jsonviewer?view_url=/api/vfs">Virtual File System API</a>
                             </li>
+                            <li>
+                                <a href="/newui/logs">Browse Logs Dir</a>
+                            </li>
                         </ul>
                     </small>
                 </div>
diff --git a/Kudu.Services.Web/Pages/NewUI/logs.cshtml b/Kudu.Services.Web/Pages/NewUI/logs.cshtml
new file mode 100644
index 00000000..ca979c09
--- /dev/null
+++ b/Kudu.Services.Web/Pages/NewUI/logs.cshtml
@@ -0,0 +1,23 @@
+@page
+<div class="row" style="margin-top: 20px;margin-top: 10px">
+    <div class="col-xs-offset 1 col-xs-11 col-sm-offset-2 col-sm-8 col-md-offset-3 col-md-6">
+        <div class="btn-toolbar" role="toolbar">
+            <div class="btn-group btn-group-justified" role="group">
+                <div class="btn-group" role="group">
+                    <button id="page-back-btn" class="btn btn-primary btn-primary" title="Go Back" onclick="goBack()"><i class="fas fa-arrow-left fa-lg" aria-hidden="true"></i></button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    function goBack() {
+        if (document.getElementById("wwwroot-files-frame").contentWindow.history.length) {
+            $("#page-back-btn").removeClass("disabled");
+            window.history.back();
+        } else {
+            $("#page-back-btn").addClass("disabled");
+        }
+    }
+</script>
+<iframe src="/logs" id="wwwroot-files-frame" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:100vh;"></iframe>
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index dc40c8c9..49442fdd 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -310,7 +310,6 @@ public void Configure(IApplicationBuilder app,
 
             app.MapWhen(containsRelativePath, application => application.Run(async context =>
             {
-                //context.Response.StatusCode = StatusCodes.Status500InternalServerError;
                 await context.Response.WriteAsync("Kestrel Running");
             }));
 
@@ -375,8 +374,11 @@ public void Configure(IApplicationBuilder app,
                 app.Map(url, appBranch => appBranch.RunCustomGitRepositoryHandler());
             }
 
-            // Sets up the file server to server web app's wwwroot
-            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment);
+            // Sets up the file server to web app's wwwroot
+            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.WebRootPath, "/wwwroot");
+            
+            // Sets up the file server to LogFiles
+            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.LogFilesPath, "/logs");
 
             app.UseSwagger();
 
diff --git a/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js b/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
index 4324a823..f1406434 100644
--- a/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
+++ b/Kudu.Services.Web/wwwroot/Content/Scripts/jsonTree.js
@@ -379,16 +379,21 @@ var jsonTree = (function() {
      */
     function NodeString(label, val, isLast) {
         this.type = "string";
-        var fileExtsToWhiteList = [".log",".txt",".zip",".py",".js"];
+        var fileExtsToWhiteList = [".log",".txt",".zip",".py",".js",".xml"];
         if(val!=null&&val.includes("/api/")){
             var urlStartIdx = val.indexOf("/api/");
             var shouldShowJSONViewerURL = true;
+            /*
             for(ext in fileExtsToWhiteList){
-                if(val.endsWith(ext)){
+                if(val.includes(ext)){
                     shouldShowJSONViewerURL = false;
                     break;
                 }   
             }
+            */
+            if(val.length>3&&(val.charAt(val.length-3) === "." || val.charAt(val.length-4) === ".")){
+                shouldShowJSONViewerURL = false;
+            }
             if(shouldShowJSONViewerURL) {
                 val = "<span style=\"color:#953b39\"><a href=\"/newui/jsonviewer?view_url=" + val.substring(urlStartIdx, val.length) + "\">" + val + "</a></span>";
             }else{

From e87afe2dbd639ba00caec94142b0ccfe82b53423 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 30 Jan 2019 13:50:51 -0800
Subject: [PATCH 026/245] fix detector deeplink

176d9290a7bb5e4ea93b3548f7e1fadd5fb9e6e6 from kudu to
---
 Kudu.Services.Web/Pages/Detectors/index.cshtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
index b97d3f93..92d62fde 100644
--- a/Kudu.Services.Web/Pages/Detectors/index.cshtml
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -15,14 +15,14 @@
     string detectorPath;
     if (Kudu.Core.Helpers.OSDetector.IsOnWindows())
     {
-        detectorPath = "diagnostics/availability/analysis";
+        detectorPath = "diagnostics%2Favailability%2Fanalysis";
     }
     else
     {
-        detectorPath = "detectors/LinuxAppDown";
+        detectorPath = "detectors%2FLinuxAppDown";
     }
 
-    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath="
+    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath%3D"
             + detectorPath
             + "#resource/subscriptions/" + subscriptionId
             + "/resourceGroups/" + resourceGroup

From d870248bb9e301dbb54927787dcabd64b83a969b Mon Sep 17 00:00:00 2001
From: root
 <root@tuxedolinuxbuildvm.i1t5xd3p4kue5apare5pkznajf.cx.internal.cloudapp.net>
Date: Tue, 5 Feb 2019 21:43:49 +0000
Subject: [PATCH 027/245] trial fix

---
 Kudu.Services/Kudu.Services.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services/Kudu.Services.csproj b/Kudu.Services/Kudu.Services.csproj
index 80deeed9..914021d4 100644
--- a/Kudu.Services/Kudu.Services.csproj
+++ b/Kudu.Services/Kudu.Services.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Kudu.Contracts\Kudu.Contracts.csproj" />
@@ -35,4 +36,4 @@
   <PropertyGroup>
     <DocumentationFile>/opt/Kudu/Kudu.Services.xml</DocumentationFile>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

From 08a54b5b99508d88064d5942db429200423021ea Mon Sep 17 00:00:00 2001
From: root
 <root@tuxedolinuxbuildvm.i1t5xd3p4kue5apare5pkznajf.cx.internal.cloudapp.net>
Date: Tue, 5 Feb 2019 22:55:26 +0000
Subject: [PATCH 028/245] Test fix 2

---
 Kudu.Services.Web/Startup.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 49442fdd..b7714d2e 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -305,6 +305,13 @@ public void Configure(IApplicationBuilder app,
                 app.UseExceptionHandler("/Error");
             }
 
+
+            var webSocketOptions = new WebSocketOptions()
+            {
+                KeepAliveInterval = TimeSpan.FromSeconds(15)
+            };
+            app.UseWebSockets(webSocketOptions);
+
             var containsRelativePath = new Func<HttpContext, bool>(i =>
                 i.Request.Path.Value.StartsWith("/Default", StringComparison.OrdinalIgnoreCase));
 

From 8022aa482ec9309ca36393ad5b7d05d9dbf21106 Mon Sep 17 00:00:00 2001
From: root
 <root@tuxedolinuxbuildvm.i1t5xd3p4kue5apare5pkznajf.cx.internal.cloudapp.net>
Date: Fri, 8 Feb 2019 16:25:53 +0000
Subject: [PATCH 029/245] Fixup post-receive for kudulite migration when
 SCM_REPOSITORY_PATH is set in settings file

---
 Kudu.Services.Web/KuduWebUtil.cs | 55 ++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index e8c65246..0457071a 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -187,7 +187,17 @@ internal static string GetRequestTraceFile(IServiceProvider serviceProvider)
         /// <param name="environment"></param>
         internal static void MigrateToNetCorePatch(IEnvironment environment)
         {
-            var gitPostReceiveHookFile = Path.Combine(environment.RepositoryPath, ".git", "hooks", "post-receive");
+	    // Get the repository path:
+            // Use value in the settings.xml file if it is present.
+            string repositoryPath = environment.RepositoryPath;
+            IDeploymentSettingsManager settings = GetDeploymentSettingsManager(environment);
+            if (settings != null)
+            {
+                var settingsRepoPath = DeploymentSettingsExtension.GetRepositoryPath(settings);
+                repositoryPath = Path.Combine(environment.SiteRootPath, settingsRepoPath);
+            }
+
+            var gitPostReceiveHookFile = Path.Combine(repositoryPath, ".git", "hooks", "post-receive");
             if (FileSystemHelpers.FileExists(gitPostReceiveHookFile))
             {
                 var fileText = "";
@@ -204,7 +214,6 @@ internal static void MigrateToNetCorePatch(IEnvironment environment)
             }
         }
 
-
         internal static void TraceShutdown(IEnvironment environment, IDeploymentSettingsManager settings)
         {
             ITracer tracer = GetTracerWithoutContext(environment, settings);
@@ -339,6 +348,46 @@ internal static void EnsureValidDeploymentXmlSettings(IEnvironment environment)
             }
         }
 
+	/// <summary>
+        /// Get Deploployment settings
+        /// </summary>
+        /// <param name="environment"></param>
+        private static IDeploymentSettingsManager GetDeploymentSettingsManager(IEnvironment environment)
+        {
+            var path = GetSettingsPath(environment);
+            if (!FileSystemHelpers.FileExists(path))
+            {
+                return null;
+            }
+
+            IDeploymentSettingsManager result = null;
+
+            try
+            {
+                var settings = new DeploymentSettingsManager(new XmlSettings.Settings(path));
+                settings.GetValue(SettingsKeys.TraceLevel);
+
+                result = settings;
+            }
+            catch (Exception ex)
+            {
+                DateTime lastWriteTimeUtc = DateTime.MinValue;
+                OperationManager.SafeExecute(() => lastWriteTimeUtc = File.GetLastWriteTimeUtc(path));
+                // trace initialization error
+                KuduEventSource.Log.KuduException(
+                    ServerConfiguration.GetApplicationName(),
+                    "Startup.cs",
+                    string.Empty,
+                    string.Empty,
+                    string.Format("Invalid '{0}' is detected and deleted.  Last updated time was {1}.", path,
+                        lastWriteTimeUtc),
+                    ex.ToString());
+                File.Delete(path);
+            }
+
+            return result;
+        }
+
         internal static void PrependFoldersToPath(IEnvironment environment)
         {
             var folders = PathUtilityFactory.Instance.GetPathFolders(environment);
@@ -451,4 +500,4 @@ internal static string GetSettingsPath(IEnvironment environment)
             return Path.Combine(environment.DeploymentsPath, Constants.DeploySettingsPath);
         }
     }
-}
\ No newline at end of file
+}

From bded37fb883aeefa89d92f18ed4cc0b2327ffbff Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 12 Feb 2019 14:04:47 -0800
Subject: [PATCH 030/245] Fixed a bug where .log/unknown file types were not
 handled in the directory browser

---
 Kudu.Services.Web/KuduWebUtil.cs     | 12 +++++++++++-
 Kudu.Services.Web/Pages/Index.cshtml |  2 +-
 Kudu.Services.Web/Startup.cs         |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 0457071a..dbbca615 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -99,6 +99,10 @@ private static void SetupLocks(ITraceFactory traceFactory, IEnvironment environm
 
         internal static void SetupFileServer(IApplicationBuilder app, string fileDirectoryPath, string requestPath)
         {
+
+            // Create deployment logs directory if it doesn't exist
+            FileSystemHelpers.CreateDirectory(fileDirectoryPath);
+            
             // Set up custom content types - associating file extension to MIME type
             var provider = new FileExtensionContentTypeProvider
             {
@@ -107,6 +111,7 @@ internal static void SetupFileServer(IApplicationBuilder app, string fileDirecto
                     [".py"] = "text/html",
                     [".env"] = "text/html",
                     [".cshtml"] = "text/html",
+                    [".log"] = "text/html",
                     [".image"] = "image/png"
                 }
             };
@@ -117,7 +122,12 @@ internal static void SetupFileServer(IApplicationBuilder app, string fileDirecto
                     fileDirectoryPath),
                 RequestPath = requestPath,
                 EnableDirectoryBrowsing = true,
-                StaticFileOptions = {ContentTypeProvider = provider}
+                StaticFileOptions =
+                {
+                    ServeUnknownFileTypes = true,
+                    DefaultContentType = "text/plain",
+                    ContentTypeProvider = provider
+                }
             });
         }
 
diff --git a/Kudu.Services.Web/Pages/Index.cshtml b/Kudu.Services.Web/Pages/Index.cshtml
index 4aa3d4be..1cf11845 100644
--- a/Kudu.Services.Web/Pages/Index.cshtml
+++ b/Kudu.Services.Web/Pages/Index.cshtml
@@ -113,7 +113,7 @@
     <h3>Browse Directory</h3>
     <ul>
         <li>
-            <a href="logs">Logs</a>
+            <a href="deploymentlogs">Deployment Logs</a>
         </li>
         <li>
             <a href="wwwroot">Site wwwroot</a>
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index b7714d2e..363cadf5 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -385,7 +385,7 @@ public void Configure(IApplicationBuilder app,
             KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.WebRootPath, "/wwwroot");
             
             // Sets up the file server to LogFiles
-            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.LogFilesPath, "/logs");
+            KuduWebUtil.SetupFileServer(app, Path.Combine(_webAppRuntimeEnvironment.LogFilesPath,"kudu","deployment"), "/deploymentlogs");
 
             app.UseSwagger();
 

From d14486c8d1f07afded77a17fdaa33ef6e2f4d09d Mon Sep 17 00:00:00 2001
From: Michimune Kohno <mikono@microsoft.com>
Date: Wed, 13 Feb 2019 17:06:34 -0800
Subject: [PATCH 031/245] Fix detectors link to the slot app

---
 .../Pages/Detectors/index.cshtml              | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
index 92d62fde..56dc510c 100644
--- a/Kudu.Services.Web/Pages/Detectors/index.cshtml
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -5,6 +5,7 @@
     var subscriptionId = ownerName;
     var resourceGroup = Environment.GetEnvironmentVariable("WEBSITE_RESOURCE_GROUP") ?? "";
     var siteName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "";
+    var hostName = Environment.GetEnvironmentVariable("HTTP_HOST") ?? "";
 
     var index = ownerName.IndexOf('+');
     if (index >= 0)
@@ -22,12 +23,36 @@
         detectorPath = "detectors%2FLinuxAppDown";
     }
 
+    var hostNameIndex = hostName.IndexOf('.');
+    if (hostNameIndex >= 0)
+    {
+        hostName = hostName.Substring(0, hostNameIndex);
+    }
+
+    var runtimeSuffxIndex = siteName.IndexOf("__");
+    if (runtimeSuffxIndex >= 0)
+    {
+        siteName = siteName.Substring(0, runtimeSuffxIndex);
+    }
+
+    // Get the slot name
+    if (!hostName.Equals(siteName, StringComparison.CurrentCultureIgnoreCase))
+    {
+        var slotNameIndex = siteName.Length;
+        if (hostName.Length > slotNameIndex && hostName[slotNameIndex] == '-')
+        {
+            // Fix up hostName by replacing "-SLOTNAME" with "/slots/SLOTNAME"
+            var slotName = hostName.Substring(slotNameIndex + 1);
+            hostName = hostName.Substring(0, slotNameIndex) + "/slots/" + slotName;
+        }
+    }
+
     var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath%3D"
             + detectorPath
             + "#resource/subscriptions/" + subscriptionId
             + "/resourceGroups/" + resourceGroup
             + "/providers/Microsoft.Web/sites/"
-            + siteName
+            + hostName
             + "/troubleshoot";
 
     Response.Redirect(detectorDeepLink);

From 59da4d822394495886ac8cd499e2571e2f171fd6 Mon Sep 17 00:00:00 2001
From: Michimune Kohno <mikono@microsoft.com>
Date: Thu, 14 Feb 2019 12:58:51 -0800
Subject: [PATCH 032/245] Refactor slot name handling

---
 Kudu.Services.Web/Pages/Detectors/index.cshtml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
index 56dc510c..8502e816 100644
--- a/Kudu.Services.Web/Pages/Detectors/index.cshtml
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -6,6 +6,7 @@
     var resourceGroup = Environment.GetEnvironmentVariable("WEBSITE_RESOURCE_GROUP") ?? "";
     var siteName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "";
     var hostName = Environment.GetEnvironmentVariable("HTTP_HOST") ?? "";
+    var slotName = "";
 
     var index = ownerName.IndexOf('+');
     if (index >= 0)
@@ -41,18 +42,21 @@
         var slotNameIndex = siteName.Length;
         if (hostName.Length > slotNameIndex && hostName[slotNameIndex] == '-')
         {
-            // Fix up hostName by replacing "-SLOTNAME" with "/slots/SLOTNAME"
-            var slotName = hostName.Substring(slotNameIndex + 1);
-            hostName = hostName.Substring(0, slotNameIndex) + "/slots/" + slotName;
+            // Fix up hostName by removing "-SLOTNAME"
+            slotName = hostName.Substring(slotNameIndex + 1);
+            hostName = hostName.Substring(0, slotNameIndex);
         }
     }
 
+    var isSlot = !String.IsNullOrWhiteSpace(slotName) && !slotName.Equals("production", StringComparison.CurrentCultureIgnoreCase);
+
     var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath%3D"
             + detectorPath
             + "#resource/subscriptions/" + subscriptionId
             + "/resourceGroups/" + resourceGroup
             + "/providers/Microsoft.Web/sites/"
             + hostName
+            + (isSlot ? "/slots/" + slotName : "")
             + "/troubleshoot";
 
     Response.Redirect(detectorDeepLink);

From 780e0f8c3e77a89fd1e39986d8f9c0622eeb5895 Mon Sep 17 00:00:00 2001
From: Jenny Lawrance <jennylaw@microsoft.com>
Date: Sat, 16 Feb 2019 01:22:18 +0000
Subject: [PATCH 033/245] Ensure zip-deploy does build only when configured

---
 .../Generator/SiteBuilderFactory.cs           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index 07360174..6bab1102 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -26,15 +26,6 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
         {
             string repositoryRoot = repository.RepositoryPath;
 
-            string enableOryxBuild = System.Environment.GetEnvironmentVariable("ENABLE_ORYX_BUILD");
-            if (!string.IsNullOrEmpty(enableOryxBuild))
-            {
-                if (enableOryxBuild.Equals("true", StringComparison.OrdinalIgnoreCase))
-                {
-                    return new OryxBuilder(_environment, settings, _propertyProvider, repositoryRoot);
-                }
-            }
-
             // Use the cached vs projects file finder for: a. better performance, b. ignoring solutions/projects under node_modules
             var fileFinder = new CachedVsProjectsFileFinder(repository);
 
@@ -72,6 +63,15 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
                 return new BasicBuilder(_environment, settings, _propertyProvider, repositoryRoot, projectPath);
             }
 
+            string enableOryxBuild = System.Environment.GetEnvironmentVariable("ENABLE_ORYX_BUILD");
+            if (!string.IsNullOrEmpty(enableOryxBuild))
+            {
+                if (enableOryxBuild.Equals("true", StringComparison.OrdinalIgnoreCase))
+                {
+                    return new OryxBuilder(_environment, settings, _propertyProvider, repositoryRoot);
+                }
+            }
+
             if (!String.IsNullOrEmpty(targetProjectPath))
             {
                 // Try to resolve the project
@@ -417,4 +417,4 @@ public IEnumerable<string> ListFiles(string path, SearchOption searchOption, par
             }
         }
     }
-}
\ No newline at end of file
+}

From 315de0b1be408186eb9b656ae02e08d66e7f7863 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 6 Mar 2019 17:18:58 -0800
Subject: [PATCH 034/245] Update python builds to minimize deployment failures'

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 8cc730c5..381ff214 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -46,6 +46,18 @@ public override Task Build(DeploymentContext context)
             {
                 oryxLanguage = "python";
                 runOryxBuild = true;
+                string virtualEnvName = "antenv";
+
+                if (version.StartsWith("3.6"))
+                {
+                    virtualEnvName = "antenv3.6";
+                }
+                else if (version.StartsWith("2.7"))
+                {
+                    virtualEnvName = "antenv2.7";
+                }
+
+                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
 
             if (runOryxBuild)

From 004941fd9e97f37ceff887eabb4768308f78aeaa Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 7 Mar 2019 16:14:14 -0800
Subject: [PATCH 035/245] Increasing deployments lock timeout to 20 minutes

---
 Kudu.Core/AllSafeLinuxLock.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/AllSafeLinuxLock.cs b/Kudu.Core/AllSafeLinuxLock.cs
index 2dc5955c..75ac36ad 100644
--- a/Kudu.Core/AllSafeLinuxLock.cs
+++ b/Kudu.Core/AllSafeLinuxLock.cs
@@ -19,6 +19,7 @@ public class AllSafeLinuxLock :IOperationLock
     {
         private ITraceFactory _traceFactory;
         private static readonly string locksPath = "/home/site/locks";
+	private const int lockTimeout = 1200; //in seconds
         public AllSafeLinuxLock(string path, ITraceFactory traceFactory)
         {
             _traceFactory = traceFactory;
@@ -104,7 +105,7 @@ private static void CreateLockInfoFile(string operationName)
             lockInfo.heldByTID = Thread.CurrentThread.ManagedThreadId;
             lockInfo.heldByWorker = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
             lockInfo.heldByOp = operationName;
-            lockInfo.lockExpiry = DateTime.UtcNow.AddSeconds(600);
+            lockInfo.lockExpiry = DateTime.UtcNow.AddSeconds(lockTimeout);
             //Console.WriteLine("CreatingLockDir - LockInfoObj : "+lockInfo);
             var json = JsonConvert.SerializeObject(lockInfo);
             FileSystemHelpers.WriteAllText(locksPath+"/deployment/info.lock",json);
@@ -171,4 +172,4 @@ public override string ToString()
             }
         }
     }
-}
\ No newline at end of file
+}

From bc07d1f381bba5b6f890b667eaff36b5dbfb5629 Mon Sep 17 00:00:00 2001
From: Jenny Lawrance <jennylaw@microsoft.com>
Date: Wed, 13 Mar 2019 04:44:02 +0000
Subject: [PATCH 036/245] Adding dotnet support

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 381ff214..f380d345 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -59,6 +59,11 @@ public override Task Build(DeploymentContext context)
 
                 additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
+	    else if (framework.StartsWith("DOTNETCORE"))
+	    {
+		oryxLanguage = "dotnet";
+		runOryxBuild = true;
+	    }
 
             if (runOryxBuild)
             {
@@ -82,4 +87,4 @@ public override Task Build(DeploymentContext context)
         //    FileLogHelper.Log("Completed PostBuild oryx....");
         //}
     }
-}
\ No newline at end of file
+}

From 7ba5e9e4c7be33ea7c9c869e304ece9e14d35f6b Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Fri, 29 Mar 2019 11:52:47 -0700
Subject: [PATCH 037/245] Test Commit for new build options

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  49 +-----
 Kudu.Core/Deployment/Oryx/BuildFlags.cs       |  34 ++++
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   |  15 ++
 Kudu.Core/Deployment/Oryx/OryxArguments.cs    | 145 ++++++++++++++++++
 .../Deployment/Oryx/SupportedLanguages.cs     |  35 +++++
 5 files changed, 237 insertions(+), 41 deletions(-)
 create mode 100644 Kudu.Core/Deployment/Oryx/BuildFlags.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/OryxArguments.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/SupportedLanguages.cs

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index f380d345..062abffb 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -30,51 +30,18 @@ public override Task Build(DeploymentContext context)
 
             RunCommand(context, kuduSyncCommand, false, "Oryx-Build: Running kudu sync...");
 
-            string framework = System.Environment.GetEnvironmentVariable("FRAMEWORK");
-            string version = System.Environment.GetEnvironmentVariable("FRAMEWORK_VERSION");
-
-            string oryxLanguage = "";
-            string additionalOptions = "";
-            bool runOryxBuild = false;
-
-            if (framework.StartsWith("NODE"))
-            {
-                oryxLanguage = "nodejs";
-                runOryxBuild = true;
-            }
-            else if (framework.StartsWith("PYTHON"))
+            OryxArguments args = new OryxArguments();
+            if (args.RunOryxBuild)
             {
-                oryxLanguage = "python";
-                runOryxBuild = true;
-                string virtualEnvName = "antenv";
+                string buildCommand = args.GenerateOryxBuildCommand(context, RepositoryPath);
+                RunCommand(context, buildCommand, false, "Running oryx build...");
 
-                if (version.StartsWith("3.6"))
-                {
-                    virtualEnvName = "antenv3.6";
-                }
-                else if (version.StartsWith("2.7"))
+                //
+                // Run express build setups if needed
+                if (args.Flags == BuildFlags.UseExpressBuild)
                 {
-                    virtualEnvName = "antenv2.7";
+                    // TODO
                 }
-
-                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
-            }
-	    else if (framework.StartsWith("DOTNETCORE"))
-	    {
-		oryxLanguage = "dotnet";
-		runOryxBuild = true;
-	    }
-
-            if (runOryxBuild)
-            {
-                string oryxBuildCommand = string.Format("oryx build {0} -o {1} -l {2} --language-version {3} {4}",
-                    context.OutputPath,
-                    context.OutputPath,
-                    oryxLanguage,
-                    version,
-                    additionalOptions);
-
-                RunCommand(context, oryxBuildCommand, false, "Running oryx build...");
             }
 
             return Task.CompletedTask;
diff --git a/Kudu.Core/Deployment/Oryx/BuildFlags.cs b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
new file mode 100644
index 00000000..6c168481
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment
+{
+    public enum BuildFlags
+    {
+        None = 0,
+        UseTmpDirectory = 1,
+        UseExpressBuild = 2
+    }
+
+    public class BuildFlagsHelper
+    {
+        public static BuildFlags Parse(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return BuildFlags.None;
+            }
+
+            try
+            {
+                var result = (BuildFlags)Enum.Parse(typeof(BuildFlags), value);
+                return result;
+            }
+            catch (Exception)
+            {
+                return BuildFlags.None;
+            }
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
new file mode 100644
index 00000000..9e415c26
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    public class ExpressBuilder
+    {
+        public void SetupExpressBuilderArtifacts()
+        {
+            // 0. Generate the packagename.txt:
+            // 1. Copy the zip'd output to /home/data/SitePackages
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
new file mode 100644
index 00000000..3beb3182
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Kudu.Core.Deployment.Oryx;
+
+namespace Kudu.Core.Deployment
+{
+    public class OryxArguments
+    {
+        public bool RunOryxBuild { get; set; }
+
+        public Framework Language { get; set; }
+
+        public string Version { get; set; }
+
+        public string PublishFolder { get; set; }
+
+        public string VirtualEnv { get; private set; }
+
+        public BuildFlags Flags { get; set; }
+
+        public OryxArguments()
+        {
+            RunOryxBuild = false;
+
+            string framework = System.Environment.GetEnvironmentVariable("FRAMEWORK");
+            string version = System.Environment.GetEnvironmentVariable("FRAMEWORK_VERSION");
+            string buildFlags = System.Environment.GetEnvironmentVariable("BUILD_FLAGS");
+
+            if (string.IsNullOrEmpty(framework) ||
+                string.IsNullOrEmpty(version))
+            {
+                return;
+            }
+
+            Language = SupportedFrameworks.ParseLanguage(framework);
+            if (Language == Framework.None)
+            {
+                return;
+            }
+
+            RunOryxBuild = true;
+            Version = version;
+
+            // Set language specific 
+            SetLanguageOptions();
+
+            // Parse Build Flags
+            Flags = BuildFlagsHelper.Parse(buildFlags);
+        }
+
+        private void SetLanguageOptions()
+        {
+            switch(Language)
+            {
+                case Framework.None:
+                    return;
+
+                case Framework.Python:
+                    SetVirtualEnvironment();
+                    return;
+
+                case Framework.DotNETCore:
+                    return;
+
+                case Framework.NodeJs:
+                    return;
+            }
+        }
+
+        private void SetVirtualEnvironment()
+        {
+            string virtualEnvName = "antenv";
+            if (Version.StartsWith("3.6"))
+            {
+                virtualEnvName = "antenv3.6";
+            }
+            else if (Version.StartsWith("2.7"))
+            {
+                virtualEnvName = "antenv2.7";
+            }
+
+            VirtualEnv = virtualEnvName;
+        }
+
+        public string GenerateOryxBuildCommand(DeploymentContext context, string repositoryPath)
+        {
+            StringBuilder args = new StringBuilder();
+
+            // Input/Output
+            args.AppendFormat("oryx build {0} -o {1}", repositoryPath, context.OutputPath);
+
+            // Language
+            switch(Language)
+            {
+                case Framework.None:
+                    break;
+
+                case Framework.NodeJs:
+                    args.AppendFormat(" -l nodejs");
+                    break;
+
+                case Framework.Python:
+                    args.AppendFormat(" -l python");
+                    break;
+
+                case Framework.DotNETCore:
+                    args.AppendFormat(" -l dotnet");
+                    break;
+            }
+
+            // Version
+            args.AppendFormat(" --language-version {0}", Version);
+
+            // Build Flags
+            switch (Flags)
+            {
+                case BuildFlags.None:
+                    break;
+
+                case BuildFlags.UseTmpDirectory:
+                    args.AppendFormat(" -i {0}", context.BuildTempPath);
+                    break;
+
+                case BuildFlags.UseExpressBuild:
+                    args.AppendFormat(" -i {0} --compress-packages zip", context.BuildTempPath);
+                    break;
+            }
+
+            // Virtual Env?
+            if (!String.IsNullOrEmpty(VirtualEnv))
+            {
+                args.AppendFormat(" -p {0}", VirtualEnv);
+            }
+
+            // Publish Output?
+            if (!String.IsNullOrEmpty(PublishFolder))
+            {
+                args.AppendFormat(" -publishedOutputPath {0}", PublishFolder);
+            }
+
+            return args.ToString();
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs b/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
new file mode 100644
index 00000000..60313767
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    public enum Framework
+    {
+        None,
+        NodeJs,
+        Python,
+        DotNETCore
+    }
+
+    public class SupportedFrameworks
+    {
+        public static Framework ParseLanguage(string value)
+        {
+            if (value.StartsWith("NODE", StringComparison.OrdinalIgnoreCase))
+            {
+                return Framework.NodeJs;
+            }
+            else if (value.StartsWith("PYTHON", StringComparison.OrdinalIgnoreCase))
+            {
+                return Framework.Python;
+            }
+            else if (value.StartsWith("DOTNETCORE", StringComparison.OrdinalIgnoreCase))
+            {
+                return Framework.DotNETCore;
+            }
+
+            return Framework.None;
+        }
+    }
+}

From 357b58385d0fbb95d175a86e81d45dc6ad98c5a1 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Mon, 1 Apr 2019 13:48:29 -0700
Subject: [PATCH 038/245] Oryx build optimizations

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  4 +-
 Kudu.Core/Deployment/Oryx/BuildFlags.cs       | 17 +++---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   | 10 +++-
 Kudu.Core/Deployment/Oryx/OryxArguments.cs    | 56 +++++++++++++++----
 4 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 062abffb..36803c2c 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -38,9 +38,9 @@ public override Task Build(DeploymentContext context)
 
                 //
                 // Run express build setups if needed
-                if (args.Flags == BuildFlags.UseExpressBuild)
+                if (args.Flags == BuildOptimizationsFlags.UseExpressBuild)
                 {
-                    // TODO
+                    Oryx.ExpressBuilder.SetupExpressBuilderArtifacts(context.OutputPath);
                 }
             }
 
diff --git a/Kudu.Core/Deployment/Oryx/BuildFlags.cs b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
index 6c168481..4e08f627 100644
--- a/Kudu.Core/Deployment/Oryx/BuildFlags.cs
+++ b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
@@ -4,30 +4,31 @@
 
 namespace Kudu.Core.Deployment
 {
-    public enum BuildFlags
+    public enum BuildOptimizationsFlags
     {
-        None = 0,
-        UseTmpDirectory = 1,
-        UseExpressBuild = 2
+        Off,
+        None,
+        CompressModules,
+        UseExpressBuild
     }
 
     public class BuildFlagsHelper
     {
-        public static BuildFlags Parse(string value)
+        public static BuildOptimizationsFlags Parse(string value)
         {
             if (string.IsNullOrEmpty(value))
             {
-                return BuildFlags.None;
+                return BuildOptimizationsFlags.None;
             }
 
             try
             {
-                var result = (BuildFlags)Enum.Parse(typeof(BuildFlags), value);
+                var result = (BuildOptimizationsFlags)Enum.Parse(typeof(BuildOptimizationsFlags), value);
                 return result;
             }
             catch (Exception)
             {
-                return BuildFlags.None;
+                return BuildOptimizationsFlags.None;
             }
         }
     }
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 9e415c26..056e8564 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -1,15 +1,19 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.IO;
 
 namespace Kudu.Core.Deployment.Oryx
 {
     public class ExpressBuilder
     {
-        public void SetupExpressBuilderArtifacts()
+        public static void SetupExpressBuilderArtifacts(string outputPath)
         {
-            // 0. Generate the packagename.txt:
-            // 1. Copy the zip'd output to /home/data/SitePackages
+            //
+            // Generate packagename.txt and packagepath
+            string packagename = "nodemodules.zip:/node_modules";
+            File.WriteAllText("/home/data/SitePackages/packagename.txt", packagename);
+            File.WriteAllText("/home/data/SitePackages/packagepath.txt", outputPath);
         }
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
index 3beb3182..329d306a 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -17,7 +17,7 @@ public class OryxArguments
 
         public string VirtualEnv { get; private set; }
 
-        public BuildFlags Flags { get; set; }
+        public BuildOptimizationsFlags Flags { get; set; }
 
         public OryxArguments()
         {
@@ -42,11 +42,11 @@ public OryxArguments()
             RunOryxBuild = true;
             Version = version;
 
-            // Set language specific 
-            SetLanguageOptions();
-
             // Parse Build Flags
             Flags = BuildFlagsHelper.Parse(buildFlags);
+
+            // Set language specific 
+            SetLanguageOptions();
         }
 
         private void SetLanguageOptions()
@@ -64,6 +64,12 @@ private void SetLanguageOptions()
                     return;
 
                 case Framework.NodeJs:
+                    // For node, enable compress option by default
+                    if (Flags == BuildOptimizationsFlags.None)
+                    {
+                        Flags = BuildOptimizationsFlags.CompressModules;
+                    }
+
                     return;
             }
         }
@@ -91,7 +97,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context, string reposit
             args.AppendFormat("oryx build {0} -o {1}", repositoryPath, context.OutputPath);
 
             // Language
-            switch(Language)
+            switch (Language)
             {
                 case Framework.None:
                     break;
@@ -115,15 +121,30 @@ public string GenerateOryxBuildCommand(DeploymentContext context, string reposit
             // Build Flags
             switch (Flags)
             {
-                case BuildFlags.None:
+                case BuildOptimizationsFlags.Off:
+                case BuildOptimizationsFlags.None:
                     break;
 
-                case BuildFlags.UseTmpDirectory:
-                    args.AppendFormat(" -i {0}", context.BuildTempPath);
+                case BuildOptimizationsFlags.CompressModules:
+                    AddTempDirectoryOption(args, context.BuildTempPath);
+                    if (Language == Framework.NodeJs)
+                    {
+                        AddNodeCompressOption(args, "tar-gz");
+                    }
+                    else if (Language == Framework.Python)
+                    {
+                        AddPythonCompressOption(args);
+                    }
+
                     break;
 
-                case BuildFlags.UseExpressBuild:
-                    args.AppendFormat(" -i {0} --compress-packages zip", context.BuildTempPath);
+                case BuildOptimizationsFlags.UseExpressBuild:
+                    AddTempDirectoryOption(args, context.BuildTempPath);
+                    if (Language == Framework.NodeJs)
+                    {
+                        AddNodeCompressOption(args, "zip");
+                    }
+
                     break;
             }
 
@@ -141,5 +162,20 @@ public string GenerateOryxBuildCommand(DeploymentContext context, string reposit
 
             return args.ToString();
         }
+
+        private static void AddTempDirectoryOption(StringBuilder args, string tempDir)
+        {
+            args.AppendFormat(" -i {0}", tempDir);
+        }
+
+        private static void AddNodeCompressOption(StringBuilder args, string format)
+        {
+            args.AppendFormat(" -p compress_node_modules={0}", format);
+        }
+
+        private static void AddPythonCompressOption(StringBuilder args)
+        {
+            args.AppendFormat(" -p zip_venv_dir");
+        }
     }
 }

From 47e3235a1f163c89badbbebe8675c3e8f12c6cb0 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 2 Apr 2019 14:02:20 -0700
Subject: [PATCH 039/245] Fix bug in source directory

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 2 +-
 Kudu.Core/Deployment/Oryx/OryxArguments.cs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 36803c2c..2602b117 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -33,7 +33,7 @@ public override Task Build(DeploymentContext context)
             OryxArguments args = new OryxArguments();
             if (args.RunOryxBuild)
             {
-                string buildCommand = args.GenerateOryxBuildCommand(context, RepositoryPath);
+                string buildCommand = args.GenerateOryxBuildCommand(context);
                 RunCommand(context, buildCommand, false, "Running oryx build...");
 
                 //
diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
index 329d306a..79e3a839 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -89,12 +89,12 @@ private void SetVirtualEnvironment()
             VirtualEnv = virtualEnvName;
         }
 
-        public string GenerateOryxBuildCommand(DeploymentContext context, string repositoryPath)
+        public string GenerateOryxBuildCommand(DeploymentContext context)
         {
             StringBuilder args = new StringBuilder();
 
             // Input/Output
-            args.AppendFormat("oryx build {0} -o {1}", repositoryPath, context.OutputPath);
+            args.AppendFormat("oryx build {0} -o {1}", context.OutputPath, context.OutputPath);
 
             // Language
             switch (Language)

From e3fbccae4172706555334da998e48c8f1d429ca1 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 2 Apr 2019 16:21:47 -0700
Subject: [PATCH 040/245] Fix python builds to use virtualenv flags correctly

---
 Kudu.Core/Deployment/Oryx/OryxArguments.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
index 79e3a839..726a99a2 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -151,7 +151,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
             // Virtual Env?
             if (!String.IsNullOrEmpty(VirtualEnv))
             {
-                args.AppendFormat(" -p {0}", VirtualEnv);
+                args.AppendFormat(" -p virtualenv_name={0}", VirtualEnv);
             }
 
             // Publish Output?

From 8fdf9741a307365ccd60bd1aa7be4e0a1f1a2bcb Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 2 Apr 2019 17:06:41 -0700
Subject: [PATCH 041/245] Fix expressbuilder issue

---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 056e8564..6a034b7d 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -9,11 +9,26 @@ public class ExpressBuilder
     {
         public static void SetupExpressBuilderArtifacts(string outputPath)
         {
+            string root = "/home/site/data/SitePackages";
+            string packageNameFile = Path.Combine(root, "packagename.txt");
+            string packagePathFile = Path.Combine(root, "packagepath.txt");
+
             //
             // Generate packagename.txt and packagepath
             string packagename = "nodemodules.zip:/node_modules";
-            File.WriteAllText("/home/data/SitePackages/packagename.txt", packagename);
-            File.WriteAllText("/home/data/SitePackages/packagepath.txt", outputPath);
+
+            CreateSitePackagesDirectory(root);
+
+            File.WriteAllText(packageNameFile, packagename);
+            File.WriteAllText(packagePathFile, outputPath);
+        }
+
+        private static void CreateSitePackagesDirectory(string path)
+        {
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
         }
     }
 }

From 05a457fcb4829549db4c1cb7fa404dd18afe326c Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 3 Apr 2019 08:04:49 -0700
Subject: [PATCH 042/245] Update ExpressBuilder.cs

Correcting the SitePackages root path
---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 6a034b7d..f546187f 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -9,7 +9,7 @@ public class ExpressBuilder
     {
         public static void SetupExpressBuilderArtifacts(string outputPath)
         {
-            string root = "/home/site/data/SitePackages";
+            string root = "/home/data/SitePackages";
             string packageNameFile = Path.Combine(root, "packagename.txt");
             string packagePathFile = Path.Combine(root, "packagepath.txt");
 

From 9244e65a5ce947dca59895cfd1f025677b086155 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 22 Mar 2019 12:16:44 -0700
Subject: [PATCH 043/245] Fixed the bug where kudu didn't handle symlinks in
 zip files for zip deploy

---
 .../Infrastructure/ZipArchiveExtensions.cs    | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs b/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
index 3b44c28a..9e61ff05 100644
--- a/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
+++ b/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
@@ -4,6 +4,7 @@
 using System.IO.Abstractions;
 using System.IO.Compression;
 using Kudu.Contracts.Tracing;
+using Kudu.Core.Helpers;
 using Kudu.Core.Tracing;
 
 namespace Kudu.Core.Infrastructure
@@ -127,12 +128,57 @@ public static void Extract(this ZipArchive archive, string directoryName)
                     }
 
                     using (Stream zipStream = entry.Open(),
-                                  fileStream = fileInfo.Open(FileMode.Create, FileAccess.Write))
+                                  fileStream = fileInfo.Open(FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
                     {
                         zipStream.CopyTo(fileStream);
                     }
 
+                    bool createSymLink = false;
+                    string originalFileName = string.Empty;
+                    if (!OSDetector.IsOnWindows())
+                    {
+                        try
+                        {
+                            using (Stream fs = fileInfo.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                            {
+                                byte[] buffer = new byte[10];
+                                fs.Read(buffer, 0, buffer.Length);
+                                fs.Close();
+
+                                var str = System.Text.Encoding.Default.GetString(buffer);
+                                if (str.StartsWith("../"))
+                                {
+                                    string fullPath = Path.GetFullPath(str);
+                                    if (fullPath.StartsWith(directoryName))
+                                    {
+                                        createSymLink = true;
+                                        originalFileName = fullPath;
+                                    }
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception("Could not identify symlinks in zip file : " + ex.ToString());
+                        }
+                    }
+
                     fileInfo.LastWriteTimeUtc = entry.LastWriteTime.ToUniversalTime().DateTime;
+
+                    if (createSymLink)
+                    {
+                        try
+                        {
+                            fileInfo.Delete();
+
+                            Mono.Unix.UnixFileInfo unixFileInfo = new Mono.Unix.UnixFileInfo(originalFileName);
+                            unixFileInfo.CreateSymbolicLink(path);
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception("Could not create symlinks : " + ex.ToString());
+                        }
+                    }
                 }
             }
         }

From 04ed8641ea97f703c8e3ba523616ec2d5213c141 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 22 Mar 2019 12:17:56 -0700
Subject: [PATCH 044/245] Added functionality to return the deployment log url
 at the end of a git deployment

---
 Kudu.Console/Program.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index c758592e..1c9d0ed2 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -196,6 +196,12 @@ private static int PerformDeploy(
                     System.Console.Error.WriteLine(Resources.Log_DeploymentError);
                     return 1;
                 }
+                finally
+                {
+                    System.Console.WriteLine("Deployment Logs : '"+
+                        env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=api/deployments/" + 
+                        gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
+                }
             }
 
             if (logger.HasErrors)

From 636adaccc6c72047dcff49eacae31d1e0964bbed Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 3 Apr 2019 08:27:02 -0700
Subject: [PATCH 045/245] Added functionality to switch between volatile logs
 and mounted dir logs

---
 Kudu.Services/Diagnostics/LogStreamManager.cs | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index e17bc531..6eacfe6d 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -47,6 +47,8 @@ public class LogStreamManager
         private DateTime _startTime;
         private TimeSpan _timeout;
 
+        private const string volatileLogsPath = "/appsvctmp/volatile/logs/runtime";
+
         // CORE TODO
         //private ShutdownDetector _shutdownDetector;
         //private CancellationTokenRegistration _cancellationTokenRegistration;
@@ -97,8 +99,19 @@ public async Task ProcessRequest(HttpContext context)
 
             var firstPath = routePath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
 
-            path = FileSystemHelpers.EnsureDirectory(Path.Combine(_logPath, routePath));
+            // Ensure mounted logFiles dir 
 
+            string mountedLogFilesDir = Path.Combine(_logPath, routePath);
+            FileSystemHelpers.EnsureDirectory(mountedLogFilesDir);
+
+            if (shouldMonitiorVolatileLogsPath(mountedLogFilesDir))
+            {
+                path = volatileLogsPath;
+            }
+            else
+            {
+                path = mountedLogFilesDir;
+            }
 
             await WriteInitialMessage(context);
 
@@ -148,6 +161,31 @@ private static Task WriteInitialMessage(HttpContext context)
             var msg = String.Format(CultureInfo.CurrentCulture, Resources.LogStream_Welcome, DateTime.UtcNow.ToString("s"), System.Environment.NewLine);
             return context.Response.WriteAsync(msg);
         }
+        
+        /// <summary>
+        /// Determines if Kudu Should Monitor Mounted Logs directory,
+        /// or the mounted fs logs dir, if kudu
+        /// </summary>
+        /// <returns></returns>
+        private static bool shouldMonitiorVolatileLogsPath(string mountedDirPath)
+        {
+            int count = 0;
+            string dateToday = DateTime.Now.ToString("yyyy_MM_dd");
+
+            if (FileSystemHelpers.DirectoryExists(mountedDirPath))
+            {
+                // if more than two log files present that are generated today, 
+                // use this directory; first file for a date is the marker file
+                foreach (var file in Directory.GetFiles(mountedDirPath, "*", SearchOption.AllDirectories))
+                {
+                    if (file.StartsWith(dateToday) && ++count > 1)
+                    {
+                        break;
+                    }
+                }
+            }
+            return count<=1;
+        }
 
         private void Initialize(string path, HttpContext context)
         {

From f0e03fffeae8836f10a3a556ca11d3b820ce664c Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Thu, 4 Apr 2019 14:48:08 -0700
Subject: [PATCH 046/245] Update ExpressBuilder.cs

Fix typo node_modules.zip
---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index f546187f..21385940 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -15,7 +15,7 @@ public static void SetupExpressBuilderArtifacts(string outputPath)
 
             //
             // Generate packagename.txt and packagepath
-            string packagename = "nodemodules.zip:/node_modules";
+            string packagename = "node_modules.zip:/node_modules";
 
             CreateSitePackagesDirectory(root);
 

From 6e26eb7d7bf28de2d057b7a9de66f875be49ca7c Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 9 Apr 2019 12:29:51 -0700
Subject: [PATCH 047/245] Minor fixes to the Kudu Ui.Added tail 10 lines to log
 stream startup

---
 Kudu.Console/Program.cs                       |  2 +-
 Kudu.Console/Properties/launchSettings.json   | 27 +++++++
 Kudu.Core/Kudu.Core.csproj                    |  5 +-
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    | 32 +++-----
 .../Pages/NewUI/JsonViewer.cshtml             | 13 +++-
 Kudu.Services.Web/Pages/NewUI/_Layout.cshtml  | 39 +++++++---
 .../Pages/NewUI/kududebug.cshtml              |  3 +
 Kudu.Services.Web/Pages/NewUI/logs.cshtml     |  2 +-
 Kudu.Services.Web/Pages/NewUI/webssh.cshtml   |  3 +-
 .../wwwroot/Content/Styles/dashboard.css      | 18 +++++
 .../wwwroot/Content/Styles/newui.css          |  4 -
 Kudu.Services/Diagnostics/LogStreamManager.cs | 78 ++++++++++++++++---
 Kudu.Services/Kudu.Services.csproj            |  1 -
 13 files changed, 172 insertions(+), 55 deletions(-)
 create mode 100644 Kudu.Console/Properties/launchSettings.json
 create mode 100644 Kudu.Services.Web/Pages/NewUI/kududebug.cshtml

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 1c9d0ed2..cfbf6dc2 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -199,7 +199,7 @@ private static int PerformDeploy(
                 finally
                 {
                     System.Console.WriteLine("Deployment Logs : '"+
-                        env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=api/deployments/" + 
+                        env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
                         gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
                 }
             }
diff --git a/Kudu.Console/Properties/launchSettings.json b/Kudu.Console/Properties/launchSettings.json
new file mode 100644
index 00000000..704a661f
--- /dev/null
+++ b/Kudu.Console/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:7668/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Kudu.Console": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:7669/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index adaad2bb..430cdd4c 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -28,8 +28,9 @@
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Mercurial.Net" Version="1.1.1.607" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-    <PackageReference Include="System.Text.RegularExpressions" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" />
+     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />	    
+     <PackageReference Include="System.Text.RegularExpressions"/>
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="0.1.78-alpha" />
     <PackageReference Include="ncrontab" Version="3.3.0" />
     <PackageReference Include="NuGet.Protocol" Version="4.8.0" />
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index 119f73dd..ff173812 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -49,7 +49,7 @@
             <small>Site UpTime: <i class="fas fa-circle" style="color: #26C281; font-size: x-small; margin-right: 5px"></i>@Tracing.TraceMiddleware.UpTime.ToString(@"dd\.hh\:mm\:ss") | Site Folder: @PathResolver.ResolveRootPath() | Temp Folder: @System.IO.Path.GetTempPath()</small>
             <br> <small onclick="clickLink(this)" id="curr-instance" title="@workerIdHash">Kudu Attached to Instance: &nbsp;<i class="fas fa-desktop fa-style"></i>&nbsp;<a href="#">@workerIdShortHash </a>| <span class="dropdown">
                 <button class="btn btn-sm dropdown-toggle" type="button" style="background-color: rgb(244, 245, 247);border: none" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <i class="fas fa-network-wired fa-style"></i> <a href="#"> Switch Instance</a>
+                    <i class="fas fa-network-wired fa-style text-sm"></i> <a href="#"> Switch Instance</a>
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                     <a class="dropdown-item" href="#">Instance 1</a>
@@ -66,7 +66,7 @@
                 </div>
                 <div class="col-md-2 row-fluid">
                     <div class="centering text-center">
-                        <a class="btn btn-primary btn-sm align-middle" href="#" role="button">Stream Logs</a>
+                        <a class="btn btn-primary btn-sm align-middle" href="/api/logstream" role="button">Stream Logs</a>
                     </div>
                 </div>
             </div>
@@ -82,7 +82,7 @@
                     <p class="badge badge-secondary inconsolata align-left" style="background-color: #343a40; color: #fafafa"> Successful <i class="fas fa-check-circle" style="color: #26C281;"></i>&nbsp;</p>
                 </h6>
                 <div class="row-fluid">
-                    <small style="color: #42526e"> Performing an Overlapped Recycle of your WebApp. Your changes would reflect in <span id="timer2"></span> seconds</small>
+                    <small style="color: #42526e"> Performing an Overlapped Recycle of your WebApp. Your changes would reflect in <span id="statusStrTimer"></span> seconds</small>
                 </div>
             </div>
             <div class="col-md-2 row-fluid" style="margin: 0px">
@@ -110,16 +110,12 @@
         </div>
         <div class="col-md-5" id="appsvc-welcome-banner" style="@welcomeBannerDisplayVal">
             <div class="container" style="height: 100%; width: 100%; display: flex; align-items: center; vertical-align: middle">
-                <div class="row-fluid">
-                    <div class="col-md-6 text-center">
-                        <div class="wrapper">
-                            <a class="btn btn-primary btn-sm" href="#" role="button"><i class="fas fa-cloud-upload-alt"></i>Deploy your first app</a>
-                        </div>
+                <div class="row col-md-12 col-sm-12">
+                    <div class="col-lg-6 col-md-12 col-sm-12 mb-10 mt-10 text-center">
+                            <button type="button" onclick="location.href = 'https://go.microsoft.com/fwlink/?linkid=2084231';" class="btn btn-primary btn-sm"><i class="fas fa-cloud-upload-alt"></i>Deploy your first app</button>      
                     </div>
-                    <div class="col-sm-12 col-md-6 text-center">
-                        <div class="wrapper">
-                            <a class="btn btn-primary btn-sm align-middle bkg-light-gray border-0" href="#" role="button" style="margin-left: -10px"> Learn Node <i class="fab fa-node-js"></i> Development</a>
-                        </div>
+                    <div class="col-lg-6 col-sm-12 col-md-12 mb-10 mt-10 d-xs-none d-sm-none d-md-block text-center">
+                            <button type="button"  onclick="location.href = 'https://docs.microsoft.com/en-us/visualstudio/ide/quickstart-nodejs?view=vs-2019';" class="btn bkg-light-gray border-0 btn-sm"><i class="fas fa-cloud-upload-alt"></i> Learn Node <i class="fab fa-node-js"></i> Development</button>
                     </div>
                 </div>
             </div>
@@ -189,7 +185,7 @@
                             <li>
                                 <a href="/api/logs/docker/zip">Download All Container Logs</a>
                             </li>
-                            <li>
+                            <li hidden>
                                 <a href="#">Process Dump</a>
                             </li>
                         </ul>
@@ -230,9 +226,7 @@
                     $('#is-deploying-banner').css("display", "none");
                     console.log("Trying to show just deployed banner : wasDeploying value is "+wasDeploying);
                     if (wasDeploying) {
-                        console.log("Before updating UI "+wasDeploying);
                         UpdateLatestDeploymentStatus();
-                        console.log("After updating UI "+wasDeploying);
                     }
                 }
             },
@@ -263,7 +257,7 @@
                             .prop('title', 'Deployment Status');
                     } else if (data["status"] === 1 || data["status"] === 2) {
                         $("#latest-deployment-id")
-                            .html("Pending &nbsp;<i class=\"fas fa-exclamation-circle\" style=\"color: #ff5e57;\"></i>")
+                            .html("Pending &nbsp;<i class=\"fas fa-exclamation-circle\" style=\"color: #fdcb6e;\"></i>")
                             .prop('title', 'Deployment Status');
                     } else {
                         $("#diagnose-btn").css("display","inline-block");
@@ -304,16 +298,14 @@
         count=count-1;
         if (count <= 0)
         {
-            //clearInterval(counter);
-            console.log("counter overrrrrrrrr ");
             count = 10;
             document.getElementById("timer").innerHTML="0"; 
-            document.getElementById("timer2").innerHTML="0"; 
+            document.getElementById("statusStrTimer").innerHTML="0"; 
             setTimeout(UpdateLatestDeploymentStatus, 1000);
             return;
         }
         document.getElementById("timer").innerHTML=count; 
-        document.getElementById("timer2").innerHTML=count; 
+        document.getElementById("statusStrTimer").innerHTML=count; 
         setTimeout(timer, 1000);
     }
 
diff --git a/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml b/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
index d9462122..609d2dc6 100644
--- a/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
@@ -13,7 +13,6 @@ http://github.com/summerstyle/jsonTreeViewer
 Copyright 2017 Vera Lobacheva (http://iamvera.com)
 Released under the MIT license (LICENSE.txt)
 -->
-
 <div class="row" style="margin-top: 20px">
     <div class="col-xs-offset 1 col-xs-11 col-sm-offset-2 col-sm-8 col-md-offset-3 col-md-6">
         <div class="btn-toolbar" role="toolbar">
@@ -37,9 +36,13 @@ Released under the MIT license (LICENSE.txt)
         </div>
     </div>
 </div>
+
 <!-- For source JSON -->
-<div class="code" id="source_json" data-header="Source JSON" style="margin-top: 20px">
-    <div id="wrapper">
+<div class="code" id="source_json" data-header="Source JSON" style="margin-top:20px;">    
+    <div class="d-flex justify-content-center">
+          <i class="fa-3x fas fa-circle-notch fa-spin" id="jsonLoadingSpinner" style="color:#007bff"></i>
+    </div> 
+    <div id="wrapper">   
     </div>
 </div>
 
@@ -101,8 +104,10 @@ Released under the MIT license (LICENSE.txt)
         url: $.urlParam('view_url'),
         type: "GET",
         success: function(data) {
-            console.log("deployment going on" + data["value"]);
             dataStr = data;
+
+           $("#jsonLoadingSpinner").hide();
+
             // Create json-tree
             tree = jsonTree.create(data, wrapper);
 
diff --git a/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml b/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
index b1d72b09..09a07e64 100644
--- a/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
@@ -14,13 +14,14 @@
     {
         <link rel="shortcut icon" type="image/x-icon" href="/linux_favicon.ico" />
         <link rel="icon" type="image/x-icon" href="/linux_favicon.ico" />
-	
+  
     }
 
 <html lang="en">
 
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"> 
+
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <meta name="description" content="">
 <meta name="author" content="">
@@ -44,7 +45,22 @@
   <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="/newui"><img src="/Content/Images/AppService.png" height="30" width="30" style="display: inline-block; margin-right: 10px"/>Azure App Service</a>
   <ul class="navbar-nav px-3">
     <li class="nav-item text-nowrap">
-      <a class="nav-link" href="#">Sign out</a>
+                      @{
+                    var email = httpContextAccessor.HttpContext.Request.Headers["X-MS-CLIENT-PRINCIPAL-NAME"].ToString();
+                    var displayName = httpContextAccessor.HttpContext.Request.Headers["X-MS-CLIENT-DISPLAY-NAME"].ToString() ?? email;
+                    if (email != null && email.Contains("@"))
+                    {
+                        <ul class="nav navbar-nav navbar-right" style="position: fixed; right: 65px;">
+                            <li class="dropdown">
+                                <i class="fas fa-user-circle" style="padding:1px;color:#e5e8ec"></i>
+                                <a href="#" data-toggle="dropdown" style="display: inline">@email</a>
+                                <ul class="dropdown-menu">
+                                    <li><a href="/logout">Logout</a></li>
+                                </ul>
+                            </li>
+                        </ul>
+                    }
+                }
     </li>
   </ul>
 </nav>
@@ -71,28 +87,28 @@
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="/newui/bash">
+            <a class="nav-link" href="/newui/kududebug">
               <i class="feather fas fa-laptop-code clr-icon-navbar"></i> Bash
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="#" title="If no log events are being generated the page may not load.">
+            <a class="nav-link" href="/api/logstream" title="If no log events are being generated the page may not load.">
               <i class="feather fas fa-stream clr-icon-navbar"></i> Log stream
             </a>
           </li>
-          <li class="nav-item">
+          <li class="nav-item" hidden>
             <a class="nav-link" href="#">
               <i class="feather fas fa-user-md clr-icon-navbar"></i> App Lens
             </a>
           </li>
-          <li class="nav-item">
+          <li class="nav-item" hidden>
             <a class="nav-link" href="#">
               <i class="feather fas fa-globe-americas clr-icon-navbar"></i> Kudu REST APIs
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="#">
-              <i class="feather fas fa-bolt clr-icon-navbar"></i> VSCode Live Debugging
+            <a class="nav-link" href="https://code.visualstudio.com/docs/azure/remote-debugging">
+              <i class="feather fas fa-bolt clr-icon-navbar"></i> VSCode Remote Debugging
             </a>
           </li>
         </ul>
@@ -144,8 +160,9 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script>window.jQuery || document.write('<script src="/assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
 <!-- Icons -->
 <script src="https://unpkg.com/feather-icons/dist/feather.min.js"></script>
 <script>
diff --git a/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml b/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml
new file mode 100644
index 00000000..4ef3c9bf
--- /dev/null
+++ b/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml
@@ -0,0 +1,3 @@
+@page
+<button onclick="location.href='/webssh/host?debugconsolereq=true'" style="position: fixed; top:70px; right:30px;" type="button" class="btn btn-outline-light border-0"><i class="fas fa-expand-arrows-alt"></i></button>
+<iframe src="/webssh/host?debugconsolereq=true" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:calc(100vh - 85px);marginx-top:40px;"></iframe>
diff --git a/Kudu.Services.Web/Pages/NewUI/logs.cshtml b/Kudu.Services.Web/Pages/NewUI/logs.cshtml
index ca979c09..d04fbf9d 100644
--- a/Kudu.Services.Web/Pages/NewUI/logs.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/logs.cshtml
@@ -20,4 +20,4 @@
         }
     }
 </script>
-<iframe src="/logs" id="wwwroot-files-frame" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:100vh;"></iframe>
+<iframe src="/deploymentlogs" id="wwwroot-files-frame" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:100vh;"></iframe>
diff --git a/Kudu.Services.Web/Pages/NewUI/webssh.cshtml b/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
index 36f5da1d..220ac651 100644
--- a/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
@@ -1,2 +1,3 @@
 @page
-<iframe src="/webssh/host" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:100vh;"></iframe>
+<button onclick="location.href='/webssh/host'" style="position: fixed;top:70px; right:30px;" type="button" class="btn btn-outline-light border-0"><i class="fas fa-expand-arrows-alt"></i></button>
+<iframe src="/webssh/host" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:calc(100vh - 85px);marginx-top:40px;"></iframe>
\ No newline at end of file
diff --git a/Kudu.Services.Web/wwwroot/Content/Styles/dashboard.css b/Kudu.Services.Web/wwwroot/Content/Styles/dashboard.css
index aaed6bb0..b1564767 100644
--- a/Kudu.Services.Web/wwwroot/Content/Styles/dashboard.css
+++ b/Kudu.Services.Web/wwwroot/Content/Styles/dashboard.css
@@ -187,4 +187,22 @@ body {
 a {
     text-decoration:none;
     color:  #252e3e;
+}
+
+/* Bootstrap Media Query Breakpoints */
+
+@media only screen and (min-width : 768px) {
+    .border-between{
+        content: "";
+    }
+}
+
+@media only screen and (min-width : 992px) {
+    .border-between{
+        content: " ";
+    }
+}
+
+@media only screen and (min-width : 1200px) {
+
 }
\ No newline at end of file
diff --git a/Kudu.Services.Web/wwwroot/Content/Styles/newui.css b/Kudu.Services.Web/wwwroot/Content/Styles/newui.css
index 7176af20..91d40a58 100644
--- a/Kudu.Services.Web/wwwroot/Content/Styles/newui.css
+++ b/Kudu.Services.Web/wwwroot/Content/Styles/newui.css
@@ -124,7 +124,3 @@ hr {
 .border-common {
     border-color: #e4e9ed !important;
 }
-
-.block-base {
-    
-}
\ No newline at end of file
diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index 6eacfe6d..512bede4 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -25,11 +25,10 @@ public class LogStreamManager
         private const string FilterQueryKey = "filter";
         private const string AzureDriveEnabledKey = "AzureDriveEnabled";
 
-        // Azure 3 mins timeout, heartbeat every mins keep alive.
         private static string[] LogFileExtensions = new string[] { ".txt", ".log", ".htm" };
 
-        // TODO Set back to 1 minute
-        private static TimeSpan HeartbeatInterval = TimeSpan.FromSeconds(5);
+        // Azure 3 mins timeout, heartbeat every mins keep alive.
+        private static TimeSpan HeartbeatInterval = TimeSpan.FromSeconds(60);
 
         private readonly object _thisLock = new object();
         private readonly string _logPath;
@@ -102,26 +101,49 @@ public async Task ProcessRequest(HttpContext context)
             // Ensure mounted logFiles dir 
 
             string mountedLogFilesDir = Path.Combine(_logPath, routePath);
+
             FileSystemHelpers.EnsureDirectory(mountedLogFilesDir);
 
-            if (shouldMonitiorVolatileLogsPath(mountedLogFilesDir))
+            if (shouldMonitiorMountedLogsPath(mountedLogFilesDir))
             {
-                path = volatileLogsPath;
+                path = mountedLogFilesDir;
             }
             else
             {
-                path = mountedLogFilesDir;
+                path = volatileLogsPath;
             }
 
+            context.Response.Headers.Add("Content-Type", "text/event-stream");
+
             await WriteInitialMessage(context);
 
             // CORE TODO Get the fsw and keep it in scope here with a using that ends at the end
-            
+
             lock (_thisLock)
             {
                 Initialize(path, context);
             }
 
+            if (_logFiles != null)
+            {
+                foreach (string log in _logFiles.Keys)
+                {
+                    var reader = new StreamReader(log, Encoding.ASCII);
+                    foreach (string logLine in Tail(reader, 10))
+                    {
+                        await context.Response.WriteAsync(
+                            string.Format(System.Environment.NewLine, 
+                                logLine, 
+                                System.Environment.NewLine));
+                    }
+                }
+            }
+            else
+            {
+                _tracer.TraceError("LogStream: No pervious logfiles");
+                Console.WriteLine("LogStream: No pervious logfiles");
+            }
+
             // CORE TODO diagnostics setting for enabling app logging            
 
             while (!context.RequestAborted.IsCancellationRequested)
@@ -156,9 +178,45 @@ public async Task ProcessRequest(HttpContext context)
             }
         }
 
+        ///<summary>Returns the end of a text reader.</summary>
+        ///<param name="reader">The reader to read from.</param>
+        ///<param name="lineCount">The number of lines to return.</param>
+        ///<returns>The last lineCount lines from the reader.</returns>
+        public string[] Tail(TextReader reader, int lineCount)
+        {
+            var buffer = new List<string>(lineCount);
+            string line;
+            for (int i = 0; i < lineCount; i++)
+            {
+                line = reader.ReadLine();
+                if (line == null) return buffer.ToArray();
+                buffer.Add(line);
+            }
+
+            int lastLine = lineCount - 1;           //The index of the last line read from the buffer.  Everything > this index was read earlier than everything <= this indes
+
+            while (null != (line = reader.ReadLine()))
+            {
+                lastLine++;
+                if (lastLine == lineCount) lastLine = 0;
+                buffer[lastLine] = line;
+            }
+
+            if (lastLine == lineCount - 1) return buffer.ToArray();
+            var retVal = new string[lineCount];
+            buffer.CopyTo(lastLine + 1, retVal, 0, lineCount - lastLine - 1);
+            buffer.CopyTo(0, retVal, lineCount - lastLine - 1, lastLine + 1);
+            return retVal;
+        }
+
         private static Task WriteInitialMessage(HttpContext context)
         {
-            var msg = String.Format(CultureInfo.CurrentCulture, Resources.LogStream_Welcome, DateTime.UtcNow.ToString("s"), System.Environment.NewLine);
+            var msg = String.Format( 
+                CultureInfo.CurrentCulture, 
+                Resources.LogStream_Welcome, 
+                DateTime.UtcNow.ToString("s"), 
+                System.Environment.NewLine);
+
             return context.Response.WriteAsync(msg);
         }
         
@@ -167,7 +225,7 @@ private static Task WriteInitialMessage(HttpContext context)
         /// or the mounted fs logs dir, if kudu
         /// </summary>
         /// <returns></returns>
-        private static bool shouldMonitiorVolatileLogsPath(string mountedDirPath)
+        private static bool shouldMonitiorMountedLogsPath(string mountedDirPath)
         {
             int count = 0;
             string dateToday = DateTime.Now.ToString("yyyy_MM_dd");
@@ -184,7 +242,7 @@ private static bool shouldMonitiorVolatileLogsPath(string mountedDirPath)
                     }
                 }
             }
-            return count<=1;
+            return count==2;
         }
 
         private void Initialize(string path, HttpContext context)
diff --git a/Kudu.Services/Kudu.Services.csproj b/Kudu.Services/Kudu.Services.csproj
index 914021d4..a29db278 100644
--- a/Kudu.Services/Kudu.Services.csproj
+++ b/Kudu.Services/Kudu.Services.csproj
@@ -8,7 +8,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.WebSockets" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Kudu.Contracts\Kudu.Contracts.csproj" />

From 17335d38c69e4654930a20d25e9b297757ed8b9c Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 17 Apr 2019 09:14:53 -0700
Subject: [PATCH 048/245] Increasing log stream timeout and new line fix

---
 .../Settings/DeploymentSettingsExtension.cs   |  2 +-
 .../DebugExtensionMiddleware.cs               | 34 +++++++++++++------
 Kudu.Services/Diagnostics/LogStreamManager.cs |  4 +--
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs b/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
index bd8c1138..552d562e 100644
--- a/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
+++ b/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
@@ -8,7 +8,7 @@ namespace Kudu.Contracts.Settings
     public static class DeploymentSettingsExtension
     {
         public static readonly TimeSpan DefaultCommandIdleTimeout = TimeSpan.FromMinutes(1);
-        public static readonly TimeSpan DefaultLogStreamTimeout = TimeSpan.FromMinutes(30);
+        public static readonly TimeSpan DefaultLogStreamTimeout = TimeSpan.FromMinutes(120);
         public static readonly TimeSpan DefaultWebJobsRestartTime = TimeSpan.FromMinutes(1);
         public static readonly TimeSpan DefaultJobsIdleTimeout = TimeSpan.FromMinutes(2);
         public const TraceLevel DefaultTraceLevel = TraceLevel.Error;
diff --git a/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs b/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
index e9f1499a..8748c805 100644
--- a/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
+++ b/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
@@ -113,11 +113,22 @@ public async Task Invoke (HttpContext context)
                 {
                 }
 
+                bool continueIpCheck = true;
+                int debugPort = 2222;
+
                 try
                 {
                     if (ipAddress == null)
                     {
                         ipAddress = System.IO.File.ReadAllText("/appsvctmp/ipaddr_" + Environment.GetEnvironmentVariable("WEBSITE_ROLE_INSTANCE_ID"));
+                        if(ipAddress != null && ipAddress.Contains(':'))
+                        {
+                            string[] ipAddrPortStr = ipAddress.Split(":");
+                            ipAddress = ipAddrPortStr[0];
+                            debugPort = Int32.Parse(ipAddrPortStr[1]);
+                            continueIpCheck = false;
+                            _logger.LogInformation("HandleWebSocketConnection: VNET Conatiner PORT : " + tunnelPort);
+                    }
                         _logger.LogInformation("HandleWebSocketConnection: Found IP Address from appsvctmp file: " + ipAddress);
                     }
                 }
@@ -127,7 +138,7 @@ public async Task Invoke (HttpContext context)
 
                 try
                 {
-                    if (ipAddress == null)
+                    if (continueIpCheck && ipAddress == null)
                     {
                         ipAddress = System.IO.File.ReadAllText("/home/site/ipaddr_" + Environment.GetEnvironmentVariable("WEBSITE_ROLE_INSTANCE_ID"));
                         _logger.LogInformation("HandleWebSocketConnection: Found IP Address from share file: " + ipAddress);
@@ -144,21 +155,22 @@ public async Task Invoke (HttpContext context)
 
                 _logger.LogInformation("HandleWebSocketConnection: Final IP Address: " + ipAddress);
 
-                int debugPort = 2222;
-
-                try
+                if (continueIpCheck)
                 {
-                    debugPort = Int32.Parse(Environment.GetEnvironmentVariable("APPSVC_TUNNEL_PORT"));
+                    try
+                    {
+                        debugPort = Int32.Parse(Environment.GetEnvironmentVariable("APPSVC_TUNNEL_PORT"));
 
-                    if (debugPort <= 0)
+                       if (debugPort <= 0)
+                        {
+                            throw new Exception("Debuggee not found. Please start your site in debug mode and then attach debugger.");
+                        }
+                    }
+                    catch (Exception)
                     {
-                        throw new Exception("Debuggee not found. Please start your site in debug mode and then attach debugger.");
+                        debugPort = 2222;
                     }
                 }
-                catch (Exception)
-                {
-                    debugPort = 2222;
-                }
 
                 string remoteDebug = "FALSE";
                 int remoteDebugPort = -1;
diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index 512bede4..3a3136a4 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -132,9 +132,7 @@ public async Task ProcessRequest(HttpContext context)
                     foreach (string logLine in Tail(reader, 10))
                     {
                         await context.Response.WriteAsync(
-                            string.Format(System.Environment.NewLine, 
-                                logLine, 
-                                System.Environment.NewLine));
+                            string.Format(logLine,System.Environment.NewLine));
                     }
                 }
             }

From 9b6a5178c888ffb9cb8f048ff4c4bcf9d7e1ffdd Mon Sep 17 00:00:00 2001
From: Michimune Kohno <mikono@microsoft.com>
Date: Fri, 26 Apr 2019 15:48:48 -0700
Subject: [PATCH 049/245] Enable functions detector deeplink

---
 Kudu.Services.Web/Pages/Detectors/index.cshtml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
index 8502e816..f569cc3f 100644
--- a/Kudu.Services.Web/Pages/Detectors/index.cshtml
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -7,6 +7,7 @@
     var siteName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "";
     var hostName = Environment.GetEnvironmentVariable("HTTP_HOST") ?? "";
     var slotName = "";
+    var isFunctionApp = Environment.GetEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME") != null;
 
     var index = ownerName.IndexOf('+');
     if (index >= 0)
@@ -15,13 +16,19 @@
     }
 
     string detectorPath;
-    if (Kudu.Core.Helpers.OSDetector.IsOnWindows())
+    string troubleshootExt = "";
+    if (isFunctionApp)
     {
-        detectorPath = "diagnostics%2Favailability%2Fanalysis";
+        troubleshootExt = "appsvc.troubleshoot%3Dtrue%7C"; // "appsvc.troubleshoot=true|"
+        detectorPath = "diagnostics%2Ffunctionappdownanderrors"; // "diagnostics/functionappdownanderrors"
+    }
+    else if (Kudu.Core.Helpers.OSDetector.IsOnWindows())
+    {
+        detectorPath = "diagnostics%2Favailability%2Fanalysis"; // "diagnostics/availability/analysis"
     }
     else
     {
-        detectorPath = "detectors%2FLinuxAppDown";
+        detectorPath = "detectors%2FLinuxAppDown"; // "detectors/LinuxAppDown"
     }
 
     var hostNameIndex = hostName.IndexOf('.');
@@ -50,7 +57,9 @@
 
     var isSlot = !String.IsNullOrWhiteSpace(slotName) && !slotName.Equals("production", StringComparison.CurrentCultureIgnoreCase);
 
-    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath%3D"
+    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext="
+            + troubleshootExt
+            + "asd.featurePath%3D"
             + detectorPath
             + "#resource/subscriptions/" + subscriptionId
             + "/resourceGroups/" + resourceGroup

From 98ef1a5f1d95cbacd7a7ca22073fc6137a66bf40 Mon Sep 17 00:00:00 2001
From: Jenny Lawrance <jennylaw@microsoft.com>
Date: Wed, 13 Mar 2019 04:44:02 +0000
Subject: [PATCH 050/245] Adding dotnet support

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 381ff214..f380d345 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -59,6 +59,11 @@ public override Task Build(DeploymentContext context)
 
                 additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
             }
+	    else if (framework.StartsWith("DOTNETCORE"))
+	    {
+		oryxLanguage = "dotnet";
+		runOryxBuild = true;
+	    }
 
             if (runOryxBuild)
             {
@@ -82,4 +87,4 @@ public override Task Build(DeploymentContext context)
         //    FileLogHelper.Log("Completed PostBuild oryx....");
         //}
     }
-}
\ No newline at end of file
+}

From 1a43f1d6a082cd4b7936f781ee1e5c0874078fd8 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Fri, 29 Mar 2019 11:52:47 -0700
Subject: [PATCH 051/245] Test Commit for new build options

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  49 +-----
 Kudu.Core/Deployment/Oryx/BuildFlags.cs       |  34 ++++
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   |  15 ++
 Kudu.Core/Deployment/Oryx/OryxArguments.cs    | 145 ++++++++++++++++++
 .../Deployment/Oryx/SupportedLanguages.cs     |  35 +++++
 5 files changed, 237 insertions(+), 41 deletions(-)
 create mode 100644 Kudu.Core/Deployment/Oryx/BuildFlags.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/OryxArguments.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/SupportedLanguages.cs

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index f380d345..062abffb 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -30,51 +30,18 @@ public override Task Build(DeploymentContext context)
 
             RunCommand(context, kuduSyncCommand, false, "Oryx-Build: Running kudu sync...");
 
-            string framework = System.Environment.GetEnvironmentVariable("FRAMEWORK");
-            string version = System.Environment.GetEnvironmentVariable("FRAMEWORK_VERSION");
-
-            string oryxLanguage = "";
-            string additionalOptions = "";
-            bool runOryxBuild = false;
-
-            if (framework.StartsWith("NODE"))
-            {
-                oryxLanguage = "nodejs";
-                runOryxBuild = true;
-            }
-            else if (framework.StartsWith("PYTHON"))
+            OryxArguments args = new OryxArguments();
+            if (args.RunOryxBuild)
             {
-                oryxLanguage = "python";
-                runOryxBuild = true;
-                string virtualEnvName = "antenv";
+                string buildCommand = args.GenerateOryxBuildCommand(context, RepositoryPath);
+                RunCommand(context, buildCommand, false, "Running oryx build...");
 
-                if (version.StartsWith("3.6"))
-                {
-                    virtualEnvName = "antenv3.6";
-                }
-                else if (version.StartsWith("2.7"))
+                //
+                // Run express build setups if needed
+                if (args.Flags == BuildFlags.UseExpressBuild)
                 {
-                    virtualEnvName = "antenv2.7";
+                    // TODO
                 }
-
-                additionalOptions = string.Format("-p virtualenv_name={0}", virtualEnvName);
-            }
-	    else if (framework.StartsWith("DOTNETCORE"))
-	    {
-		oryxLanguage = "dotnet";
-		runOryxBuild = true;
-	    }
-
-            if (runOryxBuild)
-            {
-                string oryxBuildCommand = string.Format("oryx build {0} -o {1} -l {2} --language-version {3} {4}",
-                    context.OutputPath,
-                    context.OutputPath,
-                    oryxLanguage,
-                    version,
-                    additionalOptions);
-
-                RunCommand(context, oryxBuildCommand, false, "Running oryx build...");
             }
 
             return Task.CompletedTask;
diff --git a/Kudu.Core/Deployment/Oryx/BuildFlags.cs b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
new file mode 100644
index 00000000..6c168481
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment
+{
+    public enum BuildFlags
+    {
+        None = 0,
+        UseTmpDirectory = 1,
+        UseExpressBuild = 2
+    }
+
+    public class BuildFlagsHelper
+    {
+        public static BuildFlags Parse(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return BuildFlags.None;
+            }
+
+            try
+            {
+                var result = (BuildFlags)Enum.Parse(typeof(BuildFlags), value);
+                return result;
+            }
+            catch (Exception)
+            {
+                return BuildFlags.None;
+            }
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
new file mode 100644
index 00000000..9e415c26
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    public class ExpressBuilder
+    {
+        public void SetupExpressBuilderArtifacts()
+        {
+            // 0. Generate the packagename.txt:
+            // 1. Copy the zip'd output to /home/data/SitePackages
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
new file mode 100644
index 00000000..3beb3182
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Kudu.Core.Deployment.Oryx;
+
+namespace Kudu.Core.Deployment
+{
+    public class OryxArguments
+    {
+        public bool RunOryxBuild { get; set; }
+
+        public Framework Language { get; set; }
+
+        public string Version { get; set; }
+
+        public string PublishFolder { get; set; }
+
+        public string VirtualEnv { get; private set; }
+
+        public BuildFlags Flags { get; set; }
+
+        public OryxArguments()
+        {
+            RunOryxBuild = false;
+
+            string framework = System.Environment.GetEnvironmentVariable("FRAMEWORK");
+            string version = System.Environment.GetEnvironmentVariable("FRAMEWORK_VERSION");
+            string buildFlags = System.Environment.GetEnvironmentVariable("BUILD_FLAGS");
+
+            if (string.IsNullOrEmpty(framework) ||
+                string.IsNullOrEmpty(version))
+            {
+                return;
+            }
+
+            Language = SupportedFrameworks.ParseLanguage(framework);
+            if (Language == Framework.None)
+            {
+                return;
+            }
+
+            RunOryxBuild = true;
+            Version = version;
+
+            // Set language specific 
+            SetLanguageOptions();
+
+            // Parse Build Flags
+            Flags = BuildFlagsHelper.Parse(buildFlags);
+        }
+
+        private void SetLanguageOptions()
+        {
+            switch(Language)
+            {
+                case Framework.None:
+                    return;
+
+                case Framework.Python:
+                    SetVirtualEnvironment();
+                    return;
+
+                case Framework.DotNETCore:
+                    return;
+
+                case Framework.NodeJs:
+                    return;
+            }
+        }
+
+        private void SetVirtualEnvironment()
+        {
+            string virtualEnvName = "antenv";
+            if (Version.StartsWith("3.6"))
+            {
+                virtualEnvName = "antenv3.6";
+            }
+            else if (Version.StartsWith("2.7"))
+            {
+                virtualEnvName = "antenv2.7";
+            }
+
+            VirtualEnv = virtualEnvName;
+        }
+
+        public string GenerateOryxBuildCommand(DeploymentContext context, string repositoryPath)
+        {
+            StringBuilder args = new StringBuilder();
+
+            // Input/Output
+            args.AppendFormat("oryx build {0} -o {1}", repositoryPath, context.OutputPath);
+
+            // Language
+            switch(Language)
+            {
+                case Framework.None:
+                    break;
+
+                case Framework.NodeJs:
+                    args.AppendFormat(" -l nodejs");
+                    break;
+
+                case Framework.Python:
+                    args.AppendFormat(" -l python");
+                    break;
+
+                case Framework.DotNETCore:
+                    args.AppendFormat(" -l dotnet");
+                    break;
+            }
+
+            // Version
+            args.AppendFormat(" --language-version {0}", Version);
+
+            // Build Flags
+            switch (Flags)
+            {
+                case BuildFlags.None:
+                    break;
+
+                case BuildFlags.UseTmpDirectory:
+                    args.AppendFormat(" -i {0}", context.BuildTempPath);
+                    break;
+
+                case BuildFlags.UseExpressBuild:
+                    args.AppendFormat(" -i {0} --compress-packages zip", context.BuildTempPath);
+                    break;
+            }
+
+            // Virtual Env?
+            if (!String.IsNullOrEmpty(VirtualEnv))
+            {
+                args.AppendFormat(" -p {0}", VirtualEnv);
+            }
+
+            // Publish Output?
+            if (!String.IsNullOrEmpty(PublishFolder))
+            {
+                args.AppendFormat(" -publishedOutputPath {0}", PublishFolder);
+            }
+
+            return args.ToString();
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs b/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
new file mode 100644
index 00000000..60313767
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    public enum Framework
+    {
+        None,
+        NodeJs,
+        Python,
+        DotNETCore
+    }
+
+    public class SupportedFrameworks
+    {
+        public static Framework ParseLanguage(string value)
+        {
+            if (value.StartsWith("NODE", StringComparison.OrdinalIgnoreCase))
+            {
+                return Framework.NodeJs;
+            }
+            else if (value.StartsWith("PYTHON", StringComparison.OrdinalIgnoreCase))
+            {
+                return Framework.Python;
+            }
+            else if (value.StartsWith("DOTNETCORE", StringComparison.OrdinalIgnoreCase))
+            {
+                return Framework.DotNETCore;
+            }
+
+            return Framework.None;
+        }
+    }
+}

From b8455289cba2a36dc8a055ec4bc4ad0a0badd39f Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Mon, 1 Apr 2019 13:48:29 -0700
Subject: [PATCH 052/245] Oryx build optimizations

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  4 +-
 Kudu.Core/Deployment/Oryx/BuildFlags.cs       | 17 +++---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   | 10 +++-
 Kudu.Core/Deployment/Oryx/OryxArguments.cs    | 56 +++++++++++++++----
 4 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 062abffb..36803c2c 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -38,9 +38,9 @@ public override Task Build(DeploymentContext context)
 
                 //
                 // Run express build setups if needed
-                if (args.Flags == BuildFlags.UseExpressBuild)
+                if (args.Flags == BuildOptimizationsFlags.UseExpressBuild)
                 {
-                    // TODO
+                    Oryx.ExpressBuilder.SetupExpressBuilderArtifacts(context.OutputPath);
                 }
             }
 
diff --git a/Kudu.Core/Deployment/Oryx/BuildFlags.cs b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
index 6c168481..4e08f627 100644
--- a/Kudu.Core/Deployment/Oryx/BuildFlags.cs
+++ b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
@@ -4,30 +4,31 @@
 
 namespace Kudu.Core.Deployment
 {
-    public enum BuildFlags
+    public enum BuildOptimizationsFlags
     {
-        None = 0,
-        UseTmpDirectory = 1,
-        UseExpressBuild = 2
+        Off,
+        None,
+        CompressModules,
+        UseExpressBuild
     }
 
     public class BuildFlagsHelper
     {
-        public static BuildFlags Parse(string value)
+        public static BuildOptimizationsFlags Parse(string value)
         {
             if (string.IsNullOrEmpty(value))
             {
-                return BuildFlags.None;
+                return BuildOptimizationsFlags.None;
             }
 
             try
             {
-                var result = (BuildFlags)Enum.Parse(typeof(BuildFlags), value);
+                var result = (BuildOptimizationsFlags)Enum.Parse(typeof(BuildOptimizationsFlags), value);
                 return result;
             }
             catch (Exception)
             {
-                return BuildFlags.None;
+                return BuildOptimizationsFlags.None;
             }
         }
     }
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 9e415c26..056e8564 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -1,15 +1,19 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.IO;
 
 namespace Kudu.Core.Deployment.Oryx
 {
     public class ExpressBuilder
     {
-        public void SetupExpressBuilderArtifacts()
+        public static void SetupExpressBuilderArtifacts(string outputPath)
         {
-            // 0. Generate the packagename.txt:
-            // 1. Copy the zip'd output to /home/data/SitePackages
+            //
+            // Generate packagename.txt and packagepath
+            string packagename = "nodemodules.zip:/node_modules";
+            File.WriteAllText("/home/data/SitePackages/packagename.txt", packagename);
+            File.WriteAllText("/home/data/SitePackages/packagepath.txt", outputPath);
         }
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
index 3beb3182..329d306a 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -17,7 +17,7 @@ public class OryxArguments
 
         public string VirtualEnv { get; private set; }
 
-        public BuildFlags Flags { get; set; }
+        public BuildOptimizationsFlags Flags { get; set; }
 
         public OryxArguments()
         {
@@ -42,11 +42,11 @@ public OryxArguments()
             RunOryxBuild = true;
             Version = version;
 
-            // Set language specific 
-            SetLanguageOptions();
-
             // Parse Build Flags
             Flags = BuildFlagsHelper.Parse(buildFlags);
+
+            // Set language specific 
+            SetLanguageOptions();
         }
 
         private void SetLanguageOptions()
@@ -64,6 +64,12 @@ private void SetLanguageOptions()
                     return;
 
                 case Framework.NodeJs:
+                    // For node, enable compress option by default
+                    if (Flags == BuildOptimizationsFlags.None)
+                    {
+                        Flags = BuildOptimizationsFlags.CompressModules;
+                    }
+
                     return;
             }
         }
@@ -91,7 +97,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context, string reposit
             args.AppendFormat("oryx build {0} -o {1}", repositoryPath, context.OutputPath);
 
             // Language
-            switch(Language)
+            switch (Language)
             {
                 case Framework.None:
                     break;
@@ -115,15 +121,30 @@ public string GenerateOryxBuildCommand(DeploymentContext context, string reposit
             // Build Flags
             switch (Flags)
             {
-                case BuildFlags.None:
+                case BuildOptimizationsFlags.Off:
+                case BuildOptimizationsFlags.None:
                     break;
 
-                case BuildFlags.UseTmpDirectory:
-                    args.AppendFormat(" -i {0}", context.BuildTempPath);
+                case BuildOptimizationsFlags.CompressModules:
+                    AddTempDirectoryOption(args, context.BuildTempPath);
+                    if (Language == Framework.NodeJs)
+                    {
+                        AddNodeCompressOption(args, "tar-gz");
+                    }
+                    else if (Language == Framework.Python)
+                    {
+                        AddPythonCompressOption(args);
+                    }
+
                     break;
 
-                case BuildFlags.UseExpressBuild:
-                    args.AppendFormat(" -i {0} --compress-packages zip", context.BuildTempPath);
+                case BuildOptimizationsFlags.UseExpressBuild:
+                    AddTempDirectoryOption(args, context.BuildTempPath);
+                    if (Language == Framework.NodeJs)
+                    {
+                        AddNodeCompressOption(args, "zip");
+                    }
+
                     break;
             }
 
@@ -141,5 +162,20 @@ public string GenerateOryxBuildCommand(DeploymentContext context, string reposit
 
             return args.ToString();
         }
+
+        private static void AddTempDirectoryOption(StringBuilder args, string tempDir)
+        {
+            args.AppendFormat(" -i {0}", tempDir);
+        }
+
+        private static void AddNodeCompressOption(StringBuilder args, string format)
+        {
+            args.AppendFormat(" -p compress_node_modules={0}", format);
+        }
+
+        private static void AddPythonCompressOption(StringBuilder args)
+        {
+            args.AppendFormat(" -p zip_venv_dir");
+        }
     }
 }

From 2f8d34c4765ed9bad55b9935db24dcf37ceeeba8 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 2 Apr 2019 14:02:20 -0700
Subject: [PATCH 053/245] Fix bug in source directory

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 2 +-
 Kudu.Core/Deployment/Oryx/OryxArguments.cs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 36803c2c..2602b117 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -33,7 +33,7 @@ public override Task Build(DeploymentContext context)
             OryxArguments args = new OryxArguments();
             if (args.RunOryxBuild)
             {
-                string buildCommand = args.GenerateOryxBuildCommand(context, RepositoryPath);
+                string buildCommand = args.GenerateOryxBuildCommand(context);
                 RunCommand(context, buildCommand, false, "Running oryx build...");
 
                 //
diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
index 329d306a..79e3a839 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -89,12 +89,12 @@ private void SetVirtualEnvironment()
             VirtualEnv = virtualEnvName;
         }
 
-        public string GenerateOryxBuildCommand(DeploymentContext context, string repositoryPath)
+        public string GenerateOryxBuildCommand(DeploymentContext context)
         {
             StringBuilder args = new StringBuilder();
 
             // Input/Output
-            args.AppendFormat("oryx build {0} -o {1}", repositoryPath, context.OutputPath);
+            args.AppendFormat("oryx build {0} -o {1}", context.OutputPath, context.OutputPath);
 
             // Language
             switch (Language)

From 4c8fe4ea7c5c5441eb213f0353798dfafd54a13e Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 2 Apr 2019 16:21:47 -0700
Subject: [PATCH 054/245] Fix python builds to use virtualenv flags correctly

---
 Kudu.Core/Deployment/Oryx/OryxArguments.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
index 79e3a839..726a99a2 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -151,7 +151,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
             // Virtual Env?
             if (!String.IsNullOrEmpty(VirtualEnv))
             {
-                args.AppendFormat(" -p {0}", VirtualEnv);
+                args.AppendFormat(" -p virtualenv_name={0}", VirtualEnv);
             }
 
             // Publish Output?

From c5c063d97144b71e1cad5424c483ed93b2c86e57 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Tue, 2 Apr 2019 17:06:41 -0700
Subject: [PATCH 055/245] Fix expressbuilder issue

---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 056e8564..6a034b7d 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -9,11 +9,26 @@ public class ExpressBuilder
     {
         public static void SetupExpressBuilderArtifacts(string outputPath)
         {
+            string root = "/home/site/data/SitePackages";
+            string packageNameFile = Path.Combine(root, "packagename.txt");
+            string packagePathFile = Path.Combine(root, "packagepath.txt");
+
             //
             // Generate packagename.txt and packagepath
             string packagename = "nodemodules.zip:/node_modules";
-            File.WriteAllText("/home/data/SitePackages/packagename.txt", packagename);
-            File.WriteAllText("/home/data/SitePackages/packagepath.txt", outputPath);
+
+            CreateSitePackagesDirectory(root);
+
+            File.WriteAllText(packageNameFile, packagename);
+            File.WriteAllText(packagePathFile, outputPath);
+        }
+
+        private static void CreateSitePackagesDirectory(string path)
+        {
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
         }
     }
 }

From 59a34227a566544a5f97d484aad389a3f284d12d Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 3 Apr 2019 08:04:49 -0700
Subject: [PATCH 056/245] Update ExpressBuilder.cs

Correcting the SitePackages root path
---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 6a034b7d..f546187f 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -9,7 +9,7 @@ public class ExpressBuilder
     {
         public static void SetupExpressBuilderArtifacts(string outputPath)
         {
-            string root = "/home/site/data/SitePackages";
+            string root = "/home/data/SitePackages";
             string packageNameFile = Path.Combine(root, "packagename.txt");
             string packagePathFile = Path.Combine(root, "packagepath.txt");
 

From a90ad909daffbddd8b4343d48927a196e12721a7 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 22 Mar 2019 12:16:44 -0700
Subject: [PATCH 057/245] Fixed the bug where kudu didn't handle symlinks in
 zip files for zip deploy

---
 .../Infrastructure/ZipArchiveExtensions.cs    | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs b/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
index 3b44c28a..9e61ff05 100644
--- a/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
+++ b/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
@@ -4,6 +4,7 @@
 using System.IO.Abstractions;
 using System.IO.Compression;
 using Kudu.Contracts.Tracing;
+using Kudu.Core.Helpers;
 using Kudu.Core.Tracing;
 
 namespace Kudu.Core.Infrastructure
@@ -127,12 +128,57 @@ public static void Extract(this ZipArchive archive, string directoryName)
                     }
 
                     using (Stream zipStream = entry.Open(),
-                                  fileStream = fileInfo.Open(FileMode.Create, FileAccess.Write))
+                                  fileStream = fileInfo.Open(FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
                     {
                         zipStream.CopyTo(fileStream);
                     }
 
+                    bool createSymLink = false;
+                    string originalFileName = string.Empty;
+                    if (!OSDetector.IsOnWindows())
+                    {
+                        try
+                        {
+                            using (Stream fs = fileInfo.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                            {
+                                byte[] buffer = new byte[10];
+                                fs.Read(buffer, 0, buffer.Length);
+                                fs.Close();
+
+                                var str = System.Text.Encoding.Default.GetString(buffer);
+                                if (str.StartsWith("../"))
+                                {
+                                    string fullPath = Path.GetFullPath(str);
+                                    if (fullPath.StartsWith(directoryName))
+                                    {
+                                        createSymLink = true;
+                                        originalFileName = fullPath;
+                                    }
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception("Could not identify symlinks in zip file : " + ex.ToString());
+                        }
+                    }
+
                     fileInfo.LastWriteTimeUtc = entry.LastWriteTime.ToUniversalTime().DateTime;
+
+                    if (createSymLink)
+                    {
+                        try
+                        {
+                            fileInfo.Delete();
+
+                            Mono.Unix.UnixFileInfo unixFileInfo = new Mono.Unix.UnixFileInfo(originalFileName);
+                            unixFileInfo.CreateSymbolicLink(path);
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception("Could not create symlinks : " + ex.ToString());
+                        }
+                    }
                 }
             }
         }

From 362c3e6d8e8b746d584d7001ff34d102302f82a7 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 22 Mar 2019 12:17:56 -0700
Subject: [PATCH 058/245] Added functionality to return the deployment log url
 at the end of a git deployment

---
 Kudu.Console/Program.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index c758592e..1c9d0ed2 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -196,6 +196,12 @@ private static int PerformDeploy(
                     System.Console.Error.WriteLine(Resources.Log_DeploymentError);
                     return 1;
                 }
+                finally
+                {
+                    System.Console.WriteLine("Deployment Logs : '"+
+                        env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=api/deployments/" + 
+                        gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
+                }
             }
 
             if (logger.HasErrors)

From cc38631e2c9d4259514af7c32032343ee8e54bbb Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 3 Apr 2019 08:27:02 -0700
Subject: [PATCH 059/245] Added functionality to switch between volatile logs
 and mounted dir logs

---
 Kudu.Services/Diagnostics/LogStreamManager.cs | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index e17bc531..6eacfe6d 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -47,6 +47,8 @@ public class LogStreamManager
         private DateTime _startTime;
         private TimeSpan _timeout;
 
+        private const string volatileLogsPath = "/appsvctmp/volatile/logs/runtime";
+
         // CORE TODO
         //private ShutdownDetector _shutdownDetector;
         //private CancellationTokenRegistration _cancellationTokenRegistration;
@@ -97,8 +99,19 @@ public async Task ProcessRequest(HttpContext context)
 
             var firstPath = routePath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
 
-            path = FileSystemHelpers.EnsureDirectory(Path.Combine(_logPath, routePath));
+            // Ensure mounted logFiles dir 
 
+            string mountedLogFilesDir = Path.Combine(_logPath, routePath);
+            FileSystemHelpers.EnsureDirectory(mountedLogFilesDir);
+
+            if (shouldMonitiorVolatileLogsPath(mountedLogFilesDir))
+            {
+                path = volatileLogsPath;
+            }
+            else
+            {
+                path = mountedLogFilesDir;
+            }
 
             await WriteInitialMessage(context);
 
@@ -148,6 +161,31 @@ private static Task WriteInitialMessage(HttpContext context)
             var msg = String.Format(CultureInfo.CurrentCulture, Resources.LogStream_Welcome, DateTime.UtcNow.ToString("s"), System.Environment.NewLine);
             return context.Response.WriteAsync(msg);
         }
+        
+        /// <summary>
+        /// Determines if Kudu Should Monitor Mounted Logs directory,
+        /// or the mounted fs logs dir, if kudu
+        /// </summary>
+        /// <returns></returns>
+        private static bool shouldMonitiorVolatileLogsPath(string mountedDirPath)
+        {
+            int count = 0;
+            string dateToday = DateTime.Now.ToString("yyyy_MM_dd");
+
+            if (FileSystemHelpers.DirectoryExists(mountedDirPath))
+            {
+                // if more than two log files present that are generated today, 
+                // use this directory; first file for a date is the marker file
+                foreach (var file in Directory.GetFiles(mountedDirPath, "*", SearchOption.AllDirectories))
+                {
+                    if (file.StartsWith(dateToday) && ++count > 1)
+                    {
+                        break;
+                    }
+                }
+            }
+            return count<=1;
+        }
 
         private void Initialize(string path, HttpContext context)
         {

From fcaab14c7a70fff5c1aef1f6f4ba5c38b5b49467 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Thu, 4 Apr 2019 14:48:08 -0700
Subject: [PATCH 060/245] Update ExpressBuilder.cs

Fix typo node_modules.zip
---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index f546187f..21385940 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -15,7 +15,7 @@ public static void SetupExpressBuilderArtifacts(string outputPath)
 
             //
             // Generate packagename.txt and packagepath
-            string packagename = "nodemodules.zip:/node_modules";
+            string packagename = "node_modules.zip:/node_modules";
 
             CreateSitePackagesDirectory(root);
 

From 85a6f0612bedc0cec413d802e722ed9bb740e226 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 9 Apr 2019 12:29:51 -0700
Subject: [PATCH 061/245] Minor fixes to the Kudu Ui.Added tail 10 lines to log
 stream startup

---
 Kudu.Console/Program.cs                       |  2 +-
 Kudu.Console/Properties/launchSettings.json   | 27 +++++++
 Kudu.Core/Kudu.Core.csproj                    |  5 +-
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    | 32 +++-----
 .../Pages/NewUI/JsonViewer.cshtml             | 13 +++-
 Kudu.Services.Web/Pages/NewUI/_Layout.cshtml  | 39 +++++++---
 .../Pages/NewUI/kududebug.cshtml              |  3 +
 Kudu.Services.Web/Pages/NewUI/logs.cshtml     |  2 +-
 Kudu.Services.Web/Pages/NewUI/webssh.cshtml   |  3 +-
 .../wwwroot/Content/Styles/dashboard.css      | 18 +++++
 .../wwwroot/Content/Styles/newui.css          |  4 -
 Kudu.Services/Diagnostics/LogStreamManager.cs | 78 ++++++++++++++++---
 Kudu.Services/Kudu.Services.csproj            |  1 -
 13 files changed, 172 insertions(+), 55 deletions(-)
 create mode 100644 Kudu.Console/Properties/launchSettings.json
 create mode 100644 Kudu.Services.Web/Pages/NewUI/kududebug.cshtml

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 1c9d0ed2..cfbf6dc2 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -199,7 +199,7 @@ private static int PerformDeploy(
                 finally
                 {
                     System.Console.WriteLine("Deployment Logs : '"+
-                        env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=api/deployments/" + 
+                        env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
                         gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
                 }
             }
diff --git a/Kudu.Console/Properties/launchSettings.json b/Kudu.Console/Properties/launchSettings.json
new file mode 100644
index 00000000..704a661f
--- /dev/null
+++ b/Kudu.Console/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:7668/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Kudu.Console": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:7669/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index adaad2bb..430cdd4c 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -28,8 +28,9 @@
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Mercurial.Net" Version="1.1.1.607" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-    <PackageReference Include="System.Text.RegularExpressions" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" />
+     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />	    
+     <PackageReference Include="System.Text.RegularExpressions"/>
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="0.1.78-alpha" />
     <PackageReference Include="ncrontab" Version="3.3.0" />
     <PackageReference Include="NuGet.Protocol" Version="4.8.0" />
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index 119f73dd..ff173812 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -49,7 +49,7 @@
             <small>Site UpTime: <i class="fas fa-circle" style="color: #26C281; font-size: x-small; margin-right: 5px"></i>@Tracing.TraceMiddleware.UpTime.ToString(@"dd\.hh\:mm\:ss") | Site Folder: @PathResolver.ResolveRootPath() | Temp Folder: @System.IO.Path.GetTempPath()</small>
             <br> <small onclick="clickLink(this)" id="curr-instance" title="@workerIdHash">Kudu Attached to Instance: &nbsp;<i class="fas fa-desktop fa-style"></i>&nbsp;<a href="#">@workerIdShortHash </a>| <span class="dropdown">
                 <button class="btn btn-sm dropdown-toggle" type="button" style="background-color: rgb(244, 245, 247);border: none" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <i class="fas fa-network-wired fa-style"></i> <a href="#"> Switch Instance</a>
+                    <i class="fas fa-network-wired fa-style text-sm"></i> <a href="#"> Switch Instance</a>
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                     <a class="dropdown-item" href="#">Instance 1</a>
@@ -66,7 +66,7 @@
                 </div>
                 <div class="col-md-2 row-fluid">
                     <div class="centering text-center">
-                        <a class="btn btn-primary btn-sm align-middle" href="#" role="button">Stream Logs</a>
+                        <a class="btn btn-primary btn-sm align-middle" href="/api/logstream" role="button">Stream Logs</a>
                     </div>
                 </div>
             </div>
@@ -82,7 +82,7 @@
                     <p class="badge badge-secondary inconsolata align-left" style="background-color: #343a40; color: #fafafa"> Successful <i class="fas fa-check-circle" style="color: #26C281;"></i>&nbsp;</p>
                 </h6>
                 <div class="row-fluid">
-                    <small style="color: #42526e"> Performing an Overlapped Recycle of your WebApp. Your changes would reflect in <span id="timer2"></span> seconds</small>
+                    <small style="color: #42526e"> Performing an Overlapped Recycle of your WebApp. Your changes would reflect in <span id="statusStrTimer"></span> seconds</small>
                 </div>
             </div>
             <div class="col-md-2 row-fluid" style="margin: 0px">
@@ -110,16 +110,12 @@
         </div>
         <div class="col-md-5" id="appsvc-welcome-banner" style="@welcomeBannerDisplayVal">
             <div class="container" style="height: 100%; width: 100%; display: flex; align-items: center; vertical-align: middle">
-                <div class="row-fluid">
-                    <div class="col-md-6 text-center">
-                        <div class="wrapper">
-                            <a class="btn btn-primary btn-sm" href="#" role="button"><i class="fas fa-cloud-upload-alt"></i>Deploy your first app</a>
-                        </div>
+                <div class="row col-md-12 col-sm-12">
+                    <div class="col-lg-6 col-md-12 col-sm-12 mb-10 mt-10 text-center">
+                            <button type="button" onclick="location.href = 'https://go.microsoft.com/fwlink/?linkid=2084231';" class="btn btn-primary btn-sm"><i class="fas fa-cloud-upload-alt"></i>Deploy your first app</button>      
                     </div>
-                    <div class="col-sm-12 col-md-6 text-center">
-                        <div class="wrapper">
-                            <a class="btn btn-primary btn-sm align-middle bkg-light-gray border-0" href="#" role="button" style="margin-left: -10px"> Learn Node <i class="fab fa-node-js"></i> Development</a>
-                        </div>
+                    <div class="col-lg-6 col-sm-12 col-md-12 mb-10 mt-10 d-xs-none d-sm-none d-md-block text-center">
+                            <button type="button"  onclick="location.href = 'https://docs.microsoft.com/en-us/visualstudio/ide/quickstart-nodejs?view=vs-2019';" class="btn bkg-light-gray border-0 btn-sm"><i class="fas fa-cloud-upload-alt"></i> Learn Node <i class="fab fa-node-js"></i> Development</button>
                     </div>
                 </div>
             </div>
@@ -189,7 +185,7 @@
                             <li>
                                 <a href="/api/logs/docker/zip">Download All Container Logs</a>
                             </li>
-                            <li>
+                            <li hidden>
                                 <a href="#">Process Dump</a>
                             </li>
                         </ul>
@@ -230,9 +226,7 @@
                     $('#is-deploying-banner').css("display", "none");
                     console.log("Trying to show just deployed banner : wasDeploying value is "+wasDeploying);
                     if (wasDeploying) {
-                        console.log("Before updating UI "+wasDeploying);
                         UpdateLatestDeploymentStatus();
-                        console.log("After updating UI "+wasDeploying);
                     }
                 }
             },
@@ -263,7 +257,7 @@
                             .prop('title', 'Deployment Status');
                     } else if (data["status"] === 1 || data["status"] === 2) {
                         $("#latest-deployment-id")
-                            .html("Pending &nbsp;<i class=\"fas fa-exclamation-circle\" style=\"color: #ff5e57;\"></i>")
+                            .html("Pending &nbsp;<i class=\"fas fa-exclamation-circle\" style=\"color: #fdcb6e;\"></i>")
                             .prop('title', 'Deployment Status');
                     } else {
                         $("#diagnose-btn").css("display","inline-block");
@@ -304,16 +298,14 @@
         count=count-1;
         if (count <= 0)
         {
-            //clearInterval(counter);
-            console.log("counter overrrrrrrrr ");
             count = 10;
             document.getElementById("timer").innerHTML="0"; 
-            document.getElementById("timer2").innerHTML="0"; 
+            document.getElementById("statusStrTimer").innerHTML="0"; 
             setTimeout(UpdateLatestDeploymentStatus, 1000);
             return;
         }
         document.getElementById("timer").innerHTML=count; 
-        document.getElementById("timer2").innerHTML=count; 
+        document.getElementById("statusStrTimer").innerHTML=count; 
         setTimeout(timer, 1000);
     }
 
diff --git a/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml b/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
index d9462122..609d2dc6 100644
--- a/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
@@ -13,7 +13,6 @@ http://github.com/summerstyle/jsonTreeViewer
 Copyright 2017 Vera Lobacheva (http://iamvera.com)
 Released under the MIT license (LICENSE.txt)
 -->
-
 <div class="row" style="margin-top: 20px">
     <div class="col-xs-offset 1 col-xs-11 col-sm-offset-2 col-sm-8 col-md-offset-3 col-md-6">
         <div class="btn-toolbar" role="toolbar">
@@ -37,9 +36,13 @@ Released under the MIT license (LICENSE.txt)
         </div>
     </div>
 </div>
+
 <!-- For source JSON -->
-<div class="code" id="source_json" data-header="Source JSON" style="margin-top: 20px">
-    <div id="wrapper">
+<div class="code" id="source_json" data-header="Source JSON" style="margin-top:20px;">    
+    <div class="d-flex justify-content-center">
+          <i class="fa-3x fas fa-circle-notch fa-spin" id="jsonLoadingSpinner" style="color:#007bff"></i>
+    </div> 
+    <div id="wrapper">   
     </div>
 </div>
 
@@ -101,8 +104,10 @@ Released under the MIT license (LICENSE.txt)
         url: $.urlParam('view_url'),
         type: "GET",
         success: function(data) {
-            console.log("deployment going on" + data["value"]);
             dataStr = data;
+
+           $("#jsonLoadingSpinner").hide();
+
             // Create json-tree
             tree = jsonTree.create(data, wrapper);
 
diff --git a/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml b/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
index b1d72b09..09a07e64 100644
--- a/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
@@ -14,13 +14,14 @@
     {
         <link rel="shortcut icon" type="image/x-icon" href="/linux_favicon.ico" />
         <link rel="icon" type="image/x-icon" href="/linux_favicon.ico" />
-	
+  
     }
 
 <html lang="en">
 
 <head>
-<meta charset="utf-8">
+<meta charset="utf-8"> 
+
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <meta name="description" content="">
 <meta name="author" content="">
@@ -44,7 +45,22 @@
   <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="/newui"><img src="/Content/Images/AppService.png" height="30" width="30" style="display: inline-block; margin-right: 10px"/>Azure App Service</a>
   <ul class="navbar-nav px-3">
     <li class="nav-item text-nowrap">
-      <a class="nav-link" href="#">Sign out</a>
+                      @{
+                    var email = httpContextAccessor.HttpContext.Request.Headers["X-MS-CLIENT-PRINCIPAL-NAME"].ToString();
+                    var displayName = httpContextAccessor.HttpContext.Request.Headers["X-MS-CLIENT-DISPLAY-NAME"].ToString() ?? email;
+                    if (email != null && email.Contains("@"))
+                    {
+                        <ul class="nav navbar-nav navbar-right" style="position: fixed; right: 65px;">
+                            <li class="dropdown">
+                                <i class="fas fa-user-circle" style="padding:1px;color:#e5e8ec"></i>
+                                <a href="#" data-toggle="dropdown" style="display: inline">@email</a>
+                                <ul class="dropdown-menu">
+                                    <li><a href="/logout">Logout</a></li>
+                                </ul>
+                            </li>
+                        </ul>
+                    }
+                }
     </li>
   </ul>
 </nav>
@@ -71,28 +87,28 @@
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="/newui/bash">
+            <a class="nav-link" href="/newui/kududebug">
               <i class="feather fas fa-laptop-code clr-icon-navbar"></i> Bash
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="#" title="If no log events are being generated the page may not load.">
+            <a class="nav-link" href="/api/logstream" title="If no log events are being generated the page may not load.">
               <i class="feather fas fa-stream clr-icon-navbar"></i> Log stream
             </a>
           </li>
-          <li class="nav-item">
+          <li class="nav-item" hidden>
             <a class="nav-link" href="#">
               <i class="feather fas fa-user-md clr-icon-navbar"></i> App Lens
             </a>
           </li>
-          <li class="nav-item">
+          <li class="nav-item" hidden>
             <a class="nav-link" href="#">
               <i class="feather fas fa-globe-americas clr-icon-navbar"></i> Kudu REST APIs
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="#">
-              <i class="feather fas fa-bolt clr-icon-navbar"></i> VSCode Live Debugging
+            <a class="nav-link" href="https://code.visualstudio.com/docs/azure/remote-debugging">
+              <i class="feather fas fa-bolt clr-icon-navbar"></i> VSCode Remote Debugging
             </a>
           </li>
         </ul>
@@ -144,8 +160,9 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script>window.jQuery || document.write('<script src="/assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
 <!-- Icons -->
 <script src="https://unpkg.com/feather-icons/dist/feather.min.js"></script>
 <script>
diff --git a/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml b/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml
new file mode 100644
index 00000000..4ef3c9bf
--- /dev/null
+++ b/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml
@@ -0,0 +1,3 @@
+@page
+<button onclick="location.href='/webssh/host?debugconsolereq=true'" style="position: fixed; top:70px; right:30px;" type="button" class="btn btn-outline-light border-0"><i class="fas fa-expand-arrows-alt"></i></button>
+<iframe src="/webssh/host?debugconsolereq=true" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:calc(100vh - 85px);marginx-top:40px;"></iframe>
diff --git a/Kudu.Services.Web/Pages/NewUI/logs.cshtml b/Kudu.Services.Web/Pages/NewUI/logs.cshtml
index ca979c09..d04fbf9d 100644
--- a/Kudu.Services.Web/Pages/NewUI/logs.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/logs.cshtml
@@ -20,4 +20,4 @@
         }
     }
 </script>
-<iframe src="/logs" id="wwwroot-files-frame" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:100vh;"></iframe>
+<iframe src="/deploymentlogs" id="wwwroot-files-frame" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:100vh;"></iframe>
diff --git a/Kudu.Services.Web/Pages/NewUI/webssh.cshtml b/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
index 36f5da1d..220ac651 100644
--- a/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
@@ -1,2 +1,3 @@
 @page
-<iframe src="/webssh/host" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:100vh;"></iframe>
+<button onclick="location.href='/webssh/host'" style="position: fixed;top:70px; right:30px;" type="button" class="btn btn-outline-light border-0"><i class="fas fa-expand-arrows-alt"></i></button>
+<iframe src="/webssh/host" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:calc(100vh - 85px);marginx-top:40px;"></iframe>
\ No newline at end of file
diff --git a/Kudu.Services.Web/wwwroot/Content/Styles/dashboard.css b/Kudu.Services.Web/wwwroot/Content/Styles/dashboard.css
index aaed6bb0..b1564767 100644
--- a/Kudu.Services.Web/wwwroot/Content/Styles/dashboard.css
+++ b/Kudu.Services.Web/wwwroot/Content/Styles/dashboard.css
@@ -187,4 +187,22 @@ body {
 a {
     text-decoration:none;
     color:  #252e3e;
+}
+
+/* Bootstrap Media Query Breakpoints */
+
+@media only screen and (min-width : 768px) {
+    .border-between{
+        content: "";
+    }
+}
+
+@media only screen and (min-width : 992px) {
+    .border-between{
+        content: " ";
+    }
+}
+
+@media only screen and (min-width : 1200px) {
+
 }
\ No newline at end of file
diff --git a/Kudu.Services.Web/wwwroot/Content/Styles/newui.css b/Kudu.Services.Web/wwwroot/Content/Styles/newui.css
index 7176af20..91d40a58 100644
--- a/Kudu.Services.Web/wwwroot/Content/Styles/newui.css
+++ b/Kudu.Services.Web/wwwroot/Content/Styles/newui.css
@@ -124,7 +124,3 @@ hr {
 .border-common {
     border-color: #e4e9ed !important;
 }
-
-.block-base {
-    
-}
\ No newline at end of file
diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index 6eacfe6d..512bede4 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -25,11 +25,10 @@ public class LogStreamManager
         private const string FilterQueryKey = "filter";
         private const string AzureDriveEnabledKey = "AzureDriveEnabled";
 
-        // Azure 3 mins timeout, heartbeat every mins keep alive.
         private static string[] LogFileExtensions = new string[] { ".txt", ".log", ".htm" };
 
-        // TODO Set back to 1 minute
-        private static TimeSpan HeartbeatInterval = TimeSpan.FromSeconds(5);
+        // Azure 3 mins timeout, heartbeat every mins keep alive.
+        private static TimeSpan HeartbeatInterval = TimeSpan.FromSeconds(60);
 
         private readonly object _thisLock = new object();
         private readonly string _logPath;
@@ -102,26 +101,49 @@ public async Task ProcessRequest(HttpContext context)
             // Ensure mounted logFiles dir 
 
             string mountedLogFilesDir = Path.Combine(_logPath, routePath);
+
             FileSystemHelpers.EnsureDirectory(mountedLogFilesDir);
 
-            if (shouldMonitiorVolatileLogsPath(mountedLogFilesDir))
+            if (shouldMonitiorMountedLogsPath(mountedLogFilesDir))
             {
-                path = volatileLogsPath;
+                path = mountedLogFilesDir;
             }
             else
             {
-                path = mountedLogFilesDir;
+                path = volatileLogsPath;
             }
 
+            context.Response.Headers.Add("Content-Type", "text/event-stream");
+
             await WriteInitialMessage(context);
 
             // CORE TODO Get the fsw and keep it in scope here with a using that ends at the end
-            
+
             lock (_thisLock)
             {
                 Initialize(path, context);
             }
 
+            if (_logFiles != null)
+            {
+                foreach (string log in _logFiles.Keys)
+                {
+                    var reader = new StreamReader(log, Encoding.ASCII);
+                    foreach (string logLine in Tail(reader, 10))
+                    {
+                        await context.Response.WriteAsync(
+                            string.Format(System.Environment.NewLine, 
+                                logLine, 
+                                System.Environment.NewLine));
+                    }
+                }
+            }
+            else
+            {
+                _tracer.TraceError("LogStream: No pervious logfiles");
+                Console.WriteLine("LogStream: No pervious logfiles");
+            }
+
             // CORE TODO diagnostics setting for enabling app logging            
 
             while (!context.RequestAborted.IsCancellationRequested)
@@ -156,9 +178,45 @@ public async Task ProcessRequest(HttpContext context)
             }
         }
 
+        ///<summary>Returns the end of a text reader.</summary>
+        ///<param name="reader">The reader to read from.</param>
+        ///<param name="lineCount">The number of lines to return.</param>
+        ///<returns>The last lineCount lines from the reader.</returns>
+        public string[] Tail(TextReader reader, int lineCount)
+        {
+            var buffer = new List<string>(lineCount);
+            string line;
+            for (int i = 0; i < lineCount; i++)
+            {
+                line = reader.ReadLine();
+                if (line == null) return buffer.ToArray();
+                buffer.Add(line);
+            }
+
+            int lastLine = lineCount - 1;           //The index of the last line read from the buffer.  Everything > this index was read earlier than everything <= this indes
+
+            while (null != (line = reader.ReadLine()))
+            {
+                lastLine++;
+                if (lastLine == lineCount) lastLine = 0;
+                buffer[lastLine] = line;
+            }
+
+            if (lastLine == lineCount - 1) return buffer.ToArray();
+            var retVal = new string[lineCount];
+            buffer.CopyTo(lastLine + 1, retVal, 0, lineCount - lastLine - 1);
+            buffer.CopyTo(0, retVal, lineCount - lastLine - 1, lastLine + 1);
+            return retVal;
+        }
+
         private static Task WriteInitialMessage(HttpContext context)
         {
-            var msg = String.Format(CultureInfo.CurrentCulture, Resources.LogStream_Welcome, DateTime.UtcNow.ToString("s"), System.Environment.NewLine);
+            var msg = String.Format( 
+                CultureInfo.CurrentCulture, 
+                Resources.LogStream_Welcome, 
+                DateTime.UtcNow.ToString("s"), 
+                System.Environment.NewLine);
+
             return context.Response.WriteAsync(msg);
         }
         
@@ -167,7 +225,7 @@ private static Task WriteInitialMessage(HttpContext context)
         /// or the mounted fs logs dir, if kudu
         /// </summary>
         /// <returns></returns>
-        private static bool shouldMonitiorVolatileLogsPath(string mountedDirPath)
+        private static bool shouldMonitiorMountedLogsPath(string mountedDirPath)
         {
             int count = 0;
             string dateToday = DateTime.Now.ToString("yyyy_MM_dd");
@@ -184,7 +242,7 @@ private static bool shouldMonitiorVolatileLogsPath(string mountedDirPath)
                     }
                 }
             }
-            return count<=1;
+            return count==2;
         }
 
         private void Initialize(string path, HttpContext context)
diff --git a/Kudu.Services/Kudu.Services.csproj b/Kudu.Services/Kudu.Services.csproj
index 914021d4..a29db278 100644
--- a/Kudu.Services/Kudu.Services.csproj
+++ b/Kudu.Services/Kudu.Services.csproj
@@ -8,7 +8,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.WebSockets" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Kudu.Contracts\Kudu.Contracts.csproj" />

From b405116813820b5be28f49b697c52a24f158ef2f Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 17 Apr 2019 09:14:53 -0700
Subject: [PATCH 062/245] Increasing log stream timeout and new line fix

---
 .../Settings/DeploymentSettingsExtension.cs   |  2 +-
 .../DebugExtensionMiddleware.cs               | 34 +++++++++++++------
 Kudu.Services/Diagnostics/LogStreamManager.cs |  4 +--
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs b/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
index bd8c1138..552d562e 100644
--- a/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
+++ b/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
@@ -8,7 +8,7 @@ namespace Kudu.Contracts.Settings
     public static class DeploymentSettingsExtension
     {
         public static readonly TimeSpan DefaultCommandIdleTimeout = TimeSpan.FromMinutes(1);
-        public static readonly TimeSpan DefaultLogStreamTimeout = TimeSpan.FromMinutes(30);
+        public static readonly TimeSpan DefaultLogStreamTimeout = TimeSpan.FromMinutes(120);
         public static readonly TimeSpan DefaultWebJobsRestartTime = TimeSpan.FromMinutes(1);
         public static readonly TimeSpan DefaultJobsIdleTimeout = TimeSpan.FromMinutes(2);
         public const TraceLevel DefaultTraceLevel = TraceLevel.Error;
diff --git a/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs b/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
index e9f1499a..8748c805 100644
--- a/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
+++ b/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
@@ -113,11 +113,22 @@ public async Task Invoke (HttpContext context)
                 {
                 }
 
+                bool continueIpCheck = true;
+                int debugPort = 2222;
+
                 try
                 {
                     if (ipAddress == null)
                     {
                         ipAddress = System.IO.File.ReadAllText("/appsvctmp/ipaddr_" + Environment.GetEnvironmentVariable("WEBSITE_ROLE_INSTANCE_ID"));
+                        if(ipAddress != null && ipAddress.Contains(':'))
+                        {
+                            string[] ipAddrPortStr = ipAddress.Split(":");
+                            ipAddress = ipAddrPortStr[0];
+                            debugPort = Int32.Parse(ipAddrPortStr[1]);
+                            continueIpCheck = false;
+                            _logger.LogInformation("HandleWebSocketConnection: VNET Conatiner PORT : " + tunnelPort);
+                    }
                         _logger.LogInformation("HandleWebSocketConnection: Found IP Address from appsvctmp file: " + ipAddress);
                     }
                 }
@@ -127,7 +138,7 @@ public async Task Invoke (HttpContext context)
 
                 try
                 {
-                    if (ipAddress == null)
+                    if (continueIpCheck && ipAddress == null)
                     {
                         ipAddress = System.IO.File.ReadAllText("/home/site/ipaddr_" + Environment.GetEnvironmentVariable("WEBSITE_ROLE_INSTANCE_ID"));
                         _logger.LogInformation("HandleWebSocketConnection: Found IP Address from share file: " + ipAddress);
@@ -144,21 +155,22 @@ public async Task Invoke (HttpContext context)
 
                 _logger.LogInformation("HandleWebSocketConnection: Final IP Address: " + ipAddress);
 
-                int debugPort = 2222;
-
-                try
+                if (continueIpCheck)
                 {
-                    debugPort = Int32.Parse(Environment.GetEnvironmentVariable("APPSVC_TUNNEL_PORT"));
+                    try
+                    {
+                        debugPort = Int32.Parse(Environment.GetEnvironmentVariable("APPSVC_TUNNEL_PORT"));
 
-                    if (debugPort <= 0)
+                       if (debugPort <= 0)
+                        {
+                            throw new Exception("Debuggee not found. Please start your site in debug mode and then attach debugger.");
+                        }
+                    }
+                    catch (Exception)
                     {
-                        throw new Exception("Debuggee not found. Please start your site in debug mode and then attach debugger.");
+                        debugPort = 2222;
                     }
                 }
-                catch (Exception)
-                {
-                    debugPort = 2222;
-                }
 
                 string remoteDebug = "FALSE";
                 int remoteDebugPort = -1;
diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index 512bede4..3a3136a4 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -132,9 +132,7 @@ public async Task ProcessRequest(HttpContext context)
                     foreach (string logLine in Tail(reader, 10))
                     {
                         await context.Response.WriteAsync(
-                            string.Format(System.Environment.NewLine, 
-                                logLine, 
-                                System.Environment.NewLine));
+                            string.Format(logLine,System.Environment.NewLine));
                     }
                 }
             }

From 30942e34c02ba81afa722dbddc9ff41fca3d47a3 Mon Sep 17 00:00:00 2001
From: Michimune Kohno <mikono@microsoft.com>
Date: Fri, 26 Apr 2019 15:48:48 -0700
Subject: [PATCH 063/245] Enable functions detector deeplink

---
 Kudu.Services.Web/Pages/Detectors/index.cshtml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Kudu.Services.Web/Pages/Detectors/index.cshtml b/Kudu.Services.Web/Pages/Detectors/index.cshtml
index 8502e816..f569cc3f 100644
--- a/Kudu.Services.Web/Pages/Detectors/index.cshtml
+++ b/Kudu.Services.Web/Pages/Detectors/index.cshtml
@@ -7,6 +7,7 @@
     var siteName = Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") ?? "";
     var hostName = Environment.GetEnvironmentVariable("HTTP_HOST") ?? "";
     var slotName = "";
+    var isFunctionApp = Environment.GetEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME") != null;
 
     var index = ownerName.IndexOf('+');
     if (index >= 0)
@@ -15,13 +16,19 @@
     }
 
     string detectorPath;
-    if (Kudu.Core.Helpers.OSDetector.IsOnWindows())
+    string troubleshootExt = "";
+    if (isFunctionApp)
     {
-        detectorPath = "diagnostics%2Favailability%2Fanalysis";
+        troubleshootExt = "appsvc.troubleshoot%3Dtrue%7C"; // "appsvc.troubleshoot=true|"
+        detectorPath = "diagnostics%2Ffunctionappdownanderrors"; // "diagnostics/functionappdownanderrors"
+    }
+    else if (Kudu.Core.Helpers.OSDetector.IsOnWindows())
+    {
+        detectorPath = "diagnostics%2Favailability%2Fanalysis"; // "diagnostics/availability/analysis"
     }
     else
     {
-        detectorPath = "detectors%2FLinuxAppDown";
+        detectorPath = "detectors%2FLinuxAppDown"; // "detectors/LinuxAppDown"
     }
 
     var hostNameIndex = hostName.IndexOf('.');
@@ -50,7 +57,9 @@
 
     var isSlot = !String.IsNullOrWhiteSpace(slotName) && !slotName.Equals("production", StringComparison.CurrentCultureIgnoreCase);
 
-    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext=asd.featurePath%3D"
+    var detectorDeepLink = "https://portal.azure.com/?websitesextension_ext="
+            + troubleshootExt
+            + "asd.featurePath%3D"
             + detectorPath
             + "#resource/subscriptions/" + subscriptionId
             + "/resourceGroups/" + resourceGroup

From 35c56c936d5e78b0ce2172733a4de9e6fa3c85d7 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 25 Apr 2019 12:16:35 -0700
Subject: [PATCH 064/245] Add: support for .sh file in PostDeploymentActions

---
 .../Generator/ExternalCommandBuilder.cs       | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs b/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
index b1cc0894..b98c1b4a 100644
--- a/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
@@ -8,6 +8,7 @@
 using Kudu.Contracts.Settings;
 using Kudu.Core.Infrastructure;
 using Kudu.Core.Tracing;
+using Kudu.Core.Helpers;
 using NuGet.Versioning;
 
 namespace Kudu.Core.Deployment.Generator
@@ -61,11 +62,17 @@ public void PostBuild(DeploymentContext context)
             {
                 var fi = new FileInfo(file);
                 string scriptFilePath = null;
-                if (string.Equals(".ps1", fi.Extension, StringComparison.OrdinalIgnoreCase))
+
+                if (OSDetector.IsOnWindows())
+                {
+                    scriptFilePath = GetWindowsPostBuildFilepath(fi);
+                }
+                else if (!OSDetector.IsOnWindows())
                 {
-                    scriptFilePath = string.Format(CultureInfo.InvariantCulture, "PowerShell.exe -ExecutionPolicy RemoteSigned -File \"{0}\"", file);
+                    scriptFilePath = GetLinuxPostBuildFilepath(fi);
                 }
-                else
+
+                if (string.IsNullOrEmpty(scriptFilePath))
                 {
                     scriptFilePath = string.Format(CultureInfo.InvariantCulture, "\"{0}\"", file);
                 }
@@ -195,6 +202,7 @@ public IList<string> GetPostBuildActionScripts()
             {
                 var files = FileSystemHelpers.GetFiles(sf, "*")
                                         .Where(f => f.EndsWith(".cmd", StringComparison.OrdinalIgnoreCase)
+                                            || f.EndsWith(".sh", StringComparison.OrdinalIgnoreCase)
                                             || f.EndsWith(".bat", StringComparison.OrdinalIgnoreCase)
                                             || f.EndsWith(".ps1", StringComparison.OrdinalIgnoreCase)).ToList();
 
@@ -204,5 +212,23 @@ public IList<string> GetPostBuildActionScripts()
 
             return scriptFilesGroupedAndSorted;
         }
+
+        private string GetLinuxPostBuildFilepath(FileInfo fi)
+        {
+            if (string.Equals(".sh", fi.Extension, StringComparison.OrdinalIgnoreCase))
+            {
+                return string.Format(CultureInfo.InvariantCulture, "sh \"{0}\"", fi.FullName);
+            }
+            return null;
+        }
+
+        private string GetWindowsPostBuildFilepath(FileInfo fi)
+        {
+            if (string.Equals(".ps1", fi.Extension, StringComparison.OrdinalIgnoreCase))
+            {
+                return string.Format(CultureInfo.InvariantCulture, "PowerShell.exe -ExecutionPolicy RemoteSigned -File \"{0}\"", fi.FullName);
+            }
+            return null;
+        }
     }
 }

From 2b607d54ecf35b424c3b99a371e159e188811e64 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Fri, 26 Apr 2019 16:35:46 -0700
Subject: [PATCH 065/245] Add execution mode before running the script

---
 .../Deployment/Generator/ExternalCommandBuilder.cs   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs b/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
index b98c1b4a..67b49b33 100644
--- a/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
@@ -65,11 +65,11 @@ public void PostBuild(DeploymentContext context)
 
                 if (OSDetector.IsOnWindows())
                 {
-                    scriptFilePath = GetWindowsPostBuildFilepath(fi);
+                    scriptFilePath = GetWindowsPostBuildFilepath(context, fi);
                 }
                 else if (!OSDetector.IsOnWindows())
                 {
-                    scriptFilePath = GetLinuxPostBuildFilepath(fi);
+                    scriptFilePath = GetLinuxPostBuildFilepath(context, fi);
                 }
 
                 if (string.IsNullOrEmpty(scriptFilePath))
@@ -213,16 +213,18 @@ public IList<string> GetPostBuildActionScripts()
             return scriptFilesGroupedAndSorted;
         }
 
-        private string GetLinuxPostBuildFilepath(FileInfo fi)
+        private string GetLinuxPostBuildFilepath(DeploymentContext context, FileInfo fi)
         {
             if (string.Equals(".sh", fi.Extension, StringComparison.OrdinalIgnoreCase))
             {
-                return string.Format(CultureInfo.InvariantCulture, "sh \"{0}\"", fi.FullName);
+                context.Logger.Log("Setting execute permissions for post build script " + fi.FullName);
+                PermissionHelper.Chmod("ugo+x", fi.FullName, Environment, DeploymentSettings, context.Logger);
+                return string.Format(CultureInfo.InvariantCulture, "\"{0}\"", fi.FullName);
             }
             return null;
         }
 
-        private string GetWindowsPostBuildFilepath(FileInfo fi)
+        private string GetWindowsPostBuildFilepath(DeploymentContext context, FileInfo fi)
         {
             if (string.Equals(".ps1", fi.Extension, StringComparison.OrdinalIgnoreCase))
             {

From c58fceb4f121ade9e1f6f9914e246d345d7361a1 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Fri, 26 Apr 2019 16:38:31 -0700
Subject: [PATCH 066/245] Add logging for running powershell script in
 RemoteSigned

---
 Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs b/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
index 67b49b33..3c426f15 100644
--- a/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
@@ -217,7 +217,7 @@ private string GetLinuxPostBuildFilepath(DeploymentContext context, FileInfo fi)
         {
             if (string.Equals(".sh", fi.Extension, StringComparison.OrdinalIgnoreCase))
             {
-                context.Logger.Log("Setting execute permissions for post build script " + fi.FullName);
+                context.Logger.Log("Add execute permission for post build script " + fi.FullName);
                 PermissionHelper.Chmod("ugo+x", fi.FullName, Environment, DeploymentSettings, context.Logger);
                 return string.Format(CultureInfo.InvariantCulture, "\"{0}\"", fi.FullName);
             }
@@ -228,6 +228,7 @@ private string GetWindowsPostBuildFilepath(DeploymentContext context, FileInfo f
         {
             if (string.Equals(".ps1", fi.Extension, StringComparison.OrdinalIgnoreCase))
             {
+                context.Logger.Log("Execute post build script with RemoteSigned policy " + fi.FullName);
                 return string.Format(CultureInfo.InvariantCulture, "PowerShell.exe -ExecutionPolicy RemoteSigned -File \"{0}\"", fi.FullName);
             }
             return null;

From 1eb7af87d51ab345c89cbf43b325ac417295f370 Mon Sep 17 00:00:00 2001
From: Ankit Kumar <ankikuma@microsoft.com>
Date: Mon, 13 May 2019 12:09:22 -0700
Subject: [PATCH 067/245] Add support for function app build by oryx

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |   3 +-
 ...rguments.cs => AppServiceOryxArguments.cs} |  59 ++++-----
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   |  35 +++--
 .../Oryx/FunctionAppOryxArguments.cs          | 121 ++++++++++++++++++
 .../Oryx/FunctionAppSupportedWorkerRuntime.cs |  51 ++++++++
 Kudu.Core/Deployment/Oryx/IOryxArguments.cs   |  15 +++
 .../Deployment/Oryx/OryxArgumentsFactory.cs   |  16 +++
 .../Deployment/Oryx/OryxArgumentsHelper.cs    |  54 ++++++++
 .../Deployment/Oryx/OryxBuildConstants.cs     |  31 +++++
 9 files changed, 338 insertions(+), 47 deletions(-)
 rename Kudu.Core/Deployment/Oryx/{OryxArguments.cs => AppServiceOryxArguments.cs} (69%)
 create mode 100644 Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/IOryxArguments.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 2602b117..7be68e9f 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Kudu.Core.Helpers;
 using Kudu.Contracts.Settings;
+using Kudu.Core.Deployment.Oryx;
 
 namespace Kudu.Core.Deployment.Generator
 {
@@ -30,7 +31,7 @@ public override Task Build(DeploymentContext context)
 
             RunCommand(context, kuduSyncCommand, false, "Oryx-Build: Running kudu sync...");
 
-            OryxArguments args = new OryxArguments();
+            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
             if (args.RunOryxBuild)
             {
                 string buildCommand = args.GenerateOryxBuildCommand(context);
diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
similarity index 69%
rename from Kudu.Core/Deployment/Oryx/OryxArguments.cs
rename to Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 726a99a2..10fd4c95 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -5,27 +5,27 @@
 
 namespace Kudu.Core.Deployment
 {
-    public class OryxArguments
+    public class AppServiceOryxArguments : IOryxArguments
     {
         public bool RunOryxBuild { get; set; }
 
-        public Framework Language { get; set; }
+        public BuildOptimizationsFlags Flags { get; set; }
 
-        public string Version { get; set; }
+        private Framework Language { get; set; }
 
-        public string PublishFolder { get; set; }
+        private string Version { get; set; }
 
-        public string VirtualEnv { get; private set; }
+        private string PublishFolder { get; set; }
 
-        public BuildOptimizationsFlags Flags { get; set; }
+        private string VirtualEnv { get; set; }
 
-        public OryxArguments()
+        public AppServiceOryxArguments()
         {
             RunOryxBuild = false;
 
-            string framework = System.Environment.GetEnvironmentVariable("FRAMEWORK");
-            string version = System.Environment.GetEnvironmentVariable("FRAMEWORK_VERSION");
-            string buildFlags = System.Environment.GetEnvironmentVariable("BUILD_FLAGS");
+            string framework = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkSetting);
+            string version = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkVersionSetting);
+            string buildFlags = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.BuildFlagsSetting);
 
             if (string.IsNullOrEmpty(framework) ||
                 string.IsNullOrEmpty(version))
@@ -94,7 +94,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
             StringBuilder args = new StringBuilder();
 
             // Input/Output
-            args.AppendFormat("oryx build {0} -o {1}", context.OutputPath, context.OutputPath);
+            OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
 
             // Language
             switch (Language)
@@ -103,20 +103,20 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     break;
 
                 case Framework.NodeJs:
-                    args.AppendFormat(" -l nodejs");
+                    OryxArgumentsHelper.AddLanguage(args, "nodejs");
                     break;
 
                 case Framework.Python:
-                    args.AppendFormat(" -l python");
+                    OryxArgumentsHelper.AddLanguage(args, "python");
                     break;
 
                 case Framework.DotNETCore:
-                    args.AppendFormat(" -l dotnet");
+                    OryxArgumentsHelper.AddLanguage(args, "dotnet");
                     break;
             }
 
             // Version
-            args.AppendFormat(" --language-version {0}", Version);
+            OryxArgumentsHelper.AddLanguageVersion(args, Version);
 
             // Build Flags
             switch (Flags)
@@ -126,23 +126,23 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     break;
 
                 case BuildOptimizationsFlags.CompressModules:
-                    AddTempDirectoryOption(args, context.BuildTempPath);
+                    OryxArgumentsHelper.AddTempDirectoryOption(args, context.BuildTempPath);
                     if (Language == Framework.NodeJs)
                     {
-                        AddNodeCompressOption(args, "tar-gz");
+                        OryxArgumentsHelper.AddNodeCompressOption(args, "tar-gz");
                     }
                     else if (Language == Framework.Python)
                     {
-                        AddPythonCompressOption(args);
+                        OryxArgumentsHelper.AddPythonCompressOption(args);
                     }
 
                     break;
 
                 case BuildOptimizationsFlags.UseExpressBuild:
-                    AddTempDirectoryOption(args, context.BuildTempPath);
+                    OryxArgumentsHelper.AddTempDirectoryOption(args, context.BuildTempPath);
                     if (Language == Framework.NodeJs)
                     {
-                        AddNodeCompressOption(args, "zip");
+                        OryxArgumentsHelper.AddNodeCompressOption(args, "zip");
                     }
 
                     break;
@@ -151,31 +151,16 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
             // Virtual Env?
             if (!String.IsNullOrEmpty(VirtualEnv))
             {
-                args.AppendFormat(" -p virtualenv_name={0}", VirtualEnv);
+                OryxArgumentsHelper.AddPythonVirtualEnv(args, VirtualEnv);
             }
 
             // Publish Output?
             if (!String.IsNullOrEmpty(PublishFolder))
             {
-                args.AppendFormat(" -publishedOutputPath {0}", PublishFolder);
+                OryxArgumentsHelper.AddPublishedOutputPath(args, PublishFolder);
             }
 
             return args.ToString();
         }
-
-        private static void AddTempDirectoryOption(StringBuilder args, string tempDir)
-        {
-            args.AppendFormat(" -i {0}", tempDir);
-        }
-
-        private static void AddNodeCompressOption(StringBuilder args, string format)
-        {
-            args.AppendFormat(" -p compress_node_modules={0}", format);
-        }
-
-        private static void AddPythonCompressOption(StringBuilder args)
-        {
-            args.AppendFormat(" -p zip_venv_dir");
-        }
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 21385940..ef2603e1 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
+using System.IO;
+using System.IO.Compression;
+using Kudu.Core.Infrastructure;
 
 namespace Kudu.Core.Deployment.Oryx
 {
@@ -13,14 +12,32 @@ public static void SetupExpressBuilderArtifacts(string outputPath)
             string packageNameFile = Path.Combine(root, "packagename.txt");
             string packagePathFile = Path.Combine(root, "packagepath.txt");
 
-            //
-            // Generate packagename.txt and packagepath
-            string packagename = "node_modules.zip:/node_modules";
+            CreateSitePackagesDirectory(root);
+
+            if (FunctionAppHelper.LooksLikeFunctionApp())
+            {
+                // For function app express mode
+                SetupFunctionApp(root, packageNameFile, outputPath);
+            }
+            else
+            {
+                // For App service express mode
+                // Generate packagename.txt and packagepath
+                string packagename = "node_modules.zip:/node_modules";
+
+                File.WriteAllText(packageNameFile, packagename);
+                File.WriteAllText(packagePathFile, outputPath);
+            }
+        }
+
+        private static void SetupFunctionApp(string root, string packageNameFile, string outputPath)
+        {
+            string zipAppName = "functionapp.zip";
 
             CreateSitePackagesDirectory(root);
 
-            File.WriteAllText(packageNameFile, packagename);
-            File.WriteAllText(packagePathFile, outputPath);
+            ZipFile.CreateFromDirectory(outputPath, Path.Combine(root, zipAppName));
+            File.WriteAllText(packageNameFile, zipAppName);
         }
 
         private static void CreateSitePackagesDirectory(string path)
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
new file mode 100644
index 00000000..33d01755
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -0,0 +1,121 @@
+using System.Text;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    class FunctionAppOryxArguments : IOryxArguments
+    {
+        public bool RunOryxBuild { get; set; }
+
+        public BuildOptimizationsFlags Flags { get; set; }
+
+        private readonly WorkerRuntime FunctionsWorkerRuntime;
+
+        public FunctionAppOryxArguments()
+        {
+            FunctionsWorkerRuntime = ResolveWorkerRuntime();
+            RunOryxBuild = FunctionsWorkerRuntime != WorkerRuntime.None;
+            var buildFlags = GetEnvironmentVariableOrNull(OryxBuildConstants.OryxEnvVars.BuildFlagsSetting);
+            Flags = BuildFlagsHelper.Parse(buildFlags);
+        }
+
+        public string GenerateOryxBuildCommand(DeploymentContext context)
+        {
+            StringBuilder args = new StringBuilder();
+
+            AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
+            AddLanguage(args, FunctionsWorkerRuntime);
+            AddLanguageVersion(args, FunctionsWorkerRuntime);
+            AddBuildOptimizationFlags(args, context, Flags);
+            AddWorkerRuntimeArgs(args, FunctionsWorkerRuntime);
+
+            return args.ToString();
+        }
+
+        private void AddOryxBuildCommand(StringBuilder args, string source, string destination)
+        {
+            OryxArgumentsHelper.AddOryxBuildCommand(args, source, destination);
+        }
+
+        private void AddLanguage(StringBuilder args, WorkerRuntime workerRuntime)
+        {
+            switch (workerRuntime)
+            {
+                case WorkerRuntime.DotNet:
+                    OryxArgumentsHelper.AddLanguage(args, "dotnet");
+                    break;
+
+                case WorkerRuntime.Node:
+                    OryxArgumentsHelper.AddLanguage(args, "nodejs");
+                    break;
+
+                case WorkerRuntime.Python:
+                    OryxArgumentsHelper.AddLanguage(args, "python");
+                    break;
+            }
+        }
+
+        private void AddLanguageVersion(StringBuilder args, WorkerRuntime workerRuntime)
+        {
+            var workerVersion = ResolveWorkerRuntimeVersion(FunctionsWorkerRuntime);
+            if (!string.IsNullOrEmpty(workerVersion))
+            {
+                OryxArgumentsHelper.AddLanguageVersion(args, workerVersion);
+            }
+        }
+
+        private void AddBuildOptimizationFlags(StringBuilder args, DeploymentContext context, BuildOptimizationsFlags optimizationFlags)
+        {
+            switch (Flags)
+            {
+                // By default, we always want to use the temp directory path
+                // However, it's good to have an off option here.
+                // Ideally, we would always use ExpressBuild, as that also performs run from package
+                case BuildOptimizationsFlags.Off:
+                    break;
+                case BuildOptimizationsFlags.None:
+                case BuildOptimizationsFlags.CompressModules:
+                case BuildOptimizationsFlags.UseExpressBuild:
+                    OryxArgumentsHelper.AddTempDirectoryOption(args, context.BuildTempPath);
+                    break;
+            }
+        }
+
+        private void AddWorkerRuntimeArgs(StringBuilder args, WorkerRuntime workerRuntime)
+        {
+            switch (workerRuntime)
+            {
+                case WorkerRuntime.Python:
+                    OryxArgumentsHelper.AddPythonPackageDir(args, OryxBuildConstants.FunctionAppBuildSettings.PythonPackagesTargetDir);
+                    break;
+            }
+        }
+
+        private WorkerRuntime ResolveWorkerRuntime()
+        {
+            // Note: FRAMEWORK is not set right now for a Function App. However, we are planning on doing so,
+            // similar to what AppService does. Once we start setting that, this should be the order of preference
+            var functionsWorkerRuntimeStr = GetEnvironmentVariableOrNull(OryxBuildConstants.OryxEnvVars.FrameworkSetting)
+                ?? GetEnvironmentVariableOrNull(OryxBuildConstants.FunctionAppEnvVars.WorkerRuntimeSetting);
+
+            return FunctionAppSupportedWorkerRuntime.ParseWorkerRuntime(functionsWorkerRuntimeStr);
+        }
+
+        private string ResolveWorkerRuntimeVersion(WorkerRuntime workerRuntime)
+        {
+            // Note: FRAMEWORK_VERSION is not set right now for a Function App. However, we are planning on doing so,
+            // similar to what AppService does. Until then, we will always hit the defaults
+            return GetEnvironmentVariableOrNull(OryxBuildConstants.OryxEnvVars.FrameworkVersionSetting)
+                ?? FunctionAppSupportedWorkerRuntime.GetDefaultLanguageVersion(workerRuntime);
+        }
+
+        private string GetEnvironmentVariableOrNull(string environmentVarName)
+        {
+            var environmentVarValue = System.Environment.GetEnvironmentVariable(environmentVarName);
+            if (string.IsNullOrEmpty(environmentVarValue))
+            {
+                return null;
+            }
+            return environmentVarValue;
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs b/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
new file mode 100644
index 00000000..c45d5c14
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
@@ -0,0 +1,51 @@
+using System;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    public enum WorkerRuntime
+    {
+        None,
+        Node,
+        Python,
+        DotNet
+    }
+
+    public class FunctionAppSupportedWorkerRuntime
+    {
+        public static WorkerRuntime ParseWorkerRuntime(string value)
+        {
+            if (value.StartsWith("NODE", StringComparison.OrdinalIgnoreCase))
+            {
+                return WorkerRuntime.Node;
+            }
+            else if (value.StartsWith("PYTHON", StringComparison.OrdinalIgnoreCase))
+            {
+                return WorkerRuntime.Python;
+            }
+            else if (value.StartsWith("DOTNET", StringComparison.OrdinalIgnoreCase))
+            {
+                return WorkerRuntime.DotNet;
+            }
+
+            return WorkerRuntime.None;
+        }
+
+        public static string GetDefaultLanguageVersion(WorkerRuntime workerRuntime)
+        {
+            switch (workerRuntime)
+            {
+                case WorkerRuntime.DotNet:
+                    return OryxBuildConstants.FunctionAppWorkerRuntimeDefaults.Dotnet;
+
+                case WorkerRuntime.Node:
+                    return OryxBuildConstants.FunctionAppWorkerRuntimeDefaults.Node;
+
+                case WorkerRuntime.Python:
+                    return OryxBuildConstants.FunctionAppWorkerRuntimeDefaults.Python;
+
+                default:
+                    return "";
+            }
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
new file mode 100644
index 00000000..e4af2179
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    interface IOryxArguments
+    {
+        bool RunOryxBuild { get; set; }
+
+        BuildOptimizationsFlags Flags { get; set; }
+
+        string GenerateOryxBuildCommand(DeploymentContext context);
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs b/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
new file mode 100644
index 00000000..1dca6f3e
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
@@ -0,0 +1,16 @@
+using Kudu.Core.Infrastructure;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    class OryxArgumentsFactory
+    {
+        public static IOryxArguments CreateOryxArguments()
+        {
+            if (FunctionAppHelper.LooksLikeFunctionApp())
+            {
+                return new FunctionAppOryxArguments();
+            }
+            return new AppServiceOryxArguments();
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs b/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
new file mode 100644
index 00000000..c13a40cb
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    internal static class OryxArgumentsHelper
+    {
+        internal static void AddOryxBuildCommand(StringBuilder args, string source, string destination)
+        {
+            args.AppendFormat("oryx build {0} -o {1}", source, destination);
+        }
+
+        internal static void AddLanguage(StringBuilder args, string language)
+        {
+            args.AppendFormat(" -l {0}", language);
+        }
+
+        internal static void AddLanguageVersion(StringBuilder args, string languageVer)
+        {
+            args.AppendFormat(" --language-version {0}", languageVer);
+        }
+
+        internal static void AddTempDirectoryOption(StringBuilder args, string tempDir)
+        {
+            args.AppendFormat(" -i {0}", tempDir);
+        }
+
+        internal static void AddNodeCompressOption(StringBuilder args, string format)
+        {
+            args.AppendFormat(" -p compress_node_modules={0}", format);
+        }
+
+        internal static void AddPythonCompressOption(StringBuilder args)
+        {
+            args.AppendFormat(" -p zip_venv_dir");
+        }
+
+        internal static void AddPythonVirtualEnv(StringBuilder args, string virtualEnv)
+        {
+            args.AppendFormat(" -p virtualenv_name={0}", virtualEnv);
+        }
+
+        internal static void AddPythonPackageDir(StringBuilder args, string packageDir)
+        {
+            args.AppendFormat(" -p packagedir={0}", packageDir);
+        }
+
+        internal static void AddPublishedOutputPath(StringBuilder args, string path)
+        {
+            args.AppendFormat(" -publishedOutputPath {0}", path);
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
new file mode 100644
index 00000000..018ec122
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
@@ -0,0 +1,31 @@
+using System.IO;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    internal static class OryxBuildConstants
+    {
+        internal static class OryxEnvVars
+        {
+            public static readonly string FrameworkSetting = "FRAMEWORK";
+            public static readonly string FrameworkVersionSetting = "FRAMEWORK_VERSION";
+            public static readonly string BuildFlagsSetting = "BUILD_FLAGS";
+        }
+
+        internal static class FunctionAppEnvVars
+        {
+            public static readonly string WorkerRuntimeSetting = "FUNCTIONS_WORKER_RUNTIME";
+        }
+
+        internal static class FunctionAppWorkerRuntimeDefaults
+        {
+            public static readonly string Node = "10.14.1";
+            public static readonly string Python = "3.6";
+            public static readonly string Dotnet = "2.2";
+        }
+
+        internal static class FunctionAppBuildSettings
+        {
+            public static readonly string PythonPackagesTargetDir = Path.Combine(".python_packages", "lib", "python3.6", "site-packages");
+        }
+    }
+}

From 104020a22d0a7cd25a6be5a6b1b0e14d1219d355 Mon Sep 17 00:00:00 2001
From: Ankit Kumar <ankikuma@microsoft.com>
Date: Tue, 14 May 2019 16:59:20 -0700
Subject: [PATCH 068/245] Fix issue when redeploying using zipdeploy function
 app

---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index ef2603e1..780315d1 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -33,10 +33,14 @@ public static void SetupExpressBuilderArtifacts(string outputPath)
         private static void SetupFunctionApp(string root, string packageNameFile, string outputPath)
         {
             string zipAppName = "functionapp.zip";
+            string zipFilePath = Path.Combine(root, zipAppName);
 
-            CreateSitePackagesDirectory(root);
+            if (File.Exists(zipFilePath))
+            {
+                File.Delete(zipFilePath);
+            }
 
-            ZipFile.CreateFromDirectory(outputPath, Path.Combine(root, zipAppName));
+            ZipFile.CreateFromDirectory(outputPath, zipFilePath);
             File.WriteAllText(packageNameFile, zipAppName);
         }
 

From c77842ccbd9a2f3219b02dd8c504c96f46dec55b Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 16 May 2019 18:46:37 -0700
Subject: [PATCH 069/245] Add: Url support for ZipDeploy

---
 Kudu.Core/Deployment/ZipDeploymentInfo.cs     |  3 +
 Kudu.Services.Web/Startup.cs                  |  3 +
 .../Deployment/PushDeploymentController.cs    | 91 ++++++++++++++++++-
 3 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/Kudu.Core/Deployment/ZipDeploymentInfo.cs b/Kudu.Core/Deployment/ZipDeploymentInfo.cs
index d336ff35..e37eee8d 100644
--- a/Kudu.Core/Deployment/ZipDeploymentInfo.cs
+++ b/Kudu.Core/Deployment/ZipDeploymentInfo.cs
@@ -32,5 +32,8 @@ public override IRepository GetRepository()
         
         // This is used if the deployment is Run-From-Zip
         public string ZipName { get; set; }
+
+        // This is used when getting the zipfile from the zipURL
+        public string ZipURL { get; set; }
     }
 }
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 363cadf5..5f10cea4 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -443,6 +443,9 @@ public void Configure(IApplicationBuilder app,
                 routes.MapRoute("zip-push-deploy", "api/zipdeploy",
                     new {controller = "PushDeployment", action = "ZipPushDeploy"},
                     new {verb = new HttpMethodRouteConstraint("POST")});
+                routes.MapRoute("zip-push-deploy-url", "api/zipdeploy",
+                    new {controller = "PushDeployment", action = "ZipPushDeployViaUrl"},
+                    new {verb = new HttpMethodRouteConstraint("PUT")});
                 routes.MapRoute("zip-war-deploy", "api/wardeploy",
                     new {controller = "PushDeployment", action = "WarPushDeploy"},
                     new {verb = new HttpMethodRouteConstraint("POST")});
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index d7d18e4f..7c92f2ce 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -15,6 +15,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Newtonsoft.Json.Linq;
+using System.Net.Http;
 
 namespace Kudu.Services.Deployment
 {
@@ -71,7 +73,8 @@ public async Task<IActionResult> ZipPushDeploy(
                     DoFullBuildByDefault = false,
                     Author = author,
                     AuthorEmail = authorEmail,
-                    Message = message
+                    Message = message,
+                    ZipURL = null
                 };
 
                 if (_settings.RunFromLocalZip())
@@ -92,6 +95,41 @@ public async Task<IActionResult> ZipPushDeploy(
             }
         }
 
+        [HttpPut]
+        public async Task<IActionResult> ZipPushDeployViaUrl(
+            [FromBody] JObject requestJson,
+            [FromQuery] bool isAsync = false,
+            [FromQuery] string author = null,
+            [FromQuery] string authorEmail = null,
+            [FromQuery] string deployer = DefaultDeployer,
+            [FromQuery] string message = DefaultMessage)
+        {
+            using (_tracer.Step("ZipPushDeployViaUrl"))
+            {
+                string zipUrl = GetZipURLFromJSON(requestJson);
+
+                var deploymentInfo = new ZipDeploymentInfo(_environment, _traceFactory)
+                {
+                    AllowDeploymentWhileScmDisabled = true,
+                    Deployer = deployer,
+                    IsContinuous = false,
+                    AllowDeferredDeployment = false,
+                    IsReusable = false,
+                    TargetChangeset =
+                        DeploymentManager.CreateTemporaryChangeSet(message: "Deploying from pushed zip file"),
+                    CommitId = null,
+                    RepositoryType = RepositoryType.None,
+                    Fetch = LocalZipHandler,
+                    DoFullBuildByDefault = false,
+                    Author = author,
+                    AuthorEmail = authorEmail,
+                    Message = message,
+                    ZipURL = zipUrl,
+                };
+                return await PushDeployAsync(deploymentInfo, isAsync, HttpContext);
+            }
+        }
+
 
         [HttpPost]
         [DisableRequestSizeLimit]
@@ -130,13 +168,39 @@ public async Task<IActionResult> WarPushDeploy(
                     DoFullBuildByDefault = false,
                     Author = author,
                     AuthorEmail = authorEmail,
-                    Message = message
+                    Message = message,
+                    ZipURL = null
                 };
-
                 return await PushDeployAsync(deploymentInfo, isAsync, HttpContext);
             }
         }
 
+        private string GetZipURLFromJSON(JObject requestObject)
+        {
+            using (_tracer.Step("Reading the zip URL from the request JSON"))
+            {
+                try
+                {
+                    string packageUri = requestObject.Value<string>("packageUri");
+                    if (string.IsNullOrEmpty(packageUri))
+                    {
+                        throw new ArgumentException("Request body does not contain packageUri");
+                    }
+
+                    Uri zipUri = null;
+                    if (!Uri.TryCreate(packageUri, UriKind.Absolute, out zipUri))
+                    {
+                        throw new ArgumentException("Malformed packageUri");
+                    }
+                    return packageUri;
+                }
+                catch (Exception ex)
+                {
+                    _tracer.TraceError(ex, "Error reading the URL from the JSON {0}", requestObject.ToString());
+                    throw;
+                }
+            }
+        }
 
         private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentInfo, bool isAsync,
             HttpContext context)
@@ -162,6 +226,27 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
                             }
                         }
                     }
+                    else if (deploymentInfo.ZipURL != null)
+                    {
+                        using (_tracer.Step("Writing zip file from packageUri to {0}", zipFilePath))
+                        {
+                            using (var file = System.IO.File.Create(zipFilePath))
+                            {
+                                using (var client = new HttpClient())
+                                {
+                                    var zipUrlResponse = await client.GetAsync(deploymentInfo.ZipURL);
+                                    if (zipUrlResponse.IsSuccessStatusCode)
+                                    {
+                                        await zipUrlResponse.Content.CopyToAsync(file);
+                                    }
+                                    else
+                                    {
+                                        _tracer.TraceError("Failed to get file from packageUri {0}", deploymentInfo.ZipURL);
+                                    }
+                                }
+                            }
+                        }
+                    }
                     else
                     {
                         using (var file = System.IO.File.Create(zipFilePath))

From dab71f58b346f003485782821129372612a31e37 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Fri, 17 May 2019 09:16:13 -0700
Subject: [PATCH 070/245] Use ReadAsStreamAsync to reduce thread blocking time

---
 .../Deployment/PushDeploymentController.cs    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index 7c92f2ce..d503017c 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -230,19 +230,26 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
                     {
                         using (_tracer.Step("Writing zip file from packageUri to {0}", zipFilePath))
                         {
-                            using (var file = System.IO.File.Create(zipFilePath))
+                            using (var httpClient = new HttpClient())
+                            using (var fileStream = new FileStream(zipFilePath,
+                                FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true))
                             {
-                                using (var client = new HttpClient())
+                                var zipUrlRequest = new HttpRequestMessage(HttpMethod.Get, deploymentInfo.ZipURL);
+                                var zipUrlResponse = await httpClient.SendAsync(zipUrlRequest);
+
+                                try
+                                {
+                                    zipUrlResponse.EnsureSuccessStatusCode();
+                                }
+                                catch (HttpRequestException hre)
+                                {
+                                    _tracer.TraceError(hre, "Failed to get file from packageUri {0}", deploymentInfo.ZipURL);
+                                    throw;
+                                }
+
+                                using (var content = await zipUrlResponse.Content.ReadAsStreamAsync())
                                 {
-                                    var zipUrlResponse = await client.GetAsync(deploymentInfo.ZipURL);
-                                    if (zipUrlResponse.IsSuccessStatusCode)
-                                    {
-                                        await zipUrlResponse.Content.CopyToAsync(file);
-                                    }
-                                    else
-                                    {
-                                        _tracer.TraceError("Failed to get file from packageUri {0}", deploymentInfo.ZipURL);
-                                    }
+                                    await content.CopyToAsync(fileStream);
                                 }
                             }
                         }

From 2f2a656c33dfc985b26547a2ca1e251509e88abf Mon Sep 17 00:00:00 2001
From: Ankit Kumar <ankikuma@microsoft.com>
Date: Fri, 17 May 2019 15:11:13 -0700
Subject: [PATCH 071/245] Change sitepackage.txt to packageversion.txt (fixes
 #36)

---
 Common/Constants.cs                       | 1 -
 Kudu.Core/Deployment/DeploymentManager.cs | 2 +-
 Kudu.Core/Helpers/PostDeploymentHelper.cs | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index f4135d8a..149929b6 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -127,7 +127,6 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string DurableTask = "durableTask";
         public const string Extensions = "extensions";
         public const string SitePackages = "SitePackages";
-        public const string SiteVersionTxt = "siteversion.txt";
         public const string PackageNameTxt = "packagename.txt";
         public const string KuduBuild = "1.0.0.6";
     }
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 4cbae178..37b91ac8 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -696,7 +696,7 @@ await PostDeploymentHelper.SyncFunctionsTriggers(
                         
                         if (_settings.RunFromLocalZip() && deploymentInfo is ZipDeploymentInfo)
                         {
-                            await PostDeploymentHelper.UpdateSiteVersion(deploymentInfo as ZipDeploymentInfo, _environment, logger);
+                            await PostDeploymentHelper.UpdatePackageName(deploymentInfo as ZipDeploymentInfo, _environment, logger);
                         }
 
                         FinishDeployment(id, deployStep);
diff --git a/Kudu.Core/Helpers/PostDeploymentHelper.cs b/Kudu.Core/Helpers/PostDeploymentHelper.cs
index 79be973f..3143358f 100644
--- a/Kudu.Core/Helpers/PostDeploymentHelper.cs
+++ b/Kudu.Core/Helpers/PostDeploymentHelper.cs
@@ -699,11 +699,11 @@ private static void Trace(TraceEventType eventType, string format, params object
             }
         }
         
-        public static async Task UpdateSiteVersion(ZipDeploymentInfo deploymentInfo, IEnvironment environment, ILogger logger)
+        public static async Task UpdatePackageName(ZipDeploymentInfo deploymentInfo, IEnvironment environment, ILogger logger)
         {
-            var siteVersionPath = Path.Combine(environment.SitePackagesPath, Constants.SiteVersionTxt);
-            logger.Log($"Updating {siteVersionPath} with deployment {deploymentInfo.ZipName}");
-            await FileSystemHelpers.WriteAllTextToFileAsync(siteVersionPath, deploymentInfo.ZipName);
+            var packageNamePath = Path.Combine(environment.SitePackagesPath, Constants.PackageNameTxt);
+            logger.Log($"Updating {packageNamePath} with deployment {deploymentInfo.ZipName}");
+            await FileSystemHelpers.WriteAllTextToFileAsync(packageNamePath, deploymentInfo.ZipName);
         }
     }
 }

From 5591efea963033d486722c458ff0bd01d179a866 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Mon, 20 May 2019 15:42:11 -0700
Subject: [PATCH 072/245] Updates for .NET core Builds

---
 Kudu.Core/Deployment/DeploymentContext.cs     |  5 ++++
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 27 ++++++++++++-------
 .../Oryx/AppServiceOryxArguments.cs           | 20 +++++++++++---
 .../Oryx/FunctionAppOryxArguments.cs          |  2 ++
 Kudu.Core/Deployment/Oryx/IOryxArguments.cs   |  2 ++
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/Kudu.Core/Deployment/DeploymentContext.cs b/Kudu.Core/Deployment/DeploymentContext.cs
index 5e7d01c3..5a7b62b3 100644
--- a/Kudu.Core/Deployment/DeploymentContext.cs
+++ b/Kudu.Core/Deployment/DeploymentContext.cs
@@ -31,6 +31,11 @@ public class DeploymentContext
         /// </summary>
         public ILogger GlobalLogger { get; set; }
 
+        /// <summary>
+        /// Repository Path
+        /// </summary>
+        public string RepositoryPath { get; set; }
+
         /// <summary>
         /// The output path.
         /// </summary>
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 7be68e9f..864d9408 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -18,20 +18,27 @@ public override Task Build(DeploymentContext context)
         {
             FileLogHelper.Log("In oryx build...");
 
-            // Step 1: Run kudusync
+            // initialize the repository Path for the build
+            context.RepositoryPath = RepositoryPath;
 
-            string kuduSyncCommand = string.Format("kudusync -v 50 -f {0} -t {1} -n {2} -p {3} -i \".git;.hg;.deployment;.deploy.sh\"",
-                RepositoryPath,
-                context.OutputPath,
-                context.NextManifestFilePath,
-                context.PreviousManifestFilePath
-                );
+            // Initialize Oryx Args.
+            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
 
-            FileLogHelper.Log("Running KuduSync with  " + kuduSyncCommand);
+            if (!args.SkipKuduSync)
+            {
+                // Step 1: Run kudusync
+                string kuduSyncCommand = string.Format("kudusync -v 50 -f {0} -t {1} -n {2} -p {3} -i \".git;.hg;.deployment;.deploy.sh\"",
+                    RepositoryPath,
+                    context.OutputPath,
+                    context.NextManifestFilePath,
+                    context.PreviousManifestFilePath
+                    );
 
-            RunCommand(context, kuduSyncCommand, false, "Oryx-Build: Running kudu sync...");
+                FileLogHelper.Log("Running KuduSync with  " + kuduSyncCommand);
 
-            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                RunCommand(context, kuduSyncCommand, false, "Oryx-Build: Running kudu sync...");
+            }
+           
             if (args.RunOryxBuild)
             {
                 string buildCommand = args.GenerateOryxBuildCommand(context);
diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 10fd4c95..1a0eb341 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -22,6 +22,7 @@ public class AppServiceOryxArguments : IOryxArguments
         public AppServiceOryxArguments()
         {
             RunOryxBuild = false;
+            SkipKuduSync = false;
 
             string framework = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkSetting);
             string version = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkVersionSetting);
@@ -38,6 +39,11 @@ public AppServiceOryxArguments()
             {
                 return;
             }
+            else if (Language == Framework.DotNETCore)
+            {
+                // Skip kudu sync for .NET core builds
+                SkipKuduSync = true;
+            }
 
             RunOryxBuild = true;
             Version = version;
@@ -93,24 +99,30 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
         {
             StringBuilder args = new StringBuilder();
 
-            // Input/Output
-            OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
-
             // Language
             switch (Language)
             {
                 case Framework.None:
+                    // Input/Output
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
                     break;
 
                 case Framework.NodeJs:
+                    // Input/Output
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
+
                     OryxArgumentsHelper.AddLanguage(args, "nodejs");
                     break;
 
                 case Framework.Python:
+                    // Input/Output
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
                     OryxArgumentsHelper.AddLanguage(args, "python");
                     break;
 
                 case Framework.DotNETCore:
+                    // Input/Output [For .NET core, the source path is the RepositoryPath]
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.OutputPath);
                     OryxArgumentsHelper.AddLanguage(args, "dotnet");
                     break;
             }
@@ -162,5 +174,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
 
             return args.ToString();
         }
+
+        public bool SkipKuduSync { get; set; }
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index 33d01755..0fd7fee5 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -9,9 +9,11 @@ class FunctionAppOryxArguments : IOryxArguments
         public BuildOptimizationsFlags Flags { get; set; }
 
         private readonly WorkerRuntime FunctionsWorkerRuntime;
+        public bool SkipKuduSync { get; set; }
 
         public FunctionAppOryxArguments()
         {
+            SkipKuduSync = false;
             FunctionsWorkerRuntime = ResolveWorkerRuntime();
             RunOryxBuild = FunctionsWorkerRuntime != WorkerRuntime.None;
             var buildFlags = GetEnvironmentVariableOrNull(OryxBuildConstants.OryxEnvVars.BuildFlagsSetting);
diff --git a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
index e4af2179..32c133f4 100644
--- a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
@@ -10,6 +10,8 @@ interface IOryxArguments
 
         BuildOptimizationsFlags Flags { get; set; }
 
+        bool SkipKuduSync { get; set; }
+
         string GenerateOryxBuildCommand(DeploymentContext context);
     }
 }

From 66ec6a2153e4837ceed6e918ad2e84465753c886 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Mon, 20 May 2019 16:19:10 -0700
Subject: [PATCH 073/245] .NET core use temp directory for build

---
 .../Deployment/Oryx/AppServiceOryxArguments.cs    | 15 +++++++++------
 Kudu.Core/Deployment/Oryx/BuildFlags.cs           |  3 ++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 1a0eb341..8e34b9ed 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -67,6 +67,11 @@ private void SetLanguageOptions()
                     return;
 
                 case Framework.DotNETCore:
+                    if (Flags == BuildOptimizationsFlags.None)
+                    {
+                        Flags = BuildOptimizationsFlags.UseTempDirectory;
+                    }
+
                     return;
 
                 case Framework.NodeJs:
@@ -158,6 +163,10 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     }
 
                     break;
+
+                case BuildOptimizationsFlags.UseTempDirectory:
+                    OryxArgumentsHelper.AddTempDirectoryOption(args, context.BuildTempPath);
+                    break;
             }
 
             // Virtual Env?
@@ -166,12 +175,6 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                 OryxArgumentsHelper.AddPythonVirtualEnv(args, VirtualEnv);
             }
 
-            // Publish Output?
-            if (!String.IsNullOrEmpty(PublishFolder))
-            {
-                OryxArgumentsHelper.AddPublishedOutputPath(args, PublishFolder);
-            }
-
             return args.ToString();
         }
 
diff --git a/Kudu.Core/Deployment/Oryx/BuildFlags.cs b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
index 4e08f627..7b278476 100644
--- a/Kudu.Core/Deployment/Oryx/BuildFlags.cs
+++ b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
@@ -9,7 +9,8 @@ public enum BuildOptimizationsFlags
         Off,
         None,
         CompressModules,
-        UseExpressBuild
+        UseExpressBuild,
+        UseTempDirectory
     }
 
     public class BuildFlagsHelper

From c09a530a9b3bace1710d2799084e729337f86f70 Mon Sep 17 00:00:00 2001
From: Ankit Kumar <ankikuma@microsoft.com>
Date: Tue, 21 May 2019 03:00:30 -0700
Subject: [PATCH 074/245] Fix issues with functionapp build

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs  | 18 ++++++++++++++++++
 .../Oryx/FunctionAppOryxArguments.cs           | 11 ++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 864d9408..6a7add35 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -2,6 +2,8 @@
 using Kudu.Core.Helpers;
 using Kudu.Contracts.Settings;
 using Kudu.Core.Deployment.Oryx;
+using Kudu.Core.Infrastructure;
+using System.IO;
 
 namespace Kudu.Core.Deployment.Generator
 {
@@ -41,6 +43,8 @@ public override Task Build(DeploymentContext context)
            
             if (args.RunOryxBuild)
             {
+                PreOryxBuild(context);
+
                 string buildCommand = args.GenerateOryxBuildCommand(context);
                 RunCommand(context, buildCommand, false, "Running oryx build...");
 
@@ -55,6 +59,20 @@ public override Task Build(DeploymentContext context)
             return Task.CompletedTask;
         }
 
+        public static void PreOryxBuild(DeploymentContext context)
+        {
+            if (FunctionAppHelper.LooksLikeFunctionApp())
+            {
+                // We need to delete this directory in order to avoid issues with
+                // reinstalling Python dependencies on a target directory
+                var pythonPackagesDir = Path.Combine(context.OutputPath, ".python_packages");
+                if (Directory.Exists(pythonPackagesDir))
+                {
+                    FileSystemHelpers.DeleteDirectorySafe(pythonPackagesDir);
+                }
+            }
+        }
+
         //public override void PostBuild(DeploymentContext context)
         //{
         //    // no-op
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index 0fd7fee5..ad69b730 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -94,20 +94,13 @@ private void AddWorkerRuntimeArgs(StringBuilder args, WorkerRuntime workerRuntim
 
         private WorkerRuntime ResolveWorkerRuntime()
         {
-            // Note: FRAMEWORK is not set right now for a Function App. However, we are planning on doing so,
-            // similar to what AppService does. Once we start setting that, this should be the order of preference
-            var functionsWorkerRuntimeStr = GetEnvironmentVariableOrNull(OryxBuildConstants.OryxEnvVars.FrameworkSetting)
-                ?? GetEnvironmentVariableOrNull(OryxBuildConstants.FunctionAppEnvVars.WorkerRuntimeSetting);
-
+            var functionsWorkerRuntimeStr = GetEnvironmentVariableOrNull(OryxBuildConstants.FunctionAppEnvVars.WorkerRuntimeSetting);
             return FunctionAppSupportedWorkerRuntime.ParseWorkerRuntime(functionsWorkerRuntimeStr);
         }
 
         private string ResolveWorkerRuntimeVersion(WorkerRuntime workerRuntime)
         {
-            // Note: FRAMEWORK_VERSION is not set right now for a Function App. However, we are planning on doing so,
-            // similar to what AppService does. Until then, we will always hit the defaults
-            return GetEnvironmentVariableOrNull(OryxBuildConstants.OryxEnvVars.FrameworkVersionSetting)
-                ?? FunctionAppSupportedWorkerRuntime.GetDefaultLanguageVersion(workerRuntime);
+            return FunctionAppSupportedWorkerRuntime.GetDefaultLanguageVersion(workerRuntime);
         }
 
         private string GetEnvironmentVariableOrNull(string environmentVarName)

From fb45966762a630128310191086790faac16655af Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Tue, 21 May 2019 14:19:33 -0700
Subject: [PATCH 075/245] Enhance SimpleWebTokenHelper

---
 Kudu.Contracts/Settings/SettingsKeys.cs       |   8 ++
 Kudu.Core/Helpers/SimpleWebTokenHelper.cs     | 120 ++++++++++++++++--
 Kudu.Core/Kudu.Core.csproj                    |   6 +-
 .../Core/Helpers/SimpleWebTokenTests.cs       |  97 ++++++++++++++
 Kudu.Tests/Kudu.Tests.csproj                  |  20 +++
 .../EncryptedHostAssignmentContextTests.cs    |  52 ++++++++
 Kudu.Tests/TestHelpers.cs                     |  27 ++++
 Kudu.sln                                      |   6 +
 8 files changed, 324 insertions(+), 12 deletions(-)
 create mode 100644 Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
 create mode 100644 Kudu.Tests/Kudu.Tests.csproj
 create mode 100644 Kudu.Tests/Services/Models/EncryptedHostAssignmentContextTests.cs
 create mode 100644 Kudu.Tests/TestHelpers.cs

diff --git a/Kudu.Contracts/Settings/SettingsKeys.cs b/Kudu.Contracts/Settings/SettingsKeys.cs
index a4a5f996..6eb2eb0b 100644
--- a/Kudu.Contracts/Settings/SettingsKeys.cs
+++ b/Kudu.Contracts/Settings/SettingsKeys.cs
@@ -46,5 +46,13 @@ public static class SettingsKeys
         public const string RunFromZipOld = "WEBSITE_RUN_FROM_ZIP";  // Old name, will eventually go away
         public const string RunFromZip = "WEBSITE_RUN_FROM_PACKAGE";
         public const string MaxZipPackageCount = "SCM_MAX_ZIP_PACKAGE_COUNT";
+        // Antares container specific settings
+        public const string ScmRunFromPackage = "SCM_RUN_FROM_PACKAGE";
+        public const string PlaceholderMode = "WEBSITE_PLACEHOLDER_MODE";
+        public const string ContainerReady = "WEBSITE_CONTAINER_READY";
+        public const string WebsiteHostname = "WEBSITE_HOSTNAME";
+        public const string AuthEncryptionKey = "WEBSITE_AUTH_ENCRYPTION_KEY";
+        public const string ContainerEncryptionKey = "CONTAINER_ENCRYPTION_KEY";
+        public const string MachineDecryptionKey = "MACHINEKEY_DecryptionKey";
     }
 }
diff --git a/Kudu.Core/Helpers/SimpleWebTokenHelper.cs b/Kudu.Core/Helpers/SimpleWebTokenHelper.cs
index fd3f896f..b8e345d2 100644
--- a/Kudu.Core/Helpers/SimpleWebTokenHelper.cs
+++ b/Kudu.Core/Helpers/SimpleWebTokenHelper.cs
@@ -1,11 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
- namespace Kudu.Core.Helpers
+using Kudu.Contracts.Settings;
+using Microsoft.AspNetCore.Authentication;
+
+namespace Kudu.Core.Helpers
 {
     public static class SimpleWebTokenHelper
     {
@@ -15,19 +17,25 @@ public static class SimpleWebTokenHelper
         /// The SWT is then returned as an encrypted string
         /// </summary>
         /// <param name="validUntil">Datetime for when the token should expire</param>
+        /// <param name="key">Optional key to encrypt the token with</param>
         /// <returns>a SWT signed by this app</returns>
-        public static string CreateToken(DateTime validUntil) => Encrypt($"exp={validUntil.Ticks}");
+        public static string CreateToken(DateTime validUntil, byte[] key = null) => Encrypt($"exp={validUntil.Ticks}", key);
          [SuppressMessage("Microsoft.Usage", "CA2202:Object 'cipherStream' and 'cryptoStream' can be disposed mo re than once",
             Justification = "MemoeryStream, CryptoStream, and BinaryWriter handle multiple disposal correctly. The alternative is pretty ugly code for clearing each variable, checking for null, and manual dispose.")]
-        private static string Encrypt(string value)
+        public static string Encrypt(string value, byte[] key = null)
         {
-            using (var aes = new AesManaged { Key = GetWebSiteAuthEncryptionKey() })
+            if (key == null)
+            {
+                TryGetEncryptionKey(SettingsKeys.AuthEncryptionKey, out key);
+            }
+
+            using (var aes = new AesManaged { Key = key })
             {
                 // IV is always generated for the key every time
                 aes.GenerateIV();
                 var input = Encoding.UTF8.GetBytes(value);
                 var iv = Convert.ToBase64String(aes.IV);
-                 using (var encrypter = aes.CreateEncryptor(aes.Key, aes.IV))
+                using (var encrypter = aes.CreateEncryptor(aes.Key, aes.IV))
                 using (var cipherStream = new MemoryStream())
                 {
                     using (var cryptoStream = new CryptoStream(cipherStream, encrypter, CryptoStreamMode.Write))
@@ -41,21 +49,114 @@ private static string Encrypt(string value)
                 }
             }
         }
-         private static string GetSHA256Base64String(byte[] key)
+
+        public static bool TryValidateToken(string token, ISystemClock systemClock)
+        {
+            try
+            {
+                return ValidateToken(token, systemClock);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public static bool ValidateToken(string token, ISystemClock systemClock)
+        {
+            // Use WebSiteAuthEncryptionKey if available else fallback to ContainerEncryptionKey.
+            // Until the container is specialized to a specific site WebSiteAuthEncryptionKey will not be available.
+            byte[] key;
+            if (!TryGetEncryptionKey(SettingsKeys.AuthEncryptionKey, out key, false))
+            {
+                TryGetEncryptionKey(SettingsKeys.ContainerEncryptionKey, out key);
+            }
+
+            var data = Decrypt(key, token);
+
+            var parsedToken = data
+                // token = key1=value1;key2=value2
+                .Split(';', StringSplitOptions.RemoveEmptyEntries)
+                 // ["key1=value1", "key2=value2"]
+                 .Select(v => v.Split('=', StringSplitOptions.RemoveEmptyEntries))
+                 // [["key1", "value1"], ["key2", "value2"]]
+                 .ToDictionary(k => k[0], v => v[1]);
+
+            return parsedToken.ContainsKey("exp") && systemClock.UtcNow.UtcDateTime < new DateTime(long.Parse(parsedToken["exp"]));
+        }
+
+        public static string Decrypt(byte[] encryptionKey, string value)
+        {
+            var parts = value.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
+            if (parts.Length != 2 && parts.Length != 3)
+            {
+                throw new InvalidOperationException("Malformed token.");
+            }
+
+            var iv = Convert.FromBase64String(parts[0]);
+            var data = Convert.FromBase64String(parts[1]);
+            var base64KeyHash = parts.Length == 3 ? parts[2] : null;
+
+            if (!string.IsNullOrEmpty(base64KeyHash) && !string.Equals(GetSHA256Base64String(encryptionKey), base64KeyHash))
+            {
+                throw new InvalidOperationException(string.Format("Key with hash {0} does not exist.", base64KeyHash));
+            }
+
+            using (var aes = new AesManaged { Key = encryptionKey })
+            {
+                using (var ms = new MemoryStream())
+                {
+                    using (var cs = new CryptoStream(ms, aes.CreateDecryptor(aes.Key, iv), CryptoStreamMode.Write))
+                    using (var binaryWriter = new BinaryWriter(cs))
+                    {
+                        binaryWriter.Write(data, 0, data.Length);
+                    }
+
+                    return Encoding.UTF8.GetString(ms.ToArray());
+                }
+            }
+        }
+
+        private static bool TryGetEncryptionKey(string keyName, out byte[] encryptionKey, bool throwIfFailed = true)
+        {
+            encryptionKey = null;
+            var hexOrBase64 = System.Environment.GetEnvironmentVariable(keyName);
+            if (string.IsNullOrEmpty(hexOrBase64))
+            {
+                if (throwIfFailed)
+                {
+                    throw new InvalidOperationException($"No {keyName} defined in the environment");
+                }
+
+                return false;
+            }
+
+            encryptionKey = hexOrBase64.ToKeyBytes();
+
+            return true;
+        }
+
+        private static string GetSHA256Base64String(byte[] key)
         {
             using (var sha256 = new SHA256Managed())
             {
                 return Convert.ToBase64String(sha256.ComputeHash(key));
             }
         }
-         private static byte[] GetWebSiteAuthEncryptionKey()
+
+        private static byte[] GetWebSiteAuthEncryptionKey()
         {
             var hexOrBase64 = System.Environment.GetEnvironmentVariable(Constants.SiteAuthEncryptionKey);
             if (string.IsNullOrEmpty(hexOrBase64))
             {
                 throw new InvalidOperationException($"No {Constants.SiteAuthEncryptionKey} defined in the environment");
             }
-            
+
+            return hexOrBase64.ToKeyBytes();
+        }
+
+        public static byte[] ToKeyBytes(this string hexOrBase64)
+        {
             // only support 32 bytes (256 bits) key length
             if (hexOrBase64.Length == 64)
             {
@@ -64,6 +165,7 @@ private static byte[] GetWebSiteAuthEncryptionKey()
                     .Select(x => Convert.ToByte(hexOrBase64.Substring(x, 2), 16))
                     .ToArray();
             }
+
             return Convert.FromBase64String(hexOrBase64);
         }
     }
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index 430cdd4c..aaeeaedc 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -27,10 +27,10 @@
     <PackageReference Include="LibGit2Sharp" Version="0.25.2" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Mercurial.Net" Version="1.1.1.607" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />	    
-     <PackageReference Include="System.Text.RegularExpressions"/>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="0.1.78-alpha" />
     <PackageReference Include="ncrontab" Version="3.3.0" />
     <PackageReference Include="NuGet.Protocol" Version="4.8.0" />
diff --git a/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs b/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
new file mode 100644
index 00000000..d11c10e8
--- /dev/null
+++ b/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
@@ -0,0 +1,97 @@
+using System;
+using Microsoft.AspNetCore.Authentication;
+using Xunit;
+using Kudu.Core.Helpers;
+using Kudu.Contracts.Settings;
+
+namespace Kudu.Tests.Core.Helpers
+{
+    public class SimpleWebTokenTests
+    {
+        [Fact]
+        public void EncryptShouldThrowIdNoEncryptionKeyDefined()
+        {
+            // Make sure WEBSITE_AUTH_ENCRYPTION_KEY is empty
+            Environment.SetEnvironmentVariable("WEBSITE_AUTH_ENCRYPTION_KEY", string.Empty);
+
+            try
+            {
+                SimpleWebTokenHelper.Encrypt("value");
+            }
+            catch (Exception ex)
+            {
+                Assert.IsType<InvalidOperationException>(ex);
+                Assert.Contains("WEBSITE_AUTH_ENCRYPTION_KEY", ex.Message);
+            }
+        }
+
+        [Theory]
+        [InlineData("value")]
+        public void EncryptShouldGenerateDecryptableValues(string valueToEncrypt)
+        {
+            var key = TestHelpers.GenerateKeyBytes();
+            var stringKey = TestHelpers.GenerateKeyHexString(key);
+            Environment.SetEnvironmentVariable("WEBSITE_AUTH_ENCRYPTION_KEY", stringKey);
+
+            var encrypted = SimpleWebTokenHelper.Encrypt(valueToEncrypt);
+            var decrypted = SimpleWebTokenHelper.Decrypt(key, encrypted);
+
+            Assert.Matches("(.*)[.](.*)[.](.*)", encrypted);
+            Assert.Equal(valueToEncrypt, decrypted);
+        }
+
+        [Fact]
+        public void CreateTokenShouldCreateAValidToken()
+        {
+            var key = TestHelpers.GenerateKeyBytes();
+            var stringKey = TestHelpers.GenerateKeyHexString(key);
+            var timeStamp = DateTime.UtcNow;
+            Environment.SetEnvironmentVariable("WEBSITE_AUTH_ENCRYPTION_KEY", stringKey);
+
+            var token = SimpleWebTokenHelper.CreateToken(timeStamp);
+            var decrypted = SimpleWebTokenHelper.Decrypt(key, token);
+
+            Assert.Equal($"exp={timeStamp.Ticks}", decrypted);
+        }
+
+        [Fact]
+        public void Validate_Token_Uses_WebSiteAuthEncryptionKey_If_Available()
+        {
+            var containerEncryptionKey = TestHelpers.GenerateKeyBytes();
+            var containerEncryptionStringKey = TestHelpers.GenerateKeyHexString(containerEncryptionKey);
+
+            var websiteAuthEncryptionKey = TestHelpers.GenerateKeyBytes();
+            var websiteAuthEncryptionStringKey = TestHelpers.GenerateKeyHexString(websiteAuthEncryptionKey);
+
+            var timeStamp = DateTime.UtcNow.AddHours(1);
+
+            Environment.SetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, containerEncryptionStringKey);
+            Environment.SetEnvironmentVariable(SettingsKeys.AuthEncryptionKey, websiteAuthEncryptionStringKey);
+
+            var token = SimpleWebTokenHelper.CreateToken(timeStamp, websiteAuthEncryptionKey);
+            Assert.True(SimpleWebTokenHelper.TryValidateToken(token, new SystemClock()));
+        }
+
+        [Fact]
+        public void Validate_Token_Uses_Website_Encryption_Key_If_Container_Encryption_Key_Not_Available()
+        {
+            var websiteAuthEncryptionKey = TestHelpers.GenerateKeyBytes();
+            var websiteAuthEncryptionStringKey = TestHelpers.GenerateKeyHexString(websiteAuthEncryptionKey);
+
+            var timeStamp = DateTime.UtcNow.AddHours(1);
+
+            Environment.SetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, string.Empty);
+            Environment.SetEnvironmentVariable(SettingsKeys.AuthEncryptionKey, websiteAuthEncryptionStringKey);
+
+            var token = SimpleWebTokenHelper.CreateToken(timeStamp, websiteAuthEncryptionKey);
+            Assert.True(SimpleWebTokenHelper.TryValidateToken(token, new SystemClock()));
+        }
+
+        public void Dispose()
+        {
+            // Clean up
+            Environment.SetEnvironmentVariable(SettingsKeys.AuthEncryptionKey, string.Empty);
+            Environment.SetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, string.Empty);
+        }
+    }
+}
diff --git a/Kudu.Tests/Kudu.Tests.csproj b/Kudu.Tests/Kudu.Tests.csproj
new file mode 100644
index 00000000..f1e34689
--- /dev/null
+++ b/Kudu.Tests/Kudu.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Kudu.Core\Kudu.Core.csproj" />
+    <ProjectReference Include="..\Kudu.Services\Kudu.Services.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Kudu.Tests/Services/Models/EncryptedHostAssignmentContextTests.cs b/Kudu.Tests/Services/Models/EncryptedHostAssignmentContextTests.cs
new file mode 100644
index 00000000..d2950387
--- /dev/null
+++ b/Kudu.Tests/Services/Models/EncryptedHostAssignmentContextTests.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Kudu.Services.Models;
+using Xunit;
+
+namespace Kudu.Tests.Services.Models
+{
+    public class EncryptedHostAssignmentContextTests
+    {
+        private const string _encryptionKey = "MDEyMzQ1Njc4OUFCQ0RFRjAxMjM0NTY3ODlBQkNERUY=";
+        private const string _lastModifiedTime = "2019-01-15T15:53:00";
+        private HostAssignmentContext _context = new HostAssignmentContext() {
+            SiteId = 10,
+            SiteName = "sitename",
+            LastModifiedTime = DateTime.Parse(_lastModifiedTime),
+            Environment = new Dictionary<string, string>()
+            {
+                {"APPSETTING_AzureWebJobsStorage", "<StorageString>"},
+                {"APPSETTING_SCM_RUN_FROM_PACKAGE", "1"},
+                {"APPSETTING_SCM_DO_BUILD_DURING_DEPLOYMENT", "true"},
+                {"APPSETTING_SCM_NO_REPOSITORY", "1"},
+                {"ENABLE_ORYX_BUILD", "true"},
+                {"FRAMEWORK", "PYTHON"},
+                {"FRAMEWORK_VERSION", "3.6"}
+            }
+        };
+
+        [Fact]
+        public void EncryptedContextShouldExistAfterCreate()
+        {
+            var result = EncryptedHostAssignmentContext.Create(_context, _encryptionKey);
+            Assert.NotEmpty(result.EncryptedContext);
+        }
+
+        [Fact]
+        public void DecryptedContextShouldMatchByEqual()
+        {
+            var encrypted = EncryptedHostAssignmentContext.Create(_context, _encryptionKey);
+            var decrypted = encrypted.Decrypt(_encryptionKey);
+            Assert.True(_context.Equals(decrypted));
+        }
+
+        [Fact]
+        public void DecryptedContextShouldMatchEnvironments()
+        {
+            var encrypted = EncryptedHostAssignmentContext.Create(_context, _encryptionKey);
+            var decrypted = encrypted.Decrypt(_encryptionKey);
+            Assert.Equal(_context.Environment, decrypted.Environment);
+        }
+    }
+}
diff --git a/Kudu.Tests/TestHelpers.cs b/Kudu.Tests/TestHelpers.cs
new file mode 100644
index 00000000..3b6939a2
--- /dev/null
+++ b/Kudu.Tests/TestHelpers.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Security.Cryptography;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Tests
+{
+    public static class TestHelpers
+    {
+        private const string Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        private static readonly Random Random = new Random();
+
+        public static byte[] GenerateKeyBytes()
+        {
+            using (var aes = new AesManaged())
+            {
+                aes.GenerateKey();
+                return aes.Key;
+            }
+        }
+
+        public static string GenerateKeyHexString(byte[] key = null)
+        {
+            return BitConverter.ToString(key ?? GenerateKeyBytes()).Replace("-", string.Empty);
+        }
+    }
+}
diff --git a/Kudu.sln b/Kudu.sln
index fec4363d..f8ec6a9d 100644
--- a/Kudu.sln
+++ b/Kudu.sln
@@ -16,6 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kudu.Services.Web", "Kudu.S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kudu.Console", "Kudu.Console\Kudu.Console.csproj", "{32AE9472-F7C0-4ED8-8D8C-EAB2419F5083}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kudu.Tests", "Kudu.Tests\Kudu.Tests.csproj", "{C667BB81-BD51-4009-9555-1BC7462855B4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,6 +49,10 @@ Global
 		{32AE9472-F7C0-4ED8-8D8C-EAB2419F5083}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{32AE9472-F7C0-4ED8-8D8C-EAB2419F5083}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32AE9472-F7C0-4ED8-8D8C-EAB2419F5083}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C667BB81-BD51-4009-9555-1BC7462855B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C667BB81-BD51-4009-9555-1BC7462855B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C667BB81-BD51-4009-9555-1BC7462855B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C667BB81-BD51-4009-9555-1BC7462855B4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From d81afd77875af9c9b06a54b902025d121148bd4a Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Tue, 21 May 2019 14:31:32 -0700
Subject: [PATCH 076/245] Add: HostAssignmentContext

---
 .../Models/EncryptedHostAssignmentContext.cs  | 30 ++++++++++
 Kudu.Services/Models/HostAssignmentContext.cs | 56 +++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 Kudu.Services/Models/EncryptedHostAssignmentContext.cs
 create mode 100644 Kudu.Services/Models/HostAssignmentContext.cs

diff --git a/Kudu.Services/Models/EncryptedHostAssignmentContext.cs b/Kudu.Services/Models/EncryptedHostAssignmentContext.cs
new file mode 100644
index 00000000..965747ce
--- /dev/null
+++ b/Kudu.Services/Models/EncryptedHostAssignmentContext.cs
@@ -0,0 +1,30 @@
+using System;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Kudu.Core.Helpers;
+
+namespace Kudu.Services.Models
+{
+    public class EncryptedHostAssignmentContext
+    {
+        [JsonProperty("encryptedContext")]
+        public string EncryptedContext { get; set; }
+
+        public static EncryptedHostAssignmentContext Create(HostAssignmentContext context, string key)
+        {
+            string json = JsonConvert.SerializeObject(context);
+            var encryptionKey = Convert.FromBase64String(key);
+            string encrypted = SimpleWebTokenHelper.Encrypt(json, encryptionKey);
+
+            return new EncryptedHostAssignmentContext { EncryptedContext = encrypted };
+        }
+
+        public HostAssignmentContext Decrypt(string key)
+        {
+            var decrypted = SimpleWebTokenHelper.Decrypt(key.ToKeyBytes(), EncryptedContext);
+            return JsonConvert.DeserializeObject<HostAssignmentContext>(decrypted);
+        }
+    }
+}
diff --git a/Kudu.Services/Models/HostAssignmentContext.cs b/Kudu.Services/Models/HostAssignmentContext.cs
new file mode 100644
index 00000000..2eeae52f
--- /dev/null
+++ b/Kudu.Services/Models/HostAssignmentContext.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using Kudu.Contracts.Settings;
+using Kudu.Core;
+
+namespace Kudu.Services.Models
+{
+    public class HostAssignmentContext
+    {
+        [JsonProperty("siteId")]
+        public int SiteId { get; set; }
+
+        [JsonProperty("siteName")]
+        public string SiteName { get; set; }
+
+        [JsonProperty("environment")]
+        public Dictionary<string, string> Environment { get; set; }
+
+        [JsonProperty("lastModifiedTime")]
+        public DateTime LastModifiedTime { get; set; }
+
+        public string ZipUrl
+        {
+            get
+            {
+                if (Environment.ContainsKey(SettingsKeys.RunFromZip))
+                {
+                    return Environment[SettingsKeys.RunFromZip];
+                }
+                else
+                {
+                    return string.Empty;
+                }
+            }
+        }
+
+        public bool Equals(HostAssignmentContext other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+
+            return SiteId == other.SiteId && LastModifiedTime.CompareTo(other.LastModifiedTime) == 0;
+        }
+
+        public void ApplyAppSettings()
+        {
+            foreach (var pair in Environment)
+            {
+                System.Environment.SetEnvironmentVariable(pair.Key, pair.Value);
+            }
+        }
+    }
+}

From dde0ab88c8edaac4105ad6f91dce4afc8da0263b Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Tue, 21 May 2019 14:45:44 -0700
Subject: [PATCH 077/245] Remove unnecessary SettingsKeys.cs

---
 Kudu.Contracts/Settings/SettingsKeys.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Kudu.Contracts/Settings/SettingsKeys.cs b/Kudu.Contracts/Settings/SettingsKeys.cs
index 6eb2eb0b..dc870102 100644
--- a/Kudu.Contracts/Settings/SettingsKeys.cs
+++ b/Kudu.Contracts/Settings/SettingsKeys.cs
@@ -47,12 +47,7 @@ public static class SettingsKeys
         public const string RunFromZip = "WEBSITE_RUN_FROM_PACKAGE";
         public const string MaxZipPackageCount = "SCM_MAX_ZIP_PACKAGE_COUNT";
         // Antares container specific settings
-        public const string ScmRunFromPackage = "SCM_RUN_FROM_PACKAGE";
-        public const string PlaceholderMode = "WEBSITE_PLACEHOLDER_MODE";
-        public const string ContainerReady = "WEBSITE_CONTAINER_READY";
-        public const string WebsiteHostname = "WEBSITE_HOSTNAME";
         public const string AuthEncryptionKey = "WEBSITE_AUTH_ENCRYPTION_KEY";
         public const string ContainerEncryptionKey = "CONTAINER_ENCRYPTION_KEY";
-        public const string MachineDecryptionKey = "MACHINEKEY_DecryptionKey";
     }
 }

From e9c93529cf4eb51793b05beed3461a71560f67b8 Mon Sep 17 00:00:00 2001
From: Ankit Kumar <ankikuma@microsoft.com>
Date: Wed, 22 May 2019 03:12:59 -0700
Subject: [PATCH 078/245] Update function app express build artifacts

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 43 ++++++++++++++++++-
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   | 37 +++-------------
 .../Oryx/FunctionAppOryxArguments.cs          | 23 ++++++++--
 .../Deployment/Oryx/OryxBuildConstants.cs     |  1 +
 4 files changed, 69 insertions(+), 35 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 6a7add35..1bc25e9c 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -4,6 +4,8 @@
 using Kudu.Core.Deployment.Oryx;
 using Kudu.Core.Infrastructure;
 using System.IO;
+using System;
+using Kudu.Core.Commands;
 
 namespace Kudu.Core.Deployment.Generator
 {
@@ -52,14 +54,21 @@ public override Task Build(DeploymentContext context)
                 // Run express build setups if needed
                 if (args.Flags == BuildOptimizationsFlags.UseExpressBuild)
                 {
-                    Oryx.ExpressBuilder.SetupExpressBuilderArtifacts(context.OutputPath);
+                    if (FunctionAppHelper.LooksLikeFunctionApp())
+                    {
+                        SetupFunctionAppExpressArtifacts(context);
+                    }
+                    else
+                    {
+                        Oryx.ExpressBuilder.SetupExpressBuilderArtifacts(context.OutputPath);
+                    }
                 }
             }
 
             return Task.CompletedTask;
         }
 
-        public static void PreOryxBuild(DeploymentContext context)
+        private static void PreOryxBuild(DeploymentContext context)
         {
             if (FunctionAppHelper.LooksLikeFunctionApp())
             {
@@ -73,6 +82,36 @@ public static void PreOryxBuild(DeploymentContext context)
             }
         }
 
+        private void SetupFunctionAppExpressArtifacts(DeploymentContext context)
+        {
+            string sitePackages = "/home/data/SitePackages";
+            string packageNameFile = Path.Combine(sitePackages, "packagename.txt");
+            string packagePathFile = Path.Combine(sitePackages, "packagepath.txt");
+
+            FileSystemHelpers.EnsureDirectory(sitePackages);
+
+            string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+            string zipFile = Path.Combine(sitePackages, zipAppName);
+
+            context.Logger.Log("Writing the artifacts to a zip file");
+            var exe = ExternalCommandFactory.BuildExternalCommandExecutable(OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup, sitePackages, context.Logger);
+            try
+            {
+                exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"zip -r {zipFile} .", String.Empty);
+            }
+            catch (Exception)
+            {
+                context.GlobalLogger.LogError();
+                throw;
+            }
+
+            // Just to be sure that we don't keep adding zip files here
+            DeploymentHelper.PurgeZipsIfNecessary(sitePackages, context.Tracer, totalAllowedZips: 3);
+
+            File.WriteAllText(packageNameFile, zipAppName);
+            File.WriteAllText(packagePathFile, sitePackages);
+        }
+
         //public override void PostBuild(DeploymentContext context)
         //{
         //    // no-op
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 780315d1..64ccade7 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -1,6 +1,5 @@
-using System.IO;
-using System.IO.Compression;
-using Kudu.Core.Infrastructure;
+using System;
+using System.IO;
 
 namespace Kudu.Core.Deployment.Oryx
 {
@@ -14,34 +13,12 @@ public static void SetupExpressBuilderArtifacts(string outputPath)
 
             CreateSitePackagesDirectory(root);
 
-            if (FunctionAppHelper.LooksLikeFunctionApp())
-            {
-                // For function app express mode
-                SetupFunctionApp(root, packageNameFile, outputPath);
-            }
-            else
-            {
-                // For App service express mode
-                // Generate packagename.txt and packagepath
-                string packagename = "node_modules.zip:/node_modules";
-
-                File.WriteAllText(packageNameFile, packagename);
-                File.WriteAllText(packagePathFile, outputPath);
-            }
-        }
-
-        private static void SetupFunctionApp(string root, string packageNameFile, string outputPath)
-        {
-            string zipAppName = "functionapp.zip";
-            string zipFilePath = Path.Combine(root, zipAppName);
-
-            if (File.Exists(zipFilePath))
-            {
-                File.Delete(zipFilePath);
-            }
+            // For App service express mode
+            // Generate packagename.txt and packagepath
+            string packagename = "node_modules.zip:/node_modules";
 
-            ZipFile.CreateFromDirectory(outputPath, zipFilePath);
-            File.WriteAllText(packageNameFile, zipAppName);
+            File.WriteAllText(packageNameFile, packagename);
+            File.WriteAllText(packagePathFile, outputPath);
         }
 
         private static void CreateSitePackagesDirectory(string path)
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index ad69b730..85339caf 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -1,4 +1,6 @@
-using System.Text;
+using Kudu.Core.Infrastructure;
+using System.IO;
+using System.Text;
 
 namespace Kudu.Core.Deployment.Oryx
 {
@@ -18,13 +20,14 @@ public FunctionAppOryxArguments()
             RunOryxBuild = FunctionsWorkerRuntime != WorkerRuntime.None;
             var buildFlags = GetEnvironmentVariableOrNull(OryxBuildConstants.OryxEnvVars.BuildFlagsSetting);
             Flags = BuildFlagsHelper.Parse(buildFlags);
+            SkipKuduSync = Flags == BuildOptimizationsFlags.UseExpressBuild;
         }
 
         public string GenerateOryxBuildCommand(DeploymentContext context)
         {
             StringBuilder args = new StringBuilder();
 
-            AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
+            AddOryxBuildCommand(args, context, source: context.OutputPath, destination: context.OutputPath);
             AddLanguage(args, FunctionsWorkerRuntime);
             AddLanguageVersion(args, FunctionsWorkerRuntime);
             AddBuildOptimizationFlags(args, context, Flags);
@@ -33,8 +36,22 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
             return args.ToString();
         }
 
-        private void AddOryxBuildCommand(StringBuilder args, string source, string destination)
+        private void AddOryxBuildCommand(StringBuilder args, DeploymentContext context, string source, string destination)
         {
+            // If it is express build, we don't directly need to write to /home/site/wwwroot
+            // So, we build into a different directory to avoid overlap
+            // Additionally, we didn't run kudusync, and can just build directly from repository path
+            if (Flags == BuildOptimizationsFlags.UseExpressBuild)
+            {
+                source = context.RepositoryPath;
+                destination = OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup;
+                // It is important to clean and recreate the directory to make sure no overwrite occurs
+                if (FileSystemHelpers.DirectoryExists(destination))
+                {
+                    FileSystemHelpers.DeleteDirectorySafe(destination);
+                }
+                FileSystemHelpers.EnsureDirectory(destination);
+            }
             OryxArgumentsHelper.AddOryxBuildCommand(args, source, destination);
         }
 
diff --git a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
index 018ec122..f1a20e4f 100644
--- a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
@@ -25,6 +25,7 @@ internal static class FunctionAppWorkerRuntimeDefaults
 
         internal static class FunctionAppBuildSettings
         {
+            public static readonly string ExpressBuildSetup = "/tmp/build/expressbuild";
             public static readonly string PythonPackagesTargetDir = Path.Combine(".python_packages", "lib", "python3.6", "site-packages");
         }
     }

From ec6c2a7693d8bf9ed7927e11f7dc8f268bd42fa0 Mon Sep 17 00:00:00 2001
From: JennyLawrance <jennylaw@microsoft.com>
Date: Wed, 22 May 2019 17:56:57 -0700
Subject: [PATCH 079/245] Fix .net core 1.0 and 2.0 builds with oryx

---
 .../Oryx/AppServiceOryxArguments.cs           | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 8e34b9ed..1e78706a 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -133,7 +133,33 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
             }
 
             // Version
-            OryxArgumentsHelper.AddLanguageVersion(args, Version);
+            switch (Language)
+            {
+                case Framework.None:
+                    break;
+
+                case Framework.NodeJs:
+                case Framework.Python:
+                    OryxArgumentsHelper.AddLanguageVersion(args, Version);
+                    break;
+
+                // work around issue regarding sdk version vs runtime version
+                case Framework.DotNETCore:
+                    if (Version == "1.0")
+                    {
+                        Version = "1.1";
+                    }
+                    else if (Version == "2.0")
+                    {
+                        Version = "2.1";
+                    }
+
+                    OryxArgumentsHelper.AddLanguageVersion(args, Version);
+                    break;
+
+                default:
+                    break;
+            }
 
             // Build Flags
             switch (Flags)

From c5aefe35963bb787c658c87926b15e1bf8490630 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Wed, 22 May 2019 10:26:44 -0700
Subject: [PATCH 080/245] Add authorization and authentication

---
 Kudu.Contracts/Settings/SettingsKeys.cs       |   2 +
 .../InstanceAdministrationExtensions.cs       |  33 ++++
 Kudu.Services.Web/Program.cs                  |  24 +++
 Kudu.Services.Web/Startup.cs                  |  11 ++
 .../ArmAuthenticationDefaults.cs              |  11 ++
 .../ArmAuthenticationExtensions.cs            |  13 ++
 .../ArmAuthenticationHandler.cs               |  67 +++++++
 .../ArmAuthenticationOptions.cs               |  11 ++
 .../Authentication/SecurityConstants.cs       |  12 ++
 .../AuthLevelAuthorizationHandler.cs          |  21 +++
 .../Authorization/AuthLevelRequirement.cs     |  17 ++
 .../Authorization/AuthOptionsExtensions.cs    |  25 +++
 .../Authorization/AuthPolicyNames.cs          |   7 +
 .../Authorization/AuthorizationLevel.cs       |  12 ++
 .../Authorization/AuthorizationUtility.cs     |  49 +++++
 .../InstanceAdmin/InstanceController.cs       |  54 ++++++
 Kudu.Services/Kudu.Services.csproj            |   1 +
 .../Core/Helpers/SimpleWebTokenTests.cs       |  70 +++----
 .../ArmAuthenticationHandlerTets.cs           | 172 ++++++++++++++++++
 .../AuthorizationUtilityTests.cs              |  30 +++
 Kudu.Tests/TestScopedEnvironmentVariable.cs   |  60 ++++++
 Kudu.sln                                      |   5 +-
 22 files changed, 671 insertions(+), 36 deletions(-)
 create mode 100644 Kudu.Services.Web/Infrastructure/InstanceAdministrationExtensions.cs
 create mode 100644 Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
 create mode 100644 Kudu.Services/Infrastructure/Authentication/ArmAuthenticationExtensions.cs
 create mode 100644 Kudu.Services/Infrastructure/Authentication/ArmAuthenticationHandler.cs
 create mode 100644 Kudu.Services/Infrastructure/Authentication/ArmAuthenticationOptions.cs
 create mode 100644 Kudu.Services/Infrastructure/Authentication/SecurityConstants.cs
 create mode 100644 Kudu.Services/Infrastructure/Authorization/AuthLevelAuthorizationHandler.cs
 create mode 100644 Kudu.Services/Infrastructure/Authorization/AuthLevelRequirement.cs
 create mode 100644 Kudu.Services/Infrastructure/Authorization/AuthOptionsExtensions.cs
 create mode 100644 Kudu.Services/Infrastructure/Authorization/AuthPolicyNames.cs
 create mode 100644 Kudu.Services/Infrastructure/Authorization/AuthorizationLevel.cs
 create mode 100644 Kudu.Services/Infrastructure/Authorization/AuthorizationUtility.cs
 create mode 100644 Kudu.Services/InstanceAdmin/InstanceController.cs
 create mode 100644 Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTets.cs
 create mode 100644 Kudu.Tests/Services/Infrastructure/Authorization/AuthorizationUtilityTests.cs
 create mode 100644 Kudu.Tests/TestScopedEnvironmentVariable.cs

diff --git a/Kudu.Contracts/Settings/SettingsKeys.cs b/Kudu.Contracts/Settings/SettingsKeys.cs
index dc870102..fe0a225f 100644
--- a/Kudu.Contracts/Settings/SettingsKeys.cs
+++ b/Kudu.Contracts/Settings/SettingsKeys.cs
@@ -49,5 +49,7 @@ public static class SettingsKeys
         // Antares container specific settings
         public const string AuthEncryptionKey = "WEBSITE_AUTH_ENCRYPTION_KEY";
         public const string ContainerEncryptionKey = "CONTAINER_ENCRYPTION_KEY";
+        public const string MachineDecryptionKey = "MACHINEKEY_DecryptionKey";
+        public const string PlaceholderMode = "WEBSITE_PLACEHOLDER_MODE";
     }
 }
diff --git a/Kudu.Services.Web/Infrastructure/InstanceAdministrationExtensions.cs b/Kudu.Services.Web/Infrastructure/InstanceAdministrationExtensions.cs
new file mode 100644
index 00000000..3810fe4c
--- /dev/null
+++ b/Kudu.Services.Web/Infrastructure/InstanceAdministrationExtensions.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Kudu.Services.Infrastructure.Authentication;
+using Kudu.Services.Infrastructure.Authorization;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Kudu.Services.Web.Infrastructure
+{
+    public static class InstanceAdministrationExtensions
+    {
+        public static IServiceCollection AddInstanceAdminAuthentication(this IServiceCollection services)
+        {
+            services.AddAuthentication()
+                .AddArmToken();
+
+            return services;
+        }
+
+        public static IServiceCollection AddInstanceAdminAuthorization(this IServiceCollection services)
+        {
+            services.AddAuthorization(o =>
+            {
+                o.AddInstanceAdminPolicies();
+            });
+
+            services.AddSingleton<IAuthorizationHandler, AuthLevelAuthorizationHandler>();
+            return services;
+        }
+    }
+}
diff --git a/Kudu.Services.Web/Program.cs b/Kudu.Services.Web/Program.cs
index 042b0c85..6e2e0f25 100644
--- a/Kudu.Services.Web/Program.cs
+++ b/Kudu.Services.Web/Program.cs
@@ -1,5 +1,7 @@
 using System.IO;
 using System.Reflection;
+using Kudu.Contracts.Settings;
+using Kudu.Core.Helpers;
 using log4net;
 using log4net.Config;
 using Microsoft.AspNetCore;
@@ -13,6 +15,7 @@ public static void Main(string[] args)
         {
             var logRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
             XmlConfigurator.Configure(logRepository, new FileInfo("log4net.config"));
+            InitializeProcess();
             CreateWebHostBuilder(args).Build().Run();
         }
 
@@ -20,5 +23,26 @@ private static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseKestrel(options => { options.Limits.MaxRequestBodySize = null; })
                 .UseStartup<Startup>();
+
+        /// <summary>
+        /// Perform any process level initialization that needs to happen BEFORE
+        /// the WebHost is initialized.
+        /// </summary>
+        private static void InitializeProcess()
+        {
+            if (!OSDetector.IsOnWindows())
+            {
+                // Linux containers always start in placeholder mode
+                System.Environment.SetEnvironmentVariable(SettingsKeys.PlaceholderMode, "1");
+            }
+
+            // Ensure that the WEBSITE_AUTH_ENCRYPTION_KEY is propagated to machine decryption key.
+            string authEncryptionKey = System.Environment.GetEnvironmentVariable(SettingsKeys.AuthEncryptionKey);
+            string machineDecryptionKey = System.Environment.GetEnvironmentVariable(SettingsKeys.MachineDecryptionKey);
+            if (authEncryptionKey != null && machineDecryptionKey == null)
+            {
+                System.Environment.SetEnvironmentVariable(SettingsKeys.MachineDecryptionKey, authEncryptionKey);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 5f10cea4..79345d0f 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -91,6 +91,9 @@ public void ConfigureServices(IServiceCollection services)
                 .AddApplicationPart(kuduServicesAssembly).AddControllersAsServices()
                 .AddApiExplorer();
 
+            // Instance authentication and authorization for running in service fabric mesh
+            services.AddInstanceAdminAuthentication();
+            services.AddInstanceAdminAuthorization();
 
             services.AddSwaggerGen(c =>
             {
@@ -450,6 +453,14 @@ public void Configure(IApplicationBuilder app,
                     new {controller = "PushDeployment", action = "WarPushDeploy"},
                     new {verb = new HttpMethodRouteConstraint("POST")});
 
+                // Instance administration
+                routes.MapRoute("admin-instance-info", "admin/instance/info",
+                    new {controller = "Instance", action = "Info"},
+                    new {verb = new HttpMethodRouteConstraint("GET")});
+                routes.MapRoute("admin-instance-assign", "admin/instance/assign",
+                    new {controller = "Instance", action = "AssignAsync" },
+                    new {verb = new HttpMethodRouteConstraint("POST")});
+
                 // Live Command Line
                 routes.MapHttpRouteDual("execute-command", "command",
                     new {controller = "Command", action = "ExecuteCommand"},
diff --git a/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
new file mode 100644
index 00000000..62c4971b
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Services.Infrastructure.Authentication
+{
+    public static class ArmAuthenticationDefaults
+    {
+        public const string AuthenticationScheme = "ArmToken";
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationExtensions.cs b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationExtensions.cs
new file mode 100644
index 00000000..f7f5a1a2
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationExtensions.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Authentication;
+
+namespace Kudu.Services.Infrastructure.Authentication
+{
+    public static class ArmAuthenticationExtensions
+    {
+        public static AuthenticationBuilder AddArmToken(this AuthenticationBuilder builder)
+            => builder.AddScheme<ArmAuthenticationOptions, ArmAuthenticationHandler>(ArmAuthenticationDefaults.AuthenticationScheme, _ => { });
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationHandler.cs b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationHandler.cs
new file mode 100644
index 00000000..060c92b4
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationHandler.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+using Kudu.Core.Helpers;
+using Kudu.Services.Infrastructure.Authorization;
+
+namespace Kudu.Services.Infrastructure.Authentication
+{
+    public class ArmAuthenticationHandler : AuthenticationHandler<ArmAuthenticationOptions>
+    {
+        public const string ArmTokenHeaderName = "x-ms-site-restricted-token";
+
+        private readonly ILogger _logger;
+
+        public ArmAuthenticationHandler(IOptionsMonitor<ArmAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
+            : base(options, logger, encoder, clock)
+        {
+            _logger = logger.CreateLogger<ArmAuthenticationHandler>();
+        }
+
+        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            AuthenticateResult result = HandleAuthenticate();
+
+            return Task.FromResult(result);
+        }
+
+        private AuthenticateResult HandleAuthenticate()
+        {
+            string token = null;
+            if (!Context.Request.Headers.TryGetValue(ArmTokenHeaderName, out StringValues values))
+            {
+                return AuthenticateResult.NoResult();
+            }
+
+            token = values.First();
+
+            try
+            {
+                if (!SimpleWebTokenHelper.ValidateToken(token, Clock))
+                {
+                    return AuthenticateResult.Fail("Token validation failed.");
+                }
+
+                var claims = new List<Claim>
+                {
+                    new Claim(SecurityConstants.AuthLevelClaimType, AuthorizationLevel.Admin.ToString())
+                };
+
+                var identity = new ClaimsIdentity(claims, ArmAuthenticationDefaults.AuthenticationScheme);
+                return AuthenticateResult.Success(new AuthenticationTicket(new ClaimsPrincipal(identity), Scheme.Name));
+            }
+            catch (Exception exc)
+            {
+                _logger.LogError(exc, "ARM authentication token validation failed.");
+                return AuthenticateResult.Fail(exc);
+            }
+        }
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationOptions.cs b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationOptions.cs
new file mode 100644
index 00000000..e0a1fbae
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationOptions.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Authentication;
+
+namespace Kudu.Services.Infrastructure.Authentication
+{
+    public class ArmAuthenticationOptions : AuthenticationSchemeOptions
+    {
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authentication/SecurityConstants.cs b/Kudu.Services/Infrastructure/Authentication/SecurityConstants.cs
new file mode 100644
index 00000000..8735368f
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authentication/SecurityConstants.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Services.Infrastructure.Authentication
+{
+    public class SecurityConstants
+    {
+        public const string AuthLevelClaimType = "http://schemas.microsoft.com/2017/07/functions/claims/authlevel";
+        public const string AuthLevelKeyNameClaimType = "http://schemas.microsoft.com/2017/07/functions/claims/keyid";
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthLevelAuthorizationHandler.cs b/Kudu.Services/Infrastructure/Authorization/AuthLevelAuthorizationHandler.cs
new file mode 100644
index 00000000..361e41e3
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authorization/AuthLevelAuthorizationHandler.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Kudu.Services.Infrastructure.Authorization
+{
+    public class AuthLevelAuthorizationHandler : AuthorizationHandler<AuthLevelRequirement>
+    {
+        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, AuthLevelRequirement requirement)
+        {
+            if (AuthorizationUtility.PrincipalHasAuthLevelClaim(context.User, requirement.Level))
+            {
+                context.Succeed(requirement);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthLevelRequirement.cs b/Kudu.Services/Infrastructure/Authorization/AuthLevelRequirement.cs
new file mode 100644
index 00000000..de7a67b2
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authorization/AuthLevelRequirement.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Kudu.Services.Infrastructure.Authorization
+{
+    public class AuthLevelRequirement : IAuthorizationRequirement
+    {
+        public AuthLevelRequirement(AuthorizationLevel level)
+        {
+            Level = level;
+        }
+
+        public AuthorizationLevel Level { get; }
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthOptionsExtensions.cs b/Kudu.Services/Infrastructure/Authorization/AuthOptionsExtensions.cs
new file mode 100644
index 00000000..17d36266
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authorization/AuthOptionsExtensions.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Authorization;
+using Kudu.Services.Infrastructure.Authentication;
+
+namespace Kudu.Services.Infrastructure.Authorization
+{
+    public static class AuthOptionsExtensions
+    {
+        public static void AddInstanceAdminPolicies(this AuthorizationOptions options)
+        {
+            options.AddPolicy(AuthPolicyNames.AdminAuthLevel, p =>
+            {
+                p.AddInstanceAuthenticationSchemes();
+                p.AddRequirements(new AuthLevelRequirement(AuthorizationLevel.Admin));
+            });
+        }
+
+        private static void AddInstanceAuthenticationSchemes(this AuthorizationPolicyBuilder builder)
+        {
+            builder.AuthenticationSchemes.Add(ArmAuthenticationDefaults.AuthenticationScheme);
+        }
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthPolicyNames.cs b/Kudu.Services/Infrastructure/Authorization/AuthPolicyNames.cs
new file mode 100644
index 00000000..403836bc
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authorization/AuthPolicyNames.cs
@@ -0,0 +1,7 @@
+namespace Kudu.Services.Infrastructure.Authorization
+{
+    public static class AuthPolicyNames
+    {
+        public const string AdminAuthLevel = "AuthLevelAdmin";
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthorizationLevel.cs b/Kudu.Services/Infrastructure/Authorization/AuthorizationLevel.cs
new file mode 100644
index 00000000..e5c1fdc4
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authorization/AuthorizationLevel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Services.Infrastructure.Authorization
+{
+    public enum AuthorizationLevel
+    {
+        Anonymous = 0,
+        Admin = 1
+    }
+}
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthorizationUtility.cs b/Kudu.Services/Infrastructure/Authorization/AuthorizationUtility.cs
new file mode 100644
index 00000000..9928bfba
--- /dev/null
+++ b/Kudu.Services/Infrastructure/Authorization/AuthorizationUtility.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Linq;
+using System.Security.Claims;
+using Kudu.Services.Infrastructure.Authentication;
+
+namespace Kudu.Services.Infrastructure.Authorization
+{
+    public class AuthorizationUtility
+    {
+        /// <summary>
+        /// Test if a specific principle matches the authorization requirement
+        /// </summary>
+        /// <param name="principal">The current pricipal of a request</param>
+        /// <param name="requiredLevel">The required level for performing an action</param>
+        /// <param name="keyName">The name of the authorization key</param>
+        /// <returns>True on access granted</returns>
+        public static bool PrincipalHasAuthLevelClaim(ClaimsPrincipal principal, AuthorizationLevel requiredLevel, string keyName = null)
+        {
+            // If the required auth level is anonymous, the requirement is met
+            if (requiredLevel == AuthorizationLevel.Anonymous)
+            {
+                return true;
+            }
+
+            var claimLevels = principal
+                .FindAll(SecurityConstants.AuthLevelClaimType)
+                .Select(c => Enum.TryParse(c.Value, out AuthorizationLevel claimLevel) ? claimLevel : AuthorizationLevel.Anonymous)
+                .ToArray();
+
+            if (claimLevels.Length > 0)
+            {
+                // If we have a claim with Admin level, regardless of whether a name is required, return true.
+                if (claimLevels.Any(claimLevel => claimLevel == AuthorizationLevel.Admin))
+                {
+                    return true;
+                }
+
+                // Ensure we match the expected level and key name, if one is required
+                if (claimLevels.Any(l => l == requiredLevel) &&
+                   (keyName == null || string.Equals(principal.FindFirstValue(SecurityConstants.AuthLevelKeyNameClaimType), keyName, StringComparison.OrdinalIgnoreCase)))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Kudu.Services/InstanceAdmin/InstanceController.cs b/Kudu.Services/InstanceAdmin/InstanceController.cs
new file mode 100644
index 00000000..946f089b
--- /dev/null
+++ b/Kudu.Services/InstanceAdmin/InstanceController.cs
@@ -0,0 +1,54 @@
+using Kudu.Services.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Kudu.Contracts.Settings;
+using System.Collections.Generic;
+using Kudu.Services.Infrastructure.Authorization;
+
+namespace Kudu.Services.InstanceAdmin
+{
+    /// <summary>
+    /// InstanceController is mainly responsible for integrating KuduLite with Azure Functions.
+    /// There are two endpoints we need to provide in order to propagate container information and perform specialization.
+    /// </summary>
+    public class InstanceController : Controller
+    {
+        private readonly IDeploymentSettingsManager _settingsManager;
+
+        /// <summary>
+        /// This class handles appsetting assignment and provide information when running in a Service Fabric Mesh container,
+        /// namely, Functionapp on Linux Consumption Plan.
+        /// </summary>
+        /// <param name="settingsManager">Allow instance assignment to change application setting</param>
+        public InstanceController(IDeploymentSettingsManager settingsManager)
+        {
+            _settingsManager = settingsManager;
+        }
+
+        /// <summary>
+        /// A healthcheck endpoint
+        /// </summary>
+        /// <returns>Expect 200 when current service is up and running</returns>
+        [HttpGet]
+        [Authorize(Policy = AuthPolicyNames.AdminAuthLevel)]
+        public IActionResult Info()
+        {
+            return Ok("Endpoint is not implemented");
+        }
+
+        /// <summary>
+        /// A specialization endpoint.
+        /// It sets the current service's site name, site id and environment variables when it is called.
+        /// </summary>
+        /// <param name="encryptedAssignmentContext">Encrypted content which contains HostAssignmentContext</param>
+        /// <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)
+        {
+            return Accepted("Endpoint is not implemented");
+        }
+    }
+}
diff --git a/Kudu.Services/Kudu.Services.csproj b/Kudu.Services/Kudu.Services.csproj
index a29db278..52f96475 100644
--- a/Kudu.Services/Kudu.Services.csproj
+++ b/Kudu.Services/Kudu.Services.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Kudu.Contracts\Kudu.Contracts.csproj" />
diff --git a/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs b/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
index d11c10e8..0f2f7698 100644
--- a/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
+++ b/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
@@ -12,16 +12,17 @@ public class SimpleWebTokenTests
         public void EncryptShouldThrowIdNoEncryptionKeyDefined()
         {
             // Make sure WEBSITE_AUTH_ENCRYPTION_KEY is empty
-            Environment.SetEnvironmentVariable("WEBSITE_AUTH_ENCRYPTION_KEY", string.Empty);
-
-            try
-            {
-                SimpleWebTokenHelper.Encrypt("value");
-            }
-            catch (Exception ex)
+            using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, string.Empty))
             {
-                Assert.IsType<InvalidOperationException>(ex);
-                Assert.Contains("WEBSITE_AUTH_ENCRYPTION_KEY", ex.Message);
+                try
+                {
+                    SimpleWebTokenHelper.Encrypt("value");
+                }
+                catch (Exception ex)
+                {
+                    Assert.IsType<InvalidOperationException>(ex);
+                    Assert.Contains(SettingsKeys.AuthEncryptionKey, ex.Message);
+                }
             }
         }
 
@@ -31,13 +32,14 @@ public void EncryptShouldGenerateDecryptableValues(string valueToEncrypt)
         {
             var key = TestHelpers.GenerateKeyBytes();
             var stringKey = TestHelpers.GenerateKeyHexString(key);
-            Environment.SetEnvironmentVariable("WEBSITE_AUTH_ENCRYPTION_KEY", stringKey);
-
-            var encrypted = SimpleWebTokenHelper.Encrypt(valueToEncrypt);
-            var decrypted = SimpleWebTokenHelper.Decrypt(key, encrypted);
 
-            Assert.Matches("(.*)[.](.*)[.](.*)", encrypted);
-            Assert.Equal(valueToEncrypt, decrypted);
+            using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, stringKey))
+            {
+                var encrypted = SimpleWebTokenHelper.Encrypt(valueToEncrypt);
+                var decrypted = SimpleWebTokenHelper.Decrypt(key, encrypted);
+                Assert.Matches("(.*)[.](.*)[.](.*)", encrypted);
+                Assert.Equal(valueToEncrypt, decrypted);
+            }
         }
 
         [Fact]
@@ -46,12 +48,14 @@ public void CreateTokenShouldCreateAValidToken()
             var key = TestHelpers.GenerateKeyBytes();
             var stringKey = TestHelpers.GenerateKeyHexString(key);
             var timeStamp = DateTime.UtcNow;
-            Environment.SetEnvironmentVariable("WEBSITE_AUTH_ENCRYPTION_KEY", stringKey);
 
-            var token = SimpleWebTokenHelper.CreateToken(timeStamp);
-            var decrypted = SimpleWebTokenHelper.Decrypt(key, token);
+            using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, stringKey))
+            {
+                var token = SimpleWebTokenHelper.CreateToken(timeStamp);
+                var decrypted = SimpleWebTokenHelper.Decrypt(key, token);
 
-            Assert.Equal($"exp={timeStamp.Ticks}", decrypted);
+                Assert.Equal($"exp={timeStamp.Ticks}", decrypted);
+            }
         }
 
         [Fact]
@@ -65,11 +69,13 @@ public void Validate_Token_Uses_WebSiteAuthEncryptionKey_If_Available()
 
             var timeStamp = DateTime.UtcNow.AddHours(1);
 
-            Environment.SetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, containerEncryptionStringKey);
-            Environment.SetEnvironmentVariable(SettingsKeys.AuthEncryptionKey, websiteAuthEncryptionStringKey);
+            using (new TestScopedEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, containerEncryptionStringKey))
+            using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, websiteAuthEncryptionStringKey))
+            {
+                var token = SimpleWebTokenHelper.CreateToken(timeStamp, websiteAuthEncryptionKey);
+                Assert.True(SimpleWebTokenHelper.TryValidateToken(token, new SystemClock()));
+            }
 
-            var token = SimpleWebTokenHelper.CreateToken(timeStamp, websiteAuthEncryptionKey);
-            Assert.True(SimpleWebTokenHelper.TryValidateToken(token, new SystemClock()));
         }
 
         [Fact]
@@ -80,18 +86,12 @@ public void Validate_Token_Uses_Website_Encryption_Key_If_Container_Encryption_K
 
             var timeStamp = DateTime.UtcNow.AddHours(1);
 
-            Environment.SetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, string.Empty);
-            Environment.SetEnvironmentVariable(SettingsKeys.AuthEncryptionKey, websiteAuthEncryptionStringKey);
-
-            var token = SimpleWebTokenHelper.CreateToken(timeStamp, websiteAuthEncryptionKey);
-            Assert.True(SimpleWebTokenHelper.TryValidateToken(token, new SystemClock()));
-        }
-
-        public void Dispose()
-        {
-            // Clean up
-            Environment.SetEnvironmentVariable(SettingsKeys.AuthEncryptionKey, string.Empty);
-            Environment.SetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, string.Empty);
+            using (new TestScopedEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, string.Empty))
+            using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, websiteAuthEncryptionStringKey))
+            {
+                var token = SimpleWebTokenHelper.CreateToken(timeStamp, websiteAuthEncryptionKey);
+                Assert.True(SimpleWebTokenHelper.TryValidateToken(token, new SystemClock()));
+            }
         }
     }
 }
diff --git a/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTets.cs b/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTets.cs
new file mode 100644
index 00000000..fa2e2805
--- /dev/null
+++ b/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTets.cs
@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+using Kudu.Services.Infrastructure.Authentication;
+using Kudu.Core.Helpers;
+using Kudu.Contracts.Settings;
+using Kudu.Services.Infrastructure.Authorization;
+using Kudu.Tests;
+
+namespace Kudu.Tests.Services.Infrastructure.Authentication
+{
+    public class ArmAuthenticationHandlerTests
+    {
+        private static DefaultHttpContext GetContext()
+        {
+            var services = new ServiceCollection().AddLogging();
+            services.AddAuthentication(o =>
+            {
+                o.DefaultScheme = ArmAuthenticationDefaults.AuthenticationScheme;
+            })
+            .AddArmToken();
+
+            var sp = services.BuildServiceProvider();
+            var context = new DefaultHttpContext
+            {
+                RequestServices = sp
+            };
+            return context;
+        }
+
+        [Fact]
+        public async Task AuthenticateAsync_WithoutToken_DoesNotAuthenticate()
+        {
+            // Arrange
+            DefaultHttpContext context = GetContext();
+
+            // Act
+            AuthenticateResult result = await context.AuthenticateAsync();
+
+            // Assert
+            Assert.True(result.None);
+            Assert.Null(result.Failure);
+            Assert.Null(result.Principal);
+        }
+
+        [Fact]
+        public async Task AuthenticateAsync_WithToken_PerformsAuthentication_Using_WebSiteAuthEncryptionKey_IfAvailable()
+        {
+            var websiteAuthEncryptionKeyBytes = TestHelpers.GenerateKeyBytes();
+            var containerEncryptionKeyBytes = TestHelpers.GenerateKeyBytes();
+
+            var vars = new Dictionary<string, string>
+            {
+                { SettingsKeys.AuthEncryptionKey, TestHelpers.GenerateKeyHexString(websiteAuthEncryptionKeyBytes) },
+                { SettingsKeys.ContainerEncryptionKey, TestHelpers.GenerateKeyHexString(containerEncryptionKeyBytes) }
+            };
+
+            using (var env = new TestScopedEnvironmentVariable(vars))
+            {
+                // Arrange
+                DefaultHttpContext context = GetContext();
+
+                string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(2), websiteAuthEncryptionKeyBytes);
+                context.Request.Headers.Add(ArmAuthenticationHandler.ArmTokenHeaderName, token);
+
+                // Act
+                AuthenticateResult result = await context.AuthenticateAsync();
+
+                // Assert
+                Assert.True(result.Succeeded);
+                Assert.True(result.Principal.Identity.IsAuthenticated);
+                Assert.True(result.Principal.HasClaim(SecurityConstants.AuthLevelClaimType, AuthorizationLevel.Admin.ToString()));
+            }
+        }
+
+        [Fact]
+        public async Task AuthenticateAsync_WithToken_PerformsAuthentication_Using_ContainerEncryptionKey_If_WebSiteAuthEncryptionKey_Not_Available()
+        {
+            var containerEncryptionKeyBytes = TestHelpers.GenerateKeyBytes();
+
+            var vars = new Dictionary<string, string>
+            {
+                { SettingsKeys.AuthEncryptionKey, string.Empty },
+                { SettingsKeys.ContainerEncryptionKey, TestHelpers.GenerateKeyHexString(containerEncryptionKeyBytes) }
+            };
+
+            using (var env = new TestScopedEnvironmentVariable(vars))
+            {
+                // Arrange
+                DefaultHttpContext context = GetContext();
+
+                string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(2), containerEncryptionKeyBytes);
+                context.Request.Headers.Add(ArmAuthenticationHandler.ArmTokenHeaderName, token);
+
+                // Act
+                AuthenticateResult result = await context.AuthenticateAsync();
+
+                // Assert
+                Assert.True(result.Succeeded);
+                Assert.True(result.Principal.Identity.IsAuthenticated);
+                Assert.True(result.Principal.HasClaim(SecurityConstants.AuthLevelClaimType, AuthorizationLevel.Admin.ToString()));
+            }
+        }
+
+        [Fact]
+        public async Task AuthenticateAsync_WithToken_PerformsAuthentication()
+        {
+            using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, TestHelpers.GenerateKeyHexString()))
+            {
+                // Arrange
+                DefaultHttpContext context = GetContext();
+
+                string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(2));
+                context.Request.Headers.Add(ArmAuthenticationHandler.ArmTokenHeaderName, token);
+
+                // Act
+                AuthenticateResult result = await context.AuthenticateAsync();
+
+                // Assert
+                Assert.True(result.Succeeded);
+                Assert.True(result.Principal.Identity.IsAuthenticated);
+                Assert.True(result.Principal.HasClaim(SecurityConstants.AuthLevelClaimType, AuthorizationLevel.Admin.ToString()));
+            }
+        }
+
+        [Fact]
+        public async Task AuthenticateAsync_WithInvalidToken_FailsAuthentication()
+        {
+            using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, TestHelpers.GenerateKeyHexString()))
+            {
+                // Arrange
+                DefaultHttpContext context = GetContext();
+
+                string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(2));
+                token = token.Substring(0, token.Length - 5);
+                context.Request.Headers.Add(ArmAuthenticationHandler.ArmTokenHeaderName, token);
+
+                // Act
+                AuthenticateResult result = await context.AuthenticateAsync();
+
+                // Assert
+                Assert.False(result.Succeeded);
+                Assert.NotNull(result.Failure);
+                Assert.Null(result.Principal);
+            }
+        }
+
+        [Fact]
+        public async Task AuthenticateAsync_WithExpiredToken_FailsAuthentication()
+        {
+            using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, TestHelpers.GenerateKeyHexString()))
+            {
+                DefaultHttpContext context = GetContext();
+
+                string token = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(-20));
+                context.Request.Headers.Add(ArmAuthenticationHandler.ArmTokenHeaderName, token);
+
+                // Act
+                AuthenticateResult result = await context.AuthenticateAsync();
+
+                // Assert
+                Assert.False(result.Succeeded);
+                Assert.NotNull(result.Failure);
+                Assert.Null(result.Principal);
+            }
+        }
+    }
+}
diff --git a/Kudu.Tests/Services/Infrastructure/Authorization/AuthorizationUtilityTests.cs b/Kudu.Tests/Services/Infrastructure/Authorization/AuthorizationUtilityTests.cs
new file mode 100644
index 00000000..02c6a354
--- /dev/null
+++ b/Kudu.Tests/Services/Infrastructure/Authorization/AuthorizationUtilityTests.cs
@@ -0,0 +1,30 @@
+using System.Security.Claims;
+using System.Linq;
+using Kudu.Services.Infrastructure.Authentication;
+using Kudu.Services.Infrastructure.Authorization;
+using Xunit;
+
+namespace Kudu.Tests.Services.Infrastructure.Authorization
+{
+    public class AuthorizationUtilityTests
+    {
+        [Theory]
+        [InlineData(new[] { AuthorizationLevel.Admin }, AuthorizationLevel.Admin, true)]
+        [InlineData(new[] { AuthorizationLevel.Admin }, AuthorizationLevel.Anonymous, true)]
+        [InlineData(new[] { AuthorizationLevel.Anonymous }, AuthorizationLevel.Anonymous, true)]
+        [InlineData(new[] { AuthorizationLevel.Anonymous }, AuthorizationLevel.Admin, false)]
+        public void ClaimedPrincipalAuthorizationTests(AuthorizationLevel[] principalLevel, AuthorizationLevel requiredLevel, bool expectSuccess)
+        {
+            ClaimsPrincipal principal = CreatePrincipal(principalLevel);
+            bool result = AuthorizationUtility.PrincipalHasAuthLevelClaim(principal, requiredLevel);
+
+            Assert.Equal(expectSuccess, result);
+        }
+
+        private ClaimsPrincipal CreatePrincipal(AuthorizationLevel[] levels)
+        {
+            var claims = levels.Select(l => new Claim(SecurityConstants.AuthLevelClaimType, l.ToString()));
+            return new ClaimsPrincipal(new ClaimsIdentity(claims, "Test"));
+        }
+    }
+}
diff --git a/Kudu.Tests/TestScopedEnvironmentVariable.cs b/Kudu.Tests/TestScopedEnvironmentVariable.cs
new file mode 100644
index 00000000..65d30236
--- /dev/null
+++ b/Kudu.Tests/TestScopedEnvironmentVariable.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+
+namespace Kudu.Tests
+{
+    public class TestScopedEnvironmentVariable : IDisposable
+    {
+        private readonly IDictionary<string, string> _variables;
+        private readonly IDictionary<string, string> _existingVariables;
+        private bool _disposed = false;
+
+        public TestScopedEnvironmentVariable(string name, string value)
+            : this(new Dictionary<string, string> { { name, value } })
+        {
+        }
+
+        public TestScopedEnvironmentVariable(IDictionary<string, string> variables)
+        {
+            _variables = variables;
+            _existingVariables = new Dictionary<string, string>(variables.Count);
+
+            SetVariables();
+        }
+
+        private void SetVariables()
+        {
+            foreach (var item in _variables)
+            {
+                _existingVariables.Add(item.Key, Environment.GetEnvironmentVariable(item.Key));
+
+                Environment.SetEnvironmentVariable(item.Key, item.Value);
+            }
+        }
+
+        private void ClearVariables()
+        {
+            foreach (var item in _variables)
+            {
+                Environment.SetEnvironmentVariable(item.Key, _existingVariables[item.Key]);
+            }
+
+            _existingVariables.Clear();
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                ClearVariables();
+
+                _disposed = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+    }
+}
diff --git a/Kudu.sln b/Kudu.sln
index f8ec6a9d..60e60512 100644
--- a/Kudu.sln
+++ b/Kudu.sln
@@ -16,7 +16,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kudu.Services.Web", "Kudu.S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kudu.Console", "Kudu.Console\Kudu.Console.csproj", "{32AE9472-F7C0-4ED8-8D8C-EAB2419F5083}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kudu.Tests", "Kudu.Tests\Kudu.Tests.csproj", "{C667BB81-BD51-4009-9555-1BC7462855B4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kudu.Tests", "Kudu.Tests\Kudu.Tests.csproj", "{C667BB81-BD51-4009-9555-1BC7462855B4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0DAEEE18-6016-4C38-B9CD-9261C6336486} = {0DAEEE18-6016-4C38-B9CD-9261C6336486}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

From 78119290f7d4402fbe4460170197753658f036e7 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 30 May 2019 16:12:44 -0700
Subject: [PATCH 081/245] Rename Instance Controller to
 LinuxConsumptionInstanceAdmin Controller

---
 .../InstanceAdministrationExtensions.cs       | 33 --------------
 ...LinuxConsumptionInstanceAdminExtensions.cs | 45 +++++++++++++++++++
 Kudu.Services.Web/Startup.cs                  | 11 ++---
 ...inuxConsumptionInstanceAdminController.cs} |  6 +--
 ...ts.cs => ArmAuthenticationHandlerTests.cs} |  0
 5 files changed, 54 insertions(+), 41 deletions(-)
 delete mode 100644 Kudu.Services.Web/Infrastructure/InstanceAdministrationExtensions.cs
 create mode 100644 Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs
 rename Kudu.Services/{InstanceAdmin/InstanceController.cs => LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs} (90%)
 rename Kudu.Tests/Services/Infrastructure/Authentication/{ArmAuthenticationHandlerTets.cs => ArmAuthenticationHandlerTests.cs} (100%)

diff --git a/Kudu.Services.Web/Infrastructure/InstanceAdministrationExtensions.cs b/Kudu.Services.Web/Infrastructure/InstanceAdministrationExtensions.cs
deleted file mode 100644
index 3810fe4c..00000000
--- a/Kudu.Services.Web/Infrastructure/InstanceAdministrationExtensions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Kudu.Services.Infrastructure.Authentication;
-using Kudu.Services.Infrastructure.Authorization;
-using Microsoft.AspNetCore.Authorization;
-
-namespace Kudu.Services.Web.Infrastructure
-{
-    public static class InstanceAdministrationExtensions
-    {
-        public static IServiceCollection AddInstanceAdminAuthentication(this IServiceCollection services)
-        {
-            services.AddAuthentication()
-                .AddArmToken();
-
-            return services;
-        }
-
-        public static IServiceCollection AddInstanceAdminAuthorization(this IServiceCollection services)
-        {
-            services.AddAuthorization(o =>
-            {
-                o.AddInstanceAdminPolicies();
-            });
-
-            services.AddSingleton<IAuthorizationHandler, AuthLevelAuthorizationHandler>();
-            return services;
-        }
-    }
-}
diff --git a/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs b/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs
new file mode 100644
index 00000000..c1a37d63
--- /dev/null
+++ b/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Kudu.Services.Infrastructure.Authentication;
+using Kudu.Services.Infrastructure.Authorization;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Kudu.Services.Web.Infrastructure
+{
+    public static class LinuxConsumptionInstanceAdminExtensions
+    {
+        /// <summary>
+        /// In Linux consumption, we are running the KuduLite instance in a Service Fabric Mesh container.
+        /// We want to add an admin role (Antares Controller) in authentication.
+        /// </summary>
+        /// <param name="services">Dependency injection to application service</param>
+        /// <returns>Service</returns>
+        public static IServiceCollection AddLinuxConsumptionAuthentication(this IServiceCollection services)
+        {
+            services.AddAuthentication()
+                .AddArmToken();
+
+            return services;
+        }
+
+        /// <summary>
+        /// In Linux consumption, we are running the KuduLite instance in a Service Fabric Mesh container.
+        /// We want to introduce AdminAuthLevel policy to restrict admin/instance/assign access.
+        /// </summary>
+        /// <param name="services">Dependency injection to application service</param>
+        /// <returns>Service</returns>
+        public static IServiceCollection AddLinuxConsumptionAuthorization(this IServiceCollection services)
+        {
+            services.AddAuthorization(o =>
+            {
+                o.AddInstanceAdminPolicies();
+            });
+
+            services.AddSingleton<IAuthorizationHandler, AuthLevelAuthorizationHandler>();
+            return services;
+        }
+    }
+}
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 79345d0f..748be394 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -91,9 +91,10 @@ public void ConfigureServices(IServiceCollection services)
                 .AddApplicationPart(kuduServicesAssembly).AddControllersAsServices()
                 .AddApiExplorer();
 
-            // Instance authentication and authorization for running in service fabric mesh
-            services.AddInstanceAdminAuthentication();
-            services.AddInstanceAdminAuthorization();
+            // Add middleware for Linux Consumption authentication and authorization
+            // when KuduLIte is running in service fabric mesh
+            services.AddLinuxConsumptionAuthentication();
+            services.AddLinuxConsumptionAuthorization();
 
             services.AddSwaggerGen(c =>
             {
@@ -455,10 +456,10 @@ public void Configure(IApplicationBuilder app,
 
                 // Instance administration
                 routes.MapRoute("admin-instance-info", "admin/instance/info",
-                    new {controller = "Instance", action = "Info"},
+                    new {controller = "LinuxConsumptionInstanceAdminController", action = "Info"},
                     new {verb = new HttpMethodRouteConstraint("GET")});
                 routes.MapRoute("admin-instance-assign", "admin/instance/assign",
-                    new {controller = "Instance", action = "AssignAsync" },
+                    new {controller = "LinuxConsumptionInstanceAdminController", action = "AssignAsync" },
                     new {verb = new HttpMethodRouteConstraint("POST")});
 
                 // Live Command Line
diff --git a/Kudu.Services/InstanceAdmin/InstanceController.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
similarity index 90%
rename from Kudu.Services/InstanceAdmin/InstanceController.cs
rename to Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
index 946f089b..1cfdf5c0 100644
--- a/Kudu.Services/InstanceAdmin/InstanceController.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
@@ -7,13 +7,13 @@
 using System.Collections.Generic;
 using Kudu.Services.Infrastructure.Authorization;
 
-namespace Kudu.Services.InstanceAdmin
+namespace Kudu.Services.LinuxConsumptionInstanceAdmin
 {
     /// <summary>
     /// InstanceController is mainly responsible for integrating KuduLite with Azure Functions.
     /// There are two endpoints we need to provide in order to propagate container information and perform specialization.
     /// </summary>
-    public class InstanceController : Controller
+    public class LinuxConsumptionInstanceAdminController : Controller
     {
         private readonly IDeploymentSettingsManager _settingsManager;
 
@@ -22,7 +22,7 @@ public class InstanceController : Controller
         /// namely, Functionapp on Linux Consumption Plan.
         /// </summary>
         /// <param name="settingsManager">Allow instance assignment to change application setting</param>
-        public InstanceController(IDeploymentSettingsManager settingsManager)
+        public LinuxConsumptionInstanceAdminController(IDeploymentSettingsManager settingsManager)
         {
             _settingsManager = settingsManager;
         }
diff --git a/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTets.cs b/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs
similarity index 100%
rename from Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTets.cs
rename to Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs

From c4b41b11cc6a323884d5333f1adbb279ffae3f9e Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 30 May 2019 16:24:28 -0700
Subject: [PATCH 082/245] Fix: controller name

---
 Kudu.Services.Web/Startup.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 748be394..fea9de9b 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -456,10 +456,10 @@ public void Configure(IApplicationBuilder app,
 
                 // Instance administration
                 routes.MapRoute("admin-instance-info", "admin/instance/info",
-                    new {controller = "LinuxConsumptionInstanceAdminController", action = "Info"},
+                    new {controller = "LinuxConsumptionInstanceAdmin", action = "Info"},
                     new {verb = new HttpMethodRouteConstraint("GET")});
                 routes.MapRoute("admin-instance-assign", "admin/instance/assign",
-                    new {controller = "LinuxConsumptionInstanceAdminController", action = "AssignAsync" },
+                    new {controller = "LinuxConsumptionInstanceAdmin", action = "AssignAsync" },
                     new {verb = new HttpMethodRouteConstraint("POST")});
 
                 // Live Command Line

From cc603b378bde2a102b1cf9f5df6652561c1669bf Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 30 May 2019 16:59:47 -0700
Subject: [PATCH 083/245] Add some comments to explain the /assign and /info
 endpoints

---
 .../LinuxConsumptionInstanceAdminExtensions.cs         |  4 ++--
 Kudu.Services.Web/Startup.cs                           |  2 +-
 .../Authentication/ArmAuthenticationDefaults.cs        |  3 +++
 .../Infrastructure/Authorization/AuthorizationLevel.cs | 10 ++++++++++
 .../LinuxConsumptionInstanceAdminController.cs         |  9 +++++----
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs b/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs
index c1a37d63..314d5df2 100644
--- a/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs
+++ b/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs
@@ -13,7 +13,7 @@ public static class LinuxConsumptionInstanceAdminExtensions
     {
         /// <summary>
         /// In Linux consumption, we are running the KuduLite instance in a Service Fabric Mesh container.
-        /// We want to add an admin role (Antares Controller) in authentication.
+        /// We want to introduce an Antares Datarole in authentication.
         /// </summary>
         /// <param name="services">Dependency injection to application service</param>
         /// <returns>Service</returns>
@@ -27,7 +27,7 @@ public static IServiceCollection AddLinuxConsumptionAuthentication(this IService
 
         /// <summary>
         /// In Linux consumption, we are running the KuduLite instance in a Service Fabric Mesh container.
-        /// We want to introduce AdminAuthLevel policy to restrict admin/instance/assign access.
+        /// We want to introduce AdminAuthLevel policy to restrict instance admin endpoint access.
         /// </summary>
         /// <param name="services">Dependency injection to application service</param>
         /// <returns>Service</returns>
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index fea9de9b..daf40302 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -454,7 +454,7 @@ public void Configure(IApplicationBuilder app,
                     new {controller = "PushDeployment", action = "WarPushDeploy"},
                     new {verb = new HttpMethodRouteConstraint("POST")});
 
-                // Instance administration
+                // Support Linux Consumption Function app on Service Fabric Mesh
                 routes.MapRoute("admin-instance-info", "admin/instance/info",
                     new {controller = "LinuxConsumptionInstanceAdmin", action = "Info"},
                     new {verb = new HttpMethodRouteConstraint("GET")});
diff --git a/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
index 62c4971b..5f7235c7 100644
--- a/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
+++ b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
@@ -4,6 +4,9 @@
 
 namespace Kudu.Services.Infrastructure.Authentication
 {
+    /// <summary>
+    /// ARM authentication scheme for Linux Consumption authentication
+    /// </summary>
     public static class ArmAuthenticationDefaults
     {
         public const string AuthenticationScheme = "ArmToken";
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthorizationLevel.cs b/Kudu.Services/Infrastructure/Authorization/AuthorizationLevel.cs
index e5c1fdc4..484f136d 100644
--- a/Kudu.Services/Infrastructure/Authorization/AuthorizationLevel.cs
+++ b/Kudu.Services/Infrastructure/Authorization/AuthorizationLevel.cs
@@ -4,9 +4,19 @@
 
 namespace Kudu.Services.Infrastructure.Authorization
 {
+    /// <summary>
+    /// Levels used for distinguishing UserLevel auth against AdminLevel auth
+    /// </summary>
     public enum AuthorizationLevel
     {
+        /// <summary>
+        /// Anyone who has access to KuduLite can call the endpoint
+        /// </summary>
         Anonymous = 0,
+
+        /// <summary>
+        /// Only Antares hosting platform can call the endpoint (e.g. admin/instance/assign)
+        /// </summary>
         Admin = 1
     }
 }
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
index 1cfdf5c0..c992a09f 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
@@ -10,7 +10,7 @@
 namespace Kudu.Services.LinuxConsumptionInstanceAdmin
 {
     /// <summary>
-    /// InstanceController is mainly responsible for integrating KuduLite with Azure Functions.
+    /// It is mainly responsible for integrating KuduLite with Azure Functions Linux Consumption Plan.
     /// There are two endpoints we need to provide in order to propagate container information and perform specialization.
     /// </summary>
     public class LinuxConsumptionInstanceAdminController : Controller
@@ -28,7 +28,8 @@ public LinuxConsumptionInstanceAdminController(IDeploymentSettingsManager settin
         }
 
         /// <summary>
-        /// A healthcheck endpoint
+        /// A healthcheck endpoint which will be call after the container is established.
+        /// This endpoint is accessible by Antares DataRole only. KuduLite users are prohibited.
         /// </summary>
         /// <returns>Expect 200 when current service is up and running</returns>
         [HttpGet]
@@ -39,8 +40,8 @@ public IActionResult Info()
         }
 
         /// <summary>
-        /// A specialization endpoint.
-        /// It sets the current service's site name, site id and environment variables when it is called.
+        /// A specialization endpoint. It sets the current service's site name, site id and environment variables.
+        /// This endpoint is accessible by Antares DataRole only. KuduLite users are prohibited.
         /// </summary>
         /// <param name="encryptedAssignmentContext">Encrypted content which contains HostAssignmentContext</param>
         /// <returns>Expect 202 when receives the first call, otherwise, returns 409</returns>

From 7a13f06658c841585f0c62f2d4725a5450a3a0ad Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Fri, 31 May 2019 15:30:42 -0700
Subject: [PATCH 084/245] Remove PlaceholderMode setting in InitializeProcess

---
 Kudu.Services.Web/Program.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Kudu.Services.Web/Program.cs b/Kudu.Services.Web/Program.cs
index 6e2e0f25..342cbd17 100644
--- a/Kudu.Services.Web/Program.cs
+++ b/Kudu.Services.Web/Program.cs
@@ -30,12 +30,6 @@ private static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
         /// </summary>
         private static void InitializeProcess()
         {
-            if (!OSDetector.IsOnWindows())
-            {
-                // Linux containers always start in placeholder mode
-                System.Environment.SetEnvironmentVariable(SettingsKeys.PlaceholderMode, "1");
-            }
-
             // Ensure that the WEBSITE_AUTH_ENCRYPTION_KEY is propagated to machine decryption key.
             string authEncryptionKey = System.Environment.GetEnvironmentVariable(SettingsKeys.AuthEncryptionKey);
             string machineDecryptionKey = System.Environment.GetEnvironmentVariable(SettingsKeys.MachineDecryptionKey);

From 056bed3a9698c8026e013bb8bb08593cb1c951e7 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Fri, 31 May 2019 15:42:10 -0700
Subject: [PATCH 085/245] Remove initialize process

---
 Kudu.Services.Web/Program.cs | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Kudu.Services.Web/Program.cs b/Kudu.Services.Web/Program.cs
index 342cbd17..ad516714 100644
--- a/Kudu.Services.Web/Program.cs
+++ b/Kudu.Services.Web/Program.cs
@@ -15,7 +15,6 @@ public static void Main(string[] args)
         {
             var logRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
             XmlConfigurator.Configure(logRepository, new FileInfo("log4net.config"));
-            InitializeProcess();
             CreateWebHostBuilder(args).Build().Run();
         }
 
@@ -23,20 +22,5 @@ private static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseKestrel(options => { options.Limits.MaxRequestBodySize = null; })
                 .UseStartup<Startup>();
-
-        /// <summary>
-        /// Perform any process level initialization that needs to happen BEFORE
-        /// the WebHost is initialized.
-        /// </summary>
-        private static void InitializeProcess()
-        {
-            // Ensure that the WEBSITE_AUTH_ENCRYPTION_KEY is propagated to machine decryption key.
-            string authEncryptionKey = System.Environment.GetEnvironmentVariable(SettingsKeys.AuthEncryptionKey);
-            string machineDecryptionKey = System.Environment.GetEnvironmentVariable(SettingsKeys.MachineDecryptionKey);
-            if (authEncryptionKey != null && machineDecryptionKey == null)
-            {
-                System.Environment.SetEnvironmentVariable(SettingsKeys.MachineDecryptionKey, authEncryptionKey);
-            }
-        }
     }
 }
\ No newline at end of file

From fe913fb80731823e87469d15cb9359909e972ff4 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Fri, 31 May 2019 17:25:02 -0700
Subject: [PATCH 086/245] Move extensions to KuduWebUtils

---
 Kudu.Contracts/Settings/SettingsKeys.cs       |  2 -
 ...LinuxConsumptionInstanceAdminExtensions.cs | 45 -------------------
 Kudu.Services.Web/KuduWebUtil.cs              | 28 ++++++++++++
 Kudu.Services.Web/Program.cs                  |  2 -
 4 files changed, 28 insertions(+), 49 deletions(-)
 delete mode 100644 Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs

diff --git a/Kudu.Contracts/Settings/SettingsKeys.cs b/Kudu.Contracts/Settings/SettingsKeys.cs
index fe0a225f..dc870102 100644
--- a/Kudu.Contracts/Settings/SettingsKeys.cs
+++ b/Kudu.Contracts/Settings/SettingsKeys.cs
@@ -49,7 +49,5 @@ public static class SettingsKeys
         // Antares container specific settings
         public const string AuthEncryptionKey = "WEBSITE_AUTH_ENCRYPTION_KEY";
         public const string ContainerEncryptionKey = "CONTAINER_ENCRYPTION_KEY";
-        public const string MachineDecryptionKey = "MACHINEKEY_DecryptionKey";
-        public const string PlaceholderMode = "WEBSITE_PLACEHOLDER_MODE";
     }
 }
diff --git a/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs b/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs
deleted file mode 100644
index 314d5df2..00000000
--- a/Kudu.Services.Web/Infrastructure/LinuxConsumptionInstanceAdminExtensions.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Kudu.Services.Infrastructure.Authentication;
-using Kudu.Services.Infrastructure.Authorization;
-using Microsoft.AspNetCore.Authorization;
-
-namespace Kudu.Services.Web.Infrastructure
-{
-    public static class LinuxConsumptionInstanceAdminExtensions
-    {
-        /// <summary>
-        /// In Linux consumption, we are running the KuduLite instance in a Service Fabric Mesh container.
-        /// We want to introduce an Antares Datarole in authentication.
-        /// </summary>
-        /// <param name="services">Dependency injection to application service</param>
-        /// <returns>Service</returns>
-        public static IServiceCollection AddLinuxConsumptionAuthentication(this IServiceCollection services)
-        {
-            services.AddAuthentication()
-                .AddArmToken();
-
-            return services;
-        }
-
-        /// <summary>
-        /// In Linux consumption, we are running the KuduLite instance in a Service Fabric Mesh container.
-        /// We want to introduce AdminAuthLevel policy to restrict instance admin endpoint access.
-        /// </summary>
-        /// <param name="services">Dependency injection to application service</param>
-        /// <returns>Service</returns>
-        public static IServiceCollection AddLinuxConsumptionAuthorization(this IServiceCollection services)
-        {
-            services.AddAuthorization(o =>
-            {
-                o.AddInstanceAdminPolicies();
-            });
-
-            services.AddSingleton<IAuthorizationHandler, AuthLevelAuthorizationHandler>();
-            return services;
-        }
-    }
-}
diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index dbbca615..8ed15da0 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -14,6 +14,8 @@
 using Kudu.Core.Settings;
 using Kudu.Core.Tracing;
 using Kudu.Services.Infrastructure;
+using Kudu.Services.Infrastructure.Authorization;
+using Kudu.Services.Infrastructure.Authentication;
 using Kudu.Services.Web.Tracing;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -21,6 +23,7 @@
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.AspNetCore.Authorization;
 using Environment = Kudu.Core.Environment;
 
 namespace Kudu.Services.Web
@@ -509,5 +512,30 @@ internal static string GetSettingsPath(IEnvironment environment)
         {
             return Path.Combine(environment.DeploymentsPath, Constants.DeploySettingsPath);
         }
+
+        internal static IServiceCollection AddLinuxConsumptionAuthentication(this IServiceCollection services)
+        {
+            services.AddAuthentication()
+                .AddArmToken();
+
+            return services;
+        }
+
+        /// <summary>
+        /// In Linux consumption, we are running the KuduLite instance in a Service Fabric Mesh container.
+        /// We want to introduce AdminAuthLevel policy to restrict instance admin endpoint access.
+        /// </summary>
+        /// <param name="services">Dependency injection to application service</param>
+        /// <returns>Service</returns>
+        internal static IServiceCollection AddLinuxConsumptionAuthorization(this IServiceCollection services)
+        {
+            services.AddAuthorization(o =>
+            {
+                o.AddInstanceAdminPolicies();
+            });
+
+            services.AddSingleton<IAuthorizationHandler, AuthLevelAuthorizationHandler>();
+            return services;
+        }
     }
 }
diff --git a/Kudu.Services.Web/Program.cs b/Kudu.Services.Web/Program.cs
index ad516714..042b0c85 100644
--- a/Kudu.Services.Web/Program.cs
+++ b/Kudu.Services.Web/Program.cs
@@ -1,7 +1,5 @@
 using System.IO;
 using System.Reflection;
-using Kudu.Contracts.Settings;
-using Kudu.Core.Helpers;
 using log4net;
 using log4net.Config;
 using Microsoft.AspNetCore;

From 18b4e73b3de8b2499686a68f94464df0d68236ed Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Wed, 22 May 2019 14:31:38 -0700
Subject: [PATCH 087/245] Squash Commit Add admin/instance/assign and
 admin/instance/info endpoints Reset launchSettings.json Rename
 WebhostEnvironment to LinuxConsumptionEnvironment Rename InstanceAdmin
 namespace to LinuxConsumptionInstanceAdmin Add Linux Consumption
 Specialization logic

---
 .../ILinuxConsumptionEnvironment.cs           |  37 +++++
 Kudu.Contracts/Settings/SettingsKeys.cs       |   2 +
 .../Deployment/Oryx/OryxBuildConstants.cs     |   2 +
 .../FunctionAppSpecializationHelper.cs        |  41 ++++++
 Kudu.Core/LinuxConsumptionEnvironment.cs      | 114 +++++++++++++++
 Kudu.Services.Web/Startup.cs                  |   4 +
 .../ILinuxConsumptionInstanceManager.cs       |  32 ++++
 ...LinuxConsumptionInstanceAdminController.cs |  62 ++++++--
 .../LinuxConsumptionInstanceManager.cs        | 137 ++++++++++++++++++
 9 files changed, 422 insertions(+), 9 deletions(-)
 create mode 100644 Kudu.Contracts/ILinuxConsumptionEnvironment.cs
 create mode 100644 Kudu.Core/Helpers/FunctionAppSpecializationHelper.cs
 create mode 100644 Kudu.Core/LinuxConsumptionEnvironment.cs
 create mode 100644 Kudu.Services/LinuxConsumptionInstanceAdmin/ILinuxConsumptionInstanceManager.cs
 create mode 100644 Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceManager.cs

diff --git a/Kudu.Contracts/ILinuxConsumptionEnvironment.cs b/Kudu.Contracts/ILinuxConsumptionEnvironment.cs
new file mode 100644
index 00000000..cfa9f62c
--- /dev/null
+++ b/Kudu.Contracts/ILinuxConsumptionEnvironment.cs
@@ -0,0 +1,37 @@
+using System.Threading.Tasks;
+
+namespace Kudu.Contracts
+{
+    public interface ILinuxConsumptionEnvironment
+    {
+        /// <summary>
+        /// Gets a value indicating whether requests should be delayed.
+        /// </summary>
+        bool DelayRequestsEnabled { get; }
+
+        Task DelayCompletionTask { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the current environment is in standby mode.
+        /// </summary>
+        bool InStandbyMode { get; }
+
+        /// <summary>
+        /// Flags that requests under this environment should be delayed.
+        /// </summary>
+        void DelayRequests();
+
+        /// <summary>
+        /// Flags that requests under this environment should be resumed.
+        /// </summary>
+        void ResumeRequests();
+
+        /// <summary>
+        /// Flags the current environment as ready and specialized.
+        /// This sets <see cref="EnvironmentSettingNames.AzureWebsitePlaceholderMode"/> to "0"
+        /// and <see cref="EnvironmentSettingNames.AzureWebsiteContainerReady"/> to "1" against
+        /// the current environment.
+        /// </summary>
+        void FlagAsSpecializedAndReady();
+    }
+}
diff --git a/Kudu.Contracts/Settings/SettingsKeys.cs b/Kudu.Contracts/Settings/SettingsKeys.cs
index dc870102..ec002bfa 100644
--- a/Kudu.Contracts/Settings/SettingsKeys.cs
+++ b/Kudu.Contracts/Settings/SettingsKeys.cs
@@ -47,6 +47,8 @@ public static class SettingsKeys
         public const string RunFromZip = "WEBSITE_RUN_FROM_PACKAGE";
         public const string MaxZipPackageCount = "SCM_MAX_ZIP_PACKAGE_COUNT";
         // Antares container specific settings
+        public const string PlaceholderMode = "WEBSITE_PLACEHOLDER_MODE";
+        public const string ContainerReady = "WEBSITE_CONTAINER_READY";
         public const string AuthEncryptionKey = "WEBSITE_AUTH_ENCRYPTION_KEY";
         public const string ContainerEncryptionKey = "CONTAINER_ENCRYPTION_KEY";
     }
diff --git a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
index f1a20e4f..47df8329 100644
--- a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
@@ -4,6 +4,8 @@ namespace Kudu.Core.Deployment.Oryx
 {
     internal static class OryxBuildConstants
     {
+        internal static readonly string EnableOryxBuild = "ENABLE_ORYX_BUILD";
+
         internal static class OryxEnvVars
         {
             public static readonly string FrameworkSetting = "FRAMEWORK";
diff --git a/Kudu.Core/Helpers/FunctionAppSpecializationHelper.cs b/Kudu.Core/Helpers/FunctionAppSpecializationHelper.cs
new file mode 100644
index 00000000..8e5b2c26
--- /dev/null
+++ b/Kudu.Core/Helpers/FunctionAppSpecializationHelper.cs
@@ -0,0 +1,41 @@
+using Kudu.Contracts.Settings;
+using Kudu.Core.Deployment.Oryx;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Helpers
+{
+    /// <summary>
+    /// Handle Function App container specialization when running in Service Fabric Mesh
+    /// </summary>
+    public static class FunctionAppSpecializationHelper
+    {
+        /// <summary>
+        /// According to the existing environment variables key-value pair, change the container environment.
+        /// </summary>
+        /// <param name="envKey">The key of environment variable</param>
+        /// <param name="envValue">The value of environment variable</param>
+        /// <returns>The new environment variables should be set</returns>
+        public static Dictionary<string, string> HandleLinuxConsumption(string envKey, string envValue)
+        {
+            Dictionary<string, string> toBeUpdatedEnv = new Dictionary<string, string>();
+            if (envKey == OryxBuildConstants.FunctionAppEnvVars.WorkerRuntimeSetting)
+            {
+                HandleFunctionWorkerRuntime(toBeUpdatedEnv, envValue);
+            }
+            return toBeUpdatedEnv;
+        }
+
+        private static void HandleFunctionWorkerRuntime(IDictionary<string, string> result, string workerRuntime)
+        {
+            if (workerRuntime == "python")
+            {
+                result.Add(SettingsKeys.DoBuildDuringDeployment, "true");
+                result.Add(OryxBuildConstants.EnableOryxBuild, "true");
+                result.Add(OryxBuildConstants.OryxEnvVars.FrameworkSetting, "PYTHON");
+                result.Add(OryxBuildConstants.OryxEnvVars.FrameworkVersionSetting, "3.6");
+            }
+        }
+    }
+}
diff --git a/Kudu.Core/LinuxConsumptionEnvironment.cs b/Kudu.Core/LinuxConsumptionEnvironment.cs
new file mode 100644
index 00000000..51bdd7bd
--- /dev/null
+++ b/Kudu.Core/LinuxConsumptionEnvironment.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Kudu.Contracts;
+using Kudu.Contracts.Settings;
+
+namespace Kudu.Core
+{
+    public class LinuxConsumptionEnvironment : ILinuxConsumptionEnvironment
+    {
+        private readonly ReaderWriterLockSlim _delayLock = new ReaderWriterLockSlim();
+        private TaskCompletionSource<object> _delayTaskCompletionSource;
+        private bool? _standbyMode;
+
+        public LinuxConsumptionEnvironment()
+        {
+            _delayTaskCompletionSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+            _delayTaskCompletionSource.SetResult(null);
+        }
+
+        public bool DelayRequestsEnabled => !DelayCompletionTask.IsCompleted;
+
+        public Task DelayCompletionTask
+        {
+            get
+            {
+                _delayLock.EnterReadLock();
+                try
+                {
+                    return _delayTaskCompletionSource.Task;
+                }
+                finally
+                {
+                    _delayLock.ExitReadLock();
+                }
+            }
+        }
+
+        public bool InStandbyMode
+        {
+            get
+            {
+                // once set, never reset
+                if (_standbyMode != null)
+                {
+                    return _standbyMode.Value;
+                }
+                if (IsPlaceHolderModeEnabled())
+                {
+                    return true;
+                }
+
+                // no longer standby mode
+                _standbyMode = false;
+
+                return _standbyMode.Value;
+            }
+        }
+
+        Task ILinuxConsumptionEnvironment.DelayCompletionTask => throw new NotImplementedException();
+
+        public void DelayRequests()
+        {
+            _delayLock.EnterUpgradeableReadLock();
+            try
+            {
+                if (_delayTaskCompletionSource.Task.IsCompleted)
+                {
+                    _delayLock.EnterWriteLock();
+                    try
+                    {
+                        _delayTaskCompletionSource = new TaskCompletionSource<object>();
+                    }
+                    finally
+                    {
+                        _delayLock.ExitWriteLock();
+                    }
+                }
+            }
+            finally
+            {
+                _delayLock.ExitUpgradeableReadLock();
+            }
+        }
+
+        public void ResumeRequests()
+        {
+            _delayLock.EnterReadLock();
+            try
+            {
+                _delayTaskCompletionSource?.SetResult(null);
+            }
+            finally
+            {
+                _delayLock.ExitReadLock();
+            }
+        }
+
+        public void FlagAsSpecializedAndReady()
+        {
+            System.Environment.SetEnvironmentVariable(SettingsKeys.PlaceholderMode, "0");
+            System.Environment.SetEnvironmentVariable(SettingsKeys.ContainerReady, "1");
+        }
+
+        private bool IsPlaceHolderModeEnabled()
+        {
+            // If WEBSITE_PLACEHOLDER_MODE is not set, we consider the container as a placeholder
+            string placeHolderMode = System.Environment.GetEnvironmentVariable(SettingsKeys.PlaceholderMode);
+            return placeHolderMode == "1" || string.IsNullOrEmpty(placeHolderMode);
+        }
+    }
+}
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index daf40302..e5e977a3 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -6,6 +6,7 @@
 using System.Net.Http.Formatting;
 using System.Reflection;
 using AspNetCore.RouteAnalyzer;
+using Kudu.Contracts;
 using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.Settings;
 using Kudu.Contracts.SourceControl;
@@ -25,6 +26,7 @@
 using Kudu.Services.TunnelServer;
 using Kudu.Services.Web.Infrastructure;
 using Kudu.Services.Web.Tracing;
+using Kudu.Services.LinuxConsumptionInstanceAdmin;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -120,6 +122,8 @@ public void ConfigureServices(IServiceCollection services)
                 });
 
             services.AddSingleton<IHttpContextAccessor>(new HttpContextAccessor());
+            services.AddSingleton<ILinuxConsumptionEnvironment, LinuxConsumptionEnvironment>();
+            services.AddSingleton<ILinuxConsumptionInstanceManager, LinuxConsumptionInstanceManager>();
 
             KuduWebUtil.EnsureHomeEnvironmentVariable();
 
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/ILinuxConsumptionInstanceManager.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/ILinuxConsumptionInstanceManager.cs
new file mode 100644
index 00000000..ad232765
--- /dev/null
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/ILinuxConsumptionInstanceManager.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Kudu.Services.Models;
+
+namespace Kudu.Services.LinuxConsumptionInstanceAdmin
+{
+    /// <summary>
+    /// Instance manager interface for modifying the behaviour in current instance
+    /// </summary>
+    public interface ILinuxConsumptionInstanceManager
+    {
+        /// <summary>
+        /// Get an overview information of current instance health status
+        /// </summary>
+        /// <returns></returns>
+        IDictionary<string, string> GetInstanceInfo();
+
+        /// <summary>
+        /// Validate if the assignment context matches the requirement for current instance's specialization
+        /// </summary>
+        /// <param name="assignmentContext">Contains site information such as environment variables</param>
+        /// <returns>Message on error, otherwise, null.</returns>
+        Task<string> ValidateContext(HostAssignmentContext assignmentContext);
+
+        /// <summary>
+        /// Apply assignment context and start specialization for current instance
+        /// </summary>
+        /// <param name="assignmentContext">Contains site information such as environment variables</param>
+        /// <returns>True on success.</returns>
+        bool StartAssignment(HostAssignmentContext assignmentContext);
+    }
+}
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
index c992a09f..4041ebf7 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
@@ -1,9 +1,10 @@
-using Kudu.Services.Models;
+using Kudu.Services.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Kudu.Contracts.Settings;
+using Kudu.Core.Helpers;
 using System.Collections.Generic;
 using Kudu.Services.Infrastructure.Authorization;
 
@@ -15,33 +16,36 @@ namespace Kudu.Services.LinuxConsumptionInstanceAdmin
     /// </summary>
     public class LinuxConsumptionInstanceAdminController : Controller
     {
+        private const string _appsettingPrefix = "APPSETTING_";
+        private readonly ILinuxConsumptionInstanceManager _instanceManager;
         private readonly IDeploymentSettingsManager _settingsManager;
 
         /// <summary>
         /// This class handles appsetting assignment and provide information when running in a Service Fabric Mesh container,
         /// namely, Functionapp on Linux Consumption Plan.
         /// </summary>
+        /// <param name="instanceManager">Allow KuduLite to interact with Service Fabric Mesh instance in Linux Consumption</param>
         /// <param name="settingsManager">Allow instance assignment to change application setting</param>
-        public LinuxConsumptionInstanceAdminController(IDeploymentSettingsManager settingsManager)
+        public LinuxConsumptionInstanceAdminController(ILinuxConsumptionInstanceManager instanceManager, IDeploymentSettingsManager settingsManager)
         {
+            _instanceManager = instanceManager;
             _settingsManager = settingsManager;
         }
 
         /// <summary>
-        /// A healthcheck endpoint which will be call after the container is established.
-        /// This endpoint is accessible by Antares DataRole only. KuduLite users are prohibited.
+        /// A healthcheck endpoint
         /// </summary>
         /// <returns>Expect 200 when current service is up and running</returns>
         [HttpGet]
         [Authorize(Policy = AuthPolicyNames.AdminAuthLevel)]
         public IActionResult Info()
         {
-            return Ok("Endpoint is not implemented");
+            return Ok(_instanceManager.GetInstanceInfo());
         }
 
         /// <summary>
-        /// A specialization endpoint. It sets the current service's site name, site id and environment variables.
-        /// This endpoint is accessible by Antares DataRole only. KuduLite users are prohibited.
+        /// A specialization endpoint.
+        /// It sets the current service's site name, site id and environment variables when it is called.
         /// </summary>
         /// <param name="encryptedAssignmentContext">Encrypted content which contains HostAssignmentContext</param>
         /// <returns>Expect 202 when receives the first call, otherwise, returns 409</returns>
@@ -49,7 +53,47 @@ public IActionResult Info()
         [Authorize(Policy = AuthPolicyNames.AdminAuthLevel)]
         public async Task<IActionResult> AssignAsync([FromBody] EncryptedHostAssignmentContext encryptedAssignmentContext)
         {
-            return Accepted("Endpoint is not implemented");
+            var containerKey = System.Environment.GetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey);
+            var assignmentContext = encryptedAssignmentContext.Decrypt(containerKey);
+
+            // 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);
+            }
+
+            var assignmentResult = _instanceManager.StartAssignment(assignmentContext);
+
+            // modify app settings from environment variables (for all start with "APPSETTING_")
+            // setting APPSETTING_FUNCTIONS_EXTENSION_VERSION will both set the appsetting and environment variable
+            if (assignmentResult)
+            {
+                foreach (KeyValuePair<string, string> env in assignmentContext.Environment)
+                {
+                    string key = env.Key;
+                    string value = env.Value;
+
+                    if (key.StartsWith(_appsettingPrefix))
+                    {
+                        key = key.Substring(_appsettingPrefix.Length);
+                        _settingsManager.SetValue(key, value);
+                    }
+
+                    // configure function app specialization properly for Linux Consumption plan
+                    Dictionary<string, string> newSettings = FunctionAppSpecializationHelper.HandleLinuxConsumption(key, value);
+                    foreach (KeyValuePair<string, string> newSetting in newSettings)
+                    {
+                        System.Environment.SetEnvironmentVariable(newSetting.Key, newSetting.Value);
+                        _settingsManager.SetValue(newSetting.Key, newSetting.Value);
+                    }
+                }
+            }
+
+            return assignmentResult
+               ? Accepted()
+               : StatusCode(StatusCodes.Status409Conflict, "Instance already assigned");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceManager.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceManager.cs
new file mode 100644
index 00000000..813f4858
--- /dev/null
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceManager.cs
@@ -0,0 +1,137 @@
+using Kudu.Contracts;
+using Kudu.Services.Models;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Kudu.Core.Infrastructure;
+
+namespace Kudu.Services.LinuxConsumptionInstanceAdmin
+{
+    /// <summary>
+    /// Used for configuring KuduLite instance when it is running in Linux Consumption Service Fabric Mesh
+    /// </summary>
+    public class LinuxConsumptionInstanceManager : ILinuxConsumptionInstanceManager
+    {
+        private static readonly object _assignmentLock = new object();
+        private static HostAssignmentContext _assignmentContext;
+
+        private readonly ILinuxConsumptionEnvironment _linuxConsumptionEnv;
+        private readonly HttpClient _client;
+
+        /// <summary>
+        /// Create a manager to specialize KuduLite when it is running in Service Fabric Mesh
+        /// </summary>
+        /// <param name="linuxConsumptionEnv">Environment variables</param>
+        public LinuxConsumptionInstanceManager(ILinuxConsumptionEnvironment linuxConsumptionEnv)
+        {
+            _linuxConsumptionEnv = linuxConsumptionEnv;
+            _client = new HttpClient();
+        }
+
+        public IDictionary<string, string> GetInstanceInfo()
+        {
+            var result = new Dictionary<string, string>();
+            foreach (DictionaryEntry entry in System.Environment.GetEnvironmentVariables())
+            {
+                result.Add((string)entry.Key, (string)entry.Value);
+            }
+            return result;
+        }
+
+        public bool StartAssignment(HostAssignmentContext context)
+        {
+            if (!_linuxConsumptionEnv.InStandbyMode)
+            {
+                return false;
+            }
+
+            if (_assignmentContext == null)
+            {
+                lock (_assignmentLock)
+                {
+                    if (_assignmentContext != null)
+                    {
+                        return _assignmentContext.Equals(context);
+                    }
+                    _assignmentContext = context;
+                }
+
+                // set a flag which will cause any incoming http requests to buffer
+                // until specialization is complete
+                // the host is guaranteed not to receive any requests until AFTER assign
+                // has been initiated, so setting this flag here is sufficient to ensure
+                // that any subsequent incoming requests while the assign is in progress
+                // will be delayed until complete
+                _linuxConsumptionEnv.DelayRequests();
+
+                // start the specialization process in the background
+                Task.Run(async () => await Assign(context));
+
+                return true;
+            }
+            else
+            {
+                // No lock needed here since _assignmentContext is not null when we are here
+                return _assignmentContext.Equals(context);
+            }
+        }
+
+        public async Task<string> ValidateContext(HostAssignmentContext assignmentContext)
+        {
+            string error = null;
+            HttpResponseMessage response = null;
+            try
+            {
+                var zipUrl = assignmentContext.ZipUrl;
+                if (!string.IsNullOrEmpty(zipUrl))
+                {
+                    // make sure the zip uri is valid and accessible
+                    await OperationManager.AttemptAsync(async () =>
+                    {
+                        try
+                        {
+                            var request = new HttpRequestMessage(HttpMethod.Head, zipUrl);
+                            response = await _client.SendAsync(request);
+                            response.EnsureSuccessStatusCode();
+                        }
+                        catch (Exception)
+                        {
+                            throw;
+                        }
+                    }, retries: 2, delayBeforeRetry: 300 /*ms*/);
+                }
+            }
+            catch (Exception)
+            {
+                error = $"Invalid zip url specified (StatusCode: {response?.StatusCode})";
+            }
+
+            return error;
+        }
+
+        private async Task Assign(HostAssignmentContext assignmentContext)
+        {
+            try
+            {
+                // first make all environment and file system changes required for
+                // the host to be specialized
+                assignmentContext.ApplyAppSettings();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            finally
+            {
+                // all assignment settings/files have been applied so we can flip
+                // the switch now on specialization
+                // even if there are failures applying context above, we want to
+                // leave placeholder mode
+                _linuxConsumptionEnv.FlagAsSpecializedAndReady();
+                _linuxConsumptionEnv.ResumeRequests();
+            }
+        }
+    }
+}

From 78295045f3df5d1db687b679ff28350d7a979cf6 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 4 Jun 2019 09:25:29 -0700
Subject: [PATCH 088/245] Added VFS path to log stream, fixed line break
 problem with logstream

---
 Kudu.Services/Diagnostics/LogStreamManager.cs | 64 +++++++++++++++----
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index 3a3136a4..e4466014 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -9,7 +9,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -45,6 +44,7 @@ public class LogStreamManager
         private DateTime _lastTraceTime;
         private DateTime _startTime;
         private TimeSpan _timeout;
+        private Stopwatch stopwatch;
 
         private const string volatileLogsPath = "/appsvctmp/volatile/logs/runtime";
 
@@ -78,7 +78,7 @@ public async Task ProcessRequest(HttpContext context)
             _lastTraceTime = _startTime;
 
             DisableResponseBuffering(context);
-            var stopwatch = Stopwatch.StartNew();
+            stopwatch = Stopwatch.StartNew();
             
             // CORE TODO Shutdown detector registration
 
@@ -126,15 +126,30 @@ public async Task ProcessRequest(HttpContext context)
 
             if (_logFiles != null)
             {
+                NotifyClientWithLineBreak("Starting Log Tail -n 10 of exisitng logs ----", context);
+
                 foreach (string log in _logFiles.Keys)
                 {
                     var reader = new StreamReader(log, Encoding.ASCII);
+
+                    var vfsPath = GetFileVfsPath(log);
+
+                    var printLine = log + " " + (!string.IsNullOrEmpty(vfsPath) ? " (" + vfsPath + ")" : "");
+
+                    NotifyClientWithLineBreak(String.Format(
+                                CultureInfo.CurrentCulture,
+                                printLine,
+                                DateTime.UtcNow.ToString("s"),
+                                System.Environment.NewLine),context);
+
                     foreach (string logLine in Tail(reader, 10))
                     {
-                        await context.Response.WriteAsync(
-                            string.Format(logLine,System.Environment.NewLine));
+                        await context.Response.WriteAsync(logLine);
+                        await context.Response.WriteAsync(System.Environment.NewLine);
                     }
+                    await context.Response.WriteAsync(System.Environment.NewLine);
                 }
+                NotifyClientWithLineBreak("Ending Log Tail of exisitng logs ---", context);
             }
             else
             {
@@ -142,6 +157,8 @@ await context.Response.WriteAsync(
                 Console.WriteLine("LogStream: No pervious logfiles");
             }
 
+            NotifyClientWithLineBreak("Starting Live Log Stream ---", context);
+
             // CORE TODO diagnostics setting for enabling app logging            
 
             while (!context.RequestAborted.IsCancellationRequested)
@@ -387,14 +404,6 @@ private void OnHeartbeat(object state)
                     {
                         TerminateClient(String.Format(CultureInfo.CurrentCulture, Resources.LogStream_Timeout, DateTime.UtcNow.ToString("s"), (int)ts.TotalMinutes, System.Environment.NewLine), context);
                     }
-                    else
-                    {
-                        ts = DateTime.UtcNow.Subtract(_lastTraceTime);
-                        if (ts >= HeartbeatInterval)
-                        {
-                            NotifyClient(String.Format(CultureInfo.CurrentCulture, Resources.LogStream_Heartbeat, DateTime.UtcNow.ToString("s"), (int)ts.TotalMinutes, System.Environment.NewLine),context);
-                        }
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -424,12 +433,32 @@ private void OnChanged(object sender, FileSystemEventArgs e, HttpContext context
                 if (lines.Count() > 0)
                 {
                     _lastTraceTime = DateTime.UtcNow;
+                    stopwatch = Stopwatch.StartNew();
                     NotifyClient(lines,context);
                 }
             }
         }
 
+        private async void NotifyClientWithLineBreak(string line, HttpContext context)
+        {
+            if (!context.RequestAborted.IsCancellationRequested)
+            {
+                try
+                {
+                    await context.Response.WriteAsync(System.Environment.NewLine);
+                    await context.Response.WriteAsync(line);
+                    await context.Response.WriteAsync(System.Environment.NewLine);
+                }
+                catch (Exception)
+                {
+                    _tracer.TraceError("Error notifying client");
+                }
+            }
+        }
+
         /*
+         * CORE TODO : Rest API to watch a particular file by LogStream
+         * /
         private string ParseRequest(HttpContext context)
         {
             _filter = context.Request.QueryString[FilterQueryKey];
@@ -484,6 +513,7 @@ private async void NotifyClient(IEnumerable<string> lines, HttpContext context)
                 {
                     try
                     {
+                        await context.Response.WriteAsync(System.Environment.NewLine);
                         foreach (var line in lines)
                         {
                             await context.Response.WriteAsync(line);
@@ -664,6 +694,16 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
+        private string GetFileVfsPath(string filePath)
+        {
+            string relativePath = filePath.IndexOf("LogFiles") > 0 ? filePath.Substring(filePath.IndexOf("LogFiles")).Replace("\\", "/") : "";
+            string fileName = Uri.EscapeDataString(relativePath.Substring(relativePath.LastIndexOf("/")+1));
+            string encodedUrl = relativePath.Substring(0, relativePath.LastIndexOf("/")+1) + fileName;
+
+            return filePath.Contains("LogFiles") ? 
+                _environment.AppBaseUrlPrefix + "/api/vfs/" + encodedUrl : "";
+        }
+
         protected virtual void Dispose(bool disposing)
         {
             if (disposing)

From 281457127cbd978d50f7644b328fedb2fb093de1 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 4 Jun 2019 10:11:00 -0700
Subject: [PATCH 089/245] Update LogStreamManager.cs

---
 Kudu.Services/Diagnostics/LogStreamManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index e4466014..35091bfe 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -126,7 +126,7 @@ public async Task ProcessRequest(HttpContext context)
 
             if (_logFiles != null)
             {
-                NotifyClientWithLineBreak("Starting Log Tail -n 10 of exisitng logs ----", context);
+                NotifyClientWithLineBreak("Starting Log Tail -n 10 of existing logs ----", context);
 
                 foreach (string log in _logFiles.Keys)
                 {
@@ -149,7 +149,7 @@ public async Task ProcessRequest(HttpContext context)
                     }
                     await context.Response.WriteAsync(System.Environment.NewLine);
                 }
-                NotifyClientWithLineBreak("Ending Log Tail of exisitng logs ---", context);
+                NotifyClientWithLineBreak("Ending Log Tail of existing logs ---", context);
             }
             else
             {
@@ -251,7 +251,7 @@ private static bool shouldMonitiorMountedLogsPath(string mountedDirPath)
                 // use this directory; first file for a date is the marker file
                 foreach (var file in Directory.GetFiles(mountedDirPath, "*", SearchOption.AllDirectories))
                 {
-                    if (file.StartsWith(dateToday) && ++count > 1)
+                    if (file.Contains(dateToday) && ++count > 1)
                     {
                         break;
                     }

From dbfcc7a1ce91f76d9bbc6cbe362ff40d99a9b710 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 6 Jun 2019 08:26:06 -0700
Subject: [PATCH 090/245] Remove duplicated volatileLogsPath (#49)

---
 Kudu.Services/Diagnostics/LogStreamManager.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index be82e2f9..fbe41121 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -48,8 +48,6 @@ public class LogStreamManager
 
         private const string volatileLogsPath = "/appsvctmp/volatile/logs/runtime";
 
-        private const string volatileLogsPath = "/appsvctmp/volatile/logs/runtime";
-
         // CORE TODO
         //private ShutdownDetector _shutdownDetector;
         //private CancellationTokenRegistration _cancellationTokenRegistration;

From 1614affbd2979cebd58899686f58580993991851 Mon Sep 17 00:00:00 2001
From: Ankit Kumar <kumar.ankit55@gmail.com>
Date: Mon, 10 Jun 2019 16:35:09 -0700
Subject: [PATCH 091/245] Update Node default version (#54)

Signed-off-by: Ankit Kumar <ankikuma@microsoft.com>
---
 Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
index 47df8329..3ba25df7 100644
--- a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
@@ -20,7 +20,7 @@ internal static class FunctionAppEnvVars
 
         internal static class FunctionAppWorkerRuntimeDefaults
         {
-            public static readonly string Node = "10.14.1";
+            public static readonly string Node = "8.15";
             public static readonly string Python = "3.6";
             public static readonly string Dotnet = "2.2";
         }

From 6608e8865debd97f6c2571fe68c0b76b854838b4 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 13 Jun 2019 11:23:50 -0700
Subject: [PATCH 092/245] [functionapp] Disable unnecessary endpoints in Linux
 Consumption (#52)

* Filter routes for Linux Consumption KuduLite

* Block zipdeploy endpoints from Linux Consumption access from IP address
Apply authorization on Deployment Logs
Change authorization on the Controller level
Initialize Authorization after environment injection

* Handle Request header disguise in middleware

* Merge authentication and authorization logic in middleware

* Add unit tests for authentication

* Reorder using statements

* Clean up using directives

* Remove parallelzation for environment variable unit tests

* Debug Request Not Found issue

* Reorder LinuxConsumptionRouteMiddleware

* Sanitize SCM Url with Regex if DISGUISED-HOST is not presented

* Remove debug console log

* Enable stub homepage for linux consumption
---
 Common/Constants.cs                           |   2 +
 Kudu.Contracts/IEnvironment.cs                |   1 +
 Kudu.Core/Environment.cs                      |  16 +-
 Kudu.Services.Web/KuduWebUtil.cs              |   4 +-
 Kudu.Services.Web/Startup.cs                  |  14 +-
 .../ArmAuthenticationDefaults.cs              |   5 +-
 .../Authorization/AuthOptionsExtensions.cs    |  16 +-
 .../Authorization/AuthPolicyNames.cs          |  12 +
 .../LinuxConsumptionRouteMiddleware.cs        | 143 ++++++++++++
 .../Core/Helpers/SimpleWebTokenTests.cs       |   4 +-
 Kudu.Tests/Kudu.Tests.csproj                  |   1 +
 .../LinuxConsumptionRouteMiddlewareTests.cs   | 220 ++++++++++++++++++
 Kudu.Tests/Services/EnvironmentTests.cs       |  50 ++++
 .../ArmAuthenticationHandlerTests.cs          |   1 +
 Kudu.Tests/TestMockedEnvironment.cs           |  13 ++
 15 files changed, 488 insertions(+), 14 deletions(-)
 create mode 100644 Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
 create mode 100644 Kudu.Tests/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddlewareTests.cs
 create mode 100644 Kudu.Tests/Services/EnvironmentTests.cs
 create mode 100644 Kudu.Tests/TestMockedEnvironment.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 149929b6..d5680466 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -105,6 +105,8 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string SiteAuthEncryptionKey = "WEBSITE_AUTH_ENCRYPTION_KEY";
         public const string HttpHost = "HTTP_HOST";
         public const string WebSiteSwapSlotName = "WEBSITE_SWAP_SLOTNAME";
+        public const string AzureWebsiteInstanceId = "WEBSITE_INSTANCE_ID";
+        public const string ContainerName = "CONTAINER_NAME";
 
         public const string Function = "function";
         public const string Functions = "functions";
diff --git a/Kudu.Contracts/IEnvironment.cs b/Kudu.Contracts/IEnvironment.cs
index abf6df4b..a48e40d2 100644
--- a/Kudu.Contracts/IEnvironment.cs
+++ b/Kudu.Contracts/IEnvironment.cs
@@ -30,5 +30,6 @@ public interface IEnvironment
         string RequestId { get; }               // e.g. x-arr-log-id or x-ms-request-id header value
         string KuduConsoleFullPath { get; }     // e.g. KuduConsole/kudu.dll
         string SitePackagesPath { get; }        // e.g. /data/SitePackages
+        bool IsOnLinuxConsumption { get; }      // e.g. True on Linux Consumption. False on App Service.
     }
 }
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 56d33e67..6bc5e01f 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -120,7 +120,7 @@ public Environment(
             _siteExtensionSettingsPath = Path.Combine(SiteRootPath, Constants.SiteExtensionsCachePath);
             _diagnosticsPath = Path.Combine(SiteRootPath, Constants.DiagnosticsPath);
             _locksPath = Path.Combine(SiteRootPath, Constants.LocksPath);
-            
+
             if (OSDetector.IsOnWindows())
             {
                 _sshKeyPath = Path.Combine(rootPath, Constants.SSHKeyPath);
@@ -152,7 +152,7 @@ public Environment(
                 _jobsBinariesPath = Path.Combine(_webRootPath, userDefinedWebJobRoot);
             }
             _sitePackagesPath = Path.Combine(_dataPath, Constants.SitePackages);
-            
+
             RequestId = !string.IsNullOrEmpty(requestId) ? requestId : Guid.Empty.ToString();
 
             _httpContextAccessor = httpContextAccessor;
@@ -343,7 +343,7 @@ public string FunctionsPath
                 return this.WebRootPath;
             }
         }
-        
+
         public string SitePackagesPath
         {
             get
@@ -385,6 +385,16 @@ public string RequestId
             private set;
         }
 
+        public bool IsOnLinuxConsumption
+        {
+            get
+            {
+                bool isOnAppService = !string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId));
+                bool isOnLinuxContainer = !string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.ContainerName));
+                return isOnLinuxContainer && !isOnAppService;
+            }
+        }
+
         public string KuduConsoleFullPath { get; }
 
         public static bool IsAzureEnvironment()
diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 8ed15da0..270c3a34 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -527,11 +527,11 @@ internal static IServiceCollection AddLinuxConsumptionAuthentication(this IServi
         /// </summary>
         /// <param name="services">Dependency injection to application service</param>
         /// <returns>Service</returns>
-        internal static IServiceCollection AddLinuxConsumptionAuthorization(this IServiceCollection services)
+        internal static IServiceCollection AddLinuxConsumptionAuthorization(this IServiceCollection services, IEnvironment environment)
         {
             services.AddAuthorization(o =>
             {
-                o.AddInstanceAdminPolicies();
+                o.AddInstanceAdminPolicies(environment);
             });
 
             services.AddSingleton<IAuthorizationHandler, AuthLevelAuthorizationHandler>();
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index e5e977a3..2600b679 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -93,11 +93,6 @@ public void ConfigureServices(IServiceCollection services)
                 .AddApplicationPart(kuduServicesAssembly).AddControllersAsServices()
                 .AddApiExplorer();
 
-            // Add middleware for Linux Consumption authentication and authorization
-            // when KuduLIte is running in service fabric mesh
-            services.AddLinuxConsumptionAuthentication();
-            services.AddLinuxConsumptionAuthorization();
-
             services.AddSwaggerGen(c =>
             {
                 c.SwaggerDoc("v1", new Info {Title = "Kudu API Docs"});
@@ -142,6 +137,11 @@ public void ConfigureServices(IServiceCollection services)
             // Add various folders that never change to the process path. All child processes will inherit this
             KuduWebUtil.PrependFoldersToPath(environment);
 
+            // Add middleware for Linux Consumption authentication and authorization
+            // when KuduLIte is running in service fabric mesh
+            services.AddLinuxConsumptionAuthentication();
+            services.AddLinuxConsumptionAuthorization(environment);
+
             // General
             services.AddSingleton<IServerConfiguration>(ServerConfiguration);
 
@@ -313,6 +313,10 @@ public void Configure(IApplicationBuilder app,
                 app.UseExceptionHandler("/Error");
             }
 
+            if (_webAppRuntimeEnvironment.IsOnLinuxConsumption)
+            {
+                app.UseLinuxConsumptionRouteMiddleware();
+            }
 
             var webSocketOptions = new WebSocketOptions()
             {
diff --git a/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
index 5f7235c7..9ebc5be0 100644
--- a/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
+++ b/Kudu.Services/Infrastructure/Authentication/ArmAuthenticationDefaults.cs
@@ -5,10 +5,13 @@
 namespace Kudu.Services.Infrastructure.Authentication
 {
     /// <summary>
-    /// ARM authentication scheme for Linux Consumption authentication
+    /// Azure Resource Manager authentication scheme for Linux Consumption authentication
     /// </summary>
     public static class ArmAuthenticationDefaults
     {
+        /// <summary>
+        /// Use Azure Resource Manager token to authenticate (e.g. "x-ms-site-restricted-token")
+        /// </summary>
         public const string AuthenticationScheme = "ArmToken";
     }
 }
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthOptionsExtensions.cs b/Kudu.Services/Infrastructure/Authorization/AuthOptionsExtensions.cs
index 17d36266..abe4626b 100644
--- a/Kudu.Services/Infrastructure/Authorization/AuthOptionsExtensions.cs
+++ b/Kudu.Services/Infrastructure/Authorization/AuthOptionsExtensions.cs
@@ -3,18 +3,32 @@
 using System.Text;
 using Microsoft.AspNetCore.Authorization;
 using Kudu.Services.Infrastructure.Authentication;
+using Kudu.Core;
 
 namespace Kudu.Services.Infrastructure.Authorization
 {
     public static class AuthOptionsExtensions
     {
-        public static void AddInstanceAdminPolicies(this AuthorizationOptions options)
+        public static void AddInstanceAdminPolicies(this AuthorizationOptions options, IEnvironment environment)
         {
             options.AddPolicy(AuthPolicyNames.AdminAuthLevel, p =>
             {
                 p.AddInstanceAuthenticationSchemes();
                 p.AddRequirements(new AuthLevelRequirement(AuthorizationLevel.Admin));
             });
+
+            options.AddPolicy(AuthPolicyNames.LinuxConsumptionRestriction, p =>
+            {
+                p.AddInstanceAuthenticationSchemes();
+                if (environment.IsOnLinuxConsumption)
+                {
+                    p.AddRequirements(new AuthLevelRequirement(AuthorizationLevel.Admin));
+                }
+                else
+                {
+                    p.AddRequirements(new AuthLevelRequirement(AuthorizationLevel.Anonymous));
+                }
+            });
         }
 
         private static void AddInstanceAuthenticationSchemes(this AuthorizationPolicyBuilder builder)
diff --git a/Kudu.Services/Infrastructure/Authorization/AuthPolicyNames.cs b/Kudu.Services/Infrastructure/Authorization/AuthPolicyNames.cs
index 403836bc..7c714acc 100644
--- a/Kudu.Services/Infrastructure/Authorization/AuthPolicyNames.cs
+++ b/Kudu.Services/Infrastructure/Authorization/AuthPolicyNames.cs
@@ -1,7 +1,19 @@
 namespace Kudu.Services.Infrastructure.Authorization
 {
+    /// <summary>
+    /// Authorization Policies that can be applied to the endpoints
+    /// </summary>
     public static class AuthPolicyNames
     {
+        /// <summary>
+        /// Only requests with "x-ms-site-restricted-token" can access the endpoint
+        /// </summary>
         public const string AdminAuthLevel = "AuthLevelAdmin";
+
+        /// <summary>
+        /// When running on Linux Consumption, only requests with "x-ms-site-restricted-token" can access the endpoint.
+        /// No restriction when running on App Service.
+        /// </summary>
+        public const string LinuxConsumptionRestriction = "LinuxConsumptionRestriction";
     }
 }
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
new file mode 100644
index 00000000..1099fef9
--- /dev/null
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
@@ -0,0 +1,143 @@
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Kudu.Services.Infrastructure.Authorization;
+using Kudu.Services.Infrastructure.Authentication;
+using System;
+using System.Text.RegularExpressions;
+
+namespace Kudu.Services.LinuxConsumptionInstanceAdmin
+{
+    /// <summary>
+    /// Middleware to filter out unnecessary routes when running in Linux Consumption
+    /// </summary>
+    public class LinuxConsumptionRouteMiddleware
+    {
+        private static readonly HashSet<string> Whitelist = new HashSet<string>
+        {
+            HomePageRoute,
+            "/api/zipdeploy",
+            "/admin/instance",
+            "/deployments",
+        };
+
+        private readonly RequestDelegate _next;
+        private readonly HashSet<PathString> _whitelistedPathString;
+        private const string DisguisedHostHeader = "DISGUISED-HOST";
+        private const string HostHeader = "HOST";
+        private const string ForwardedProtocolHeader = "X-Forwarded-Proto";
+        private const string AuthorizationPolicy = AuthPolicyNames.LinuxConsumptionRestriction;
+
+        private static Regex malformedScmHostnameRegex = new Regex(@"^~\d+");
+        private static string HomePageRoute = "/";
+
+        /// <summary>
+        /// Filter out unnecessary routes for Linux Consumption
+        /// </summary>
+        /// <param name="next">The next request middleware to be passed in</param>
+        public LinuxConsumptionRouteMiddleware(RequestDelegate next)
+        {
+            _next = next;
+            _whitelistedPathString = new HashSet<PathString>(Whitelist.Count);
+            foreach (string pathString in Whitelist)
+            {
+                _whitelistedPathString.Add(new PathString(pathString));
+            }
+        }
+
+        /// <summary>
+        /// Detect if a route matches any of whitelisted prefixes
+        /// </summary>
+        /// <param name="context">Http request context</param>
+        /// <param name="authorizationService">Authorization service for each request</param>
+        /// <returns>Response be set to 404 if the route is not whitelisted</returns>
+        public async Task Invoke(HttpContext context, IAuthorizationService authorizationService = null)
+        {
+            // Step 1: if disguise host exists, replace the request header HOST to DISGUISED-HOST
+            //         if disguist host does not exist, check and replace ~1 with regex
+            if (context.Request.Headers.TryGetValue(DisguisedHostHeader, out StringValues value))
+            {
+                context.Request.Headers[HostHeader] = value;
+            }
+            else
+            {
+                context.Request.Host = new HostString(SanitizeScmUrl(context.Request.Headers[HostHeader][0]));
+            }
+
+            if (context.Request.Headers.TryGetValue(ForwardedProtocolHeader, out value))
+            {
+                context.Request.Scheme = value;
+            }
+
+            // Step 2: check if the request endpoint is enabled in Linux Consumption
+            if (!IsRouteWhitelisted(context.Request.Path))
+            {
+                context.Response.StatusCode = 404;
+                return;
+            }
+
+            // Step 3: check if it is homepage route, always return 200
+            if (IsHomePageRoute(context.Request.Path))
+            {
+                context.Response.StatusCode = 200;
+                return;
+            }
+
+            // Step 3: check if the request matches authorization policy
+            AuthenticateResult authenticateResult = await context.AuthenticateAsync(ArmAuthenticationDefaults.AuthenticationScheme);
+            if (!authenticateResult.Succeeded)
+            {
+                context.Response.StatusCode = 401;
+                return;
+            }
+
+            if (authorizationService != null)
+            {
+                AuthorizationResult authorizeResult = await authorizationService.AuthorizeAsync(authenticateResult.Principal, AuthorizationPolicy);
+                if (!authorizeResult.Succeeded)
+                {
+                    context.Response.StatusCode = 401;
+                    return;
+                }
+            }
+
+            await _next.Invoke(context);
+        }
+
+        private bool IsRouteWhitelisted(PathString routePath)
+        {
+            return _whitelistedPathString.Any((ps) => routePath.StartsWithSegments(ps));
+        }
+
+        private bool IsHomePageRoute(PathString routePath)
+        {
+            return routePath.ToString() == "/";
+        }
+
+        private static string SanitizeScmUrl(string malformedUrl)
+        {
+            if (string.IsNullOrEmpty(malformedUrl))
+            {
+                return malformedUrl;
+            }
+
+            return malformedScmHostnameRegex.Replace(malformedUrl, string.Empty, 1);
+        }
+    }
+
+    /// <summary>
+    /// Extension wrapper for using Linux Consumption Route Middleware
+    /// </summary>
+    public static class LinuxConsumptionRouteMiddlewareExtension
+    {
+        public static IApplicationBuilder UseLinuxConsumptionRouteMiddleware(this IApplicationBuilder builder)
+        {
+            return builder.UseMiddleware<LinuxConsumptionRouteMiddleware>();
+        }
+    }
+}
diff --git a/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs b/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
index 0f2f7698..3b9520dc 100644
--- a/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
+++ b/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
@@ -6,6 +6,7 @@
 
 namespace Kudu.Tests.Core.Helpers
 {
+    [Collection("MockedEnvironmentVariablesCollection")]
     public class SimpleWebTokenTests
     {
         [Fact]
@@ -67,7 +68,7 @@ public void Validate_Token_Uses_WebSiteAuthEncryptionKey_If_Available()
             var websiteAuthEncryptionKey = TestHelpers.GenerateKeyBytes();
             var websiteAuthEncryptionStringKey = TestHelpers.GenerateKeyHexString(websiteAuthEncryptionKey);
 
-            var timeStamp = DateTime.UtcNow.AddHours(1);
+            var timeStamp = DateTime.UtcNow.AddDays(1);
 
             using (new TestScopedEnvironmentVariable(SettingsKeys.ContainerEncryptionKey, containerEncryptionStringKey))
             using (new TestScopedEnvironmentVariable(SettingsKeys.AuthEncryptionKey, websiteAuthEncryptionStringKey))
@@ -75,7 +76,6 @@ public void Validate_Token_Uses_WebSiteAuthEncryptionKey_If_Available()
                 var token = SimpleWebTokenHelper.CreateToken(timeStamp, websiteAuthEncryptionKey);
                 Assert.True(SimpleWebTokenHelper.TryValidateToken(token, new SystemClock()));
             }
-
         }
 
         [Fact]
diff --git a/Kudu.Tests/Kudu.Tests.csproj b/Kudu.Tests/Kudu.Tests.csproj
index f1e34689..35fea095 100644
--- a/Kudu.Tests/Kudu.Tests.csproj
+++ b/Kudu.Tests/Kudu.Tests.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
diff --git a/Kudu.Tests/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddlewareTests.cs b/Kudu.Tests/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddlewareTests.cs
new file mode 100644
index 00000000..a4f07766
--- /dev/null
+++ b/Kudu.Tests/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddlewareTests.cs
@@ -0,0 +1,220 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Kudu.Services.Infrastructure.Authentication;
+using Kudu.Services.LinuxConsumptionInstanceAdmin;
+using Kudu.Contracts.Settings;
+using Xunit;
+using Kudu.Services.Infrastructure.Authorization;
+
+namespace Kudu.Tests.LinuxConsumptionInstanceAdmin
+{
+    [Collection("MockedEnvironmentVariablesCollection")]
+    public class LinuxConsumptionRouteMiddlewareTests
+    {
+        private LinuxConsumptionRouteMiddleware _middleware;
+        private byte[] _websiteAuthEncryptionKey;
+        private byte[] _containerEncryptionKey;
+        private Dictionary<string, string> _environmentVariables;
+
+        public LinuxConsumptionRouteMiddlewareTests()
+        {
+            _middleware = new LinuxConsumptionRouteMiddleware((context) =>
+            {
+                return Task.CompletedTask;
+            });
+
+            _websiteAuthEncryptionKey = TestHelpers.GenerateKeyBytes();
+            _containerEncryptionKey = TestHelpers.GenerateKeyBytes();
+            _environmentVariables = new Dictionary<string, string>
+            {
+                { SettingsKeys.AuthEncryptionKey, TestHelpers.GenerateKeyHexString(_websiteAuthEncryptionKey) },
+                { SettingsKeys.ContainerEncryptionKey, TestHelpers.GenerateKeyHexString(_containerEncryptionKey) }
+            };
+        }
+
+        private HttpContext GenerateHttpContext(DateTime? tokenExpiry = null, byte[] encryptionKey = null)
+        {
+            var services = new ServiceCollection().AddLogging();
+
+            services.AddAuthentication(o =>
+            {
+                o.DefaultScheme = ArmAuthenticationDefaults.AuthenticationScheme;
+            })
+            .AddArmToken();
+
+            services.AddAuthorization(o =>
+            {
+                o.AddPolicy(AuthPolicyNames.LinuxConsumptionRestriction, p =>
+                {
+                    p.AuthenticationSchemes.Add(ArmAuthenticationDefaults.AuthenticationScheme);
+                    p.AddRequirements(new AuthLevelRequirement(AuthorizationLevel.Admin));
+                });
+            });
+
+            var sp = services.BuildServiceProvider();
+            var context = new DefaultHttpContext
+            {
+                RequestServices = sp
+            };
+
+            if (tokenExpiry != null)
+            {
+                string token = Kudu.Core.Helpers.SimpleWebTokenHelper.CreateToken(
+                    (DateTime)tokenExpiry, encryptionKey ?? _websiteAuthEncryptionKey);
+                context.Request.Headers.Add(ArmAuthenticationHandler.ArmTokenHeaderName, token);
+            }
+            return context;
+        }
+
+        [Fact]
+        public void ParentRouteNotFound()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/admin";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(404, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void UnwhitelistedRouteNotFound()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/admin/notinstance";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(404, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void HomepageRouteNotFound()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(404, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void ExactlyMatchedOk()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/api/zipdeploy";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void QueryParameterOk()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/api/zipdeploy";
+                httpContext.Request.QueryString = new QueryString("?querystring=context");
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void TrailingSlashOk()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/api/zipdeploy/";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void CaseInvariantMatchOk()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/api/ZipDeploy";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void ChildRouteOk()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/admin/instance";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
+
+                httpContext.Request.Path = "/admin/instance/info";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void ExpiredTokenUnauthorized()
+        {
+            using (new TestScopedEnvironmentVariable(_environmentVariables))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(-1));
+                httpContext.Request.Path = "/admin/instance/info";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(401, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void NoEncyptionKeyUnauthorized()
+        {
+            HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+            httpContext.Request.Path = "/api/zipdeploy";
+            _middleware.Invoke(httpContext).Wait();
+            Assert.Equal<int>(401, httpContext.Response.StatusCode);
+        }
+
+        [Fact]
+        public void UseWebsiteEncryptionKeyOk()
+        {
+            using (new TestScopedEnvironmentVariable(
+                SettingsKeys.AuthEncryptionKey, TestHelpers.GenerateKeyHexString(_websiteAuthEncryptionKey)))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
+                httpContext.Request.Path = "/api/zipdeploy";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
+            }
+        }
+
+        [Fact]
+        public void UseContainerEncryptionKeyOk()
+        {
+            using (new TestScopedEnvironmentVariable(
+                SettingsKeys.ContainerEncryptionKey, TestHelpers.GenerateKeyHexString(_containerEncryptionKey)))
+            {
+                HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1), _containerEncryptionKey);
+                httpContext.Request.Path = "/api/zipdeploy";
+                _middleware.Invoke(httpContext).Wait();
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
+            }
+        }
+    }
+}
diff --git a/Kudu.Tests/Services/EnvironmentTests.cs b/Kudu.Tests/Services/EnvironmentTests.cs
new file mode 100644
index 00000000..153e4fc0
--- /dev/null
+++ b/Kudu.Tests/Services/EnvironmentTests.cs
@@ -0,0 +1,50 @@
+using Kudu.Core;
+using Kudu.Services;
+using Kudu.Tests;
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Kudu.Tests.Services
+{
+    [Collection("MockedEnvironmentVariablesCollection")]
+    public class EnvironmentTests
+    {
+        [Fact]
+        public void LinuxConsumptionPlan()
+        {
+            using(new TestScopedEnvironmentVariable("CONTAINER_NAME", "cn"))
+            {
+                IEnvironment env = TestMockedEnvironment.GetMockedEnvironment();
+                Assert.True(env.IsOnLinuxConsumption);
+            }
+        }
+
+        [Fact]
+        public void LinuxDedicatedPlan()
+        {
+            using (new TestScopedEnvironmentVariable("WEBSITE_INSTANCE_ID", "wii"))
+            {
+                IEnvironment env = TestMockedEnvironment.GetMockedEnvironment();
+                Assert.False(env.IsOnLinuxConsumption);
+            }
+        }
+
+        [Fact]
+        public void InvalidLinuxPlan()
+        {
+            using (new TestScopedEnvironmentVariable("CONTAINER_NAME", "cn"))
+            using (new TestScopedEnvironmentVariable("WEBSITE_INSTANCE_ID", "wii"))
+            {
+                IEnvironment env = TestMockedEnvironment.GetMockedEnvironment();
+                Assert.False(env.IsOnLinuxConsumption);
+            }
+        }
+
+        [Fact]
+        public void UnsetLinuxPlan()
+        {
+            IEnvironment env = TestMockedEnvironment.GetMockedEnvironment();
+            Assert.False(env.IsOnLinuxConsumption);
+        }
+    }
+}
diff --git a/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs b/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs
index fa2e2805..598d82de 100644
--- a/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs
+++ b/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs
@@ -13,6 +13,7 @@
 
 namespace Kudu.Tests.Services.Infrastructure.Authentication
 {
+    [Collection("MockedEnvironmentVariablesCollection")]
     public class ArmAuthenticationHandlerTests
     {
         private static DefaultHttpContext GetContext()
diff --git a/Kudu.Tests/TestMockedEnvironment.cs b/Kudu.Tests/TestMockedEnvironment.cs
new file mode 100644
index 00000000..653dade2
--- /dev/null
+++ b/Kudu.Tests/TestMockedEnvironment.cs
@@ -0,0 +1,13 @@
+using Kudu.Core;
+using Microsoft.AspNetCore.Http;
+
+namespace Kudu.Tests
+{
+    public class TestMockedEnvironment
+    {
+        public static IEnvironment GetMockedEnvironment(string rootPath = "rootPath", string binPath = "binPath", string repositoryPath = "repositoryPath", string requestId = "requestId", string kuduConsoleFullPath = "kuduConsoleFullPath")
+        {
+            return new Environment(rootPath, binPath, repositoryPath, requestId, kuduConsoleFullPath, new HttpContextAccessor());
+        }
+    }
+}

From 3e0f3973c10c883c3b3df2858f0de8155c02e602 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 13 Jun 2019 18:04:58 -0700
Subject: [PATCH 093/245] [functionapp] Enable server side build in OryxBuilder
 (#45)

* Enable scm build in oryx builder
Fix using directives
Add TODO to remove all standard workers
Address issues in comment
Rename Linux consumption functionapp related function
Internal call does not require https
Update remove all worker URL
Catch error when SCM_RUN_FROM_PACKAGE is not provided

* Add unit tests for Oryx Factory

* Make SetupLinuxConsumptionFunctionAppDeployment(context).Wait() synchronous

* Remove assignment auth

* Move ScmRunFromPackage from AppSettings to Environment Variables

* Null check for pushdeploymentcontroller.cs

* Reenable Authorize

* Address unit tests
---
 Common/Constants.cs                           |   1 +
 Kudu.Contracts/Settings/SettingsKeys.cs       |   1 +
 .../Generator/ExternalCommandBuilder.cs       |   1 +
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 118 ++++++++++++--
 .../Oryx/FunctionAppOryxArguments.cs          |  16 +-
 .../Oryx/FunctionAppSupportedWorkerRuntime.cs |   6 +-
 Kudu.Core/Deployment/Oryx/IOryxArguments.cs   |   2 +-
 ...inuxConsumptionFunctionAppOryxArguments.cs |  28 ++++
 .../Deployment/Oryx/OryxArgumentsFactory.cs   |   9 +-
 Kudu.Core/Helpers/PostDeploymentHelper.cs     |  36 +++++
 Kudu.Core/Infrastructure/FunctionAppHelper.cs |   8 +-
 Kudu.Core/Kudu.Core.csproj                    |   1 +
 .../Deployment/PushDeploymentController.cs    |   4 +-
 .../LinuxConsumptionRouteMiddleware.cs        |  18 +--
 .../Oryx/OryxArgumentsFactoryTests.cs         | 147 ++++++++++++++++++
 .../Core/Helpers/SimpleWebTokenTests.cs       |   2 +
 .../LinuxConsumptionRouteMiddlewareTests.cs   |   5 +-
 .../ArmAuthenticationHandlerTests.cs          |   2 +
 18 files changed, 368 insertions(+), 37 deletions(-)
 create mode 100644 Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
 create mode 100644 Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index d5680466..1c3154f2 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -118,6 +118,7 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string FunctionsPortal = "FunctionsPortal";
         public const string FunctionKeyNewFormat = "~0.7";
         public const string FunctionRunTimeVersion = "FUNCTIONS_EXTENSION_VERSION";
+        public const string ScmRunFromPackage = "SCM_RUN_FROM_PACKAGE";
         public const string WebSiteSku = "WEBSITE_SKU";
         public const string WebSiteElasticScaleEnabled = "WEBSITE_ELASTIC_SCALING_ENABLED";
         public const string DynamicSku = "Dynamic";
diff --git a/Kudu.Contracts/Settings/SettingsKeys.cs b/Kudu.Contracts/Settings/SettingsKeys.cs
index ec002bfa..9ddbf698 100644
--- a/Kudu.Contracts/Settings/SettingsKeys.cs
+++ b/Kudu.Contracts/Settings/SettingsKeys.cs
@@ -49,6 +49,7 @@ public static class SettingsKeys
         // Antares container specific settings
         public const string PlaceholderMode = "WEBSITE_PLACEHOLDER_MODE";
         public const string ContainerReady = "WEBSITE_CONTAINER_READY";
+        public const string WebsiteHostname = "WEBSITE_HOSTNAME";
         public const string AuthEncryptionKey = "WEBSITE_AUTH_ENCRYPTION_KEY";
         public const string ContainerEncryptionKey = "CONTAINER_ENCRYPTION_KEY";
     }
diff --git a/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs b/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
index 3c426f15..c1ded864 100644
--- a/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/ExternalCommandBuilder.cs
@@ -17,6 +17,7 @@ namespace Kudu.Core.Deployment.Generator
     //
     //  ExternalCommandBuilder
     //      CustomBuilder
+    //      OryxBuilder
     //      GeneratorSiteBuilder
     //          BaseBasicBuilder
     //              BasicBuilder
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 2d5e29b9..ba9beb3c 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -1,11 +1,13 @@
-using System.Threading.Tasks;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Net.Http;
+using Microsoft.WindowsAzure.Storage.Blob;
+using Microsoft.WindowsAzure.Storage;
+using Kudu.Core.Infrastructure;
 using Kudu.Core.Helpers;
 using Kudu.Contracts.Settings;
 using Kudu.Core.Deployment.Oryx;
-using Kudu.Core.Infrastructure;
-using System.IO;
-using System;
-using Kudu.Core.Commands;
 
 namespace Kudu.Core.Deployment.Generator
 {
@@ -42,7 +44,7 @@ public override Task Build(DeploymentContext context)
 
                 RunCommand(context, kuduSyncCommand, false, "Oryx-Build: Running kudu sync...");
             }
-           
+
             if (args.RunOryxBuild)
             {
                 PreOryxBuild(context);
@@ -65,6 +67,12 @@ public override Task Build(DeploymentContext context)
                 }
             }
 
+            // Detect if package upload is necessary for server side build
+            if (FunctionAppHelper.HasScmRunFromPackage() && FunctionAppHelper.LooksLikeFunctionApp())
+            {
+                SetupLinuxConsumptionFunctionAppDeployment(context).Wait();
+            }
+
             return Task.CompletedTask;
         }
 
@@ -91,10 +99,17 @@ private void SetupFunctionAppExpressArtifacts(DeploymentContext context)
             FileSystemHelpers.EnsureDirectory(sitePackages);
 
             string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
-            string zipFile = Path.Combine(sitePackages, zipAppName);
+            PackageArtifactFromFolder(context, OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup, sitePackages, zipAppName, zipQuota:3);
+
+            File.WriteAllText(packageNameFile, zipAppName);
+            File.WriteAllText(packagePathFile, sitePackages);
+        }
 
+        private string PackageArtifactFromFolder(DeploymentContext context, string srcDirectory, string destDirectory, string destFilename, int zipQuota = 0)
+        {
             context.Logger.Log("Writing the artifacts to a zip file");
-            var exe = ExternalCommandFactory.BuildExternalCommandExecutable(OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup, sitePackages, context.Logger);
+            string zipFile = Path.Combine(destDirectory, destFilename);
+            var exe = ExternalCommandFactory.BuildExternalCommandExecutable(srcDirectory, destDirectory, context.Logger);
             try
             {
                 exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"zip -r {zipFile} .", String.Empty);
@@ -106,10 +121,33 @@ private void SetupFunctionAppExpressArtifacts(DeploymentContext context)
             }
 
             // Just to be sure that we don't keep adding zip files here
-            DeploymentHelper.PurgeZipsIfNecessary(sitePackages, context.Tracer, totalAllowedZips: 3);
+            if (zipQuota > 0)
+            {
+                DeploymentHelper.PurgeZipsIfNecessary(destDirectory, context.Tracer, totalAllowedZips: zipQuota);
+            }
 
-            File.WriteAllText(packageNameFile, zipAppName);
-            File.WriteAllText(packagePathFile, sitePackages);
+            return zipFile;
+        }
+
+        /// <summary>
+        /// Specifically used for Linux Consumption to support Server Side build scenario
+        /// </summary>
+        /// <param name="context"></param>
+        private async Task SetupLinuxConsumptionFunctionAppDeployment(DeploymentContext context)
+        {
+            string sas = System.Environment.GetEnvironmentVariable(Constants.ScmRunFromPackage);
+            string builtFolder = context.RepositoryPath;
+            string packageFolder = Environment.DeploymentsPath;
+            string packageFileName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+
+            // Package built content from oryx build artifact
+            string filePath = PackageArtifactFromFolder(context, builtFolder, packageFolder, packageFileName);
+
+            // Upload from DeploymentsPath
+            await UploadLinuxConsumptionFunctionAppBuiltContent(context, sas, filePath);
+
+            // Remove Linux consumption plan functionapp workers for the site
+            await RemoveLinuxConsumptionFunctionAppWorkers(context);
         }
 
         //public override void PostBuild(DeploymentContext context)
@@ -118,5 +156,63 @@ private void SetupFunctionAppExpressArtifacts(DeploymentContext context)
         //    context.Logger.Log($"Skipping post build. Project type: {ProjectType}");
         //    FileLogHelper.Log("Completed PostBuild oryx....");
         //}
+
+        private async Task UploadLinuxConsumptionFunctionAppBuiltContent(DeploymentContext context, string sas, string filePath)
+        {
+            context.Logger.Log($"Uploading built content {filePath} -> {sas}");
+
+            // Check if SCM_RUN_FROM_PACKAGE does exist
+            if (string.IsNullOrEmpty(sas))
+            {
+                context.Logger.Log($"Failed to upload because SCM_RUN_FROM_PACKAGE is not provided.");
+                throw new DeploymentFailedException(new ArgumentException("Failed to upload because SAS is empty."));
+            }
+
+            // Parse SAS
+            Uri sasUri = null;
+            if (!Uri.TryCreate(sas, UriKind.Absolute, out sasUri))
+            {
+                context.Logger.Log($"Malformed SAS when uploading built content.");
+                throw new DeploymentFailedException(new ArgumentException("Failed to upload because SAS is malformed."));
+            }
+
+            // Upload blob to Azure Storage
+            CloudBlockBlob blob = new CloudBlockBlob(sasUri);
+            try
+            {
+                await blob.UploadFromFileAsync(filePath);
+            } catch (StorageException se)
+            {
+                context.Logger.Log($"Failed to upload because Azure Storage responds {se.RequestInformation.HttpStatusCode}.");
+                context.Logger.Log(se.Message);
+                throw new DeploymentFailedException(se);
+            }
+        }
+
+        private async Task RemoveLinuxConsumptionFunctionAppWorkers(DeploymentContext context)
+        {
+            string webSiteHostName = System.Environment.GetEnvironmentVariable(SettingsKeys.WebsiteHostname);
+            string sitename = ServerConfiguration.GetApplicationName();
+
+            context.Logger.Log($"Reseting all workers for {webSiteHostName}");
+
+            try
+            {
+                await OperationManager.AttemptAsync(async () =>
+                {
+                    await PostDeploymentHelper.RemoveAllWorkersAsync(webSiteHostName, sitename);
+                }, retries: 3, delayBeforeRetry: 2000);
+            }
+            catch (ArgumentException ae)
+            {
+                context.Logger.Log($"Reset all workers has malformed webSiteHostName or sitename {ae.Message}");
+                throw new DeploymentFailedException(ae);
+            }
+            catch (HttpRequestException hre)
+            {
+                context.Logger.Log($"Reset all workers endpoint responded with {hre.Message}");
+                throw new DeploymentFailedException(hre);
+            }
+        }
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index 85339caf..915db022 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -4,13 +4,13 @@
 
 namespace Kudu.Core.Deployment.Oryx
 {
-    class FunctionAppOryxArguments : IOryxArguments
+    public class FunctionAppOryxArguments : IOryxArguments
     {
         public bool RunOryxBuild { get; set; }
 
         public BuildOptimizationsFlags Flags { get; set; }
 
-        private readonly WorkerRuntime FunctionsWorkerRuntime;
+        protected readonly WorkerRuntime FunctionsWorkerRuntime;
         public bool SkipKuduSync { get; set; }
 
         public FunctionAppOryxArguments()
@@ -23,7 +23,7 @@ public FunctionAppOryxArguments()
             SkipKuduSync = Flags == BuildOptimizationsFlags.UseExpressBuild;
         }
 
-        public string GenerateOryxBuildCommand(DeploymentContext context)
+        public virtual string GenerateOryxBuildCommand(DeploymentContext context)
         {
             StringBuilder args = new StringBuilder();
 
@@ -36,7 +36,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
             return args.ToString();
         }
 
-        private void AddOryxBuildCommand(StringBuilder args, DeploymentContext context, string source, string destination)
+        protected void AddOryxBuildCommand(StringBuilder args, DeploymentContext context, string source, string destination)
         {
             // If it is express build, we don't directly need to write to /home/site/wwwroot
             // So, we build into a different directory to avoid overlap
@@ -55,7 +55,7 @@ private void AddOryxBuildCommand(StringBuilder args, DeploymentContext context,
             OryxArgumentsHelper.AddOryxBuildCommand(args, source, destination);
         }
 
-        private void AddLanguage(StringBuilder args, WorkerRuntime workerRuntime)
+        protected void AddLanguage(StringBuilder args, WorkerRuntime workerRuntime)
         {
             switch (workerRuntime)
             {
@@ -73,7 +73,7 @@ private void AddLanguage(StringBuilder args, WorkerRuntime workerRuntime)
             }
         }
 
-        private void AddLanguageVersion(StringBuilder args, WorkerRuntime workerRuntime)
+        protected void AddLanguageVersion(StringBuilder args, WorkerRuntime workerRuntime)
         {
             var workerVersion = ResolveWorkerRuntimeVersion(FunctionsWorkerRuntime);
             if (!string.IsNullOrEmpty(workerVersion))
@@ -82,7 +82,7 @@ private void AddLanguageVersion(StringBuilder args, WorkerRuntime workerRuntime)
             }
         }
 
-        private void AddBuildOptimizationFlags(StringBuilder args, DeploymentContext context, BuildOptimizationsFlags optimizationFlags)
+        protected void AddBuildOptimizationFlags(StringBuilder args, DeploymentContext context, BuildOptimizationsFlags optimizationFlags)
         {
             switch (Flags)
             {
@@ -99,7 +99,7 @@ private void AddBuildOptimizationFlags(StringBuilder args, DeploymentContext con
             }
         }
 
-        private void AddWorkerRuntimeArgs(StringBuilder args, WorkerRuntime workerRuntime)
+        protected void AddWorkerRuntimeArgs(StringBuilder args, WorkerRuntime workerRuntime)
         {
             switch (workerRuntime)
             {
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs b/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
index c45d5c14..9375cfe8 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
@@ -14,7 +14,11 @@ public class FunctionAppSupportedWorkerRuntime
     {
         public static WorkerRuntime ParseWorkerRuntime(string value)
         {
-            if (value.StartsWith("NODE", StringComparison.OrdinalIgnoreCase))
+            if (string.IsNullOrEmpty(value))
+            {
+                return WorkerRuntime.None;
+            }
+            else if (value.StartsWith("NODE", StringComparison.OrdinalIgnoreCase))
             {
                 return WorkerRuntime.Node;
             }
diff --git a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
index 32c133f4..70c48826 100644
--- a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
@@ -4,7 +4,7 @@
 
 namespace Kudu.Core.Deployment.Oryx
 {
-    interface IOryxArguments
+    public interface IOryxArguments
     {
         bool RunOryxBuild { get; set; }
 
diff --git a/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
new file mode 100644
index 00000000..929aca5a
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    public class LinuxConsumptionFunctionAppOryxArguments : FunctionAppOryxArguments
+    {
+        public LinuxConsumptionFunctionAppOryxArguments() : base()
+        {
+            SkipKuduSync = true;
+            Flags = BuildOptimizationsFlags.Off;
+        }
+
+        public override string GenerateOryxBuildCommand(DeploymentContext context)
+        {
+            StringBuilder args = new StringBuilder();
+
+            base.AddOryxBuildCommand(args, context, source: context.RepositoryPath, destination: context.RepositoryPath);
+            base.AddLanguage(args, base.FunctionsWorkerRuntime);
+            base.AddLanguageVersion(args, base.FunctionsWorkerRuntime);
+            base.AddBuildOptimizationFlags(args, context, Flags);
+            base.AddWorkerRuntimeArgs(args, base.FunctionsWorkerRuntime);
+
+            return args.ToString();
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs b/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
index 1dca6f3e..4d4d5cca 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
@@ -2,13 +2,18 @@
 
 namespace Kudu.Core.Deployment.Oryx
 {
-    class OryxArgumentsFactory
+    public class OryxArgumentsFactory
     {
         public static IOryxArguments CreateOryxArguments()
         {
             if (FunctionAppHelper.LooksLikeFunctionApp())
             {
-                return new FunctionAppOryxArguments();
+                if (FunctionAppHelper.HasScmRunFromPackage())
+                {
+                    return new LinuxConsumptionFunctionAppOryxArguments();
+                } else {
+                    return new FunctionAppOryxArguments();
+                }
             }
             return new AppServiceOryxArguments();
         }
diff --git a/Kudu.Core/Helpers/PostDeploymentHelper.cs b/Kudu.Core/Helpers/PostDeploymentHelper.cs
index 3143358f..c3e102e7 100644
--- a/Kudu.Core/Helpers/PostDeploymentHelper.cs
+++ b/Kudu.Core/Helpers/PostDeploymentHelper.cs
@@ -11,6 +11,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Web;
 using Kudu.Contracts.Settings;
 using Kudu.Core.Deployment;
 using Kudu.Core.Infrastructure;
@@ -348,6 +349,41 @@ public static async Task PerformAutoSwap(string requestId, TraceListener tracer)
             }
         }
 
+        /// <summary>
+        /// Remove all site workers after cloudbuilt content is uploaded
+        /// </summary>
+        /// <param name="websiteHostname">WEBSITE_HOSTNAME</param>
+        /// <param name="sitename">WEBSITE_SITE_NAME</param>
+        /// <exception cref="ArgumentException">Thrown when RemoveAllWorkers url is malformed.</exception>
+        /// <exception cref="HttpRequestException">Thrown when request to RemoveAllWorkers is not OK.</exception>
+        public static async Task RemoveAllWorkersAsync(string websiteHostname, string sitename)
+        {
+            // Generate URL encoded auth token
+            string websiteAuthEncryptionKey = System.Environment.GetEnvironmentVariable(SettingsKeys.AuthEncryptionKey);
+            DateTime expiry = DateTime.UtcNow.AddMinutes(5);
+            string authToken = SimpleWebTokenHelper.CreateToken(expiry, websiteAuthEncryptionKey.ToKeyBytes());
+            string authTokenEncoded = HttpUtility.UrlEncode(authToken);
+
+            // Generate RemoveAllWorker request URI
+            string baseUrl = $"http://{websiteHostname}/operations/removeworker/{sitename}/allStandard?token={authTokenEncoded}";
+            Uri baseUri = null;
+            if (!Uri.TryCreate(baseUrl, UriKind.Absolute, out baseUri))
+            {
+                throw new ArgumentException($"Malformed URI is used in RemoveAllWorkers");
+            }
+            Trace(TraceEventType.Information, "Calling RemoveAllWorkers to refresh the function app");
+
+            // Initiate GET request
+            using (var client = HttpClientFactory())
+            using (var response = await client.GetAsync(baseUri))
+            {
+                response.EnsureSuccessStatusCode();
+                Trace(TraceEventType.Information, "RemoveAllWorkers, statusCode = {0}", response.StatusCode);
+            }
+            
+            return;
+        }
+
         private static void VerifyEnvironments()
         {
             if (string.IsNullOrEmpty(HttpHost))
diff --git a/Kudu.Core/Infrastructure/FunctionAppHelper.cs b/Kudu.Core/Infrastructure/FunctionAppHelper.cs
index 67ee56ab..3a4fe65e 100644
--- a/Kudu.Core/Infrastructure/FunctionAppHelper.cs
+++ b/Kudu.Core/Infrastructure/FunctionAppHelper.cs
@@ -1,4 +1,5 @@
-using System;
+using Kudu.Contracts.Settings;
+using System;
 using System.Linq;
 
 namespace Kudu.Core.Infrastructure
@@ -10,6 +11,11 @@ public static bool LooksLikeFunctionApp()
             return !string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.FunctionRunTimeVersion));
         }
 
+        public static bool HasScmRunFromPackage()
+        {
+            return !string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.ScmRunFromPackage));
+        }
+
         public static bool IsCSharpFunctionFromProjectFile(string projectPath)
         {
             return VsHelper.IncludesAnyReferencePackage(projectPath, "Microsoft.NET.Sdk.Functions");
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index aaeeaedc..d75282c2 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -36,6 +36,7 @@
     <PackageReference Include="NuGet.Protocol" Version="4.8.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
     <PackageReference Include="System.IO.Abstractions" Version="2.1.0.192" />
+    <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
   </ItemGroup>
 
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index d503017c..82a916ca 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -214,8 +214,8 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
             {
                 using (_tracer.Step("Writing zip file to {0}", zipFilePath))
                 {
-                    if (context.Request.ContentType.Contains("multipart/form-data",
-                        StringComparison.OrdinalIgnoreCase))
+                    if (!string.IsNullOrEmpty(context.Request.ContentType) &&
+                        context.Request.ContentType.Contains("multipart/form-data", StringComparison.OrdinalIgnoreCase))
                     {
                         FormValueProvider formModel;
                         using (_tracer.Step("Writing zip file to {0}", zipFilePath))
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
index 1099fef9..432a15d4 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
@@ -20,7 +20,6 @@ public class LinuxConsumptionRouteMiddleware
     {
         private static readonly HashSet<string> Whitelist = new HashSet<string>
         {
-            HomePageRoute,
             "/api/zipdeploy",
             "/admin/instance",
             "/deployments",
@@ -66,7 +65,8 @@ public async Task Invoke(HttpContext context, IAuthorizationService authorizatio
             }
             else
             {
-                context.Request.Host = new HostString(SanitizeScmUrl(context.Request.Headers[HostHeader][0]));
+                context.Request.Host = new HostString(SanitizeScmUrl(
+                    context.Request.Headers[HostHeader].FirstOrDefault()));
             }
 
             if (context.Request.Headers.TryGetValue(ForwardedProtocolHeader, out value))
@@ -74,17 +74,17 @@ public async Task Invoke(HttpContext context, IAuthorizationService authorizatio
                 context.Request.Scheme = value;
             }
 
-            // Step 2: check if the request endpoint is enabled in Linux Consumption
-            if (!IsRouteWhitelisted(context.Request.Path))
+            // Step 2: check if it is homepage route, always return 200
+            if (IsHomePageRoute(context.Request.Path))
             {
-                context.Response.StatusCode = 404;
+                context.Response.StatusCode = 200;
                 return;
             }
 
-            // Step 3: check if it is homepage route, always return 200
-            if (IsHomePageRoute(context.Request.Path))
+            // Step 3: check if the request endpoint is enabled in Linux Consumption
+            if (!IsRouteWhitelisted(context.Request.Path))
             {
-                context.Response.StatusCode = 200;
+                context.Response.StatusCode = 404;
                 return;
             }
 
@@ -116,7 +116,7 @@ private bool IsRouteWhitelisted(PathString routePath)
 
         private bool IsHomePageRoute(PathString routePath)
         {
-            return routePath.ToString() == "/";
+            return routePath.ToString() == HomePageRoute;
         }
 
         private static string SanitizeScmUrl(string malformedUrl)
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
new file mode 100644
index 00000000..82ca3d31
--- /dev/null
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
@@ -0,0 +1,147 @@
+using Kudu.Core.Deployment;
+using Kudu.Core.Deployment.Oryx;
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Kudu.Tests.Core.Deployment.Oryx
+{
+    public class OryxArgumentsFactoryTests
+    {
+        [Fact]
+        public void OryxArgumentShouldBeAppService()
+        {
+            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+            Assert.IsType<AppServiceOryxArguments>(args);
+        }
+
+        [Fact]
+        public void OryxArgumentShouldBeFunctionApp()
+        {
+            using (new TestScopedEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME", "PYTHON"))
+            using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
+            {
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                Assert.IsType<FunctionAppOryxArguments>(args);
+            }
+        }
+
+        [Fact]
+        public void OryxArgumentShouldBeLinuxConsumption()
+        {
+            using (new TestScopedEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME", "PYTHON"))
+            using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
+            using (new TestScopedEnvironmentVariable("SCM_RUN_FROM_PACKAGE", "http://microsoft.com"))
+            {
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                Assert.IsType<LinuxConsumptionFunctionAppOryxArguments>(args);
+            }
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(false, "FUNCTIONS_EXTENSION_VERSION", "~2")]
+        [InlineData(false, "FUNCTIONS_EXTENSION_VERSION", "~2", "SCM_RUN_FROM_PACKAGE", "http://microsoft.com")]
+        [InlineData(true, "FUNCTIONS_EXTENSION_VERSION", "~2", "FUNCTIONS_WORKER_RUNTIME", "PYTHON")]
+        [InlineData(true, "FUNCTIONS_EXTENSION_VERSION", "~2", "SCM_RUN_FROM_PACKAGE", "http://microsoft.com", "FUNCTIONS_WORKER_RUNTIME", "PYTHON")]
+        public void OryxArgumentRunOryxBuild(bool expectedRunOryxBuild, params string[] varargs)
+        {
+            IDictionary<string, string> env = new Dictionary<string, string>();
+            for (int i = 0; i < varargs.Length; i += 2)
+            {
+                env.Add(varargs[i], varargs[i + 1]);
+            }
+
+            using (new TestScopedEnvironmentVariable(env))
+            {
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                Assert.Equal(expectedRunOryxBuild, args.RunOryxBuild);
+            }
+        }
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(false, "FUNCTIONS_EXTENSION_VERSION", "~2")]
+        [InlineData(true, "FUNCTIONS_EXTENSION_VERSION", "~2", "SCM_RUN_FROM_PACKAGE", "http://microsoft.com")]
+        [InlineData(false, "FUNCTIONS_EXTENSION_VERSION", "~2", "FUNCTIONS_WORKER_RUNTIME", "PYTHON")]
+        [InlineData(true, "FUNCTIONS_EXTENSION_VERSION", "~2", "SCM_RUN_FROM_PACKAGE", "http://microsoft.com", "FUNCTIONS_WORKER_RUNTIME", "PYTHON")]
+        public void OryxArgumentSkipKuduSync(bool expectedSkipKuduSync, params string[] varargs)
+        {
+            IDictionary<string, string> env = new Dictionary<string, string>();
+            for (int i = 0; i < varargs.Length; i += 2)
+            {
+                env.Add(varargs[i], varargs[i + 1]);
+            }
+
+            using (new TestScopedEnvironmentVariable(env))
+            {
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                Assert.Equal(expectedSkipKuduSync, args.SkipKuduSync);
+            }
+        }
+
+        [Fact]
+        public void BuildCommandForAppService()
+        {
+            DeploymentContext deploymentContext = new DeploymentContext()
+            {
+                OutputPath = "outputpath"
+            };
+            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+            string command = args.GenerateOryxBuildCommand(deploymentContext);
+            Assert.Equal(@"oryx build outputpath -o outputpath", command);
+        }
+
+        [Fact]
+        public void BuildCommandForFunctionApp()
+        {
+            DeploymentContext deploymentContext = new DeploymentContext()
+            {
+                OutputPath = "outputpath",
+                BuildTempPath = "buildtemppath"
+            };
+
+            using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
+            {
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                string command = args.GenerateOryxBuildCommand(deploymentContext);
+                Assert.Equal(@"oryx build outputpath -o outputpath -i buildtemppath", command);
+            }
+        }
+
+        [Fact]
+        public void BuildCommandForLinuxConsumptionFunctionApp()
+        {
+            DeploymentContext deploymentContext = new DeploymentContext()
+            {
+                RepositoryPath = "repositorypath"
+            };
+
+            using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
+            using (new TestScopedEnvironmentVariable("SCM_RUN_FROM_PACKAGE", "http://microsoft.com"))
+            {
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                string command = args.GenerateOryxBuildCommand(deploymentContext);
+                Assert.Equal(@"oryx build repositorypath -o repositorypath", command);
+            }
+        }
+
+        [Fact]
+        public void BuildCommandForPythonFunctionApp()
+        {
+            DeploymentContext deploymentContext = new DeploymentContext()
+            {
+                OutputPath = "outputpath",
+                BuildTempPath = "buildtemppath"
+            };
+
+            using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
+            using (new TestScopedEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME", "python"))
+            {
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                string command = args.GenerateOryxBuildCommand(deploymentContext);
+                Assert.Equal(@"oryx build outputpath -o outputpath -l python --language-version 3.6 -i buildtemppath -p packagedir=.python_packages\lib\python3.6\site-packages", command);
+            }
+        }
+    }
+}
diff --git a/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs b/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
index 3b9520dc..4a117e03 100644
--- a/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
+++ b/Kudu.Tests/Core/Helpers/SimpleWebTokenTests.cs
@@ -6,6 +6,8 @@
 
 namespace Kudu.Tests.Core.Helpers
 {
+    // The following 'Collection' attribute is used for disabling parallel testing
+    // Some of the tests require changing the system environment variables, which is not thread safe.
     [Collection("MockedEnvironmentVariablesCollection")]
     public class SimpleWebTokenTests
     {
diff --git a/Kudu.Tests/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddlewareTests.cs b/Kudu.Tests/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddlewareTests.cs
index a4f07766..fec7c730 100644
--- a/Kudu.Tests/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddlewareTests.cs
+++ b/Kudu.Tests/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddlewareTests.cs
@@ -30,6 +30,7 @@ public LinuxConsumptionRouteMiddlewareTests()
             _containerEncryptionKey = TestHelpers.GenerateKeyBytes();
             _environmentVariables = new Dictionary<string, string>
             {
+                { Constants.ContainerName, "linux_consumption_container_name" },
                 { SettingsKeys.AuthEncryptionKey, TestHelpers.GenerateKeyHexString(_websiteAuthEncryptionKey) },
                 { SettingsKeys.ContainerEncryptionKey, TestHelpers.GenerateKeyHexString(_containerEncryptionKey) }
             };
@@ -94,14 +95,14 @@ public void UnwhitelistedRouteNotFound()
         }
 
         [Fact]
-        public void HomepageRouteNotFound()
+        public void HomepageRouteFound()
         {
             using (new TestScopedEnvironmentVariable(_environmentVariables))
             {
                 HttpContext httpContext = GenerateHttpContext(DateTime.UtcNow.AddDays(1));
                 httpContext.Request.Path = "/";
                 _middleware.Invoke(httpContext).Wait();
-                Assert.Equal<int>(404, httpContext.Response.StatusCode);
+                Assert.Equal<int>(200, httpContext.Response.StatusCode);
             }
         }
 
diff --git a/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs b/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs
index 598d82de..e3c0655a 100644
--- a/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs
+++ b/Kudu.Tests/Services/Infrastructure/Authentication/ArmAuthenticationHandlerTests.cs
@@ -13,6 +13,8 @@
 
 namespace Kudu.Tests.Services.Infrastructure.Authentication
 {
+    // The following 'Collection' attribute is used for disabling parallel testing
+    // Some of the tests require changing the system environment variables, which is not thread safe.
     [Collection("MockedEnvironmentVariablesCollection")]
     public class ArmAuthenticationHandlerTests
     {

From e18801134f7f5fc4431b6a92b16901ae6b5b890d Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 13 Jun 2019 18:06:29 -0700
Subject: [PATCH 094/245] Refactor WEBSITE_INSTANCE_ID (#56)

---
 Kudu.Core/AllSafeLinuxLock.cs                 | 2 +-
 Kudu.Core/Environment.cs                      | 2 +-
 Kudu.Core/Helpers/PostDeploymentHelper.cs     | 2 +-
 Kudu.Core/Infrastructure/InstanceIdUtility.cs | 2 +-
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Kudu.Core/AllSafeLinuxLock.cs b/Kudu.Core/AllSafeLinuxLock.cs
index 75ac36ad..67bfb49c 100644
--- a/Kudu.Core/AllSafeLinuxLock.cs
+++ b/Kudu.Core/AllSafeLinuxLock.cs
@@ -103,7 +103,7 @@ private static void CreateLockInfoFile(string operationName)
             var lockInfo = new LinuxLockInfo();
             lockInfo.heldByPID = Process.GetCurrentProcess().Id;
             lockInfo.heldByTID = Thread.CurrentThread.ManagedThreadId;
-            lockInfo.heldByWorker = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
+            lockInfo.heldByWorker = System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId);
             lockInfo.heldByOp = operationName;
             lockInfo.lockExpiry = DateTime.UtcNow.AddSeconds(lockTimeout);
             //Console.WriteLine("CreatingLockDir - LockInfoObj : "+lockInfo);
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 6bc5e01f..a18321f0 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -399,7 +399,7 @@ public bool IsOnLinuxConsumption
 
         public static bool IsAzureEnvironment()
         {
-            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID"));
+            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId));
         }
 
         public static bool SkipSslValidation
diff --git a/Kudu.Core/Helpers/PostDeploymentHelper.cs b/Kudu.Core/Helpers/PostDeploymentHelper.cs
index c3e102e7..0b8aa1fa 100644
--- a/Kudu.Core/Helpers/PostDeploymentHelper.cs
+++ b/Kudu.Core/Helpers/PostDeploymentHelper.cs
@@ -91,7 +91,7 @@ private static string WebSiteElasticScaleEnabled
         // WEBSITE_INSTANCE_ID not null or empty
         public static bool IsAzureEnvironment()
         {
-            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID"));
+            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId));
         }
         
         // WEBSITE_HOME_STAMPNAME = waws-prod-bay-001
diff --git a/Kudu.Core/Infrastructure/InstanceIdUtility.cs b/Kudu.Core/Infrastructure/InstanceIdUtility.cs
index 9e73b016..5900100f 100644
--- a/Kudu.Core/Infrastructure/InstanceIdUtility.cs
+++ b/Kudu.Core/Infrastructure/InstanceIdUtility.cs
@@ -26,7 +26,7 @@ private static void EnsureInstanceId()
                 return;
             }
 
-            string instanceId = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
+            string instanceId = System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId);
             if (String.IsNullOrEmpty(instanceId))
             {
                 instanceId = System.Environment.MachineName;
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index ff173812..360e04bb 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -33,7 +33,7 @@
 </script>
 
 @{
-    var workerIdHash = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID");
+    var workerIdHash = System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId);
     var workerIdShortHash = workerIdHash?.Substring(0, 12);
     const string version = Constants.KuduBuild;
     var showLearningBanner = !deploymentManager.GetResults().Any();

From 0b9950de0b909f670dc20b590c941e6663a5bd6e Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Wed, 19 Jun 2019 16:23:10 -0700
Subject: [PATCH 095/245] Do not overwrite user settings in Linux Consumption
 (#58)

---
 .../LinuxConsumptionInstanceAdminController.cs        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
index 4041ebf7..da190b6b 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
@@ -85,8 +85,15 @@ public async Task<IActionResult> AssignAsync([FromBody] EncryptedHostAssignmentC
                     Dictionary<string, string> newSettings = FunctionAppSpecializationHelper.HandleLinuxConsumption(key, value);
                     foreach (KeyValuePair<string, string> newSetting in newSettings)
                     {
-                        System.Environment.SetEnvironmentVariable(newSetting.Key, newSetting.Value);
-                        _settingsManager.SetValue(newSetting.Key, newSetting.Value);
+                        if (System.Environment.GetEnvironmentVariable(newSetting.Key) == null)
+                        {
+                            System.Environment.SetEnvironmentVariable(newSetting.Key, newSetting.Value);
+                        }
+
+                        if (_settingsManager.GetValue(newSetting.Key) == null)
+                        {
+                            _settingsManager.SetValue(newSetting.Key, newSetting.Value);
+                        }
                     }
                 }
             }

From 0bd715341faf0d74293ac24a27ea85b780ef3841 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 20 Jun 2019 10:08:37 -0700
Subject: [PATCH 096/245] Randomized WebSSHProxy port for WebSSH

---
 Common/Constants.cs              | 4 ++++
 Kudu.Services.Web/KuduWebUtil.cs | 5 +++++
 Kudu.Services.Web/Startup.cs     | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 1c3154f2..ac64c16e 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -132,5 +132,9 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string SitePackages = "SitePackages";
         public const string PackageNameTxt = "packagename.txt";
         public const string KuduBuild = "1.0.0.6";
+
+        // WebSSH PORT
+        public const string WebSSHReverseProxyPortEnvVar = "KUDU_WEBSSH_PORT";
+        public const string WebSSHReverseProxyDefaultPort = "3000";
     }
 }
\ No newline at end of file
diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 270c3a34..13432d26 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -537,5 +537,10 @@ internal static IServiceCollection AddLinuxConsumptionAuthorization(this IServic
             services.AddSingleton<IAuthorizationHandler, AuthLevelAuthorizationHandler>();
             return services;
         }
+
+        internal static string GetWebSSHProxyPort()
+        {
+            return System.Environment.GetEnvironmentVariable(Constants.WebSiteSwapSlotName) ?? Constants.WebSSHReverseProxyDefaultPort;
+        }
     }
 }
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 2600b679..596fa834 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -354,7 +354,7 @@ public void Configure(IApplicationBuilder app,
 
             app.UseStaticFiles();
 
-            ProxyRequestIfRelativeUrlMatches(@"/webssh", "http", "127.0.0.1", "3000", app);
+            ProxyRequestIfRelativeUrlMatches(@"/webssh", "http", "127.0.0.1", KuduWebUtil.GetWebSSHProxyPort() , app);
 
             var configuration = app.ApplicationServices.GetRequiredService<IServerConfiguration>();
 

From 529e9694b38c8b58ed209efa96c3296ae4e97ad0 Mon Sep 17 00:00:00 2001
From: Patrick Lee <31744877+patricklee2@users.noreply.github.com>
Date: Wed, 19 Jun 2019 17:25:12 -0700
Subject: [PATCH 097/245] add php oryx build support

---
 .../Deployment/Oryx/AppServiceOryxArguments.cs    | 12 ++++++++++--
 .../Deployment/Oryx/FunctionAppOryxArguments.cs   |  4 ++++
 .../Oryx/FunctionAppSupportedWorkerRuntime.cs     | 10 +++++++++-
 Kudu.Core/Deployment/Oryx/OryxArguments.cs        | 15 +++++++++++----
 Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs   |  1 +
 Kudu.Core/Deployment/Oryx/SupportedLanguages.cs   |  7 ++++++-
 6 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 1e78706a..9e327fc1 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -82,6 +82,9 @@ private void SetLanguageOptions()
                     }
 
                     return;
+
+                case Framework.PHP:
+                    return;
             }
         }
 
@@ -115,7 +118,6 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                 case Framework.NodeJs:
                     // Input/Output
                     OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
-
                     OryxArgumentsHelper.AddLanguage(args, "nodejs");
                     break;
 
@@ -130,6 +132,12 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.OutputPath);
                     OryxArgumentsHelper.AddLanguage(args, "dotnet");
                     break;
+
+                case Framework.PHP:
+                    // Input/Output
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
+                    OryxArgumentsHelper.AddLanguage(args, "php");
+                    break;
             }
 
             // Version
@@ -137,7 +145,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
             {
                 case Framework.None:
                     break;
-
+                case Framework.PHP:
                 case Framework.NodeJs:
                 case Framework.Python:
                     OryxArgumentsHelper.AddLanguageVersion(args, Version);
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index 915db022..edae7556 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -70,6 +70,10 @@ protected void AddLanguage(StringBuilder args, WorkerRuntime workerRuntime)
                 case WorkerRuntime.Python:
                     OryxArgumentsHelper.AddLanguage(args, "python");
                     break;
+
+                case WorkerRuntime.PHP:
+                    OryxArgumentsHelper.AddLanguage(args, "php");
+                    break;
             }
         }
 
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs b/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
index 9375cfe8..513a4b5b 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppSupportedWorkerRuntime.cs
@@ -7,7 +7,8 @@ public enum WorkerRuntime
         None,
         Node,
         Python,
-        DotNet
+        DotNet,
+        PHP
     }
 
     public class FunctionAppSupportedWorkerRuntime
@@ -30,6 +31,10 @@ public static WorkerRuntime ParseWorkerRuntime(string value)
             {
                 return WorkerRuntime.DotNet;
             }
+            else if (value.StartsWith("PHP", StringComparison.OrdinalIgnoreCase))
+            {
+                return WorkerRuntime.PHP;
+            }
 
             return WorkerRuntime.None;
         }
@@ -47,6 +52,9 @@ public static string GetDefaultLanguageVersion(WorkerRuntime workerRuntime)
                 case WorkerRuntime.Python:
                     return OryxBuildConstants.FunctionAppWorkerRuntimeDefaults.Python;
 
+                case WorkerRuntime.PHP:
+                    return OryxBuildConstants.FunctionAppWorkerRuntimeDefaults.PHP;
+
                 default:
                     return "";
             }
diff --git a/Kudu.Core/Deployment/Oryx/OryxArguments.cs b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
index 726a99a2..f356c053 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArguments.cs
@@ -71,6 +71,9 @@ private void SetLanguageOptions()
                     }
 
                     return;
+
+                case Framework.PHP:
+                    return;
             }
         }
 
@@ -103,20 +106,24 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     break;
 
                 case Framework.NodeJs:
-                    args.AppendFormat(" -l nodejs");
+                    args.AppendFormat(" --platform nodejs");
                     break;
 
                 case Framework.Python:
-                    args.AppendFormat(" -l python");
+                    args.AppendFormat(" --platform python");
                     break;
 
                 case Framework.DotNETCore:
-                    args.AppendFormat(" -l dotnet");
+                    args.AppendFormat(" --platform dotnet");
+                    break;
+
+                case Framework.PHP:
+                    args.AppendFormat(" --platform php");
                     break;
             }
 
             // Version
-            args.AppendFormat(" --language-version {0}", Version);
+            args.AppendFormat(" --platform-version {0}", Version);
 
             // Build Flags
             switch (Flags)
diff --git a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
index 3ba25df7..30d4e153 100644
--- a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
@@ -23,6 +23,7 @@ internal static class FunctionAppWorkerRuntimeDefaults
             public static readonly string Node = "8.15";
             public static readonly string Python = "3.6";
             public static readonly string Dotnet = "2.2";
+            public static readonly string PHP = "7.3";
         }
 
         internal static class FunctionAppBuildSettings
diff --git a/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs b/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
index 60313767..8d08f961 100644
--- a/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
+++ b/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
@@ -9,7 +9,8 @@ public enum Framework
         None,
         NodeJs,
         Python,
-        DotNETCore
+        DotNETCore,
+        PHP
     }
 
     public class SupportedFrameworks
@@ -28,6 +29,10 @@ public static Framework ParseLanguage(string value)
             {
                 return Framework.DotNETCore;
             }
+            else if (value.StartsWith("PHP", StringComparison.OrdinalIgnoreCase))
+            {
+                return Framework.PHP;
+            }
 
             return Framework.None;
         }

From 259adbf197fe9eb46d9d6d50ca76284be7cd2367 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 21 Jun 2019 13:43:28 -0700
Subject: [PATCH 098/245] Added benv to dotnet version for KuduConsole

---
 Kudu.Services.Web/KuduWebUtil.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 270c3a34..498e42e5 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -213,11 +213,20 @@ internal static void MigrateToNetCorePatch(IEnvironment environment)
             var gitPostReceiveHookFile = Path.Combine(repositoryPath, ".git", "hooks", "post-receive");
             if (FileSystemHelpers.FileExists(gitPostReceiveHookFile))
             {
-                var fileText = "";
-                if ((fileText = FileSystemHelpers.ReadAllText(gitPostReceiveHookFile)).Contains("/usr/bin/mono"))
+                var fileText = FileSystemHelpers.ReadAllText(gitPostReceiveHookFile);
+                var isRunningOnAzure = System.Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID") != null;
+                if (fileText.Contains("/usr/bin/mono"))
                 {
-                    FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("/usr/bin/mono", "dotnet"));
+                    if(isRunningOnAzure)
+                    {
+                        FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("/usr/bin/mono", "benv dotnet=2.2 dotnet"));
+                    }
                 }
+                else if(!fileText.Contains("benv") && fileText.Contains("dotnet") && isRunningOnAzure)
+                {
+                    FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("dotnet", "benv dotnet=2.2 dotnet"));
+                }
+                
             }
 
             if (FileSystemHelpers.DirectoryExists(Path.Combine(environment.RootPath, ".mono"))

From b7e4dafd1ba4809abe632611f22ccde257631e9c Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 21 Jun 2019 15:54:06 -0700
Subject: [PATCH 099/245] Added benv to kudu command env (#63)

---
 Kudu.Core/SourceControl/Git/KnownEnvironment.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/SourceControl/Git/KnownEnvironment.cs b/Kudu.Core/SourceControl/Git/KnownEnvironment.cs
index 26b2a9af..1cdfdf5a 100644
--- a/Kudu.Core/SourceControl/Git/KnownEnvironment.cs
+++ b/Kudu.Core/SourceControl/Git/KnownEnvironment.cs
@@ -14,7 +14,7 @@ internal static class KnownEnvironment
         // Command to launch the post receive hook
         // CORE NOTE modified the script to run "dotnet," assuming EXEPATH points
         // to a framework-dependent Core app.
-        public static string KUDUCOMMAND = "dotnet \"$" + EXEPATH + "\" " +
+        public static string KUDUCOMMAND = "benv dotnet=2.2 dotnet \"$" + EXEPATH + "\" " +
                                            "\"$" + APPPATH + "\" " +
                                            "\"$" + MSBUILD + "\" " +
                                            "\"$" + DEPLOYER + "\"";

From 373a9315692008baa14b19adcdc49c31742de93c Mon Sep 17 00:00:00 2001
From: Maheer Iqbal <42051041+maiqbal11@users.noreply.github.com>
Date: Thu, 27 Jun 2019 11:03:03 -0700
Subject: [PATCH 100/245] [functionapp] Logging generator for linux containers
 (#53)

* Logging generator for linux containers

* Addressing CR comments

* Add level to logs

* Add default value for deployment duration

* Remove duplicated container name constant
---
 Common/Constants.cs                           |   5 +-
 Kudu.Core/Environment.cs                      |  26 +++
 .../Helpers/PostDeploymentTraceListener.cs    |   2 +-
 Kudu.Core/Tracing/Analytics.cs                |  14 +-
 .../Tracing/DefaultKuduEventGenerator.cs      |  49 ++++++
 Kudu.Core/Tracing/ETWTracer.cs                |   2 +-
 Kudu.Core/Tracing/IKuduEventGenerator.cs      |  24 +++
 Kudu.Core/Tracing/KuduEvent.cs                |  56 +++++++
 Kudu.Core/Tracing/KuduEventGenerator.cs       |  27 +++
 .../Tracing/LinuxContainerEventGenerator.cs   | 158 ++++++++++++++++++
 Kudu.Services.Web/Tracing/TraceMiddleware.cs  |   8 +-
 11 files changed, 357 insertions(+), 14 deletions(-)
 create mode 100644 Kudu.Core/Tracing/DefaultKuduEventGenerator.cs
 create mode 100644 Kudu.Core/Tracing/IKuduEventGenerator.cs
 create mode 100644 Kudu.Core/Tracing/KuduEvent.cs
 create mode 100644 Kudu.Core/Tracing/KuduEventGenerator.cs
 create mode 100644 Kudu.Core/Tracing/LinuxContainerEventGenerator.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index ac64c16e..d9ba423a 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -133,8 +133,11 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string PackageNameTxt = "packagename.txt";
         public const string KuduBuild = "1.0.0.6";
 
-        // WebSSH PORT
         public const string WebSSHReverseProxyPortEnvVar = "KUDU_WEBSSH_PORT";
         public const string WebSSHReverseProxyDefaultPort = "3000";
+
+        public const string LinuxLogEventStreamName = "MS_KUDU_LOGS";
+        public const string WebSiteHomeStampName = "WEBSITE_HOME_STAMPNAME";
+        public const string WebSiteStampDeploymentId = "WEBSITE_STAMP_DEPLOYMENT_ID";
     }
 }
\ No newline at end of file
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index a18321f0..625d9889 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -10,6 +10,7 @@
 using Microsoft.Win32;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
+using Kudu.Core.Settings;
 
 namespace Kudu.Core
 {
@@ -430,6 +431,31 @@ public static bool SkipSslValidation
             }
         }
 
+
+        public static string ContainerName
+        {
+            get
+            {
+                return System.Environment.GetEnvironmentVariable(Constants.ContainerName)?.ToLowerInvariant();
+            }
+        }
+
+        public static string StampName
+        {
+            get
+            {
+                return System.Environment.GetEnvironmentVariable(Constants.WebSiteHomeStampName)?.ToLowerInvariant();
+            }
+        }
+
+        public static string TenantId
+        {
+            get
+            {
+                return System.Environment.GetEnvironmentVariable(Constants.WebSiteStampDeploymentId)?.ToLowerInvariant();
+            }
+        }
+
         public static string GetFreeSpaceHtml(string path)
         {
             try
diff --git a/Kudu.Core/Helpers/PostDeploymentTraceListener.cs b/Kudu.Core/Helpers/PostDeploymentTraceListener.cs
index 96395293..0386aeef 100644
--- a/Kudu.Core/Helpers/PostDeploymentTraceListener.cs
+++ b/Kudu.Core/Helpers/PostDeploymentTraceListener.cs
@@ -24,7 +24,7 @@ public override void TraceEvent(TraceEventCache eventCache, string source, Trace
             {
                 _logger.Log(format, args);
 
-                KuduEventSource.Log.GenericEvent(
+                KuduEventGenerator.Log().GenericEvent(
                     ServerConfiguration.GetApplicationName(),
                     string.Format(format, args),
                     System.Environment.GetEnvironmentVariable("x-ms-request-id") ?? string.Empty,
diff --git a/Kudu.Core/Tracing/Analytics.cs b/Kudu.Core/Tracing/Analytics.cs
index cd136568..4136e0b2 100644
--- a/Kudu.Core/Tracing/Analytics.cs
+++ b/Kudu.Core/Tracing/Analytics.cs
@@ -23,7 +23,7 @@ public Analytics(IDeploymentSettingsManager settings, IServerConfiguration serve
 
         public void ProjectDeployed(string projectType, string result, string error, long deploymentDurationInMilliseconds, string siteMode, string vsProjectId = "")
         {
-            KuduEventSource.Log.ProjectDeployed(
+            KuduEventGenerator.Log().ProjectDeployed(
                 _serverConfiguration.ApplicationName,
                 NullToEmptyString(projectType),
                 NullToEmptyString(result),
@@ -36,7 +36,7 @@ public void ProjectDeployed(string projectType, string result, string error, lon
 
         public void JobStarted(string jobName, string scriptExtension, string jobType, string siteMode, string error, string trigger)
         {
-            KuduEventSource.Log.WebJobStarted(
+            KuduEventGenerator.Log().WebJobStarted(
                 _serverConfiguration.ApplicationName,
                 NullToEmptyString(jobName),
                 NullToEmptyString(scriptExtension),
@@ -48,7 +48,7 @@ public void JobStarted(string jobName, string scriptExtension, string jobType, s
 
         public void JobEvent(string jobName, string message, string jobType, string error)
         {
-            KuduEventSource.Log.WebJobEvent(
+            KuduEventGenerator.Log().WebJobEvent(
                 _serverConfiguration.ApplicationName,
                 NullToEmptyString(jobName),
                 NullToEmptyString(message),
@@ -66,7 +66,7 @@ public void UnexpectedException(Exception exception, bool trace = true, string m
                     return;
                 }
 
-                KuduEventSource.Log.KuduException(
+                KuduEventGenerator.Log().KuduException(
                     _serverConfiguration.ApplicationName,
                     string.Empty,
                     string.Empty,
@@ -86,7 +86,7 @@ public void UnexpectedException(Exception ex, string method, string path, string
                     return;
                 }
 
-                KuduEventSource.Log.KuduException(
+                KuduEventGenerator.Log().KuduException(
                     _serverConfiguration.ApplicationName,
                     NullToEmptyString(method),
                     NullToEmptyString(path),
@@ -106,7 +106,7 @@ public void DeprecatedApiUsed(string route, string userAgent, string method, str
                 return;
             }
 
-            KuduEventSource.Log.DeprecatedApiUsed(
+            KuduEventGenerator.Log().DeprecatedApiUsed(
                 _serverConfiguration.ApplicationName,
                 NullToEmptyString(route),
                 NullToEmptyString(userAgent),
@@ -118,7 +118,7 @@ public void DeprecatedApiUsed(string route, string userAgent, string method, str
 
         public void SiteExtensionEvent(string method, string path, string result, string deploymentDurationInMilliseconds, string message)
         {
-            KuduEventSource.Log.KuduSiteExtensionEvent(
+            KuduEventGenerator.Log().KuduSiteExtensionEvent(
                 _serverConfiguration.ApplicationName,
                 NullToEmptyString(method),
                 NullToEmptyString(path),
diff --git a/Kudu.Core/Tracing/DefaultKuduEventGenerator.cs b/Kudu.Core/Tracing/DefaultKuduEventGenerator.cs
new file mode 100644
index 00000000..5136cb63
--- /dev/null
+++ b/Kudu.Core/Tracing/DefaultKuduEventGenerator.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Tracing
+{
+    class DefaultKuduEventGenerator : IKuduEventGenerator
+    {
+        public void ProjectDeployed(string siteName, string projectType, string result, string error, long deploymentDurationInMilliseconds, string siteMode, string scmType, string vsProjectId)
+        {
+            KuduEventSource.Log.ProjectDeployed(siteName, projectType, result, error, deploymentDurationInMilliseconds, siteMode, scmType, vsProjectId);
+        }
+
+        public void WebJobStarted(string siteName, string jobName, string scriptExtension, string jobType, string siteMode, string error, string trigger)
+        {
+            KuduEventSource.Log.WebJobStarted(siteName, jobName, scriptExtension, jobType, siteMode, error, trigger);
+        }
+
+        public void KuduException(string siteName, string method, string path, string result, string Message, string exception)
+        {
+            KuduEventSource.Log.KuduException(siteName, method, path, result, Message, exception);
+        }
+
+        public void DeprecatedApiUsed(string siteName, string route, string userAgent, string method, string path)
+        {
+            KuduEventSource.Log.DeprecatedApiUsed(siteName, route, userAgent, method, path);
+        }
+        
+        public void KuduSiteExtensionEvent(string siteName, string method, string path, string result, string deploymentDurationInMilliseconds, string Message)
+        {
+            KuduEventSource.Log.KuduSiteExtensionEvent(siteName, method, path, result, deploymentDurationInMilliseconds, Message);
+        }
+
+        public void WebJobEvent(string siteName, string jobName, string Message, string jobType, string error)
+        {
+            KuduEventSource.Log.WebJobEvent(siteName, jobName, Message, jobType, error);
+        }
+
+        public void GenericEvent(string siteName, string Message, string requestId, string scmType, string siteMode, string buildVersion)
+        {
+            KuduEventSource.Log.GenericEvent(siteName, Message, requestId, scmType, siteMode, buildVersion);
+        }
+
+        public void ApiEvent(string siteName, string Message, string address, string verb, string requestId, int statusCode, long latencyInMilliseconds, string userAgent)
+        {
+            KuduEventSource.Log.ApiEvent(siteName, Message, address, verb, requestId, statusCode, latencyInMilliseconds, userAgent);
+        }
+    }
+}
diff --git a/Kudu.Core/Tracing/ETWTracer.cs b/Kudu.Core/Tracing/ETWTracer.cs
index 81b579b7..604de28c 100644
--- a/Kudu.Core/Tracing/ETWTracer.cs
+++ b/Kudu.Core/Tracing/ETWTracer.cs
@@ -76,7 +76,7 @@ public void Trace(string message, IDictionary<string, string> attributes)
                 strb.AppendFormat("{0}=\"{1}\" ", attrib.Key, attrib.Value);
             }
 
-            KuduEventSource.Log.GenericEvent(ServerConfiguration.GetApplicationName(),
+            KuduEventGenerator.Log().GenericEvent(ServerConfiguration.GetApplicationName(),
                                          strb.ToString(),
                                          _requestId,
                                          string.Empty,
diff --git a/Kudu.Core/Tracing/IKuduEventGenerator.cs b/Kudu.Core/Tracing/IKuduEventGenerator.cs
new file mode 100644
index 00000000..371b12d0
--- /dev/null
+++ b/Kudu.Core/Tracing/IKuduEventGenerator.cs
@@ -0,0 +1,24 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+
+namespace Kudu.Core.Tracing
+{
+    public interface IKuduEventGenerator
+    {
+        void ProjectDeployed(string siteName, string projectType, string result, string error, long deploymentDurationInMilliseconds, string siteMode, string scmType, string vsProjectId);
+
+        void WebJobStarted(string siteName, string jobName, string scriptExtension, string jobType, string siteMode, string error, string trigger);
+
+        void KuduException(string siteName, string method, string path, string result, string Message, string exception);
+
+        void DeprecatedApiUsed(string siteName, string route, string userAgent, string method, string path);
+
+        void KuduSiteExtensionEvent(string siteName, string method, string path, string result, string deploymentDurationInMilliseconds, string Message);
+
+        void WebJobEvent(string siteName, string jobName, string Message, string jobType, string error);
+
+        void GenericEvent(string siteName, string Message, string requestId, string scmType, string siteMode, string buildVersion);
+
+        void ApiEvent(string siteName, string Message, string address, string verb, string requestId, int statusCode, long latencyInMilliseconds, string userAgent);
+    }
+}
diff --git a/Kudu.Core/Tracing/KuduEvent.cs b/Kudu.Core/Tracing/KuduEvent.cs
new file mode 100644
index 00000000..d30e147a
--- /dev/null
+++ b/Kudu.Core/Tracing/KuduEvent.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Text;
+
+namespace Kudu.Core.Tracing
+{
+    class KuduEvent
+    {
+        public int level = (int)EventLevel.Informational;
+        public string siteName = string.Empty;
+        public string projectType = string.Empty;
+        public string result = string.Empty;
+        public string error = string.Empty;
+        public long deploymentDurationInMilliseconds = 0;
+        public string siteMode = string.Empty;
+        public string scmType = string.Empty;
+        public string vsProjectId = string.Empty;
+        public string jobName = string.Empty;
+        public string scriptExtension = string.Empty;
+        public string jobType = string.Empty;
+        public string trigger = string.Empty;
+        public string method = string.Empty;
+        public string path = string.Empty;
+        public string Message = string.Empty;
+        public string exception = string.Empty;
+        public string route = string.Empty;
+        public string userAgent = string.Empty;
+        public string requestId = string.Empty;
+        public string buildVersion = Constants.KuduBuild;
+        public string address = string.Empty;
+        public string verb = string.Empty;
+        public int statusCode = 0;
+        public long latencyInMilliseconds = 0;
+
+        public override string ToString()
+        {
+            return $"{level},{siteName},{projectType},{result},{NormalizeString(error)},{deploymentDurationInMilliseconds},{siteMode},{scmType},{vsProjectId}," +
+                $"{jobName},{scriptExtension},{jobType},{trigger},{method},{path},{NormalizeString(Message)},{NormalizeString(exception)}," +
+                $"{route},{userAgent},{requestId},{buildVersion},{address},{verb},{statusCode},{latencyInMilliseconds}";
+        }
+
+        private string NormalizeString(string value)
+        {
+            // need to remove newlines for csv output
+            value = value.Replace(System.Environment.NewLine, " ");
+
+            // Wrap string literals in enclosing quotes
+            // For string columns that may contain quotes and/or
+            // our delimiter ',', before writing the value we
+            // enclose in quotes. This allows us to define matching
+            // groups based on quotes for these values.
+            return $"\"{value}\"";
+        }
+    }
+}
diff --git a/Kudu.Core/Tracing/KuduEventGenerator.cs b/Kudu.Core/Tracing/KuduEventGenerator.cs
new file mode 100644
index 00000000..a2d8b198
--- /dev/null
+++ b/Kudu.Core/Tracing/KuduEventGenerator.cs
@@ -0,0 +1,27 @@
+namespace Kudu.Core.Tracing
+{
+    public class KuduEventGenerator
+    {
+        private static IKuduEventGenerator _eventGenerator = null;
+
+        public static IKuduEventGenerator Log()
+        {
+            bool isLinuxContainer = !string.IsNullOrEmpty(Environment.ContainerName);
+            if (isLinuxContainer)
+            {
+                if (_eventGenerator == null)
+                {
+                    _eventGenerator = new LinuxContainerEventGenerator();
+                }            
+            }
+            else
+            {
+                if (_eventGenerator == null)
+                {
+                    _eventGenerator = new DefaultKuduEventGenerator();
+                }
+            }
+            return _eventGenerator;
+        }
+    }
+}
diff --git a/Kudu.Core/Tracing/LinuxContainerEventGenerator.cs b/Kudu.Core/Tracing/LinuxContainerEventGenerator.cs
new file mode 100644
index 00000000..235c8eef
--- /dev/null
+++ b/Kudu.Core/Tracing/LinuxContainerEventGenerator.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Diagnostics.Tracing;
+using System.IO;
+using Kudu.Core.Settings;
+
+namespace Kudu.Core.Tracing
+{
+    class LinuxContainerEventGenerator : IKuduEventGenerator
+    {
+        private readonly Action<string> _writeEvent;
+        private readonly bool _consoleEnabled = true;
+
+        public LinuxContainerEventGenerator()
+        {
+            _writeEvent = ConsoleWriter;
+        }
+
+        public void ProjectDeployed(string siteName, string projectType, string result, string error, long deploymentDurationInMilliseconds, string siteMode, string scmType, string vsProjectId)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                projectType = projectType,
+                result = result,
+                error = error,
+                deploymentDurationInMilliseconds = deploymentDurationInMilliseconds,
+                siteMode = siteMode,
+                scmType = scmType,
+                vsProjectId = vsProjectId
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void WebJobStarted(string siteName, string jobName, string scriptExtension, string jobType, string siteMode, string error, string trigger)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                jobName = jobName,
+                scriptExtension = scriptExtension,
+                jobType = jobType,
+                siteMode = siteMode, 
+                error = error,
+                trigger = trigger
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void KuduException(string siteName, string method, string path, string result, string Message, string exception)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                level = (int)EventLevel.Warning,
+                siteName = siteName,
+                method = method,
+                path = path,
+                result = result,
+                Message = Message,
+                exception = exception
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void DeprecatedApiUsed(string siteName, string route, string userAgent, string method, string path)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                level = (int)EventLevel.Warning,
+                siteName = siteName,
+                route = route,
+                userAgent = userAgent,
+                method = method,
+                path = path
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void KuduSiteExtensionEvent(string siteName, string method, string path, string result, string deploymentDurationInMilliseconds, string Message)
+        {
+            long duration = 0;
+            long.TryParse(deploymentDurationInMilliseconds, out duration);
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                method = method,
+                path = path,
+                result = result,
+                deploymentDurationInMilliseconds = duration,
+                Message = Message
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void WebJobEvent(string siteName, string jobName, string Message, string jobType, string error)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                jobName = jobName,
+                Message = Message,
+                jobType = jobType, 
+                error = error
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void GenericEvent(string siteName, string Message, string requestId, string scmType, string siteMode, string buildVersion)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                Message = Message,
+                requestId = requestId, 
+                scmType = scmType, 
+                siteMode = siteMode, 
+                buildVersion = buildVersion
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void ApiEvent(string siteName, string Message, string address, string verb, string requestId, int statusCode, long latencyInMilliseconds, string userAgent)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                Message = Message,
+                address = address, 
+                verb = verb, 
+                requestId = requestId, 
+                statusCode = statusCode,
+                latencyInMilliseconds = latencyInMilliseconds, 
+                userAgent = userAgent
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void LogKuduTraceEvent(KuduEvent kuduEvent)
+        {
+            _writeEvent($"{Constants.LinuxLogEventStreamName} {kuduEvent.ToString()},{Environment.StampName},{Environment.TenantId},{Environment.ContainerName}");
+        }
+
+        private void ConsoleWriter(string evt)
+        {
+            if (_consoleEnabled)
+            {
+                Console.WriteLine(evt);
+            }
+        }
+    }
+}
diff --git a/Kudu.Services.Web/Tracing/TraceMiddleware.cs b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
index 865e8d0d..cc713da2 100644
--- a/Kudu.Services.Web/Tracing/TraceMiddleware.cs
+++ b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
@@ -215,7 +215,7 @@ private static void LogEndRequest(HttpContext httpContext)
                 var requestId = (string) httpContext.Items[Constants.RequestIdHeader];
                 var requestTime = (DateTime) httpContext.Items[Constants.RequestDateTimeUtc];
                 var latencyInMilliseconds = (long) (DateTime.UtcNow - requestTime).TotalMilliseconds;
-                KuduEventSource.Log.ApiEvent(
+                KuduEventGenerator.Log().ApiEvent(
                     ServerConfiguration.GetApplicationName(),
                     "OnEndRequest",
                     GetRawUrl(request),
@@ -305,7 +305,7 @@ private static ITracer TraceStartup(HttpContext httpContext)
                     var requestId = (string) httpContext.Items[Constants.RequestIdHeader];
                     var assembly = Assembly.GetExecutingAssembly();
                     var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
-                    KuduEventSource.Log.GenericEvent(
+                    KuduEventGenerator.Log().GenericEvent(
                         ServerConfiguration.GetApplicationName(),
                         string.Format("StartupRequest pid:{0}, domain:{1}", Process.GetCurrentProcess().Id,
                             AppDomain.CurrentDomain.Id),
@@ -327,7 +327,7 @@ private static void TraceHeartbeat()
 
             OperationManager.SafeExecute(() =>
             {
-                KuduEventSource.Log.GenericEvent(
+                KuduEventGenerator.Log().GenericEvent(
                     ServerConfiguration.GetApplicationName(),
                     string.Format("Heartbeat pid:{0}, domain:{1}", Process.GetCurrentProcess().Id,
                         AppDomain.CurrentDomain.Id),
@@ -346,7 +346,7 @@ private static void LogBeginRequest(HttpContext httpContext)
                 var requestId = request.GetRequestId() ?? Guid.NewGuid().ToString();
                 httpContext.Items[Constants.RequestIdHeader] = requestId;
                 httpContext.Items[Constants.RequestDateTimeUtc] = DateTime.UtcNow;
-                KuduEventSource.Log.ApiEvent(
+                KuduEventGenerator.Log().ApiEvent(
                     ServerConfiguration.GetApplicationName(),
                     "OnBeginRequest",
                     GetRawUrl(request),

From f47dcde13de58c9642f05a07941ac0098960b033 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Thu, 27 Jun 2019 11:12:06 -0700
Subject: [PATCH 101/245] Support squashfs in KuduLite oryx build (#57)

Address CR issues
Rename file to build artifact
---
 Kudu.Core/Deployment/DeploymentHelper.cs      | 10 ++--
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 48 ++++++++++++++-----
 .../Deployment/Oryx/BuildArtifactType.cs      | 11 +++++
 .../Deployment/Oryx/OryxBuildConstants.cs     |  4 ++
 .../Deployment/PushDeploymentController.cs    |  5 +-
 5 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 Kudu.Core/Deployment/Oryx/BuildArtifactType.cs

diff --git a/Kudu.Core/Deployment/DeploymentHelper.cs b/Kudu.Core/Deployment/DeploymentHelper.cs
index c29ed21f..46828420 100644
--- a/Kudu.Core/Deployment/DeploymentHelper.cs
+++ b/Kudu.Core/Deployment/DeploymentHelper.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using Kudu.Contracts.Tracing;
+using Kudu.Core.Deployment.Oryx;
 using Kudu.Core.Infrastructure;
 using Kudu.Core.SourceControl;
 using Kudu.Core.Tracing;
@@ -52,13 +53,14 @@ public static bool IsDefaultWebRootContent(string webroot)
             return false;
         }
         
-        public static void PurgeZipsIfNecessary(string sitePackagesPath, ITracer tracer, int totalAllowedZips)
+        public static void PurgeBuildArtifactsIfNecessary(string sitePackagesPath, BuildArtifactType fileExtension, ITracer tracer, int totalAllowedFiles)
         {
-            IEnumerable<string> zipFiles = FileSystemHelpers.GetFiles(sitePackagesPath, "*.zip");
-            if (zipFiles.Count() > totalAllowedZips)
+            string extension = fileExtension.ToString().ToLowerInvariant();
+            IEnumerable<string> fileNames = FileSystemHelpers.GetFiles(sitePackagesPath, $"*.{extension}");
+            if (fileNames.Count() > totalAllowedFiles)
             {
                 // Order the files in descending order of the modified date and remove the last (N - allowed zip files).
-                var fileNamesToDelete = zipFiles.OrderByDescending(fileName => FileSystemHelpers.GetLastWriteTimeUtc(fileName)).Skip(totalAllowedZips);
+                var fileNamesToDelete = fileNames.OrderByDescending(fileName => FileSystemHelpers.GetLastWriteTimeUtc(fileName)).Skip(totalAllowedFiles);
                 foreach (var fileName in fileNamesToDelete)
                 {
                     using (tracer.Step("Deleting outdated zip file {0}", fileName))
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index ba9beb3c..636f5efe 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -48,7 +48,7 @@ public override Task Build(DeploymentContext context)
             if (args.RunOryxBuild)
             {
                 PreOryxBuild(context);
-                
+
                 string buildCommand = args.GenerateOryxBuildCommand(context);
                 RunCommand(context, buildCommand, false, "Running oryx build...");
 
@@ -99,20 +99,41 @@ private void SetupFunctionAppExpressArtifacts(DeploymentContext context)
             FileSystemHelpers.EnsureDirectory(sitePackages);
 
             string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
-            PackageArtifactFromFolder(context, OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup, sitePackages, zipAppName, zipQuota:3);
+            PackageArtifactFromFolder(context, OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup,
+                sitePackages, zipAppName, BuildArtifactType.Zip, OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildMaxFiles);
 
             File.WriteAllText(packageNameFile, zipAppName);
             File.WriteAllText(packagePathFile, sitePackages);
         }
 
-        private string PackageArtifactFromFolder(DeploymentContext context, string srcDirectory, string destDirectory, string destFilename, int zipQuota = 0)
+        /// <summary>
+        /// Package every files and sub directories from a source folder
+        /// </summary>
+        /// <param name="context">The deployment context in current scope</param>
+        /// <param name="srcDirectory">The source directory to be packed</param>
+        /// <param name="artifactDirectory">The destination directory to eject the build artifact</param>
+        /// <param name="artifactFilename">The filename of the build artifact</param>
+        /// <param name="artifactType">The method for packing the artifact</param>
+        /// <param name="numBuildArtifacts">The number of temporary artifacts should be hold in the destination directory</param>
+        /// <returns></returns>
+        private string PackageArtifactFromFolder(DeploymentContext context, string srcDirectory, string artifactDirectory, string artifactFilename, BuildArtifactType artifactType, int numBuildArtifacts = 0)
         {
-            context.Logger.Log("Writing the artifacts to a zip file");
-            string zipFile = Path.Combine(destDirectory, destFilename);
-            var exe = ExternalCommandFactory.BuildExternalCommandExecutable(srcDirectory, destDirectory, context.Logger);
+            context.Logger.Log($"Writing the artifacts to a {artifactType.ToString()} file");
+            string file = Path.Combine(artifactDirectory, artifactFilename);
+            var exe = ExternalCommandFactory.BuildExternalCommandExecutable(srcDirectory, artifactDirectory, context.Logger);
             try
             {
-                exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"zip -r {zipFile} .", String.Empty);
+                switch(artifactType)
+                {
+                    case BuildArtifactType.Zip:
+                        exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"zip -r {file} .");
+                        break;
+                    case BuildArtifactType.Squashfs:
+                        exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"mksquashfs . {file} -noappend");
+                        break;
+                    default:
+                        throw new ArgumentException($"Received unknown file extension {artifactType.ToString()}");
+                }
             }
             catch (Exception)
             {
@@ -120,13 +141,13 @@ private string PackageArtifactFromFolder(DeploymentContext context, string srcDi
                 throw;
             }
 
-            // Just to be sure that we don't keep adding zip files here
-            if (zipQuota > 0)
+            // Just to be sure that we don't keep adding build artifacts here
+            if (numBuildArtifacts > 0)
             {
-                DeploymentHelper.PurgeZipsIfNecessary(destDirectory, context.Tracer, totalAllowedZips: zipQuota);
+                DeploymentHelper.PurgeBuildArtifactsIfNecessary(artifactDirectory, artifactType, context.Tracer, numBuildArtifacts);
             }
 
-            return zipFile;
+            return file;
         }
 
         /// <summary>
@@ -138,10 +159,11 @@ private async Task SetupLinuxConsumptionFunctionAppDeployment(DeploymentContext
             string sas = System.Environment.GetEnvironmentVariable(Constants.ScmRunFromPackage);
             string builtFolder = context.RepositoryPath;
             string packageFolder = Environment.DeploymentsPath;
-            string packageFileName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+            string packageFileName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.squashfs";
 
             // Package built content from oryx build artifact
-            string filePath = PackageArtifactFromFolder(context, builtFolder, packageFolder, packageFileName);
+            string filePath = PackageArtifactFromFolder(context, builtFolder, packageFolder, packageFileName, BuildArtifactType.Squashfs, 
+                OryxBuildConstants.FunctionAppBuildSettings.ConsumptionBuildMaxFiles);
 
             // Upload from DeploymentsPath
             await UploadLinuxConsumptionFunctionAppBuiltContent(context, sas, filePath);
diff --git a/Kudu.Core/Deployment/Oryx/BuildArtifactType.cs b/Kudu.Core/Deployment/Oryx/BuildArtifactType.cs
new file mode 100644
index 00000000..65050bc8
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/BuildArtifactType.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    public enum BuildArtifactType
+    {
+        Zip,
+        Squashfs
+    }
+}
diff --git a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
index 30d4e153..6a2b33ba 100644
--- a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
@@ -30,6 +30,10 @@ internal static class FunctionAppBuildSettings
         {
             public static readonly string ExpressBuildSetup = "/tmp/build/expressbuild";
             public static readonly string PythonPackagesTargetDir = Path.Combine(".python_packages", "lib", "python3.6", "site-packages");
+
+            // Determine how many built files should be kept in the container
+            public static readonly int ExpressBuildMaxFiles = 3;
+            public static readonly int ConsumptionBuildMaxFiles = 1;
         }
     }
 }
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index 82a916ca..afce1b0f 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -8,6 +8,7 @@
 using Kudu.Contracts.Settings;
 using Kudu.Core;
 using Kudu.Core.Deployment;
+using Kudu.Core.Deployment.Oryx;
 using Kudu.Core.Infrastructure;
 using Kudu.Core.Tracing;
 using Kudu.Services.Infrastructure;
@@ -442,8 +443,8 @@ private async Task WriteSitePackageZip(ZipDeploymentInfo zipDeploymentInfo, ITra
                 }
             }
 
-            DeploymentHelper.PurgeZipsIfNecessary(_environment.SitePackagesPath, tracer,
-                _settings.GetMaxZipPackageCount());
+            DeploymentHelper.PurgeBuildArtifactsIfNecessary(_environment.SitePackagesPath, BuildArtifactType.Zip,
+                tracer, _settings.GetMaxZipPackageCount());
         }
 
         private void DeleteFilesAndDirsExcept(string fileToKeep, string dirToKeep, ITracer tracer)

From 70cf701408e53d0388c7a0d53cffe8c6396c4933 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <hazeng@microsoft.com>
Date: Mon, 1 Jul 2019 16:45:30 -0700
Subject: [PATCH 102/245] Add kudu log in Linux Consumption middleware (#66)

* Add kudu log in Linux Consumption middleware

* Address CR issues
---
 .../LinuxConsumptionRouteMiddleware.cs        | 53 +++++++++++++++++--
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
index 432a15d4..76a796a1 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
@@ -10,6 +10,11 @@
 using Kudu.Services.Infrastructure.Authentication;
 using System;
 using System.Text.RegularExpressions;
+using Kudu.Core.Tracing;
+using Kudu.Core.Infrastructure;
+using Kudu.Contracts.Settings;
+using Kudu.Services.Infrastructure;
+using Microsoft.AspNetCore.Http.Extensions;
 
 namespace Kudu.Services.LinuxConsumptionInstanceAdmin
 {
@@ -57,6 +62,8 @@ public LinuxConsumptionRouteMiddleware(RequestDelegate next)
         /// <returns>Response be set to 404 if the route is not whitelisted</returns>
         public async Task Invoke(HttpContext context, IAuthorizationService authorizationService = null)
         {
+            DateTime requestTime = DateTime.UtcNow;
+
             // Step 1: if disguise host exists, replace the request header HOST to DISGUISED-HOST
             //         if disguist host does not exist, check and replace ~1 with regex
             if (context.Request.Headers.TryGetValue(DisguisedHostHeader, out StringValues value))
@@ -78,6 +85,15 @@ public async Task Invoke(HttpContext context, IAuthorizationService authorizatio
             if (IsHomePageRoute(context.Request.Path))
             {
                 context.Response.StatusCode = 200;
+                KuduEventGenerator.Log().ApiEvent(
+                    ServerConfiguration.GetApplicationName(),
+                    "LinuxConsumptionEndpoint",
+                    context.Request.GetEncodedPathAndQuery(),
+                    context.Request.Method,
+                    System.Environment.GetEnvironmentVariable("x-ms-request-id") ?? string.Empty,
+                    context.Response.StatusCode,
+                    (DateTime.UtcNow - requestTime).Milliseconds,
+                    context.Request.GetUserAgent());
                 return;
             }
 
@@ -85,23 +101,50 @@ public async Task Invoke(HttpContext context, IAuthorizationService authorizatio
             if (!IsRouteWhitelisted(context.Request.Path))
             {
                 context.Response.StatusCode = 404;
+                KuduEventGenerator.Log().ApiEvent(
+                    ServerConfiguration.GetApplicationName(),
+                    "BlacklistedLinuxConsumptionEndpoint",
+                    context.Request.GetEncodedPathAndQuery(),
+                    context.Request.Method,
+                    System.Environment.GetEnvironmentVariable("x-ms-request-id") ?? string.Empty,
+                    context.Response.StatusCode,
+                    (DateTime.UtcNow - requestTime).Milliseconds,
+                    context.Request.GetUserAgent());
                 return;
             }
 
-            // Step 3: check if the request matches authorization policy
-            AuthenticateResult authenticateResult = await context.AuthenticateAsync(ArmAuthenticationDefaults.AuthenticationScheme);
-            if (!authenticateResult.Succeeded)
+            // Step 4: check if the request matches authorization policy
+            AuthenticateResult authenticationResult = await context.AuthenticateAsync(ArmAuthenticationDefaults.AuthenticationScheme);
+            if (!authenticationResult.Succeeded)
             {
                 context.Response.StatusCode = 401;
+                KuduEventGenerator.Log().ApiEvent(
+                    ServerConfiguration.GetApplicationName(),
+                    "UnauthenticatedLinuxConsumptionEndpoint",
+                    context.Request.GetEncodedPathAndQuery(),
+                    context.Request.Method,
+                    System.Environment.GetEnvironmentVariable("x-ms-request-id") ?? string.Empty,
+                    context.Response.StatusCode,
+                    (DateTime.UtcNow - requestTime).Milliseconds,
+                    context.Request.GetUserAgent());
                 return;
             }
 
             if (authorizationService != null)
             {
-                AuthorizationResult authorizeResult = await authorizationService.AuthorizeAsync(authenticateResult.Principal, AuthorizationPolicy);
-                if (!authorizeResult.Succeeded)
+                AuthorizationResult endpointAuthorization = await authorizationService.AuthorizeAsync(authenticationResult.Principal, AuthorizationPolicy);
+                if (!endpointAuthorization.Succeeded)
                 {
                     context.Response.StatusCode = 401;
+                    KuduEventGenerator.Log().ApiEvent(
+                        ServerConfiguration.GetApplicationName(),
+                        "UnauthorizedLinuxConsumptionEndpoint",
+                        context.Request.GetEncodedPathAndQuery(),
+                        context.Request.Method,
+                        System.Environment.GetEnvironmentVariable("x-ms-request-id") ?? string.Empty,
+                        context.Response.StatusCode,
+                        (DateTime.UtcNow - requestTime).Milliseconds,
+                        context.Request.GetUserAgent());
                     return;
                 }
             }

From 53ad589860c41638e3aabb8af77bcc4abfdc1a6a Mon Sep 17 00:00:00 2001
From: Dor <dorfire@gmail.com>
Date: Tue, 2 Jul 2019 17:09:01 -0700
Subject: [PATCH 103/245] Updated Oryx option names (#65)

---
 Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs b/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
index c13a40cb..48a88efd 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
@@ -13,12 +13,12 @@ internal static void AddOryxBuildCommand(StringBuilder args, string source, stri
 
         internal static void AddLanguage(StringBuilder args, string language)
         {
-            args.AppendFormat(" -l {0}", language);
+            args.AppendFormat(" --platform {0}", language);
         }
 
         internal static void AddLanguageVersion(StringBuilder args, string languageVer)
         {
-            args.AppendFormat(" --language-version {0}", languageVer);
+            args.AppendFormat(" --platform-version {0}", languageVer);
         }
 
         internal static void AddTempDirectoryOption(StringBuilder args, string tempDir)

From 03c076c2ed6b0c42b981aeb6c9e0c0fb8621711f Mon Sep 17 00:00:00 2001
From: Ankit Kumar <kumar.ankit55@gmail.com>
Date: Thu, 18 Jul 2019 13:11:51 -0700
Subject: [PATCH 104/245] Fix zip issue for Function App, reduce logs, reduce
 compression (#67) (#71)

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 636f5efe..2a039258 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -99,8 +99,23 @@ private void SetupFunctionAppExpressArtifacts(DeploymentContext context)
             FileSystemHelpers.EnsureDirectory(sitePackages);
 
             string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
-            PackageArtifactFromFolder(context, OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup,
-                sitePackages, zipAppName, BuildArtifactType.Zip, OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildMaxFiles);
+            string createdZip = PackageArtifactFromFolder(context, OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup,
+                OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup, zipAppName, BuildArtifactType.Zip, numBuildArtifacts: -1);
+
+            var copyExe = ExternalCommandFactory.BuildExternalCommandExecutable(OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup, sitePackages, context.Logger);
+            var copyToPath = Path.Combine(sitePackages, zipAppName);
+            try
+            {
+                copyExe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"cp {createdZip} {copyToPath}");
+            }
+            catch (Exception)
+            {
+                context.GlobalLogger.LogError();
+                throw;
+            }
+
+            // Gotta remove the old zips
+            DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);
 
             File.WriteAllText(packageNameFile, zipAppName);
             File.WriteAllText(packagePathFile, sitePackages);
@@ -126,7 +141,7 @@ private string PackageArtifactFromFolder(DeploymentContext context, string srcDi
                 switch(artifactType)
                 {
                     case BuildArtifactType.Zip:
-                        exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"zip -r {file} .");
+                        exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"zip -r -0 -q {file} .");
                         break;
                     case BuildArtifactType.Squashfs:
                         exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"mksquashfs . {file} -noappend");

From 85affad1ba4d76730ea4e180abc973eca81510f0 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <48038149+Hazhzeng@users.noreply.github.com>
Date: Thu, 18 Jul 2019 13:24:52 -0700
Subject: [PATCH 105/245] whitelist favicon.ico path (#68)

---
 .../LinuxConsumptionRouteMiddleware.cs                 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
index 76a796a1..547ce9ee 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
@@ -39,6 +39,7 @@ public class LinuxConsumptionRouteMiddleware
 
         private static Regex malformedScmHostnameRegex = new Regex(@"^~\d+");
         private static string HomePageRoute = "/";
+        private static string FaviconRoute = "/favicon.ico";
 
         /// <summary>
         /// Filter out unnecessary routes for Linux Consumption
@@ -81,8 +82,8 @@ public async Task Invoke(HttpContext context, IAuthorizationService authorizatio
                 context.Request.Scheme = value;
             }
 
-            // Step 2: check if it is homepage route, always return 200
-            if (IsHomePageRoute(context.Request.Path))
+            // Step 2: check if it is homepage route or favicon route, always return 200
+            if (IsHomePageRoute(context.Request.Path) || IsFavIconRoute(context.Request.Path))
             {
                 context.Response.StatusCode = 200;
                 KuduEventGenerator.Log().ApiEvent(
@@ -162,6 +163,11 @@ private bool IsHomePageRoute(PathString routePath)
             return routePath.ToString() == HomePageRoute;
         }
 
+        private bool IsFavIconRoute(PathString routePath)
+        {
+            return routePath.ToString() == FaviconRoute;
+        }
+
         private static string SanitizeScmUrl(string malformedUrl)
         {
             if (string.IsNullOrEmpty(malformedUrl))

From 20949634288ecf7850f3d8acc7e34a0201ab104c Mon Sep 17 00:00:00 2001
From: ppvasude <44244649+ppvasude@users.noreply.github.com>
Date: Tue, 23 Jul 2019 15:00:28 -0700
Subject: [PATCH 106/245] User/t puvasu/scan AntiVirus scan capabilities (#55)

Implement antivirus scan api for Kudu
---
 Common/Constants.cs                           |  16 +-
 Kudu.Contracts/Scan/IScanManager.cs           |  28 +
 Kudu.Contracts/Scan/InfectedFileObject.cs     |  22 +
 Kudu.Contracts/Scan/ScanDetail.cs             |  25 +
 Kudu.Contracts/Scan/ScanOverviewResult.cs     |  24 +
 Kudu.Contracts/Scan/ScanReport.cs             |  23 +
 Kudu.Contracts/Scan/ScanRequestResult.cs      |  12 +
 Kudu.Contracts/Scan/ScanStatus.cs             |  12 +
 Kudu.Contracts/Scan/ScanStatusResult.cs       |  21 +
 Kudu.Contracts/Scan/ScanUrl.cs                |  34 ++
 Kudu.Core/AllSafeLinuxLock.cs                 |  21 +-
 Kudu.Core/Environment.cs                      |   7 +-
 Kudu.Core/Resources.Designer.cs               |  20 +-
 Kudu.Core/Resources.resx                      |   6 +
 Kudu.Core/Scan/ScanManager.cs                 | 558 ++++++++++++++++++
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    |  12 +-
 .../Pages/NewUI/JsonViewer.cshtml             |   2 +-
 Kudu.Services.Web/Startup.cs                  |  30 +
 .../wwwroot/Content/Styles/jsonTree.css       |   1 +
 .../Deployment/DeploymentController.cs        |   6 +-
 Kudu.Services/Resources.Designer.cs           |  29 +-
 Kudu.Services/Resources.resx                  |  11 +-
 Kudu.Services/Scan/ScanController.cs          | 133 +++++
 23 files changed, 1041 insertions(+), 12 deletions(-)
 create mode 100644 Kudu.Contracts/Scan/IScanManager.cs
 create mode 100644 Kudu.Contracts/Scan/InfectedFileObject.cs
 create mode 100644 Kudu.Contracts/Scan/ScanDetail.cs
 create mode 100644 Kudu.Contracts/Scan/ScanOverviewResult.cs
 create mode 100644 Kudu.Contracts/Scan/ScanReport.cs
 create mode 100644 Kudu.Contracts/Scan/ScanRequestResult.cs
 create mode 100644 Kudu.Contracts/Scan/ScanStatus.cs
 create mode 100644 Kudu.Contracts/Scan/ScanStatusResult.cs
 create mode 100644 Kudu.Contracts/Scan/ScanUrl.cs
 create mode 100644 Kudu.Core/Scan/ScanManager.cs
 create mode 100644 Kudu.Services/Scan/ScanController.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index d9ba423a..8a536a0e 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -5,6 +5,20 @@ namespace Kudu
 {
     public static class Constants
     {
+        //Scan functionality files
+        public const string ScanLockFile = "scan.lock";
+        public static string ScanStatusFile = "status.json";
+        public static string ScanLogFile = "scan_log.log";
+        public static string ScanFolderName = "Scan_";
+        public static string MaxScans = "2";
+        public static string ScanDir = "/home/site/wwwroot";
+        public static string ScriptPath = "/custom_scripts/daily_scan_script.sh";
+        public static string ScanCommand = ScriptPath+" "+ScanDir;
+        public static string ScanTimeOutMillSec = "500000";
+        public static string ScanManifest = "modified_times.json";
+        public static string AggregrateScanResults = "aggregrate_scans.log";
+        public static string TempScanFile = "temp_scan_monitor";
+
         public const string WebRoot = "wwwroot";
         public const string MappedSite = "/_app";
         public const string RepositoryPath = "repository";
@@ -140,4 +154,4 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string WebSiteHomeStampName = "WEBSITE_HOME_STAMPNAME";
         public const string WebSiteStampDeploymentId = "WEBSITE_STAMP_DEPLOYMENT_ID";
     }
-}
\ No newline at end of file
+}
diff --git a/Kudu.Contracts/Scan/IScanManager.cs b/Kudu.Contracts/Scan/IScanManager.cs
new file mode 100644
index 00000000..55c93da3
--- /dev/null
+++ b/Kudu.Contracts/Scan/IScanManager.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Kudu.Contracts.Scan
+{
+    public interface IScanManager
+    {
+        Task<ScanRequestResult> StartScan(
+            String timeout,
+            String mainScanDirPath,
+            String id,
+            String host);
+
+        Task<ScanStatusResult> GetScanStatus(
+            String scanId,
+            String mainScanDirPath);
+
+        Task<ScanReport> GetScanResultFile(
+            String scanId,
+            String mainScanDirPath);
+
+        IEnumerable<ScanOverviewResult> GetResults(String mainScanDir);
+
+        void StopScan(String mainScanDirPath);
+     }
+}
+
diff --git a/Kudu.Contracts/Scan/InfectedFileObject.cs b/Kudu.Contracts/Scan/InfectedFileObject.cs
new file mode 100644
index 00000000..43ee66a1
--- /dev/null
+++ b/Kudu.Contracts/Scan/InfectedFileObject.cs
@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Contracts.Scan
+{
+    public class InfectedFileObject
+    {
+        [JsonProperty(PropertyName = "name")]
+        public String Name { get; set; }
+
+        [JsonProperty(PropertyName = "threat_detected")]
+        public String ThreatDetected { get; set; }
+
+        public InfectedFileObject(string name, string threat)
+        {
+            this.Name = name;
+            this.ThreatDetected = threat;
+        }
+    }
+}
diff --git a/Kudu.Contracts/Scan/ScanDetail.cs b/Kudu.Contracts/Scan/ScanDetail.cs
new file mode 100644
index 00000000..48ff6acd
--- /dev/null
+++ b/Kudu.Contracts/Scan/ScanDetail.cs
@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Contracts.Scan
+{
+    public class ScanDetail
+    {
+        [JsonProperty(PropertyName = "total_scanned")]
+        public String TotalScanned { get; set; }
+
+        [JsonProperty(PropertyName = "total_infected")]
+        public String TotalInfected { get; set; }
+
+        [JsonProperty(PropertyName = "time_taken")]
+        public String TimeTaken { get; set; }
+
+        [JsonProperty(PropertyName = "safe_files")]
+        public List<String> SafeFiles { get; set; }
+
+        [JsonProperty(PropertyName = "infected_files")]
+        public List<InfectedFileObject> InfectedFiles { get; set; }
+    }
+}
diff --git a/Kudu.Contracts/Scan/ScanOverviewResult.cs b/Kudu.Contracts/Scan/ScanOverviewResult.cs
new file mode 100644
index 00000000..287bcfcc
--- /dev/null
+++ b/Kudu.Contracts/Scan/ScanOverviewResult.cs
@@ -0,0 +1,24 @@
+using Kudu.Contracts.Infrastructure;
+using Newtonsoft.Json;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Kudu.Contracts.Scan
+{
+
+    public class ScanOverviewResult : INamedObject
+    {
+        [JsonProperty(PropertyName = "status_info")]
+        public ScanStatusResult Status { get; set; }
+
+        [JsonProperty(PropertyName = "scan_results_url")]
+        public String ScanResultsUrl { get; set; }
+
+       /* [JsonIgnore]
+        public DateTime ReceivedTime { get; set; }*/
+
+        [JsonIgnore]
+        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Justification = "to provide ARM spceific name")]
+        string INamedObject.Name { get { return Status.Id; } }
+    }
+}
diff --git a/Kudu.Contracts/Scan/ScanReport.cs b/Kudu.Contracts/Scan/ScanReport.cs
new file mode 100644
index 00000000..5567f292
--- /dev/null
+++ b/Kudu.Contracts/Scan/ScanReport.cs
@@ -0,0 +1,23 @@
+using Kudu.Contracts.Infrastructure;
+using Newtonsoft.Json;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Kudu.Contracts.Scan
+{
+    public class ScanReport : INamedObject
+    {
+        [JsonProperty(PropertyName = "report")]
+        public ScanDetail Report { get; set; }
+
+        [JsonIgnore]
+        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Justification = "to provide ARM spceific name")]
+        string INamedObject.Name { get { return Id; } }
+
+        [JsonProperty(PropertyName = "timestamp")]
+        public DateTime Timestamp { get; set; }
+
+        [JsonIgnore]
+        public String Id { get; set; }
+    }
+}
diff --git a/Kudu.Contracts/Scan/ScanRequestResult.cs b/Kudu.Contracts/Scan/ScanRequestResult.cs
new file mode 100644
index 00000000..2fa0993b
--- /dev/null
+++ b/Kudu.Contracts/Scan/ScanRequestResult.cs
@@ -0,0 +1,12 @@
+namespace Kudu.Contracts.Scan
+{
+    public enum ScanRequestResult
+    {
+        RunningAynschronously,
+        RanSynchronously,
+        Pending,
+        AsyncScanFailed,
+        NoFileModifications,
+        ScanAlreadyInProgress
+    }
+}
diff --git a/Kudu.Contracts/Scan/ScanStatus.cs b/Kudu.Contracts/Scan/ScanStatus.cs
new file mode 100644
index 00000000..081ff1f2
--- /dev/null
+++ b/Kudu.Contracts/Scan/ScanStatus.cs
@@ -0,0 +1,12 @@
+namespace Kudu.Contracts.Scan
+{
+    public enum ScanStatus
+    {
+        Starting,
+        Executing,
+        Failed,
+        TimeoutFailure,
+        Success,
+        ForceStopped
+    }
+}
diff --git a/Kudu.Contracts/Scan/ScanStatusResult.cs b/Kudu.Contracts/Scan/ScanStatusResult.cs
new file mode 100644
index 00000000..121a620f
--- /dev/null
+++ b/Kudu.Contracts/Scan/ScanStatusResult.cs
@@ -0,0 +1,21 @@
+using Kudu.Contracts.Infrastructure;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Kudu.Contracts.Scan
+{
+    public class ScanStatusResult : INamedObject
+    {
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; }
+
+        [JsonProperty(PropertyName = "status")]
+        [JsonConverter(typeof(StringEnumConverter))]
+        public ScanStatus Status { get; set; }
+
+        [JsonIgnore]
+        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Justification = "to provide ARM spceific name")]
+        string INamedObject.Name { get { return Id; } }
+    }
+}
diff --git a/Kudu.Contracts/Scan/ScanUrl.cs b/Kudu.Contracts/Scan/ScanUrl.cs
new file mode 100644
index 00000000..111077ae
--- /dev/null
+++ b/Kudu.Contracts/Scan/ScanUrl.cs
@@ -0,0 +1,34 @@
+using Kudu.Contracts.Infrastructure;
+using Newtonsoft.Json;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Kudu.Contracts.Scan
+{
+    public class ScanUrl : INamedObject
+    {
+        [JsonProperty(PropertyName = "track_url")]
+        public String TrackingURL { get; set; }
+
+        [JsonProperty(PropertyName = "result_url")]
+        public String ResultURL { get; set; }
+
+        [JsonIgnore]
+        [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Justification = "to provide ARM spceific name")]
+        string INamedObject.Name { get { return Id; } }
+
+        [JsonProperty(PropertyName = "id")]
+        public String Id { get; set; }
+
+        [JsonProperty(PropertyName = "message")]
+        public String Message { get; set; }
+
+        public ScanUrl(string trackingURL, string resultURL, string id, string msg)
+        {
+            TrackingURL = trackingURL;
+            ResultURL = resultURL;
+            Id = id;
+            Message = msg;
+        }
+    }
+}
diff --git a/Kudu.Core/AllSafeLinuxLock.cs b/Kudu.Core/AllSafeLinuxLock.cs
index 67bfb49c..f9bd57f9 100644
--- a/Kudu.Core/AllSafeLinuxLock.cs
+++ b/Kudu.Core/AllSafeLinuxLock.cs
@@ -20,6 +20,8 @@ public class AllSafeLinuxLock :IOperationLock
         private ITraceFactory _traceFactory;
         private static readonly string locksPath = "/home/site/locks";
 	private const int lockTimeout = 1200; //in seconds
+        private string defaultMsg = Resources.DeploymentLockOccMsg;
+        private string Msg;
         public AllSafeLinuxLock(string path, ITraceFactory traceFactory)
         {
             _traceFactory = traceFactory;
@@ -157,7 +159,24 @@ public void Release()
                 Console.WriteLine("ReleasingLock - There is NO LOCK HELD | ERROR");
             }
         }
-        
+
+        public string GetLockMsg()
+        {
+            //throw new NotImplementedException();
+            if(Msg == null || "".Equals(Msg))
+            {
+                return defaultMsg;
+            }
+
+            return Msg;
+        }
+
+        public void SetLockMsg(string msg)
+        {
+            this.Msg = msg;
+            
+        }
+
         private class LinuxLockInfo
         {
             public DateTime lockExpiry;
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 625d9889..3ec45edb 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -129,7 +129,12 @@ public Environment(
             else
             {
                 // in linux, rootPath is "/home", while .ssh folder need to under "/home/{user}"
-                _sshKeyPath = Path.Combine(rootPath, System.Environment.GetEnvironmentVariable("KUDU_RUN_USER"), Constants.SSHKeyPath);
+                string path2 = System.Environment.GetEnvironmentVariable("KUDU_RUN_USER");
+                if(path2 == null || path2.Equals(""))
+                {
+                    path2 = "root";
+                }
+                _sshKeyPath = Path.Combine(rootPath, path2, Constants.SSHKeyPath);
             }
             _scriptPath = Path.Combine(binPath, Constants.ScriptsPath);
             _nodeModulesPath = Path.Combine(binPath, Constants.NodeModulesPath);
diff --git a/Kudu.Core/Resources.Designer.cs b/Kudu.Core/Resources.Designer.cs
index 73507117..3887d526 100644
--- a/Kudu.Core/Resources.Designer.cs
+++ b/Kudu.Core/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Kudu.Core {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -78,6 +78,15 @@ internal static string Deployment_UnknownValue {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Deployment Underway.
+        /// </summary>
+        internal static string DeploymentLockOccMsg {
+            get {
+                return ResourceManager.GetString("DeploymentLockOccMsg", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Unable to determine which project file to build. {0}..
         /// </summary>
@@ -393,6 +402,15 @@ internal static string ReceivingChanges {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Scan Underway.
+        /// </summary>
+        internal static string ScanUnderwayMsg {
+            get {
+                return ResourceManager.GetString("ScanUnderwayMsg", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Building and Deploying &apos;{0}&apos;..
         /// </summary>
diff --git a/Kudu.Core/Resources.resx b/Kudu.Core/Resources.resx
index 0dadf98b..0c4b8f25 100644
--- a/Kudu.Core/Resources.resx
+++ b/Kudu.Core/Resources.resx
@@ -120,6 +120,9 @@
   <data name="Copied" xml:space="preserve">
     <value>Copied '{0}'.</value>
   </data>
+  <data name="DeploymentLockOccMsg" xml:space="preserve">
+    <value>Deployment Underway</value>
+  </data>
   <data name="Deployment_UnknownValue" xml:space="preserve">
     <value>N/A</value>
   </data>
@@ -228,6 +231,9 @@
   <data name="ReceivingChanges" xml:space="preserve">
     <value>Receiving changes.</value>
   </data>
+  <data name="ScanUnderwayMsg" xml:space="preserve">
+    <value>Scan Underway</value>
+  </data>
   <data name="Status_BuildingAndDeploying" xml:space="preserve">
     <value>Building and Deploying '{0}'.</value>
   </data>
diff --git a/Kudu.Core/Scan/ScanManager.cs b/Kudu.Core/Scan/ScanManager.cs
new file mode 100644
index 00000000..fc7db1d6
--- /dev/null
+++ b/Kudu.Core/Scan/ScanManager.cs
@@ -0,0 +1,558 @@
+using Kudu.Contracts.Infrastructure;
+using Kudu.Contracts.Scan;
+using Kudu.Contracts.Tracing;
+using Kudu.Core.Commands;
+using Kudu.Core.Infrastructure;
+using Kudu.Core.Tracing;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Kudu.Core.Scan
+{
+    public class ScanManager : IScanManager
+    {
+
+        private readonly ITracer _tracer;
+        private readonly AllSafeLinuxLock _scanLock;
+        private static readonly string DATE_TIME_FORMAT = "yyyy-MM-dd_HH-mm-ssZ";
+       // private string tempScanFilePath = null;
+
+        public ScanManager(ITracer tracer, IDictionary<string, IOperationLock> namedLocks)
+        {
+            _tracer = tracer;
+            _scanLock = (AllSafeLinuxLock) namedLocks["deployment"];
+        }
+
+        private static void UpdateScanStatus(String folderPath,ScanStatus status)
+        {
+            String filePath = Path.Combine(folderPath, Constants.ScanStatusFile);
+            ScanStatusResult obj = ReadScanStatusFile("", "", Constants.ScanStatusFile, folderPath);
+
+            //Create new Scan Id if file is empty
+            //else get existing scan Id
+            if(obj == null || obj.Id == null)
+            {
+                obj = new ScanStatusResult();
+                obj.Id = DateTime.UtcNow.ToString(DATE_TIME_FORMAT);
+            }
+            
+            //Update status of the scan
+            obj.Status = status;
+            File.WriteAllText(filePath, JsonConvert.SerializeObject(obj));
+
+        }
+
+        private Boolean CheckModifications(String mainScanDirPath)
+        {
+            //Create path of manifest file
+            string manifestFilePath = Path.Combine(mainScanDirPath, Constants.ScanManifest);
+
+            //Check if manifest file exists
+            //This means atleast 1 previous scan has been done
+            if (FileSystemHelpers.FileExists(manifestFilePath))
+            {
+                using (FileStream file = System.IO.File.OpenRead(manifestFilePath))
+                {
+                    using (StreamReader sr = new StreamReader(file))
+                    {
+                        JsonSerializer serializer = new JsonSerializer();
+
+                        //Read the manifest file into JSON object
+                        JObject obj = (JObject)serializer.Deserialize(sr, typeof(JObject));
+
+                        //Check for modifications
+                        return IsFolderModified(obj, Constants.ScanDir);
+                    }
+
+                }
+            }
+
+            //This is the first scan
+            //Return true
+            return true;
+            
+        }
+
+        private Boolean IsFolderModified(JObject fileObj,string directoryPath)
+        {
+            //Fetch all files in this directory
+            string[] filePaths = FileSystemHelpers.GetFiles(directoryPath,"*");
+
+            if(filePaths != null)
+            {
+                foreach (string filePath in filePaths)
+                {
+                    //If manifest does not contain an entry for this file
+                    //It means the file was newly added
+                    //We need to scan as this is a modification
+                    if (!fileObj.ContainsKey(filePath))
+                    {
+                        return true;
+                    }
+                    //Modified time in manifest
+                    String lastModTime = (string)fileObj[filePath];
+                    //Current modified time
+                    String currModTime = FileSystemHelpers.GetDirectoryLastWriteTimeUtc(filePath).ToString();
+
+                    //If they are different
+                    //It means file has been modified after last scan
+                    if (!currModTime.Equals(lastModTime))
+                        return true;
+                }
+            }
+            
+
+            //Fetch all the child directories of this directory
+            string[] direcPaths = FileSystemHelpers.GetDirectories(directoryPath);
+
+            if(direcPaths != null)
+            {
+                //Do recursive comparison of all files in the child directories
+                foreach (string direcPath in direcPaths)
+                {
+                    if (IsFolderModified(fileObj, direcPath))
+                        return true;
+                }
+            }
+
+            //No modifications found
+            return false;
+        }
+
+        private void ModifyManifestFile(JObject fileObj, string directoryPath)
+        {
+            //Get all files in this directory
+            string[] filePaths = FileSystemHelpers.GetFiles(directoryPath, "*");
+
+            foreach (string filePath in filePaths)
+            {
+                //Get last modified timestamp of this file
+                String timeString = FileSystemHelpers.GetDirectoryLastWriteTimeUtc(filePath).ToString();
+                //Add it as an entry into the manifest
+                fileObj.Add(filePath, timeString);
+            }
+
+            //Get all child directories of this directory
+            string[] direcPaths = FileSystemHelpers.GetDirectories(directoryPath);
+            //Do a recursive call to add files of child directories to manifest
+            foreach (string direcPath in direcPaths)
+            {
+                ModifyManifestFile(fileObj, direcPath);                 
+            }
+
+        }
+
+        public async Task<ScanRequestResult> StartScan(String timeout,String mainScanDirPath,String id, String host)
+        {
+            using (_tracer.Step("Start scan in the background"))
+            {
+                String folderPath = Path.Combine(mainScanDirPath, Constants.ScanFolderName + id);
+                String filePath = Path.Combine(folderPath, Constants.ScanStatusFile);
+                Boolean hasFileModifcations = true;
+
+                if (_scanLock.IsHeld)
+                {
+                    return ScanRequestResult.ScanAlreadyInProgress;
+                }
+
+                //Create unique scan folder and scan status file
+                _scanLock.LockOperation(() =>
+                {
+                    //Check if files are modified
+                    if (CheckModifications(mainScanDirPath))
+                    {
+                        //Create unique scan directory for current scan
+                        FileSystemHelpers.CreateDirectory(folderPath);
+                        _tracer.Trace("Unique scan directory created for scan {0}", id);
+
+                        //Create scan status file inside folder
+                        FileSystemHelpers.CreateFile(filePath).Close();
+
+                        //Create temp file to check if scan is still running
+                        string tempScanFilePath = GetTempScanFilePath(mainScanDirPath);
+                        tempScanFilePath = Path.Combine(mainScanDirPath, Constants.TempScanFile);
+                        FileSystemHelpers.CreateFile(tempScanFilePath).Close();
+
+                        UpdateScanStatus(folderPath, ScanStatus.Starting);
+                    }
+                    else
+                    {
+                        hasFileModifcations = false;
+                    }
+
+
+                }, "Creating unique scan folder", TimeSpan.Zero);
+
+                if (!hasFileModifcations)
+                {
+                    return ScanRequestResult.NoFileModifications;
+                }
+
+                //Start Backgorund Scan
+                using (var timeoutCancellationTokenSource = new CancellationTokenSource())
+                {
+                    var successfullyScanned = PerformBackgroundScan(_tracer, _scanLock, folderPath, timeoutCancellationTokenSource.Token,id,mainScanDirPath);
+
+                    //Wait till scan task completes or the timeout goes off
+                    if (await Task.WhenAny(successfullyScanned, Task.Delay(Int32.Parse(timeout), timeoutCancellationTokenSource.Token)) == successfullyScanned)
+                    {
+                        //If scan task completes before timeout
+                        //Delete excess scan folders, just keep the maximum number allowed
+                        await DeletePastScans(mainScanDirPath, _tracer);
+
+                        //Create new Manifest file containing the modified timestamps
+                        String manifestPath = Path.Combine(mainScanDirPath, Constants.ScanManifest);
+                        if (FileSystemHelpers.FileExists(manifestPath))
+                        {
+                            FileSystemHelpers.DeleteFileSafe(manifestPath);
+                        }
+                        JObject manifestObj = new JObject();
+
+                        //Write to the manifest with new timestamps of the modified file
+                        ModifyManifestFile(manifestObj, Constants.ScanDir);
+                        File.WriteAllText(manifestPath, JsonConvert.SerializeObject(manifestObj));
+
+                        //Path to common log file for azure monitor
+                        String aggrLogPath = Path.Combine(mainScanDirPath, Constants.AggregrateScanResults);
+
+                        //This checks if result scan log is formed
+                        //If yes, it will append necessary logs to the aggregrate log file
+                        //Current appended logs will be "Scanned files","Infected files", and details of infected files
+                        String currLogPath = Path.Combine(folderPath, Constants.ScanLogFile);
+                        if (FileSystemHelpers.FileExists(currLogPath))
+                        {
+                            StreamReader file = new StreamReader(currLogPath);
+                            string line;
+                            while ((line = file.ReadLine()) != null)
+                            {
+                                if (line.Contains("FOUND") || line.Contains("Infected files") || line.Contains("Scanned files"))
+                                {
+                                    //logType "Infected" means this log line represents details of infected files
+                                    String logType = "Infected";
+                                    if (line.Contains("Infected files") || line.Contains("Scanned files"))
+                                    {
+                                        //logType "Info" means this log line represents total number of scanned or infected files
+                                        logType = "Info";
+                                    }
+                                    FileSystemHelpers.AppendAllTextToFile(aggrLogPath, DateTime.UtcNow.ToString(@"M/d/yyyy hh:mm:ss tt") + "," + id + "," + logType + "," + host + "," + line + '\n');
+                                }
+                            }
+                        }
+
+                        return successfullyScanned.Result
+                        ? ScanRequestResult.RunningAynschronously
+                        : ScanRequestResult.AsyncScanFailed;
+                    }
+                    else
+                    {
+                        //Timeout went off before scan task completion
+                        //Cancel scan task
+                        timeoutCancellationTokenSource.Cancel();
+
+                        //Scan process will be cancelled
+                        //wait till scan status file is appropriately updated
+                        await successfullyScanned;
+                       
+                        //Delete excess scan folders, just keep the maximum number allowed
+                        await DeletePastScans(mainScanDirPath, _tracer);
+
+                        return ScanRequestResult.AsyncScanFailed;
+                        
+                    }
+                }
+
+                
+            }
+
+        }
+
+        public static async Task DeletePastScans(String mainDirectory, ITracer _tracer)
+        {
+            //Run task to delete unwanted previous scans
+            await Task.Run(() =>
+            {
+                //Main scan directory where all scans are stored
+                DirectoryInfo info = new DirectoryInfo(mainDirectory);
+                //Get sub directories and sort them by time of creation
+                DirectoryInfo[] subDirs = info.GetDirectories().OrderByDescending(p => p.CreationTime).ToArray();
+                //Get max number of scans to store as history
+                int maxCnt = Int32.Parse(Constants.MaxScans);
+
+
+                if (subDirs.Length > maxCnt)
+                {
+                    int diff = subDirs.Length - maxCnt;
+                    for (int i = subDirs.Length - 1; diff > 0; diff--, i--)
+                    {
+                        //Delete oldest directories till we only have max number and no more than that
+                        subDirs[i].Delete(true);
+                        _tracer.Trace("Deleted scan record folder {0}",subDirs[i].FullName);
+                    }
+                }
+            });
+
+        }
+
+        public async Task<ScanStatusResult> GetScanStatus(String scanId,String mainScanDirPath)
+        {
+            ScanStatusResult obj = null;
+            await Task.Run(() =>
+            {
+                obj = ReadScanStatusFile(scanId, mainScanDirPath, Constants.ScanStatusFile,null);
+            });
+
+                return obj;
+        }
+
+        public async Task<ScanReport> GetScanResultFile(String scanId,String mainScanDirPath)
+        {
+            //JObject statusRes = await GetScanStatus(scanId, mainScanDirPath);
+            ScanReport report = null;
+            //Run task to read the result file
+            await Task.Run(() =>
+            {
+                String report_path = Path.Combine(mainScanDirPath, Constants.ScanFolderName + scanId, Constants.ScanLogFile);
+                ScanStatusResult scr = ReadScanStatusFile(scanId, mainScanDirPath, Constants.ScanStatusFile, null);
+
+                //Proceed only if this scan has actually been conducted
+                //Handling possibility of user entering invalid scanId and breaking the application
+                if(scr != null)
+                {
+                    report = new ScanReport
+                    {
+                        Id = scr.Id,
+                        Timestamp = DateTime.ParseExact(scr.Id, DATE_TIME_FORMAT, System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(),
+                        Report = GetScanParsedLogs(report_path)
+                    };
+                }
+            });
+
+            //All the contents of the file and the timestamp
+                return report;
+        }
+
+        private ScanDetail GetScanParsedLogs(string currLogPath)
+        {
+            ScanDetail result = null;
+            if (FileSystemHelpers.FileExists(currLogPath))
+            {
+                result = new ScanDetail();
+                StreamReader file = new StreamReader(currLogPath);
+                string line;
+                while ((line = file.ReadLine()) != null)
+                {
+                    if (line.Contains("FOUND"))
+                    {
+                        List<InfectedFileObject> infectedList = result.InfectedFiles;
+                        if(infectedList == null)
+                        {
+                            infectedList = new List<InfectedFileObject>();
+                            result.InfectedFiles = infectedList;
+                        }
+                        int separatorIndex = line.IndexOf(":");
+                        int endIndex = line.IndexOf("FOUND");
+                        string name = line.Substring(0, separatorIndex);
+                        string infection = line.Substring(separatorIndex + 1, endIndex - separatorIndex - 1).Trim();
+
+                        InfectedFileObject obj = new InfectedFileObject(name, infection);
+                        infectedList.Add(obj);                        
+                    }
+                    else if(line.Contains("Infected files"))
+                    {
+                        result.TotalInfected = line.Substring(line.IndexOf(":") + 1).Trim();
+                    }
+                    else if(line.Contains("Scanned files"))
+                    {
+                        result.TotalScanned = line.Substring(line.IndexOf(":") + 1).Trim();
+                    }
+                    else if (line.Contains(": OK"))
+                    {
+                        List<string> safeList = result.SafeFiles;
+                        if (safeList == null)
+                        {
+                            safeList = new List<string>();
+                            result.SafeFiles = safeList;
+                        }
+                        safeList.Add(line.Substring(0, line.IndexOf(":")));
+                    }
+                    else if (line.Contains("Time"))
+                    {
+                        result.TimeTaken = line.Substring(line.IndexOf(":") + 1, line.IndexOf("sec") - line.IndexOf(":") - 1).Trim();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private static ScanStatusResult ReadScanStatusFile(String scanId, String mainScanDirPath, String fileName,String folderName)
+        {
+            ScanStatusResult obj = null;
+            String readPath = Path.Combine(mainScanDirPath, Constants.ScanFolderName + scanId, fileName);
+
+            //Give preference to folderName if given
+            if(folderName != null)
+            {
+                readPath = Path.Combine(folderName, fileName);
+            }
+
+            //Check if scan status file has been formed
+            if (FileSystemHelpers.FileExists(readPath))
+            {
+                //Read json file and deserialize into JObject
+                using (FileStream file = System.IO.File.OpenRead(readPath))
+                {
+                    using (StreamReader sr = new StreamReader(file))
+                    {
+                        JsonSerializer serializer = new JsonSerializer();
+                        obj = (ScanStatusResult)serializer.Deserialize(sr, typeof(ScanStatusResult));
+                    }
+
+                }
+            }
+           
+            return obj;
+        }
+
+        public void StopScan(String mainScanDirPath)
+        {
+            string tempScanFilePath = GetTempScanFilePath(mainScanDirPath);
+            if (tempScanFilePath != null && FileSystemHelpers.FileExists(tempScanFilePath))
+            {
+                FileSystemHelpers.DeleteFileSafe(tempScanFilePath);
+                _tracer.Trace("Scan is being stopped. Deleted temp scan file at {0}",tempScanFilePath);
+            }
+        }
+
+        private string GetTempScanFilePath(String mainScanDirPath)
+        {
+            return Path.Combine(mainScanDirPath, Constants.TempScanFile);
+        }
+
+        public async Task<bool> PerformBackgroundScan(ITracer _tracer, AllSafeLinuxLock _scanLock, String folderPath,CancellationToken token, String scanId, String mainScanDirPath)
+        {
+
+            var successfulScan = true;
+
+            await Task.Run(() =>
+            {
+
+                _scanLock.LockOperation(() =>
+                {
+                    _scanLock.SetLockMsg(Resources.ScanUnderwayMsg);
+
+                    String statusFilePath = Path.Combine(folderPath, Constants.ScanStatusFile);
+
+
+                    String logFilePath = Path.Combine(folderPath, Constants.ScanLogFile);
+                    _tracer.Trace("Starting Scan {0}, ScanCommand: {1}, LogFile: {2}", scanId, Constants.ScanCommand, logFilePath);
+
+                    UpdateScanStatus(folderPath, ScanStatus.Executing);
+
+                    var escapedArgs = Constants.ScanCommand + " " + logFilePath;
+                    Process _executingProcess = new Process()
+                    {
+                        StartInfo = new ProcessStartInfo
+                        {
+                            FileName = "/bin/bash",
+                            Arguments = "-c \"" + escapedArgs + "\"",
+                            RedirectStandardOutput = true,
+                            UseShellExecute = false,
+                            CreateNoWindow = true,
+                        }
+                    };
+                    _executingProcess.Start();
+
+                    string tempScanFilePath = GetTempScanFilePath(mainScanDirPath);
+                    //Check if process is completing before timeout
+                    while (!_executingProcess.HasExited)
+                    {
+                        //Process still running, but timeout is done
+                        //Or Process is still running but scan has been stopped by user
+                        if (token.IsCancellationRequested || (tempScanFilePath != null && !FileSystemHelpers.FileExists(tempScanFilePath)))
+                        {
+                            //Kill process
+                            _executingProcess.Kill(true, _tracer);
+                            //Wait for process to be completely killed
+                            _executingProcess.WaitForExit();
+                            successfulScan = false;
+                            if (token.IsCancellationRequested)
+                            {
+                                _tracer.Trace("Scan {0} has timed out at {1}", scanId, DateTime.UtcNow.ToString("yyy-MM-dd_HH-mm-ssZ"));
+
+                                //Update status file
+                                UpdateScanStatus(folderPath, ScanStatus.TimeoutFailure);
+                            }
+                            else
+                            {
+                                _tracer.Trace("Scan {0} has been force stopped at {1}", scanId, DateTime.UtcNow.ToString("yyy-MM-dd_HH-mm-ssZ"));
+
+                                //Update status file
+                                UpdateScanStatus(folderPath, ScanStatus.ForceStopped);
+                            }
+
+                            break;
+                        }
+                    }
+
+                    //Clean up the temp file
+                    StopScan(mainScanDirPath);
+
+                    //Update status file with success
+                    if (successfulScan)
+                    {
+                        //Check if process terminated with errors
+                        if (_executingProcess.ExitCode != 0)
+                        {
+                            UpdateScanStatus(folderPath, ScanStatus.Failed);
+                            _tracer.Trace("Scan {0} has terminated with exit code {1}. More info found in {2}", scanId, _executingProcess.ExitCode, logFilePath);
+                        }
+                        else
+                        {
+                            UpdateScanStatus(folderPath, ScanStatus.Success);
+                            _tracer.Trace("Scan {0} is Successful", scanId);
+                        }
+                    }
+
+
+                }, "Performing continuous scan", TimeSpan.Zero);
+
+                _scanLock.SetLockMsg("");
+
+            });
+
+            return successfulScan;
+           
+        }
+
+        public IEnumerable<ScanOverviewResult> GetResults(String mainScanDir)
+        {
+                IEnumerable<ScanOverviewResult> results = EnumerateResults(mainScanDir).OrderByDescending(t => t.Status.Id).ToList();
+                return results;
+        }
+
+        private IEnumerable<ScanOverviewResult> EnumerateResults(String mainScanDir)
+        {
+            if (FileSystemHelpers.DirectoryExists(mainScanDir))
+            {
+                
+                foreach (String scanFolderPath in FileSystemHelpers.GetDirectories(mainScanDir))
+                {
+                    ScanOverviewResult result = new ScanOverviewResult();
+                    ScanStatusResult scanStatus = ReadScanStatusFile("", "", Constants.ScanStatusFile, scanFolderPath);
+                    result.Status = scanStatus;
+
+                    yield return result;
+                }
+            }
+        }
+
+    }
+}
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index 360e04bb..ea3f62a5 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -61,7 +61,7 @@
         <div class="col-md-5" id="is-deploying-banner" style="display: none">
             <div>
                 <div class="col-md-10 row-fluid">
-                    <h6 style="font-weight: 300"> Deployment Underway</h6>
+                    <h6 id="lock_msg" style="font-weight: 300"></h6>
                     <h6 class="badge badge-secondary inconsolata align-left" style="background-color: #343a40; color: #fafafa" id="deployment-status">...</h6>
                 </div>
                 <div class="col-md-2 row-fluid">
@@ -147,6 +147,12 @@
                             <li>
                                 <a href="/newui/logs">Browse Logs Dir</a>
                             </li>
+                            <li>
+                                <a href="/newui/jsonviewer?view_url=/api/scan/start">Scan file system</a>
+                            </li>
+                            <li>
+                                <a href="/newui/jsonviewer?view_url=/api/scan/results">Get All Scans</a>
+                            </li>
                         </ul>
                     </small>
                 </div>
@@ -205,7 +211,9 @@
             type: "GET",
             success: function(data) {
                 console.log("deployment going on" + data["value"]);
-                if (data["value"]) {
+                //document.getElementById("lock_msg").innerHTML = data["msg"]
+                $('#lock_msg').text(data["msg"]);
+                if (data["value"] == 'True') {
                     $("#appsvc-welcome-banner").css("display", "none");
                     $("#last-deployed-banner").css("display", "none");
                     $("#just-deployed-banner").css("display", "none");
diff --git a/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml b/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
index 609d2dc6..100779db 100644
--- a/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/JsonViewer.cshtml
@@ -117,6 +117,6 @@ Released under the MIT license (LICENSE.txt)
             });
         },
         dataType: "json",
-        timeout: 2000
+        timeout: 60000
     });
 </script>
\ No newline at end of file
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 596fa834..232cc294 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -8,6 +8,7 @@
 using AspNetCore.RouteAnalyzer;
 using Kudu.Contracts;
 using Kudu.Contracts.Infrastructure;
+using Kudu.Contracts.Scan;
 using Kudu.Contracts.Settings;
 using Kudu.Contracts.SourceControl;
 using Kudu.Contracts.Tracing;
@@ -16,6 +17,7 @@
 using Kudu.Core.Deployment;
 using Kudu.Core.Helpers;
 using Kudu.Core.Infrastructure;
+using Kudu.Core.Scan;
 using Kudu.Core.Settings;
 using Kudu.Core.SourceControl;
 using Kudu.Core.SSHKey;
@@ -23,6 +25,7 @@
 using Kudu.Services.Diagnostics;
 using Kudu.Services.GitServer;
 using Kudu.Services.Performance;
+using Kudu.Services.Scan;
 using Kudu.Services.TunnelServer;
 using Kudu.Services.Web.Infrastructure;
 using Kudu.Services.Web.Tracing;
@@ -220,6 +223,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddScoped<IDeploymentManager, DeploymentManager>();
             
             services.AddScoped<IFetchDeploymentManager, FetchDeploymentManager>();
+
+            services.AddScoped<IScanManager, ScanManager>();
             
             services.AddScoped<ISSHKeyManager, SSHKeyManager>();
 
@@ -503,6 +508,31 @@ public void Configure(IApplicationBuilder app,
                     new {controller = "Deployment", action = "IsDeploying"},
                     new {verb = new HttpMethodRouteConstraint("GET")});
 
+                // Initiate Scan 
+                routes.MapRoute("start-clamscan", "api/scan/start/",
+                    new { controller = "Scan", action = "ExecuteScan" },
+                    new { verb = new HttpMethodRouteConstraint("GET") });
+
+                //Get scan status
+                routes.MapRoute("get-scan-status", "/api/scan/{scanId}/track",
+                    new { controller = "Scan", action = "GetScanStatus" },
+                    new { verb = new HttpMethodRouteConstraint("GET") });
+
+                //Get unique scan result
+                routes.MapRoute("get-scan-result", "/api/scan/{scanId}/result",
+                    new { controller = "Scan", action = "GetScanLog" },
+                    new { verb = new HttpMethodRouteConstraint("GET") });
+
+                //Get all scan result
+                routes.MapRoute("get-all-scan-result", "/api/scan/results",
+                    new { controller = "Scan", action = "GetScanResults" },
+                    new { verb = new HttpMethodRouteConstraint("GET") });
+
+                //Stop scan
+                routes.MapRoute("stop-scan", "/api/scan/stop",
+                    new { controller = "Scan", action = "StopScan" },
+                    new { verb = new HttpMethodRouteConstraint("DELETE") });
+
                 // SSHKey
                 routes.MapHttpRouteDual("get-sshkey", "api/sshkey",
                     new {controller = "SSHKey", action = "GetPublicKey"},
diff --git a/Kudu.Services.Web/wwwroot/Content/Styles/jsonTree.css b/Kudu.Services.Web/wwwroot/Content/Styles/jsonTree.css
index 3c154c1e..24c9edc5 100644
--- a/Kudu.Services.Web/wwwroot/Content/Styles/jsonTree.css
+++ b/Kudu.Services.Web/wwwroot/Content/Styles/jsonTree.css
@@ -66,6 +66,7 @@
 .jsontree_value_string {
     color: #025900;
     font-weight: bold;
+    white-space: pre-line;
 }
 .jsontree_value_number {
     color: #000E59;
diff --git a/Kudu.Services/Deployment/DeploymentController.cs b/Kudu.Services/Deployment/DeploymentController.cs
index 973d9111..cd7d6a88 100644
--- a/Kudu.Services/Deployment/DeploymentController.cs
+++ b/Kudu.Services/Deployment/DeploymentController.cs
@@ -42,7 +42,7 @@ public class DeploymentController : Controller
         private readonly IDeploymentStatusManager _status;
         private readonly IDeploymentSettingsManager _settings;
         private readonly ITracer _tracer;
-        private readonly IOperationLock _deploymentLock;
+        private readonly AllSafeLinuxLock _deploymentLock;
         private readonly IRepositoryFactory _repositoryFactory;
 
         public DeploymentController(ITracer tracer,
@@ -61,7 +61,7 @@ public DeploymentController(ITracer tracer,
             _deploymentManager = deploymentManager;
             _status = status;
             _settings = settings;
-            _deploymentLock = namedLocks["deployment"];
+            _deploymentLock = (AllSafeLinuxLock) namedLocks["deployment"];
             _repositoryFactory = repositoryFactory;
         }
 
@@ -106,7 +106,7 @@ public IActionResult Delete(string id)
         [HttpGet]
         public IActionResult IsDeploying()
         {
-            return Json(new Dictionary<string,bool>(){{"value" , _deploymentLock.IsHeld}});
+            return Json(new Dictionary<string, string>() { { "value", _deploymentLock.IsHeld.ToString() }, { "msg", _deploymentLock.GetLockMsg() } });
         }
         
         
diff --git a/Kudu.Services/Resources.Designer.cs b/Kudu.Services/Resources.Designer.cs
index af9fbd66..16f3bc6f 100644
--- a/Kudu.Services/Resources.Designer.cs
+++ b/Kudu.Services/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Kudu.Services {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -375,6 +375,15 @@ internal static string Error_WebJobsStopped {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Check reults of last scan.
+        /// </summary>
+        internal static string LastScanMsg {
+            get {
+                return ResourceManager.GetString("LastScanMsg", resourceCulture);
+            }
+        }
+               
         /// <summary>
         ///   Looks up a localized string similar to {0}{1}  The application was terminated.{0}.
         /// </summary>
@@ -420,6 +429,15 @@ internal static string LogStream_Welcome {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to No files modified since last scan.
+        /// </summary>
+        internal static string NoScanModifiedFiles {
+            get {
+                return ResourceManager.GetString("NoScanModifiedFiles", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Synchronized {0} change(s) from OneDrive..
         /// </summary>
@@ -537,6 +555,15 @@ internal static string ReceivingChanges {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Scan is already in progress..
+        /// </summary>
+        internal static string ScanInProgress {
+            get {
+                return ResourceManager.GetString("ScanInProgress", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The setting &apos;{0}&apos; does not exist..
         /// </summary>
diff --git a/Kudu.Services/Resources.resx b/Kudu.Services/Resources.resx
index 958a46f6..ab7d61ae 100644
--- a/Kudu.Services/Resources.resx
+++ b/Kudu.Services/Resources.resx
@@ -315,4 +315,13 @@
   <data name="Vso_Synchronizing" xml:space="preserve">
     <value>Synchronizing changes from VSTS ...</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="LastScanMsg" xml:space="preserve">
+    <value>Check results of last scan</value>
+  </data>
+  <data name="NoScanModifiedFiles" xml:space="preserve">
+    <value>No files modified since last scan</value>
+  </data>
+  <data name="ScanInProgress" xml:space="preserve">
+    <value>Something is blocking the scan. It might be that a scan is already in progress or a deployment is underway.</value>
+  </data>
+</root>
diff --git a/Kudu.Services/Scan/ScanController.cs b/Kudu.Services/Scan/ScanController.cs
new file mode 100644
index 00000000..bf89d094
--- /dev/null
+++ b/Kudu.Services/Scan/ScanController.cs
@@ -0,0 +1,133 @@
+using Kudu.Contracts.Infrastructure;
+using Kudu.Contracts.Scan;
+using Kudu.Contracts.Tracing;
+using Kudu.Core;
+using Kudu.Core.Commands;
+using Kudu.Core.Tracing;
+using Kudu.Services.Arm;
+using Kudu.Services.Infrastructure;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Kudu.Services.Scan
+{
+    public class ScanController : Controller
+    {
+
+        private readonly ITracer _tracer;
+        private readonly IScanManager _scanManager;
+        private IEnvironment _webAppRuntimeEnvironment;
+        string mainScanDirPath = null;
+
+        public ScanController(ITracer tracer, IScanManager scanManager, IEnvironment webAppRuntimeEnvironment)
+        {
+            _tracer = tracer;
+            _scanManager = scanManager;
+            _webAppRuntimeEnvironment = webAppRuntimeEnvironment;
+            mainScanDirPath = Path.Combine(_webAppRuntimeEnvironment.LogFilesPath, "kudu", "scan");
+        }
+
+        [HttpGet]
+        public IActionResult ExecuteScan([FromQuery] string timeout)
+        {
+
+            if (timeout == null || timeout.Length == 0)
+            {
+                timeout = Constants.ScanTimeOutMillSec;
+            }
+
+            //Start async scanning
+            String id = DateTime.UtcNow.ToString("yyy-MM-dd_HH-mm-ssZ");
+            var result = _scanManager.StartScan(timeout, mainScanDirPath, id, Request.Headers["Host"]);
+            ScanUrl obj;
+
+            //Check if files were modified after last scan
+            if (result.IsCompleted && result.Result == ScanRequestResult.NoFileModifications)
+            {
+                //Create URL
+                obj = new ScanUrl(null, null, id, Resources.NoScanModifiedFiles+" "+ Resources.LastScanMsg);
+            }
+            else if(result.IsCompleted && result.Result == ScanRequestResult.ScanAlreadyInProgress)
+            {
+                //Create URL
+                obj = new ScanUrl(null, null, id, Resources.ScanInProgress);
+            }
+            else
+            {
+                //Create URL
+                obj = new ScanUrl(_webAppRuntimeEnvironment.AppBaseUrlPrefix + String.Format("/api/scan/{0}/track", id), getResultURL(id), id,"");
+            }
+
+
+            //result;
+            return Ok(ArmUtils.AddEnvelopeOnArmRequest(obj, Request));
+
+        }
+
+        private string getResultURL(string id)
+        {
+            return _webAppRuntimeEnvironment.AppBaseUrlPrefix + String.Format("/api/scan/{0}/result", id);
+        }
+
+        [HttpGet]
+        public IActionResult GetScanResults()
+        {
+            IActionResult result;
+
+            using (_tracer.Step("ScanService.GetScanResults"))
+            {
+                List<ScanOverviewResult> results = _scanManager.GetResults(mainScanDirPath).ToList();
+                foreach (ScanOverviewResult obj in results)
+                {
+                    obj.ScanResultsUrl = getResultURL(obj.Status.Id);
+                }
+                result = Ok(ArmUtils.AddEnvelopeOnArmRequest(results, Request));
+            }
+
+            return result;
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> GetScanStatus(String scanId)
+        {
+            using (_tracer.Step("ScanController.getScanStatus"))
+            {
+                var obj = await _scanManager.GetScanStatus(scanId, mainScanDirPath);
+                if (obj == null)
+                {
+                    return BadRequest();
+                }
+                return Ok(obj);
+
+            }
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> GetScanLog(String scanId)
+        {
+            using (_tracer.Step("ScanController.getScanStatus"))
+            {
+                var obj = await _scanManager.GetScanResultFile(scanId, mainScanDirPath);
+                if (obj == null)
+                {
+                    return BadRequest();
+                }
+                return Ok(ArmUtils.AddEnvelopeOnArmRequest(obj, Request));
+
+            }
+        }
+
+        [HttpDelete]
+        public void StopScan()
+        {
+            _scanManager.StopScan(mainScanDirPath);
+        }
+        
+    }
+
+
+}

From 4bed8020c4a83bd5c00a3749dff6cc520551ea19 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 29 Jul 2019 08:57:36 -0700
Subject: [PATCH 107/245] Added test/plain mime type for VFS Based log files
 (#75)

---
 Kudu.Services/Editor/VfsController.cs        | 66 --------------------
 Kudu.Services/Infrastructure/MediaTypeMap.cs |  1 +
 2 files changed, 1 insertion(+), 66 deletions(-)

diff --git a/Kudu.Services/Editor/VfsController.cs b/Kudu.Services/Editor/VfsController.cs
index 10a4f3ef..2ad29ff1 100644
--- a/Kudu.Services/Editor/VfsController.cs
+++ b/Kudu.Services/Editor/VfsController.cs
@@ -50,74 +50,9 @@ protected override Task<IActionResult> CreateDirectoryPutResponse(DirectoryInfoB
 
         protected override Task<IActionResult> CreateItemGetResponse(FileSystemInfoBase info, string localFilePath)
         {
-            // CORE TODO File() apparently has built in support for range requests and etags. From a cursory glance
-            // that renders bascially all of commented implementation belowthis obsolete. Will need checking to ensure proper behavior.
             var fileStream = GetFileReadStream(localFilePath);
             return Task.FromResult(
                 (IActionResult)File(fileStream, MediaTypeMap.GetMediaType(info.Extension).ToString(), info.LastWriteTime, CreateEntityTag(info)));
-
-            /*
-            // Get current etag
-            EntityTagHeaderValue currentEtag = CreateEntityTag(info);
-            DateTime lastModified = info.LastWriteTimeUtc;
-
-            // Check whether we have a range request (taking If-Range condition into account)
-            bool isRangeRequest = IsRangeRequest(currentEtag);
-
-            // Check whether we have a conditional If-None-Match request
-            // Unless it is a range request (see RFC2616 sec 14.35.2 Range Retrieval Requests)
-            if (!isRangeRequest && IsIfNoneMatchRequest(currentEtag))
-            {
-                Response.SetEntityTagHeader(currentEtag, lastModified);
-                return Task.FromResult((IActionResult)StatusCode(StatusCodes.Status304NotModified)));
-            }
-
-            // Generate file response
-            Stream fileStream = null;
-            try
-            {
-                fileStream = GetFileReadStream(localFilePath);
-                MediaTypeHeaderValue mediaType = MediaTypeMap.GetMediaType(info.Extension);
-                HttpResponseMessage successFileResponse = Request.CreateResponse(isRangeRequest ? HttpStatusCode.PartialContent : HttpStatusCode.OK);
-
-                if (isRangeRequest)
-                {
-                    successFileResponse.Content = new ByteRangeStreamContent(fileStream, Request.Headers.Range, mediaType, BufferSize);
-                }
-                else
-                {
-                    successFileResponse.Content = new StreamContent(fileStream, BufferSize);
-                    successFileResponse.Content.Headers.ContentType = mediaType;
-                }
-
-                // Set etag for the file
-                successFileResponse.SetEntityTagHeader(currentEtag, lastModified);
-                return Task.FromResult(successFileResponse);
-            }
-            catch (InvalidByteRangeException invalidByteRangeException)
-            {
-                // The range request had no overlap with the current extend of the resource so generate a 416 (Requested Range Not Satisfiable)
-                // including a Content-Range header with the current size.
-                Tracer.TraceError(invalidByteRangeException);
-                HttpResponseMessage invalidByteRangeResponse = Request.CreateErrorResponse(invalidByteRangeException);
-                if (fileStream != null)
-                {
-                    fileStream.Close();
-                }
-                return Task.FromResult(invalidByteRangeResponse);
-            }
-            catch (Exception ex)
-            {
-                // Could not read the file
-                Tracer.TraceError(ex);
-                HttpResponseMessage errorResponse = Request.CreateErrorResponse(HttpStatusCode.NotFound, ex);
-                if (fileStream != null)
-                {
-                    fileStream.Close();
-                }
-                return Task.FromResult(errorResponse);
-            }
-            */
         }
 
         protected override async Task<IActionResult> CreateItemPutResponse(FileSystemInfoBase info, string localFilePath, bool itemExists)
@@ -132,7 +67,6 @@ protected override async Task<IActionResult> CreateItemPutResponse(FileSystemInf
                 EntityTagHeaderValue currentEtag = CreateEntityTag(info);
 
                 // Existing resources require an etag to be updated.
-                // CORE TODO Moved to Microsoft.Net.Http.Headers, double check semantics (null, empty string etc.)
                 if (requestHeaders.IfMatch == null)
                 {
                     return StatusCode(StatusCodes.Status412PreconditionFailed, Resources.VfsController_MissingIfMatch);
diff --git a/Kudu.Services/Infrastructure/MediaTypeMap.cs b/Kudu.Services/Infrastructure/MediaTypeMap.cs
index 9fd4012f..3477746c 100644
--- a/Kudu.Services/Infrastructure/MediaTypeMap.cs
+++ b/Kudu.Services/Infrastructure/MediaTypeMap.cs
@@ -56,6 +56,7 @@ private static ConcurrentDictionary<string, MediaTypeHeaderValue> CreateMediaTyp
             var dictionary = new ConcurrentDictionary<string, MediaTypeHeaderValue>(StringComparer.OrdinalIgnoreCase);
             dictionary.TryAdd(".js", MediaTypeHeaderValue.Parse("application/javascript"));
             dictionary.TryAdd(".json", MediaTypeHeaderValue.Parse("application/json"));
+            dictionary.TryAdd(".log", MediaTypeHeaderValue.Parse("text/plain"));
 
             // Add media type for markdown
             dictionary.TryAdd(".md", MediaTypeHeaderValue.Parse("text/plain"));

From b94cac9033fbfb44e7bc288f4ea46bc5d461cc39 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <48038149+Hazhzeng@users.noreply.github.com>
Date: Wed, 31 Jul 2019 15:29:20 -0700
Subject: [PATCH 108/245] Added more tests on Oryx Arguments (#77)

---
 .../Oryx/OryxArgumentsAppServiceTests.cs      | 239 ++++++++++++++++++
 .../Oryx/OryxArgumentsFactoryTests.cs         |   3 +-
 .../Oryx/OryxArgumentsFunctionAppTests.cs     | 110 ++++++++
 ...gumentsLinuxConsumptionFunctionAppTests.cs |  83 ++++++
 4 files changed, 434 insertions(+), 1 deletion(-)
 create mode 100644 Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
 create mode 100644 Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
 create mode 100644 Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs

diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
new file mode 100644
index 00000000..bef6d177
--- /dev/null
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
@@ -0,0 +1,239 @@
+using Kudu.Core.Deployment;
+using Kudu.Core.Deployment.Oryx;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Kudu.Tests.Core.Deployment.Oryx
+{
+    [Collection("MockedEnvironmentVariablesCollection")]
+    public class OryxArgumentsAppServiceTests
+    {
+        [Fact]
+        public void DefaultTest()
+        {
+            IOryxArguments args = new AppServiceOryxArguments();
+            Assert.False(args.RunOryxBuild);
+            Assert.False(args.SkipKuduSync);
+            Assert.Equal(BuildOptimizationsFlags.Off, args.Flags);
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+            string command = args.GenerateOryxBuildCommand(mockedContext);
+            Assert.Equal("oryx build OutputPath -o OutputPath", command);
+        }
+
+        [Theory]
+        [InlineData("NODE", "8.15", true, false, BuildOptimizationsFlags.CompressModules)]
+        [InlineData("PYTHON", "3.6", true, false, BuildOptimizationsFlags.None)]
+        [InlineData("PHP", "7.3", true, false, BuildOptimizationsFlags.None)]
+        [InlineData("DOTNETCORE", "2.2", true, true, BuildOptimizationsFlags.UseTempDirectory)]
+        public void ArgumentPropertyTest(string language, string version,
+            bool expectedRunOryxBuild, bool expectedSkipKuduSync, BuildOptimizationsFlags expectedFlags)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FRAMEWORK", language },
+                { "FRAMEWORK_VERSION", version}
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new AppServiceOryxArguments();
+                Assert.Equal(expectedRunOryxBuild, args.RunOryxBuild);
+                Assert.Equal(expectedSkipKuduSync, args.SkipKuduSync);
+                Assert.Equal(expectedFlags, args.Flags);
+            }
+        }
+
+        [Theory]
+        [InlineData("NODE", "8.12",
+            "oryx build OutputPath -o OutputPath --platform nodejs --platform-version 8.12 -i BuildTempPath -p compress_node_modules=tar-gz")]
+        [InlineData("PYTHON", "3.6",
+            "oryx build OutputPath -o OutputPath --platform python --platform-version 3.6 -p virtualenv_name=antenv3.6")]
+        [InlineData("PHP", "7.3",
+            "oryx build OutputPath -o OutputPath --platform php --platform-version 7.3")]
+        [InlineData("DOTNETCORE", "2.2",
+            "oryx build RepositoryPath -o OutputPath --platform dotnet --platform-version 2.2 -i BuildTempPath")]
+        public void CommandGenerationTest(string language, string version, string expectedCommand)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FRAMEWORK", language },
+                { "FRAMEWORK_VERSION", version }
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new AppServiceOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext));
+            }
+        }
+
+        [Theory]
+        [InlineData("1.0", "oryx build RepositoryPath -o OutputPath --platform dotnet --platform-version 1.1 -i BuildTempPath")]
+        [InlineData("2.0", "oryx build RepositoryPath -o OutputPath --platform dotnet --platform-version 2.1 -i BuildTempPath")]
+        public void DotnetcoreVersionPromotionTest(string version, string expectedCommand)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FRAMEWORK", "DOTNETCORE" },
+                { "FRAMEWORK_VERSION", version }
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new AppServiceOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext));
+            }
+        }
+
+        [Fact]
+        public void NodejsUseExpressBuildTest()
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FRAMEWORK", "NODE" },
+                { "FRAMEWORK_VERSION", "8.12" },
+                { "BUILD_FLAGS", "UseExpressBuild" }
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new AppServiceOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal("oryx build OutputPath -o OutputPath --platform nodejs --platform-version 8.12 -i BuildTempPath -p compress_node_modules=zip",
+                    args.GenerateOryxBuildCommand(mockedContext));
+            }
+        }
+
+        [Theory]
+        [InlineData("2.7", "oryx build OutputPath -o OutputPath --platform python --platform-version 2.7 -p virtualenv_name=antenv2.7")]
+        [InlineData("3.6", "oryx build OutputPath -o OutputPath --platform python --platform-version 3.6 -p virtualenv_name=antenv3.6")]
+        [InlineData("3.7", "oryx build OutputPath -o OutputPath --platform python --platform-version 3.7 -p virtualenv_name=antenv")]
+        public void PythonVirtualEnvironmentNamingTest(string version, string expectedCommand)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FRAMEWORK", "PYTHON" },
+                { "FRAMEWORK_VERSION", version }
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new AppServiceOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext));
+            }
+        }
+
+        [Theory]
+        [InlineData("NODE", "oryx build OutputPath -o OutputPath")]
+        [InlineData("PYTHON", "oryx build OutputPath -o OutputPath")]
+        [InlineData("PHP", "oryx build OutputPath -o OutputPath")]
+        [InlineData("DOTNETCORE", "oryx build OutputPath -o OutputPath")]
+        public void MissingFrameworkVersionEnvironmentTest(string language, string expectedCommand)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FRAMEWORK", language },
+                //{ "FRAMEWORK_VERSION", version }
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new AppServiceOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext));
+            }
+        }
+
+        [Fact]
+        public void MissingFrameworkEnvironmentTest()
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                //{ "FRAMEWORK", language },
+                { "FRAMEWORK_VERSION", "3.6" }
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new AppServiceOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal("oryx build OutputPath -o OutputPath", args.GenerateOryxBuildCommand(mockedContext));
+            }
+        }
+
+        [Fact]
+        public void MissingOutputPathTest()
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FRAMEWORK", "PYTHON" },
+                { "FRAMEWORK_VERSION", "3.6" }
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath"
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new AppServiceOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal("oryx build  -o  --platform python --platform-version 3.6 -p virtualenv_name=antenv3.6",
+                    args.GenerateOryxBuildCommand(mockedContext));
+            }
+        }
+    }
+}
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
index 82ca3d31..5eaac526 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
@@ -6,6 +6,7 @@
 
 namespace Kudu.Tests.Core.Deployment.Oryx
 {
+    [Collection("MockedEnvironmentVariablesCollection")]
     public class OryxArgumentsFactoryTests
     {
         [Fact]
@@ -140,7 +141,7 @@ public void BuildCommandForPythonFunctionApp()
             {
                 IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
                 string command = args.GenerateOryxBuildCommand(deploymentContext);
-                Assert.Equal(@"oryx build outputpath -o outputpath -l python --language-version 3.6 -i buildtemppath -p packagedir=.python_packages\lib\python3.6\site-packages", command);
+                Assert.Equal(@"oryx build outputpath -o outputpath --platform python --platform-version 3.6 -i buildtemppath -p packagedir=.python_packages\lib\python3.6\site-packages", command);
             }
         }
     }
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
new file mode 100644
index 00000000..53944235
--- /dev/null
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
@@ -0,0 +1,110 @@
+using Kudu.Core.Deployment;
+using Kudu.Core.Deployment.Oryx;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Kudu.Tests.Core.Deployment.Oryx
+{
+    [Collection("MockedEnvironmentVariablesCollection")]
+    public class OryxArgumentsFunctionAppTests
+    {
+        [Fact]
+        public void DefaultTest()
+        {
+            IOryxArguments args = new FunctionAppOryxArguments();
+            Assert.False(args.RunOryxBuild);
+            Assert.False(args.SkipKuduSync);
+            Assert.Equal(BuildOptimizationsFlags.None, args.Flags);
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+            string command = args.GenerateOryxBuildCommand(mockedContext);
+            Assert.Equal("oryx build OutputPath -o OutputPath -i BuildTempPath", command);
+        }
+
+        [Theory]
+        [InlineData("NODE", true, false, BuildOptimizationsFlags.None)]
+        [InlineData("PYTHON", true, false, BuildOptimizationsFlags.None)]
+        [InlineData("PHP", true, false, BuildOptimizationsFlags.None)]
+        [InlineData("DOTNET", true, false, BuildOptimizationsFlags.None)]
+        public void ArgumentPropertyTest(string functions_worker_runtime,
+            bool expectedRunOryxBuild, bool expectedSkipKuduSync, BuildOptimizationsFlags expectedFlags)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FUNCTIONS_WORKER_RUNTIME", functions_worker_runtime },
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new FunctionAppOryxArguments();
+                Assert.Equal(expectedRunOryxBuild, args.RunOryxBuild);
+                Assert.Equal(expectedSkipKuduSync, args.SkipKuduSync);
+                Assert.Equal(expectedFlags, args.Flags);
+            }
+        }
+        
+        [Theory]
+        [InlineData("NODE",
+            "oryx build OutputPath -o OutputPath --platform nodejs --platform-version 8.15 -i BuildTempPath")]
+        [InlineData("PYTHON",
+            "oryx build OutputPath -o OutputPath --platform python --platform-version 3.6 -i BuildTempPath " + 
+            "-p packagedir=.python_packages\\lib\\python3.6\\site-packages")]
+        [InlineData("PHP",
+            "oryx build OutputPath -o OutputPath --platform php --platform-version 7.3 -i BuildTempPath")]
+        [InlineData("DOTNET",
+            "oryx build OutputPath -o OutputPath --platform dotnet --platform-version 2.2 -i BuildTempPath")]
+        public void CommandGenerationTest(string functions_worker_runtime, string expected_command)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FUNCTIONS_WORKER_RUNTIME", functions_worker_runtime },
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath"
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new FunctionAppOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal(expected_command, command);
+            }
+        }
+
+        [Fact]
+        public void SkipKuduSyncOnExpressBuildTest()
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FUNCTIONS_WORKER_RUNTIME", "NODE" },
+                { "BUILD_FLAGS", "UseExpressBuild" }
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath", 
+                BuildTempPath = "BuildTempPath",
+                OutputPath = "OutputPath" // Should be ignored
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new FunctionAppOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.True(args.RunOryxBuild);
+                Assert.True(args.SkipKuduSync);
+                Assert.Equal("oryx build RepositoryPath -o /tmp/build/expressbuild --platform nodejs --platform-version 8.15 -i BuildTempPath",
+                    command);
+            }
+        }
+    }
+}
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs
new file mode 100644
index 00000000..7b5cba52
--- /dev/null
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs
@@ -0,0 +1,83 @@
+using Kudu.Core.Deployment;
+using Kudu.Core.Deployment.Oryx;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Kudu.Tests.Core.Deployment.Oryx
+{
+    [Collection("MockedEnvironmentVariablesCollection")]
+    public class OryxArgumentsLinuxConsumptionFunctionAppTests
+    {
+        [Fact]
+        public void DefaultTest()
+        {
+            IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments();
+            Assert.False(args.RunOryxBuild);
+            Assert.True(args.SkipKuduSync);
+            Assert.Equal(BuildOptimizationsFlags.Off, args.Flags);
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath", // Should be ignored
+                OutputPath = "OutputPath"
+            };
+            string command = args.GenerateOryxBuildCommand(mockedContext);
+            Assert.Equal("oryx build RepositoryPath -o RepositoryPath", command);
+        }
+
+        [Theory]
+        [InlineData("NODE", true, true, BuildOptimizationsFlags.Off)]
+        [InlineData("PYTHON", true, true, BuildOptimizationsFlags.Off)]
+        [InlineData("PHP", true, true, BuildOptimizationsFlags.Off)]
+        [InlineData("DOTNET", true, true, BuildOptimizationsFlags.Off)]
+        public void ArgumentPropertyTest(string functions_worker_runtime,
+            bool expectedRunOryxBuild, bool expectedSkipKuduSync, BuildOptimizationsFlags expectedFlags)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FUNCTIONS_WORKER_RUNTIME", functions_worker_runtime },
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments();
+                Assert.Equal(expectedRunOryxBuild, args.RunOryxBuild);
+                Assert.Equal(expectedSkipKuduSync, args.SkipKuduSync);
+                Assert.Equal(expectedFlags, args.Flags);
+            }
+        }
+
+        [Theory]
+        [InlineData("NODE",
+            "oryx build RepositoryPath -o RepositoryPath --platform nodejs --platform-version 8.15")]
+        [InlineData("PYTHON",
+            "oryx build RepositoryPath -o RepositoryPath --platform python --platform-version 3.6 " +
+            "-p packagedir=.python_packages\\lib\\python3.6\\site-packages")]
+        [InlineData("PHP",
+            "oryx build RepositoryPath -o RepositoryPath --platform php --platform-version 7.3")]
+        [InlineData("DOTNET",
+            "oryx build RepositoryPath -o RepositoryPath --platform dotnet --platform-version 2.2")]
+        public void CommandGenerationTest(string functions_worker_runtime, string expected_command)
+        {
+            var mockedEnvironment = new Dictionary<string, string>()
+            {
+                { "FUNCTIONS_WORKER_RUNTIME", functions_worker_runtime },
+            };
+
+            var mockedContext = new DeploymentContext()
+            {
+                RepositoryPath = "RepositoryPath",
+                BuildTempPath = "BuildTempPath", // Should be ignored
+                OutputPath = "OutputPath" // Should be ignored
+            };
+
+            using (new TestScopedEnvironmentVariable(mockedEnvironment))
+            {
+                IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments();
+                string command = args.GenerateOryxBuildCommand(mockedContext);
+                Assert.Equal(expected_command, command);
+            }
+        }
+    }
+}

From 0219196a9779dd360490e0185ab22f29f9e04246 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <48038149+Hazhzeng@users.noreply.github.com>
Date: Wed, 31 Jul 2019 15:30:05 -0700
Subject: [PATCH 109/245] Enable oryx build for other languages in Linux
 Consumption (#76)

---
 .../Helpers/FunctionAppSpecializationHelper.cs     | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/Kudu.Core/Helpers/FunctionAppSpecializationHelper.cs b/Kudu.Core/Helpers/FunctionAppSpecializationHelper.cs
index 8e5b2c26..3bd5163b 100644
--- a/Kudu.Core/Helpers/FunctionAppSpecializationHelper.cs
+++ b/Kudu.Core/Helpers/FunctionAppSpecializationHelper.cs
@@ -22,20 +22,10 @@ public static Dictionary<string, string> HandleLinuxConsumption(string envKey, s
             Dictionary<string, string> toBeUpdatedEnv = new Dictionary<string, string>();
             if (envKey == OryxBuildConstants.FunctionAppEnvVars.WorkerRuntimeSetting)
             {
-                HandleFunctionWorkerRuntime(toBeUpdatedEnv, envValue);
+                toBeUpdatedEnv.Add(SettingsKeys.DoBuildDuringDeployment, "true");
+                toBeUpdatedEnv.Add(OryxBuildConstants.EnableOryxBuild, "true");
             }
             return toBeUpdatedEnv;
         }
-
-        private static void HandleFunctionWorkerRuntime(IDictionary<string, string> result, string workerRuntime)
-        {
-            if (workerRuntime == "python")
-            {
-                result.Add(SettingsKeys.DoBuildDuringDeployment, "true");
-                result.Add(OryxBuildConstants.EnableOryxBuild, "true");
-                result.Add(OryxBuildConstants.OryxEnvVars.FrameworkSetting, "PYTHON");
-                result.Add(OryxBuildConstants.OryxEnvVars.FrameworkVersionSetting, "3.6");
-            }
-        }
     }
 }

From 6397fa6cf9af8cae1d5e2b6ee20891f3ec1d4825 Mon Sep 17 00:00:00 2001
From: ppvasude <44244649+ppvasude@users.noreply.github.com>
Date: Tue, 6 Aug 2019 12:00:44 -0700
Subject: [PATCH 110/245] Bug Fixes (#82)

---
 Common/Constants.cs                           |  2 +-
 Kudu.Core/Scan/ScanManager.cs                 | 20 +++++++++++--------
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    |  2 +-
 .../Deployment/DeploymentController.cs        |  8 +++++++-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 8a536a0e..c9763ea2 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -14,7 +14,7 @@ public static class Constants
         public static string ScanDir = "/home/site/wwwroot";
         public static string ScriptPath = "/custom_scripts/daily_scan_script.sh";
         public static string ScanCommand = ScriptPath+" "+ScanDir;
-        public static string ScanTimeOutMillSec = "500000";
+        public static string ScanTimeOutMillSec = "1200000";    // 20 mins
         public static string ScanManifest = "modified_times.json";
         public static string AggregrateScanResults = "aggregrate_scans.log";
         public static string TempScanFile = "temp_scan_monitor";
diff --git a/Kudu.Core/Scan/ScanManager.cs b/Kudu.Core/Scan/ScanManager.cs
index fc7db1d6..ffcb4529 100644
--- a/Kudu.Core/Scan/ScanManager.cs
+++ b/Kudu.Core/Scan/ScanManager.cs
@@ -30,7 +30,7 @@ public ScanManager(ITracer tracer, IDictionary<string, IOperationLock> namedLock
             _scanLock = (AllSafeLinuxLock) namedLocks["deployment"];
         }
 
-        private static void UpdateScanStatus(String folderPath,ScanStatus status)
+        private static void UpdateScanStatus(String folderPath,ScanStatus status,String Id)
         {
             String filePath = Path.Combine(folderPath, Constants.ScanStatusFile);
             ScanStatusResult obj = ReadScanStatusFile("", "", Constants.ScanStatusFile, folderPath);
@@ -40,7 +40,11 @@ private static void UpdateScanStatus(String folderPath,ScanStatus status)
             if(obj == null || obj.Id == null)
             {
                 obj = new ScanStatusResult();
-                obj.Id = DateTime.UtcNow.ToString(DATE_TIME_FORMAT);
+                if(Id == null)
+                {
+                    Id = DateTime.UtcNow.ToString(DATE_TIME_FORMAT); 
+                }
+                obj.Id = Id;
             }
             
             //Update status of the scan
@@ -180,7 +184,7 @@ public async Task<ScanRequestResult> StartScan(String timeout,String mainScanDir
                         tempScanFilePath = Path.Combine(mainScanDirPath, Constants.TempScanFile);
                         FileSystemHelpers.CreateFile(tempScanFilePath).Close();
 
-                        UpdateScanStatus(folderPath, ScanStatus.Starting);
+                        UpdateScanStatus(folderPath, ScanStatus.Starting,id);
                     }
                     else
                     {
@@ -454,7 +458,7 @@ await Task.Run(() =>
                     String logFilePath = Path.Combine(folderPath, Constants.ScanLogFile);
                     _tracer.Trace("Starting Scan {0}, ScanCommand: {1}, LogFile: {2}", scanId, Constants.ScanCommand, logFilePath);
 
-                    UpdateScanStatus(folderPath, ScanStatus.Executing);
+                    UpdateScanStatus(folderPath, ScanStatus.Executing, null);
 
                     var escapedArgs = Constants.ScanCommand + " " + logFilePath;
                     Process _executingProcess = new Process()
@@ -488,14 +492,14 @@ await Task.Run(() =>
                                 _tracer.Trace("Scan {0} has timed out at {1}", scanId, DateTime.UtcNow.ToString("yyy-MM-dd_HH-mm-ssZ"));
 
                                 //Update status file
-                                UpdateScanStatus(folderPath, ScanStatus.TimeoutFailure);
+                                UpdateScanStatus(folderPath, ScanStatus.TimeoutFailure, null);
                             }
                             else
                             {
                                 _tracer.Trace("Scan {0} has been force stopped at {1}", scanId, DateTime.UtcNow.ToString("yyy-MM-dd_HH-mm-ssZ"));
 
                                 //Update status file
-                                UpdateScanStatus(folderPath, ScanStatus.ForceStopped);
+                                UpdateScanStatus(folderPath, ScanStatus.ForceStopped, null);
                             }
 
                             break;
@@ -511,12 +515,12 @@ await Task.Run(() =>
                         //Check if process terminated with errors
                         if (_executingProcess.ExitCode != 0)
                         {
-                            UpdateScanStatus(folderPath, ScanStatus.Failed);
+                            UpdateScanStatus(folderPath, ScanStatus.Failed, null);
                             _tracer.Trace("Scan {0} has terminated with exit code {1}. More info found in {2}", scanId, _executingProcess.ExitCode, logFilePath);
                         }
                         else
                         {
-                            UpdateScanStatus(folderPath, ScanStatus.Success);
+                            UpdateScanStatus(folderPath, ScanStatus.Success, null);
                             _tracer.Trace("Scan {0} is Successful", scanId);
                         }
                     }
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index ea3f62a5..d06f08a9 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -211,7 +211,7 @@
             type: "GET",
             success: function(data) {
                 console.log("deployment going on" + data["value"]);
-                //document.getElementById("lock_msg").innerHTML = data["msg"]
+
                 $('#lock_msg').text(data["msg"]);
                 if (data["value"] == 'True') {
                     $("#appsvc-welcome-banner").css("display", "none");
diff --git a/Kudu.Services/Deployment/DeploymentController.cs b/Kudu.Services/Deployment/DeploymentController.cs
index cd7d6a88..023b05ba 100644
--- a/Kudu.Services/Deployment/DeploymentController.cs
+++ b/Kudu.Services/Deployment/DeploymentController.cs
@@ -106,7 +106,13 @@ public IActionResult Delete(string id)
         [HttpGet]
         public IActionResult IsDeploying()
         {
-            return Json(new Dictionary<string, string>() { { "value", _deploymentLock.IsHeld.ToString() }, { "msg", _deploymentLock.GetLockMsg() } });
+            string msg = "";
+            if (_deploymentLock.IsHeld)
+            {
+                msg = _deploymentLock.GetLockMsg();
+            }
+
+            return Json(new Dictionary<string, string>() { { "value", _deploymentLock.IsHeld.ToString() }, { "msg", msg } });
         }
         
         

From 63df30456b898d11f59c357ead1f68624e2f2fb5 Mon Sep 17 00:00:00 2001
From: ppvasude <44244649+ppvasude@users.noreply.github.com>
Date: Thu, 8 Aug 2019 11:17:47 -0700
Subject: [PATCH 111/245] Added checkModified as a param to override manifest
 file checking (#83)

---
 Kudu.Contracts/Scan/IScanManager.cs  |  3 ++-
 Kudu.Core/Scan/ScanManager.cs        | 14 +++++++++++++-
 Kudu.Services/Scan/ScanController.cs |  9 +++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Kudu.Contracts/Scan/IScanManager.cs b/Kudu.Contracts/Scan/IScanManager.cs
index 55c93da3..e69cff6a 100644
--- a/Kudu.Contracts/Scan/IScanManager.cs
+++ b/Kudu.Contracts/Scan/IScanManager.cs
@@ -10,7 +10,8 @@ Task<ScanRequestResult> StartScan(
             String timeout,
             String mainScanDirPath,
             String id,
-            String host);
+            String host,
+            Boolean checkModified);
 
         Task<ScanStatusResult> GetScanStatus(
             String scanId,
diff --git a/Kudu.Core/Scan/ScanManager.cs b/Kudu.Core/Scan/ScanManager.cs
index ffcb4529..a1fe0bf4 100644
--- a/Kudu.Core/Scan/ScanManager.cs
+++ b/Kudu.Core/Scan/ScanManager.cs
@@ -153,7 +153,7 @@ private void ModifyManifestFile(JObject fileObj, string directoryPath)
 
         }
 
-        public async Task<ScanRequestResult> StartScan(String timeout,String mainScanDirPath,String id, String host)
+        public async Task<ScanRequestResult> StartScan(String timeout,String mainScanDirPath,String id, String host, Boolean checkModified)
         {
             using (_tracer.Step("Start scan in the background"))
             {
@@ -169,6 +169,18 @@ public async Task<ScanRequestResult> StartScan(String timeout,String mainScanDir
                 //Create unique scan folder and scan status file
                 _scanLock.LockOperation(() =>
                 {
+                    //This means user wants to start a scan without checking for file changes after previous scan
+                    //Delete the manifest file containing last updated timestamps of files
+                    //This will force a scan to start irrespective of changes made to files
+                    if (!checkModified)
+                    {
+                        String manifestPath = Path.Combine(mainScanDirPath, Constants.ScanManifest);
+                        if (FileSystemHelpers.FileExists(manifestPath))
+                        {
+                            FileSystemHelpers.DeleteFileSafe(manifestPath);
+                        }
+                    }
+
                     //Check if files are modified
                     if (CheckModifications(mainScanDirPath))
                     {
diff --git a/Kudu.Services/Scan/ScanController.cs b/Kudu.Services/Scan/ScanController.cs
index bf89d094..e8fbe5f1 100644
--- a/Kudu.Services/Scan/ScanController.cs
+++ b/Kudu.Services/Scan/ScanController.cs
@@ -32,7 +32,7 @@ public ScanController(ITracer tracer, IScanManager scanManager, IEnvironment web
         }
 
         [HttpGet]
-        public IActionResult ExecuteScan([FromQuery] string timeout)
+        public IActionResult ExecuteScan([FromQuery] string timeout,[FromQuery] Boolean checkModified = true)
         {
 
             if (timeout == null || timeout.Length == 0)
@@ -40,9 +40,14 @@ public IActionResult ExecuteScan([FromQuery] string timeout)
                 timeout = Constants.ScanTimeOutMillSec;
             }
 
+            if(checkModified == null)
+            {
+                checkModified = true;
+            }
+
             //Start async scanning
             String id = DateTime.UtcNow.ToString("yyy-MM-dd_HH-mm-ssZ");
-            var result = _scanManager.StartScan(timeout, mainScanDirPath, id, Request.Headers["Host"]);
+            var result = _scanManager.StartScan(timeout, mainScanDirPath, id, Request.Headers["Host"],checkModified);
             ScanUrl obj;
 
             //Check if files were modified after last scan

From 992596e2b4016b824fe354f6e62c2c1db9a8a70f Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 19 Aug 2019 12:25:25 -0700
Subject: [PATCH 112/245] Add a silent try catch while printing previous log
 tail (#87)

---
 Kudu.Services/Diagnostics/LogStreamManager.cs | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index fbe41121..63a43fd1 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -103,7 +103,7 @@ public async Task ProcessRequest(HttpContext context)
 
             FileSystemHelpers.EnsureDirectory(mountedLogFilesDir);
 
-            if (shouldMonitiorMountedLogsPath(mountedLogFilesDir))
+            if (ShouldMonitiorMountedLogsPath(mountedLogFilesDir))
             {
                 path = mountedLogFilesDir;
             }
@@ -127,33 +127,43 @@ public async Task ProcessRequest(HttpContext context)
             {
                 NotifyClientWithLineBreak("Starting Log Tail -n 10 of existing logs ----", context);
 
-                foreach (string log in _logFiles.Keys)
+                try
                 {
-                    var reader = new StreamReader(log, Encoding.ASCII);
 
-                    var vfsPath = GetFileVfsPath(log);
 
-                    var printLine = log + " " + (!string.IsNullOrEmpty(vfsPath) ? " (" + vfsPath + ")" : "");
+                    foreach (string log in _logFiles.Keys)
+                    {
+
+                        var reader = new StreamReader(log, Encoding.ASCII);
 
-                    NotifyClientWithLineBreak(String.Format(
-                                CultureInfo.CurrentCulture,
-                                printLine,
-                                DateTime.UtcNow.ToString("s"),
-                                System.Environment.NewLine),context);
+                        var vfsPath = GetFileVfsPath(log);
 
-                    foreach (string logLine in Tail(reader, 10))
-                    {
-                        await context.Response.WriteAsync(logLine);
+                        var printLine = log + " " + (!string.IsNullOrEmpty(vfsPath) ? " (" + vfsPath + ")" : "");
+
+                        NotifyClientWithLineBreak(String.Format(
+                                    CultureInfo.CurrentCulture,
+                                    printLine,
+                                    DateTime.UtcNow.ToString("s"),
+                                    System.Environment.NewLine), context);
+
+                        foreach (string logLine in Tail(reader, 10))
+                        {
+                            await context.Response.WriteAsync(logLine);
+                            await context.Response.WriteAsync(System.Environment.NewLine);
+                        }
                         await context.Response.WriteAsync(System.Environment.NewLine);
                     }
-                    await context.Response.WriteAsync(System.Environment.NewLine);
                 }
+                catch (Exception)
+                {
+                    // best effort to get tail logs
+                }
+
                 NotifyClientWithLineBreak("Ending Log Tail of existing logs ---", context);
             }
             else
             {
                 _tracer.TraceError("LogStream: No pervious logfiles");
-                Console.WriteLine("LogStream: No pervious logfiles");
             }
 
             NotifyClientWithLineBreak("Starting Live Log Stream ---", context);
@@ -239,7 +249,7 @@ private static Task WriteInitialMessage(HttpContext context)
         /// or the mounted fs logs dir, if kudu
         /// </summary>
         /// <returns></returns>
-        private static bool shouldMonitiorMountedLogsPath(string mountedDirPath)
+        private static bool ShouldMonitiorMountedLogsPath(string mountedDirPath)
         {
             int count = 0;
             string dateToday = DateTime.Now.ToString("yyyy_MM_dd");

From 6d1af0ee0a263ff315b2c73f0c7c74c3bf16fcf7 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 19 Aug 2019 12:25:35 -0700
Subject: [PATCH 113/245] Added console event generator for kudu (#85)

---
 Kudu.Core/Tracing/ConsoleEventGenerator.cs | 158 +++++++++++++++++++++
 Kudu.Core/Tracing/KuduEventGenerator.cs    |  15 +-
 2 files changed, 171 insertions(+), 2 deletions(-)
 create mode 100644 Kudu.Core/Tracing/ConsoleEventGenerator.cs

diff --git a/Kudu.Core/Tracing/ConsoleEventGenerator.cs b/Kudu.Core/Tracing/ConsoleEventGenerator.cs
new file mode 100644
index 00000000..52856b75
--- /dev/null
+++ b/Kudu.Core/Tracing/ConsoleEventGenerator.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Diagnostics.Tracing;
+using System.IO;
+using Kudu.Core.Settings;
+
+namespace Kudu.Core.Tracing
+{
+    class ConsoleEventGenerator : IKuduEventGenerator
+    {
+        private readonly Action<string> _writeEvent;
+        private readonly bool _consoleEnabled = true;
+
+        public ConsoleEventGenerator()
+        {
+            _writeEvent = ConsoleWriter;
+        }
+
+        public void ProjectDeployed(string siteName, string projectType, string result, string error, long deploymentDurationInMilliseconds, string siteMode, string scmType, string vsProjectId)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                projectType = projectType,
+                result = result,
+                error = error,
+                deploymentDurationInMilliseconds = deploymentDurationInMilliseconds,
+                siteMode = siteMode,
+                scmType = scmType,
+                vsProjectId = vsProjectId
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void WebJobStarted(string siteName, string jobName, string scriptExtension, string jobType, string siteMode, string error, string trigger)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                jobName = jobName,
+                scriptExtension = scriptExtension,
+                jobType = jobType,
+                siteMode = siteMode,
+                error = error,
+                trigger = trigger
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void KuduException(string siteName, string method, string path, string result, string Message, string exception)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                level = (int)EventLevel.Warning,
+                siteName = siteName,
+                method = method,
+                path = path,
+                result = result,
+                Message = Message,
+                exception = exception
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void DeprecatedApiUsed(string siteName, string route, string userAgent, string method, string path)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                level = (int)EventLevel.Warning,
+                siteName = siteName,
+                route = route,
+                userAgent = userAgent,
+                method = method,
+                path = path
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void KuduSiteExtensionEvent(string siteName, string method, string path, string result, string deploymentDurationInMilliseconds, string Message)
+        {
+            long duration = 0;
+            long.TryParse(deploymentDurationInMilliseconds, out duration);
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                method = method,
+                path = path,
+                result = result,
+                deploymentDurationInMilliseconds = duration,
+                Message = Message
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void WebJobEvent(string siteName, string jobName, string Message, string jobType, string error)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                jobName = jobName,
+                Message = Message,
+                jobType = jobType,
+                error = error
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void GenericEvent(string siteName, string Message, string requestId, string scmType, string siteMode, string buildVersion)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                Message = Message,
+                requestId = requestId,
+                scmType = scmType,
+                siteMode = siteMode,
+                buildVersion = buildVersion
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void ApiEvent(string siteName, string Message, string address, string verb, string requestId, int statusCode, long latencyInMilliseconds, string userAgent)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                Message = Message,
+                address = address,
+                verb = verb,
+                requestId = requestId,
+                statusCode = statusCode,
+                latencyInMilliseconds = latencyInMilliseconds,
+                userAgent = userAgent
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void LogKuduTraceEvent(KuduEvent kuduEvent)
+        {
+            _writeEvent($"{Constants.LinuxLogEventStreamName} {kuduEvent.ToString()},{Environment.StampName},{Environment.TenantId},{Environment.ContainerName}");
+        }
+
+        private void ConsoleWriter(string evt)
+        {
+            if (_consoleEnabled)
+            {
+                Console.WriteLine(evt);
+            }
+        }
+    }
+}
diff --git a/Kudu.Core/Tracing/KuduEventGenerator.cs b/Kudu.Core/Tracing/KuduEventGenerator.cs
index a2d8b198..10b513e8 100644
--- a/Kudu.Core/Tracing/KuduEventGenerator.cs
+++ b/Kudu.Core/Tracing/KuduEventGenerator.cs
@@ -1,4 +1,6 @@
-namespace Kudu.Core.Tracing
+using Kudu.Core.Helpers;
+
+namespace Kudu.Core.Tracing
 {
     public class KuduEventGenerator
     {
@@ -6,6 +8,7 @@ public class KuduEventGenerator
 
         public static IKuduEventGenerator Log()
         {
+            // Linux Consumptions only
             bool isLinuxContainer = !string.IsNullOrEmpty(Environment.ContainerName);
             if (isLinuxContainer)
             {
@@ -18,7 +21,15 @@ public static IKuduEventGenerator Log()
             {
                 if (_eventGenerator == null)
                 {
-                    _eventGenerator = new DefaultKuduEventGenerator();
+                    // Generate ETW events when running on windows
+                    if (OSDetector.IsOnWindows())
+                    {
+                        _eventGenerator = new DefaultKuduEventGenerator();
+                    }
+                    else
+                    {
+                        _eventGenerator = new DefaultKuduEventGenerator();
+                    }
                 }
             }
             return _eventGenerator;

From f05beeca00879ed9b2a73d54dad7f09196cd49db Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 19 Aug 2019 12:25:47 -0700
Subject: [PATCH 114/245] Fixed the bug where symlinks couldn't be created for
 zip extraction + (#84)

added recursive permissions change for zip deploy/zip controller
---
 Common/Constants.cs                           |  2 +-
 .../Deployment/DeploymentInfoBase.cs          |  4 ++
 .../Deployment/FetchDeploymentManager.cs      |  2 +-
 Kudu.Core/Helpers/PermissionHelper.cs         | 33 +++++++++++++-
 Kudu.Core/Infrastructure/FileSystemHelpers.cs | 23 ++++++++++
 .../Infrastructure/ZipArchiveExtensions.cs    | 45 ++++++++++---------
 Kudu.Services.Web/Startup.cs                  |  2 +-
 .../Deployment/PushDeploymentController.cs    | 25 +++++++++--
 Kudu.Services/Zip/ZipController.cs            |  9 +++-
 9 files changed, 113 insertions(+), 32 deletions(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index c9763ea2..0867ec00 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -145,7 +145,7 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string Extensions = "extensions";
         public const string SitePackages = "SitePackages";
         public const string PackageNameTxt = "packagename.txt";
-        public const string KuduBuild = "1.0.0.6";
+        public const string KuduBuild = "1.0.0.7";
 
         public const string WebSSHReverseProxyPortEnvVar = "KUDU_WEBSSH_PORT";
         public const string WebSSHReverseProxyDefaultPort = "3000";
diff --git a/Kudu.Contracts/Deployment/DeploymentInfoBase.cs b/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
index 012b5639..fc8b5730 100644
--- a/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
+++ b/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
@@ -2,6 +2,8 @@
 using Kudu.Core.SourceControl;
 using Kudu.Contracts.Tracing;
 using System.Threading.Tasks;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace Kudu.Core.Deployment
 {
@@ -28,6 +30,8 @@ protected DeploymentInfoBase()
         public FetchDelegate Fetch { get; set; }
         public bool AllowDeploymentWhileScmDisabled { get; set; }
 
+        public IDictionary<string, string> repositorySymlinks { get; set; }
+
         // Optional.
         // Path of the directory to be deployed to. The path should be relative to the wwwroot directory.
         // Example: "webapps/ROOT"
diff --git a/Kudu.Core/Deployment/FetchDeploymentManager.cs b/Kudu.Core/Deployment/FetchDeploymentManager.cs
index ba651c01..1c813c7a 100644
--- a/Kudu.Core/Deployment/FetchDeploymentManager.cs
+++ b/Kudu.Core/Deployment/FetchDeploymentManager.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.IO.Abstractions;
 using System.Threading.Tasks;
 using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.Settings;
@@ -125,7 +126,6 @@ public async Task<FetchDeploymentRequestResult> FetchDeploy(
                     }
 
                     await PerformDeployment(deployInfo);
-                    Console.WriteLine("\n\n\n\n Perform deployment Over\n\n\n");
                     return FetchDeploymentRequestResult.RanSynchronously;
                 }, "Performing continuous deployment", TimeSpan.Zero);
             }
diff --git a/Kudu.Core/Helpers/PermissionHelper.cs b/Kudu.Core/Helpers/PermissionHelper.cs
index 305b7bad..378a4ded 100644
--- a/Kudu.Core/Helpers/PermissionHelper.cs
+++ b/Kudu.Core/Helpers/PermissionHelper.cs
@@ -1,9 +1,12 @@
-using System.IO;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
 using Kudu.Contracts.Settings;
+using Kudu.Contracts.Tracing;
 using Kudu.Core.Deployment;
 using Kudu.Core.Deployment.Generator;
 using Kudu.Core.Infrastructure;
-using System;
 
 namespace Kudu.Core.Helpers
 {
@@ -16,5 +19,31 @@ public static void Chmod(string permission, string filePath, IEnvironment enviro
             Executable exe = exeFactory.BuildCommandExecutable("/bin/chmod", folder, deploymentSettingManager.GetCommandIdleTimeout(), logger);
             exe.Execute("{0} \"{1}\"", permission, filePath);
         }
+
+        public static void ChmodRecursive(string permission, string directoryPath, ITracer tracer, TimeSpan timeout)
+        {
+            string cmd = String.Format("timeout {0}s chmod {1} -R {2}",timeout.TotalSeconds, permission, directoryPath);
+            var escapedArgs = cmd.Replace("\"", "\\\"");
+
+            var process = new Process
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    RedirectStandardOutput = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden,
+                    FileName = "/bin/bash",
+                    Arguments = $"-c \"{escapedArgs}\""
+                }
+            };
+            process.Start();
+            process.WaitForExit();
+
+            if(process.ExitCode != 0)
+            {
+                throw new Exception(string.Format("Error in changing file permissions : {0}",process.ExitCode));
+            }
+        }
     }
 }
diff --git a/Kudu.Core/Infrastructure/FileSystemHelpers.cs b/Kudu.Core/Infrastructure/FileSystemHelpers.cs
index 4082a980..3d6132f9 100644
--- a/Kudu.Core/Infrastructure/FileSystemHelpers.cs
+++ b/Kudu.Core/Infrastructure/FileSystemHelpers.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.IO.Abstractions;
@@ -375,6 +376,28 @@ private static void DeleteDirectoryContentsSafe(DirectoryInfoBase directoryInfo,
             }
         }
 
+        public static void CreateRelativeSymlinks(string source, string destination, TimeSpan timeout)
+        {
+            string directory = FileSystemHelpers.GetDirectoryName(source);
+            string cmd = String.Format("cd {0}; timeout {1}s  ln -s {2} {3}", directory, timeout.TotalSeconds, destination, source);
+            var escapedArgs = cmd.Replace("\"", "\\\"");
+
+            var process = new Process
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    RedirectStandardOutput = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden,
+                    FileName = "/bin/bash",
+                    Arguments = $"-c \"{escapedArgs}\""
+                }
+            };
+            process.Start();
+            process.WaitForExit();
+        }
+
         private static void DeleteFileSystemInfo(FileSystemInfoBase fileSystemInfo, bool ignoreErrors)
         {
             if (!fileSystemInfo.Exists)
diff --git a/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs b/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
index 9e61ff05..031c577f 100644
--- a/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
+++ b/Kudu.Core/Infrastructure/ZipArchiveExtensions.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
@@ -108,8 +110,10 @@ public static ZipArchiveEntry AddFile(this ZipArchive zip, string fileName, stri
             return entry;
         }
 
-        public static void Extract(this ZipArchive archive, string directoryName)
+        public static IDictionary<string, string> Extract(this ZipArchive archive, string directoryName)
         {
+            IDictionary<string, string> symLinks = new Dictionary<string, string>();
+            bool isSymLink = false;
             foreach (ZipArchiveEntry entry in archive.Entries)
             {
                 string path = Path.Combine(directoryName, entry.FullName);
@@ -126,34 +130,33 @@ public static void Extract(this ZipArchive archive, string directoryName)
                     {
                         fileInfo.Directory.Create();
                     }
-
                     using (Stream zipStream = entry.Open(),
-                                  fileStream = fileInfo.Open(FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
+                        fileStream = fileInfo.Open(FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
                     {
                         zipStream.CopyTo(fileStream);
                     }
 
-                    bool createSymLink = false;
+                    isSymLink = false;
                     string originalFileName = string.Empty;
+
                     if (!OSDetector.IsOnWindows())
                     {
                         try
                         {
                             using (Stream fs = fileInfo.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                             {
-                                byte[] buffer = new byte[10];
+                                byte[] buffer = new byte[4];
                                 fs.Read(buffer, 0, buffer.Length);
                                 fs.Close();
 
                                 var str = System.Text.Encoding.Default.GetString(buffer);
                                 if (str.StartsWith("../"))
                                 {
-                                    string fullPath = Path.GetFullPath(str);
-                                    if (fullPath.StartsWith(directoryName))
+                                    using (StreamReader reader = fileInfo.OpenText())
                                     {
-                                        createSymLink = true;
-                                        originalFileName = fullPath;
+                                        symLinks[entry.FullName] = reader.ReadToEnd();
                                     }
+                                    isSymLink = true;
                                 }
                             }
                         }
@@ -163,24 +166,22 @@ public static void Extract(this ZipArchive archive, string directoryName)
                         }
                     }
 
-                    fileInfo.LastWriteTimeUtc = entry.LastWriteTime.ToUniversalTime().DateTime;
-
-                    if (createSymLink)
+                    try
                     {
-                        try
-                        {
-                            fileInfo.Delete();
+                        fileInfo.LastWriteTimeUtc = entry.LastWriteTime.ToUniversalTime().DateTime;
+                    }
+                    catch(Exception)
+                    {
+                        //best effort
+                    }
 
-                            Mono.Unix.UnixFileInfo unixFileInfo = new Mono.Unix.UnixFileInfo(originalFileName);
-                            unixFileInfo.CreateSymbolicLink(path);
-                        }
-                        catch (Exception ex)
-                        {
-                            throw new Exception("Could not create symlinks : " + ex.ToString());
-                        }
+                    if(isSymLink)
+                    {
+                        fileInfo.Delete();
                     }
                 }
             }
+            return symLinks;
         }
 
         private static string EnsureTrailingSlash(string input)
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 232cc294..519f2f50 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -75,7 +75,7 @@ public Startup(IConfiguration configuration, IHostingEnvironment hostingEnvironm
         public void ConfigureServices(IServiceCollection services)
         {
             Console.WriteLine(@"Configure Services : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
-
+            FileSystemHelpers.DeleteDirectorySafe("/home/site/locks/deployment");
             services.Configure<FormOptions>(options =>
             {
                 options.MultipartBodyLengthLimit = 52428800;
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index afce1b0f..30486b56 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -18,6 +18,10 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Newtonsoft.Json.Linq;
 using System.Net.Http;
+using System.Collections.Generic;
+using Kudu.Core.Helpers;
+using System.Threading;
+using System.Collections;
 
 namespace Kudu.Services.Deployment
 {
@@ -344,11 +348,12 @@ private Task LocalZipFetch(IRepository repository, DeploymentInfoBase deployment
 
                 using (var zip = new ZipArchive(file, ZipArchiveMode.Read))
                 {
-                    zip.Extract(extractTargetDirectory);
+                    deploymentInfo.repositorySymlinks = zip.Extract(extractTargetDirectory);
+
+                    CreateZipSymlinks(deploymentInfo.repositorySymlinks, extractTargetDirectory);
+
+                    PermissionHelper.ChmodRecursive("777", extractTargetDirectory, tracer, TimeSpan.FromMinutes(1));
                 }
-                //});
-                //await Task.WhenAll(cleanTask, extractTask);
-                //await Task.WhenAll(cleanTask, extractTask);
             }
 
             CommitRepo(repository, zipDeploymentInfo);
@@ -414,6 +419,18 @@ private static void CommitRepo(IRepository repository, ZipDeploymentInfo zipDepl
             repository.Commit(zipDeploymentInfo.Message, zipDeploymentInfo.Author, zipDeploymentInfo.AuthorEmail);
         }
 
+        private static void CreateZipSymlinks(IDictionary<string, string> symLinks, string extractTargetDirectory)
+        {
+            if (!OSDetector.IsOnWindows() && symLinks != null)
+            {
+                foreach (var symlinkPair in symLinks)
+                {
+                    string symLinkFilePath = Path.Combine(extractTargetDirectory, symlinkPair.Key);
+                    FileSystemHelpers.EnsureDirectory(FileSystemHelpers.GetDirectoryName(Path.Combine(extractTargetDirectory, symlinkPair.Key)));
+                    FileSystemHelpers.CreateRelativeSymlinks(symLinkFilePath, symlinkPair.Value, TimeSpan.FromSeconds(5));
+                }
+            }
+        }
 
         private async Task WriteSitePackageZip(ZipDeploymentInfo zipDeploymentInfo, ITracer tracer)
         {
diff --git a/Kudu.Services/Zip/ZipController.cs b/Kudu.Services/Zip/ZipController.cs
index f90a0164..d9773d84 100644
--- a/Kudu.Services/Zip/ZipController.cs
+++ b/Kudu.Services/Zip/ZipController.cs
@@ -11,6 +11,8 @@
 using System.IO;
 using Microsoft.Extensions.DependencyInjection;
 using Kudu.Core.Infrastructure;
+using Kudu.Core.Helpers;
+using System.Threading;
 
 namespace Kudu.Services.Zip
 {
@@ -18,9 +20,14 @@ namespace Kudu.Services.Zip
     // of good reusable logic in there. We could consider extracting a more basic base class from it.
     public class ZipController : VfsControllerBase
     {
+        private ITracer _tracer;
+        private IEnvironment _environment;
         public ZipController(ITracer tracer, IEnvironment environment)
             : base(tracer, environment, environment.RootPath)
         {
+            _tracer = tracer;
+            _environment = environment;
+
         }
 
         protected override Task<IActionResult> CreateDirectoryGetResponse(DirectoryInfoBase info, string localFilePath)
@@ -70,7 +77,7 @@ protected override Task<IActionResult> CreateDirectoryPutResponse(DirectoryInfoB
         {
             var zipArchive = new ZipArchive(Request.Body, ZipArchiveMode.Read);
             zipArchive.Extract(localFilePath);
-
+            PermissionHelper.ChmodRecursive("777", localFilePath, _tracer, TimeSpan.FromSeconds(30));
             return Task.FromResult((IActionResult)Ok());
         }
 

From 795ab0eeb2014428c0580d422ce7d8afaae57b28 Mon Sep 17 00:00:00 2001
From: "Hanzhang Zeng (Roger)" <48038149+Hazhzeng@users.noreply.github.com>
Date: Fri, 13 Sep 2019 13:14:52 -0700
Subject: [PATCH 115/245] ANT84 Linux Consumption Remote Build Patch (#88)

* ANT84 Linux Consumption Server Side Build Patch

* Add logger for dependencies

* Remove zip context validation

* Fix error message when doing zip deploy with WEBSITE_RUN_FROM_PACKAGE
---
 Kudu.Core/Deployment/DeploymentHelper.cs      |   1 +
 Kudu.Core/Deployment/DeploymentManager.cs     |   9 +
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  96 -------
 .../Generator/SiteBuilderFactory.cs           |   3 +-
 ...inuxConsumptionFunctionAppOryxArguments.cs |   2 +-
 .../Deployment/Oryx/OryxBuildConstants.cs     |   1 +
 .../LinuxConsumptionDeploymentHelper.cs       | 255 ++++++++++++++++++
 .../Deployment/PushDeploymentController.cs    |   2 +-
 ...LinuxConsumptionInstanceAdminController.cs |   9 +-
 .../LinuxConsumptionRouteMiddleware.cs        |   3 +
 Kudu.Services/Resources.Designer.cs           |   8 +-
 Kudu.Services/Resources.resx                  |   4 +-
 12 files changed, 280 insertions(+), 113 deletions(-)
 create mode 100644 Kudu.Core/Helpers/LinuxConsumptionDeploymentHelper.cs

diff --git a/Kudu.Core/Deployment/DeploymentHelper.cs b/Kudu.Core/Deployment/DeploymentHelper.cs
index 46828420..1db2d498 100644
--- a/Kudu.Core/Deployment/DeploymentHelper.cs
+++ b/Kudu.Core/Deployment/DeploymentHelper.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using Kudu.Contracts.Tracing;
+using Kudu.Core.Deployment.Generator;
 using Kudu.Core.Deployment.Oryx;
 using Kudu.Core.Infrastructure;
 using Kudu.Core.SourceControl;
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 37b91ac8..ae716a35 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -684,6 +684,15 @@ private async Task Build(
                         await builder.Build(context);
                         builder.PostBuild(context);
 
+                        if (FunctionAppHelper.LooksLikeFunctionApp() && _environment.IsOnLinuxConsumption)
+                        {
+                            // A Linux consumption function app deployment requires (no matter whether it is oryx build or basic deployment)
+                            // 1. packaging the output folder
+                            // 2. upload the artifact to user's storage account
+                            // 3. reset the container workers after deployment
+                            await LinuxConsumptionDeploymentHelper.SetupLinuxConsumptionFunctionAppDeployment(_environment, _settings, context);
+                        }
+
                         await PostDeploymentHelper.SyncFunctionsTriggers(
                             _environment.RequestId, 
                             new PostDeploymentTraceListener(tracer, logger), 
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 2a039258..53ab6cf8 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -1,9 +1,6 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using System.Net.Http;
-using Microsoft.WindowsAzure.Storage.Blob;
-using Microsoft.WindowsAzure.Storage;
 using Kudu.Core.Infrastructure;
 using Kudu.Core.Helpers;
 using Kudu.Contracts.Settings;
@@ -67,12 +64,6 @@ public override Task Build(DeploymentContext context)
                 }
             }
 
-            // Detect if package upload is necessary for server side build
-            if (FunctionAppHelper.HasScmRunFromPackage() && FunctionAppHelper.LooksLikeFunctionApp())
-            {
-                SetupLinuxConsumptionFunctionAppDeployment(context).Wait();
-            }
-
             return Task.CompletedTask;
         }
 
@@ -164,92 +155,5 @@ private string PackageArtifactFromFolder(DeploymentContext context, string srcDi
 
             return file;
         }
-
-        /// <summary>
-        /// Specifically used for Linux Consumption to support Server Side build scenario
-        /// </summary>
-        /// <param name="context"></param>
-        private async Task SetupLinuxConsumptionFunctionAppDeployment(DeploymentContext context)
-        {
-            string sas = System.Environment.GetEnvironmentVariable(Constants.ScmRunFromPackage);
-            string builtFolder = context.RepositoryPath;
-            string packageFolder = Environment.DeploymentsPath;
-            string packageFileName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.squashfs";
-
-            // Package built content from oryx build artifact
-            string filePath = PackageArtifactFromFolder(context, builtFolder, packageFolder, packageFileName, BuildArtifactType.Squashfs, 
-                OryxBuildConstants.FunctionAppBuildSettings.ConsumptionBuildMaxFiles);
-
-            // Upload from DeploymentsPath
-            await UploadLinuxConsumptionFunctionAppBuiltContent(context, sas, filePath);
-
-            // Remove Linux consumption plan functionapp workers for the site
-            await RemoveLinuxConsumptionFunctionAppWorkers(context);
-        }
-
-        //public override void PostBuild(DeploymentContext context)
-        //{
-        //    // no-op
-        //    context.Logger.Log($"Skipping post build. Project type: {ProjectType}");
-        //    FileLogHelper.Log("Completed PostBuild oryx....");
-        //}
-
-        private async Task UploadLinuxConsumptionFunctionAppBuiltContent(DeploymentContext context, string sas, string filePath)
-        {
-            context.Logger.Log($"Uploading built content {filePath} -> {sas}");
-
-            // Check if SCM_RUN_FROM_PACKAGE does exist
-            if (string.IsNullOrEmpty(sas))
-            {
-                context.Logger.Log($"Failed to upload because SCM_RUN_FROM_PACKAGE is not provided.");
-                throw new DeploymentFailedException(new ArgumentException("Failed to upload because SAS is empty."));
-            }
-
-            // Parse SAS
-            Uri sasUri = null;
-            if (!Uri.TryCreate(sas, UriKind.Absolute, out sasUri))
-            {
-                context.Logger.Log($"Malformed SAS when uploading built content.");
-                throw new DeploymentFailedException(new ArgumentException("Failed to upload because SAS is malformed."));
-            }
-
-            // Upload blob to Azure Storage
-            CloudBlockBlob blob = new CloudBlockBlob(sasUri);
-            try
-            {
-                await blob.UploadFromFileAsync(filePath);
-            } catch (StorageException se)
-            {
-                context.Logger.Log($"Failed to upload because Azure Storage responds {se.RequestInformation.HttpStatusCode}.");
-                context.Logger.Log(se.Message);
-                throw new DeploymentFailedException(se);
-            }
-        }
-
-        private async Task RemoveLinuxConsumptionFunctionAppWorkers(DeploymentContext context)
-        {
-            string webSiteHostName = System.Environment.GetEnvironmentVariable(SettingsKeys.WebsiteHostname);
-            string sitename = ServerConfiguration.GetApplicationName();
-
-            context.Logger.Log($"Reseting all workers for {webSiteHostName}");
-
-            try
-            {
-                await OperationManager.AttemptAsync(async () =>
-                {
-                    await PostDeploymentHelper.RemoveAllWorkersAsync(webSiteHostName, sitename);
-                }, retries: 3, delayBeforeRetry: 2000);
-            }
-            catch (ArgumentException ae)
-            {
-                context.Logger.Log($"Reset all workers has malformed webSiteHostName or sitename {ae.Message}");
-                throw new DeploymentFailedException(ae);
-            }
-            catch (HttpRequestException hre)
-            {
-                context.Logger.Log($"Reset all workers endpoint responded with {hre.Message}");
-                throw new DeploymentFailedException(hre);
-            }
-        }
     }
 }
diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index 6bab1102..e7404044 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.Settings;
 using Kudu.Contracts.Tracing;
 using Kudu.Core.Infrastructure;
@@ -66,7 +67,7 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
             string enableOryxBuild = System.Environment.GetEnvironmentVariable("ENABLE_ORYX_BUILD");
             if (!string.IsNullOrEmpty(enableOryxBuild))
             {
-                if (enableOryxBuild.Equals("true", StringComparison.OrdinalIgnoreCase))
+                if (StringUtils.IsTrueLike(enableOryxBuild))
                 {
                     return new OryxBuilder(_environment, settings, _propertyProvider, repositoryRoot);
                 }
diff --git a/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
index 929aca5a..1c377554 100644
--- a/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
@@ -16,7 +16,7 @@ public override string GenerateOryxBuildCommand(DeploymentContext context)
         {
             StringBuilder args = new StringBuilder();
 
-            base.AddOryxBuildCommand(args, context, source: context.RepositoryPath, destination: context.RepositoryPath);
+            base.AddOryxBuildCommand(args, context, source: context.RepositoryPath, destination: context.OutputPath);
             base.AddLanguage(args, base.FunctionsWorkerRuntime);
             base.AddLanguageVersion(args, base.FunctionsWorkerRuntime);
             base.AddBuildOptimizationFlags(args, context, Flags);
diff --git a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
index 6a2b33ba..0ca96396 100644
--- a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
@@ -29,6 +29,7 @@ internal static class FunctionAppWorkerRuntimeDefaults
         internal static class FunctionAppBuildSettings
         {
             public static readonly string ExpressBuildSetup = "/tmp/build/expressbuild";
+            public static readonly string LinuxConsumptionArtifactName = "functionappartifact.squashfs";
             public static readonly string PythonPackagesTargetDir = Path.Combine(".python_packages", "lib", "python3.6", "site-packages");
 
             // Determine how many built files should be kept in the container
diff --git a/Kudu.Core/Helpers/LinuxConsumptionDeploymentHelper.cs b/Kudu.Core/Helpers/LinuxConsumptionDeploymentHelper.cs
new file mode 100644
index 00000000..c569de85
--- /dev/null
+++ b/Kudu.Core/Helpers/LinuxConsumptionDeploymentHelper.cs
@@ -0,0 +1,255 @@
+using Kudu.Contracts.Settings;
+using Kudu.Core.Deployment;
+using Kudu.Core.Deployment.Generator;
+using Kudu.Core.Deployment.Oryx;
+using Kudu.Core.Infrastructure;
+using Kudu.Core.Tracing;
+using Microsoft.WindowsAzure.Storage;
+using Microsoft.WindowsAzure.Storage.Blob;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace Kudu.Core.Helpers
+{
+    public class LinuxConsumptionDeploymentHelper
+    {
+        /// <summary>
+        /// Specifically used for Linux Consumption to support Server Side build scenario
+        /// </summary>
+        /// <param name="context"></param>
+        public static async Task SetupLinuxConsumptionFunctionAppDeployment(IEnvironment env, IDeploymentSettingsManager settings, DeploymentContext context)
+        {
+            string sas = System.Environment.GetEnvironmentVariable(Constants.ScmRunFromPackage);
+            string builtFolder = context.OutputPath;
+            string packageFolder = env.DeploymentsPath;
+            string packageFileName = OryxBuildConstants.FunctionAppBuildSettings.LinuxConsumptionArtifactName;
+
+            // Package built content from oryx build artifact
+            string filePath = PackageArtifactFromFolder(env, settings, context, builtFolder, packageFolder, packageFileName);
+
+            // Log function app dependencies to kusto (requirements.txt, package.json, .csproj)
+            await LogDependenciesFile(context.RepositoryPath);
+
+            // Upload from DeploymentsPath
+            await UploadLinuxConsumptionFunctionAppBuiltContent(context, sas, filePath);
+
+            // Clean up local built content
+            FileSystemHelpers.DeleteDirectoryContentsSafe(context.OutputPath);
+
+            // Remove Linux consumption plan functionapp workers for the site
+            await RemoveLinuxConsumptionFunctionAppWorkers(context);
+        }
+
+        private static async Task LogDependenciesFile(string builtFolder)
+        {
+            try
+            {
+                await PrintRequirementsTxtDependenciesAsync(builtFolder);
+                await PrintPackageJsonDependenciesAsync(builtFolder);
+                PrintCsprojDependenciesAsync(builtFolder);
+            } catch (Exception)
+            {
+                KuduEventGenerator.Log().GenericEvent(
+                    ServerConfiguration.GetApplicationName(),
+                    $"dependencies,failed to parse function app dependencies",
+                    Guid.Empty.ToString(),
+                    string.Empty,
+                    string.Empty,
+                    string.Empty);
+            }
+        }
+
+        private static async Task PrintRequirementsTxtDependenciesAsync(string builtFolder)
+        {
+            string filename = "requirements.txt";
+            string requirementsTxtPath = Path.Combine(builtFolder, filename);
+            if (File.Exists(requirementsTxtPath))
+            {
+                string[] lines = await File.ReadAllLinesAsync(requirementsTxtPath);
+                foreach (string line in lines)
+                {
+                    int separatorIndex;
+                    if (line.IndexOf("==") >= 0)
+                    {
+                        separatorIndex = line.IndexOf("==");
+                    } else if (line.IndexOf(">=") >= 0)
+                    {
+                        separatorIndex = line.IndexOf(">=");
+                    } else if (line.IndexOf("<=") >= 0)
+                    {
+                        separatorIndex = line.IndexOf("<=");
+                    } else if (line.IndexOf(">") >= 0)
+                    {
+                        separatorIndex = line.IndexOf(">");
+                    } else if (line.IndexOf("<") >= 0)
+                    {
+                        separatorIndex = line.IndexOf("<");
+                    } else
+                    {
+                        separatorIndex = line.Length;
+                    }
+
+                    string package = line.Substring(0, separatorIndex).Trim();
+                    string version = line.Substring(separatorIndex).Trim();
+
+                    KuduEventGenerator.Log().GenericEvent(
+                        ServerConfiguration.GetApplicationName(),
+                        $"dependencies,python,{filename},{package},{version}",
+                        Guid.Empty.ToString(),
+                        string.Empty,
+                        string.Empty,
+                        string.Empty);
+                }
+            }
+        }
+
+        private static async Task PrintPackageJsonDependenciesAsync(string builtFolder)
+        {
+            string filename = "package.json";
+            string packageJsonPath = Path.Combine(builtFolder, filename);
+            if (File.Exists(packageJsonPath))
+            {
+                string content = await File.ReadAllTextAsync(packageJsonPath);
+                JObject jobj = JObject.Parse(content);
+                if (jobj.ContainsKey("devDependencies"))
+                {
+                    Dictionary<string, string> dictObj = jobj["devDependencies"].ToObject<Dictionary<string, string>>();
+                    foreach (string key in dictObj.Keys)
+                    {
+                        KuduEventGenerator.Log().GenericEvent(
+                            ServerConfiguration.GetApplicationName(),
+                            $"dependencies,node,{filename},{key},{dictObj[key]},devDependencies",
+                            Guid.Empty.ToString(),
+                            string.Empty,
+                            string.Empty,
+                            string.Empty);
+                    }
+                }
+
+                if (jobj.ContainsKey("dependencies"))
+                {
+                    Dictionary<string, string> dictObj = jobj["dependencies"].ToObject<Dictionary<string, string>>();
+                    foreach (string key in dictObj.Keys)
+                    {
+                        KuduEventGenerator.Log().GenericEvent(
+                            ServerConfiguration.GetApplicationName(),
+                            $"dependencies,node,{filename},{key},{dictObj[key]},dependencies",
+                            Guid.Empty.ToString(),
+                            string.Empty,
+                            string.Empty,
+                            string.Empty);
+                    }
+                }
+            }
+        }
+
+        private static void PrintCsprojDependenciesAsync(string builtFolder)
+        {
+            foreach (string csprojPath in Directory.GetFiles(builtFolder, "*.csproj", SearchOption.TopDirectoryOnly))
+            {
+                string filename = Path.GetFileName(csprojPath);
+                XElement purchaseOrder = XElement.Load(csprojPath);
+                foreach (var itemGroup in purchaseOrder.Elements("ItemGroup"))
+                {
+                    foreach (var packageReference in itemGroup.Elements("PackageReference"))
+                    {
+                        string include = packageReference.Attribute("Include").Value;
+                        string version = packageReference.Attribute("Version").Value;
+                        KuduEventGenerator.Log().GenericEvent(
+                            ServerConfiguration.GetApplicationName(),
+                            $"dependencies,dotnet,{filename},{include},{version}",
+                            Guid.Empty.ToString(),
+                            string.Empty,
+                            string.Empty,
+                            string.Empty);
+                    }
+                }
+            }
+        }
+
+        private static async Task UploadLinuxConsumptionFunctionAppBuiltContent(DeploymentContext context, string sas, string filePath)
+        {
+            context.Logger.Log($"Uploading built content {filePath} -> {sas}");
+
+            // Check if SCM_RUN_FROM_PACKAGE does exist
+            if (string.IsNullOrEmpty(sas))
+            {
+                context.Logger.Log($"Failed to upload because SCM_RUN_FROM_PACKAGE is not provided.");
+                throw new DeploymentFailedException(new ArgumentException("Failed to upload because SAS is empty."));
+            }
+
+            // Parse SAS
+            Uri sasUri = null;
+            if (!Uri.TryCreate(sas, UriKind.Absolute, out sasUri))
+            {
+                context.Logger.Log($"Malformed SAS when uploading built content.");
+                throw new DeploymentFailedException(new ArgumentException("Failed to upload because SAS is malformed."));
+            }
+
+            // Upload blob to Azure Storage
+            CloudBlockBlob blob = new CloudBlockBlob(sasUri);
+            try
+            {
+                await blob.UploadFromFileAsync(filePath);
+            }
+            catch (StorageException se)
+            {
+                context.Logger.Log($"Failed to upload because Azure Storage responds {se.RequestInformation.HttpStatusCode}.");
+                context.Logger.Log(se.Message);
+                throw new DeploymentFailedException(se);
+            }
+        }
+
+        private static async Task RemoveLinuxConsumptionFunctionAppWorkers(DeploymentContext context)
+        {
+            string webSiteHostName = System.Environment.GetEnvironmentVariable(SettingsKeys.WebsiteHostname);
+            string sitename = ServerConfiguration.GetApplicationName();
+
+            context.Logger.Log($"Reseting all workers for {webSiteHostName}");
+
+            try
+            {
+                await OperationManager.AttemptAsync(async () =>
+                {
+                    await PostDeploymentHelper.RemoveAllWorkersAsync(webSiteHostName, sitename);
+                }, retries: 3, delayBeforeRetry: 2000);
+            }
+            catch (ArgumentException ae)
+            {
+                context.Logger.Log($"Reset all workers has malformed webSiteHostName or sitename {ae.Message}");
+                throw new DeploymentFailedException(ae);
+            }
+            catch (HttpRequestException hre)
+            {
+                context.Logger.Log($"Reset all workers endpoint responded with {hre.Message}");
+                throw new DeploymentFailedException(hre);
+            }
+        }
+
+        private static string PackageArtifactFromFolder(IEnvironment environment, IDeploymentSettingsManager settings, DeploymentContext context, string srcDirectory, string artifactDirectory, string artifactFilename)
+        {
+            context.Logger.Log("Writing the artifacts to a squashfs file");
+            string file = Path.Combine(artifactDirectory, artifactFilename);
+            ExternalCommandFactory commandFactory = new ExternalCommandFactory(environment, settings, context.RepositoryPath);
+            Executable exe = commandFactory.BuildExternalCommandExecutable(srcDirectory, artifactDirectory, context.Logger);
+            try
+            {
+                exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"mksquashfs . {file} -noappend");
+            }
+            catch (Exception)
+            {
+                context.GlobalLogger.LogError();
+                throw;
+            }
+
+            int numOfArtifacts = OryxBuildConstants.FunctionAppBuildSettings.ConsumptionBuildMaxFiles;
+            DeploymentHelper.PurgeBuildArtifactsIfNecessary(artifactDirectory, BuildArtifactType.Squashfs, context.Tracer, numOfArtifacts);
+            return file;
+        }
+    }
+}
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index 30486b56..c5f27a81 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -301,7 +301,7 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
                 case FetchDeploymentRequestResult.ConflictDeploymentInProgress:
                     return StatusCode(StatusCodes.Status409Conflict, Resources.Error_DeploymentInProgress);
                 case FetchDeploymentRequestResult.ConflictRunFromRemoteZipConfigured:
-                    return StatusCode(StatusCodes.Status409Conflict, Resources.Error_AutoSwapDeploymentOngoing);
+                    return StatusCode(StatusCodes.Status409Conflict, Resources.Error_RunFromRemoteZipConfigured);
                 default:
                     return BadRequest();
             }
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
index da190b6b..03c79875 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionInstanceAdminController.cs
@@ -56,14 +56,7 @@ public async Task<IActionResult> AssignAsync([FromBody] EncryptedHostAssignmentC
             var containerKey = System.Environment.GetEnvironmentVariable(SettingsKeys.ContainerEncryptionKey);
             var assignmentContext = encryptedAssignmentContext.Decrypt(containerKey);
 
-            // 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);
-            }
-
+            // We don't need to do validation on run_from_package zip, scm site on Linux Consumption should always be on
             var assignmentResult = _instanceManager.StartAssignment(assignmentContext);
 
             // modify app settings from environment variables (for all start with "APPSETTING_")
diff --git a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
index 547ce9ee..97ee3610 100644
--- a/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
+++ b/Kudu.Services/LinuxConsumptionInstanceAdmin/LinuxConsumptionRouteMiddleware.cs
@@ -26,6 +26,9 @@ public class LinuxConsumptionRouteMiddleware
         private static readonly HashSet<string> Whitelist = new HashSet<string>
         {
             "/api/zipdeploy",
+            "/api/deployments",
+            "/api/isdeploying",
+            "/api/settings",
             "/admin/instance",
             "/deployments",
         };
diff --git a/Kudu.Services/Resources.Designer.cs b/Kudu.Services/Resources.Designer.cs
index 16f3bc6f..576b6d42 100644
--- a/Kudu.Services/Resources.Designer.cs
+++ b/Kudu.Services/Resources.Designer.cs
@@ -331,7 +331,7 @@ internal static string Error_RepositoryNotFound {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Run-From-Zip is set to a remote URL using WEBSITE_USE_ZIP app setting. Deployment is not supported in this configuration..
+        ///   Looks up a localized string similar to Run-From-Zip is set to a remote URL using WEBSITE_RUN_FROM_PACKAGE or WEBSITE_USE_ZIP app setting. Deployment is not supported in this configuration..
         /// </summary>
         internal static string Error_RunFromRemoteZipConfigured {
             get {
@@ -376,14 +376,14 @@ internal static string Error_WebJobsStopped {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Check reults of last scan.
+        ///   Looks up a localized string similar to Check results of last scan.
         /// </summary>
         internal static string LastScanMsg {
             get {
                 return ResourceManager.GetString("LastScanMsg", resourceCulture);
             }
         }
-               
+        
         /// <summary>
         ///   Looks up a localized string similar to {0}{1}  The application was terminated.{0}.
         /// </summary>
@@ -556,7 +556,7 @@ internal static string ReceivingChanges {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Scan is already in progress..
+        ///   Looks up a localized string similar to Something is blocking the scan. It might be that a scan is already in progress or a deployment is underway..
         /// </summary>
         internal static string ScanInProgress {
             get {
diff --git a/Kudu.Services/Resources.resx b/Kudu.Services/Resources.resx
index ab7d61ae..c3d9ef3b 100644
--- a/Kudu.Services/Resources.resx
+++ b/Kudu.Services/Resources.resx
@@ -172,7 +172,7 @@
     <value>There is a deployment currently in progress. Please try again when it completes.</value>
   </data>
   <data name="Error_RunFromRemoteZipConfigured" xml:space="preserve">
-    <value>Run-From-Zip is set to a remote URL using WEBSITE_USE_ZIP app setting. Deployment is not supported in this configuration.</value>
+    <value>Run-From-Zip is set to a remote URL using WEBSITE_RUN_FROM_PACKAGE or WEBSITE_USE_ZIP app setting. Deployment is not supported in this configuration.</value>
   </data>
   <data name="Error_DeploymentNotFound" xml:space="preserve">
     <value>Deployment '{0}' not found.</value>
@@ -324,4 +324,4 @@
   <data name="ScanInProgress" xml:space="preserve">
     <value>Something is blocking the scan. It might be that a scan is already in progress or a deployment is underway.</value>
   </data>
-</root>
+</root>
\ No newline at end of file

From 4e179c774353c13056cc556a81b67c9cf6eb6d65 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 19 Sep 2019 18:19:05 -0700
Subject: [PATCH 116/245] Using Log4Net to generate kudu event logs

---
 Kudu.Core/Tracing/KuduEvent.cs                |   3 +-
 Kudu.Core/Tracing/KuduEventGenerator.cs       |   2 +-
 Kudu.Core/Tracing/Log4NetEventGenerator.cs    | 157 ++++++++++++++++++
 Kudu.Core/Tracing/XmlTracer.cs                |   9 +-
 Kudu.Services.Web/log4net.config              |  14 +-
 .../Diagnostics/ContainerInfoController.cs    |   2 +-
 6 files changed, 169 insertions(+), 18 deletions(-)
 create mode 100644 Kudu.Core/Tracing/Log4NetEventGenerator.cs

diff --git a/Kudu.Core/Tracing/KuduEvent.cs b/Kudu.Core/Tracing/KuduEvent.cs
index d30e147a..69863425 100644
--- a/Kudu.Core/Tracing/KuduEvent.cs
+++ b/Kudu.Core/Tracing/KuduEvent.cs
@@ -37,13 +37,14 @@ public override string ToString()
         {
             return $"{level},{siteName},{projectType},{result},{NormalizeString(error)},{deploymentDurationInMilliseconds},{siteMode},{scmType},{vsProjectId}," +
                 $"{jobName},{scriptExtension},{jobType},{trigger},{method},{path},{NormalizeString(Message)},{NormalizeString(exception)}," +
-                $"{route},{userAgent},{requestId},{buildVersion},{address},{verb},{statusCode},{latencyInMilliseconds}";
+                $"{route},{NormalizeString(userAgent)},{requestId},{buildVersion},{address},{verb},{statusCode},{latencyInMilliseconds}";
         }
 
         private string NormalizeString(string value)
         {
             // need to remove newlines for csv output
             value = value.Replace(System.Environment.NewLine, " ");
+            value = value.Replace("\"", " ");
 
             // Wrap string literals in enclosing quotes
             // For string columns that may contain quotes and/or
diff --git a/Kudu.Core/Tracing/KuduEventGenerator.cs b/Kudu.Core/Tracing/KuduEventGenerator.cs
index 10b513e8..f141e563 100644
--- a/Kudu.Core/Tracing/KuduEventGenerator.cs
+++ b/Kudu.Core/Tracing/KuduEventGenerator.cs
@@ -28,7 +28,7 @@ public static IKuduEventGenerator Log()
                     }
                     else
                     {
-                        _eventGenerator = new DefaultKuduEventGenerator();
+                        _eventGenerator = new Log4NetEventGenerator();
                     }
                 }
             }
diff --git a/Kudu.Core/Tracing/Log4NetEventGenerator.cs b/Kudu.Core/Tracing/Log4NetEventGenerator.cs
new file mode 100644
index 00000000..530a0c6e
--- /dev/null
+++ b/Kudu.Core/Tracing/Log4NetEventGenerator.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Diagnostics.Tracing;
+using System.IO;
+using Kudu.Core.Settings;
+using NuGet.Protocol.Core.Types;
+
+namespace Kudu.Core.Tracing
+{
+    class Log4NetEventGenerator : IKuduEventGenerator
+    {
+        private readonly Action<string> _writeEvent;
+
+        public static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        public Log4NetEventGenerator()
+        {
+            _writeEvent = Log4NetWriter;
+        }
+
+        public void ProjectDeployed(string siteName, string projectType, string result, string error, long deploymentDurationInMilliseconds, string siteMode, string scmType, string vsProjectId)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                projectType = projectType,
+                result = result,
+                error = error,
+                deploymentDurationInMilliseconds = deploymentDurationInMilliseconds,
+                siteMode = siteMode,
+                scmType = scmType,
+                vsProjectId = vsProjectId
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void WebJobStarted(string siteName, string jobName, string scriptExtension, string jobType, string siteMode, string error, string trigger)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                jobName = jobName,
+                scriptExtension = scriptExtension,
+                jobType = jobType,
+                siteMode = siteMode,
+                error = error,
+                trigger = trigger
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void KuduException(string siteName, string method, string path, string result, string Message, string exception)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                level = (int)EventLevel.Warning,
+                siteName = siteName,
+                method = method,
+                path = path,
+                result = result,
+                Message = Message,
+                exception = exception
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void DeprecatedApiUsed(string siteName, string route, string userAgent, string method, string path)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                level = (int)EventLevel.Warning,
+                siteName = siteName,
+                route = route,
+                userAgent = userAgent,
+                method = method,
+                path = path
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void KuduSiteExtensionEvent(string siteName, string method, string path, string result, string deploymentDurationInMilliseconds, string Message)
+        {
+            long duration = 0;
+            long.TryParse(deploymentDurationInMilliseconds, out duration);
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                method = method,
+                path = path,
+                result = result,
+                deploymentDurationInMilliseconds = duration,
+                Message = Message
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void WebJobEvent(string siteName, string jobName, string Message, string jobType, string error)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                jobName = jobName,
+                Message = Message,
+                jobType = jobType,
+                error = error
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void GenericEvent(string siteName, string Message, string requestId, string scmType, string siteMode, string buildVersion)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                Message = Message,
+                requestId = requestId,
+                scmType = scmType,
+                siteMode = siteMode,
+                buildVersion = buildVersion
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+        public void ApiEvent(string siteName, string Message, string address, string verb, string requestId, int statusCode, long latencyInMilliseconds, string userAgent)
+        {
+            KuduEvent kuduEvent = new KuduEvent
+            {
+                siteName = siteName,
+                Message = Message,
+                address = address,
+                verb = verb,
+                requestId = requestId,
+                statusCode = statusCode,
+                latencyInMilliseconds = latencyInMilliseconds,
+                userAgent = userAgent
+            };
+
+            LogKuduTraceEvent(kuduEvent);
+        }
+
+
+        public void LogKuduTraceEvent(KuduEvent kuduEvent)
+        {
+            _writeEvent($"{Constants.LinuxLogEventStreamName} {kuduEvent.ToString()},{Environment.StampName},{Environment.TenantId},{Environment.ContainerName}");
+        }
+
+        private void Log4NetWriter(string evt)
+        {
+                log.Debug(evt);
+        }
+    }
+}
diff --git a/Kudu.Core/Tracing/XmlTracer.cs b/Kudu.Core/Tracing/XmlTracer.cs
index 3b24df57..431e0c5e 100644
--- a/Kudu.Core/Tracing/XmlTracer.cs
+++ b/Kudu.Core/Tracing/XmlTracer.cs
@@ -32,7 +32,6 @@ public class XmlTracer : ITracer
         private static long _salt = 0;
         private static DateTime _lastCleanup = DateTime.MinValue;
                 
-        public static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         private bool startTagAdded = false;
 
         private readonly static TimeSpan ElapsedThreshold = TimeSpan.FromSeconds(10);
@@ -99,10 +98,7 @@ private IDisposable WriteStartElement(string title, IDictionary<string, string>
                     // generate trace file name base on attribs
                     _file = GenerateFileName(info);
                     if (!startTagAdded)
-                    {
-                        log.Debug("@@@StartTrace@@@" + DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss.fff",
-                                      CultureInfo.InvariantCulture) + "," + ServerConfiguration.GetApplicationName() +
-                                  ",");
+                    { 
                         startTagAdded = true;
                     }
                 }
@@ -133,7 +129,6 @@ private IDisposable WriteStartElement(string title, IDictionary<string, string>
                 }
 
                 FileSystemHelpers.AppendAllTextToFile(_file, strb.ToString());
-                log.Debug(Regex.Replace(strb.ToString(), @"\t|\n|\r", ""));
                 _infos.Push(info);
                 _isStartElement = true;
 
@@ -174,7 +169,6 @@ private void WriteEndTrace()
                 strb.AppendLine(String.Format("<!-- duration: {0:0}ms -->", elapsed.TotalMilliseconds));
 
                 FileSystemHelpers.AppendAllTextToFile(_file, strb.ToString());
-                log.Debug(Regex.Replace(strb.ToString(), @"\t|\n|\r", ""));
                 _isStartElement = false;
 
                 // adjust filename with statusCode
@@ -222,7 +216,6 @@ private void WriteEndTrace()
                 if (isOutgoingResponse&&zeroInfos)
                 {
                     startTagAdded = false;
-                    log.Debug("@@@EndTrace@@@\n\n\n");
                 }
             }
         }
diff --git a/Kudu.Services.Web/log4net.config b/Kudu.Services.Web/log4net.config
index af8b17fa..ee6bfcf4 100644
--- a/Kudu.Services.Web/log4net.config
+++ b/Kudu.Services.Web/log4net.config
@@ -2,14 +2,14 @@
 <log4net>
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender,log4net">
         <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
-        <file value="C:\MyApp\kudutracelogs.log" />
-        <staticLogFileName value="true"/>
-        <appendToFile value="true"/>
-        <rollingStyle value="Date"/>
-        <maxSizeRollBackups value="100"/>
-        <maximumFileSize value="15MB"/>
+        <file type="log4net.Util.PatternString" value="C:\\MyLogs\\%utcdate{yyyy-MM-dd}_%env{COMPUTERNAME}_scm_docker.log" />
+        <param name="RollingStyle" value="Size"/>
+        <param name="StaticLogFileName" value="true"/>
+        <appendToFile value="true" />
+        <maxSizeRollBackups value="10"/>
+        <maximumFileSize value="5MB"/>
         <layout type="log4net.Layout.PatternLayout">
-            <conversionPattern value="%message" />
+            <conversionPattern value="%date{yyyy-MM-dd-HH:mm:ss.fff} %message%n" />
         </layout>
     </appender>
     <root>
diff --git a/Kudu.Services/Diagnostics/ContainerInfoController.cs b/Kudu.Services/Diagnostics/ContainerInfoController.cs
index ed877784..bfb2dade 100644
--- a/Kudu.Services/Diagnostics/ContainerInfoController.cs
+++ b/Kudu.Services/Diagnostics/ContainerInfoController.cs
@@ -92,7 +92,7 @@ public IActionResult GetLog([FromRoute] string containerId = "all")
                     return Ok("Stats updated successfully");
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return StatusCode(StatusCodes.Status500InternalServerError);
             }

From 8f464ae11ef2e381965e6cea5c751476c45bec16 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 20 Sep 2019 09:02:45 -0700
Subject: [PATCH 117/245] Added lts support for Oryx on NODE. Made compressing
 python packages default. Fixed minor bugs with kudu event logs

---
 .../Oryx/AppServiceOryxArguments.cs           | 17 +++++++++++
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   | 28 +++++++++++++++----
 .../Deployment/Oryx/SupportedLanguages.cs     |  2 --
 Kudu.Services.Web/Tracing/TraceMiddleware.cs  | 14 ++++++++++
 4 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 9e327fc1..811e82aa 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -64,6 +64,11 @@ private void SetLanguageOptions()
 
                 case Framework.Python:
                     SetVirtualEnvironment();
+                    // For python, enable compress option by default
+                    if (Flags == BuildOptimizationsFlags.None)
+                    {
+                        Flags = BuildOptimizationsFlags.CompressModules;
+                    }
                     return;
 
                 case Framework.DotNETCore:
@@ -147,6 +152,18 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     break;
                 case Framework.PHP:
                 case Framework.NodeJs:
+                    if (Version.Contains("LTS", StringComparison.OrdinalIgnoreCase))
+                    {
+                        // 10-LTS, 12-LTS should use versions 10, 12 etc
+                        // Oryx Builder uses lts for major versions
+                        Version = Version.Replace("LTS", "").Replace("-", "");
+                        if (string.IsNullOrEmpty(Version))
+                        {
+                            // Current LTS
+                            Version = "10";
+                        }
+                    }
+                    break;
                 case Framework.Python:
                     OryxArgumentsHelper.AddLanguageVersion(args, Version);
                     break;
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 30a1557e..524a151d 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -1,4 +1,5 @@
-using System;
+using Kudu.Core.SourceControl;
+using System;
 using System.IO;
 
 namespace Kudu.Core.Deployment.Oryx
@@ -7,17 +8,32 @@ public class ExpressBuilder
     {
         public static void SetupExpressBuilderArtifacts(string outputPath)
         {
+            string framework = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkSetting);
+
+            if (string.IsNullOrEmpty(framework))
+            {
+                return;
+            }
+
+            Framework oryxFramework = SupportedFrameworks.ParseLanguage(framework);
             string root = "/home/data/SitePackages";
             string packageNameFile = Path.Combine(root, "packagename.txt");
             string packagePathFile = Path.Combine(root, "packagepath.txt");
 
             CreateSitePackagesDirectory(root);
+            string packageName = "";
+            if(oryxFramework == Framework.NodeJs)
+            {
+                // For App service express mode
+                // Generate packagename.txt and packagepath
+                packageName = "node_modules.zip:/node_modules";
+            }
+            else if(oryxFramework == Framework.Python)
+            {
+                // not supported
+            }
 
-            // For App service express mode
-            // Generate packagename.txt and packagepath
-            string packagename = "node_modules.zip:/node_modules";
-          
-            File.WriteAllText(packageNameFile, packagename);
+            File.WriteAllText(packageNameFile, packageName);
             File.WriteAllText(packagePathFile, outputPath);
         }
 
diff --git a/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs b/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
index 8d08f961..622359e0 100644
--- a/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
+++ b/Kudu.Core/Deployment/Oryx/SupportedLanguages.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Kudu.Core.Deployment.Oryx
 {
diff --git a/Kudu.Services.Web/Tracing/TraceMiddleware.cs b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
index cc713da2..e0703b35 100644
--- a/Kudu.Services.Web/Tracing/TraceMiddleware.cs
+++ b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
@@ -33,6 +33,8 @@ public class TraceMiddleware
 
         private const string KuduLiteTrackingHeader = "X-KUDULITE-RESPONSE";
 
+        private static List<string> whiteListedPaths = new List<string>(new string[] { "isDeploying", "default.cshtml" });
+
         private static readonly Lazy<string> KuduVersion = new Lazy<string>(() =>
         {
             var assembly = Assembly.GetExecutingAssembly();
@@ -208,6 +210,12 @@ private static string GetStatusDescription(int statusCode)
 
         private static void LogEndRequest(HttpContext httpContext)
         {
+            if (whiteListedPaths.FindIndex(x => x.Equals(httpContext.Request.Path.ToString(),
+                    StringComparison.OrdinalIgnoreCase)) != -1)
+            {
+                return;
+            }
+
             OperationManager.SafeExecute(() =>
             {
                 var request = httpContext.Request;
@@ -340,6 +348,12 @@ private static void TraceHeartbeat()
 
         private static void LogBeginRequest(HttpContext httpContext)
         {
+            if (whiteListedPaths.FindIndex(x => x.Equals(httpContext.Request.Path.ToString(),
+                    StringComparison.OrdinalIgnoreCase)) != -1)
+            {
+                return;
+            }
+
             OperationManager.SafeExecute(() =>
             {
                 var request = httpContext.Request;

From 5eabe58ad2d2af2e50852c35e7dfce2b5c17f74e Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 20 Sep 2019 09:28:23 -0700
Subject: [PATCH 118/245] Changed the log path in Log4Net config

---
 Kudu.Services.Web/log4net.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/log4net.config b/Kudu.Services.Web/log4net.config
index ee6bfcf4..4ed7c190 100644
--- a/Kudu.Services.Web/log4net.config
+++ b/Kudu.Services.Web/log4net.config
@@ -2,7 +2,7 @@
 <log4net>
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender,log4net">
         <lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
-        <file type="log4net.Util.PatternString" value="C:\\MyLogs\\%utcdate{yyyy-MM-dd}_%env{COMPUTERNAME}_scm_docker.log" />
+        <file type="log4net.Util.PatternString" value="/var/log/kudulogs/%utcdate{yyyy-MM-dd}_%env{COMPUTERNAME}_scm_docker.log" />
         <param name="RollingStyle" value="Size"/>
         <param name="StaticLogFileName" value="true"/>
         <appendToFile value="true" />

From 05dc5968341dd4d2429fdb790594b8f766ea6efd Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 20 Sep 2019 11:43:50 -0700
Subject: [PATCH 119/245] Added Express Build support for NETCore. Added a
 filter to avoid excessive logging for certain paths.

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  13 ++-
 .../Oryx/AppServiceOryxArguments.cs           |   9 +-
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   | 110 +++++++++++++++---
 .../Oryx/FunctionAppOryxArguments.cs          |   9 ++
 Kudu.Core/Deployment/Oryx/IOryxArguments.cs   |   7 ++
 Kudu.Services.Web/Tracing/TraceMiddleware.cs  |   6 +-
 6 files changed, 132 insertions(+), 22 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 53ab6cf8..5698d95b 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -12,9 +12,18 @@ public class OryxBuilder : ExternalCommandBuilder
     {
         public override string ProjectType => "Oryx-Build";
 
+        IEnvironment environment;
+        IDeploymentSettingsManager settings;
+        IBuildPropertyProvider propertyProvider;
+        string sourcePath;
+
         public OryxBuilder(IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string sourcePath)
             : base(environment, settings, propertyProvider, sourcePath)
         {
+            this.environment = environment;
+            this.settings = settings;
+            this.propertyProvider = propertyProvider;
+            this.sourcePath = sourcePath;
         }
 
         public override Task Build(DeploymentContext context)
@@ -59,11 +68,11 @@ public override Task Build(DeploymentContext context)
                     }
                     else
                     {
-                        Oryx.ExpressBuilder.SetupExpressBuilderArtifacts(context.OutputPath);
+                        ExpressBuilder appServiceExpressBuilder = new ExpressBuilder(environment, settings, propertyProvider, sourcePath);
+                        appServiceExpressBuilder.SetupExpressBuilderArtifacts(context.OutputPath, context, args);
                     }
                 }
             }
-
             return Task.CompletedTask;
         }
 
diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 811e82aa..ea4288d6 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -11,13 +11,13 @@ public class AppServiceOryxArguments : IOryxArguments
 
         public BuildOptimizationsFlags Flags { get; set; }
 
-        private Framework Language { get; set; }
+        public Framework Language { get; set; }
 
-        private string Version { get; set; }
+        public string Version { get; set; }
 
-        private string PublishFolder { get; set; }
+        public string PublishFolder { get; set; }
 
-        private string VirtualEnv { get; set; }
+        public string VirtualEnv { get; set; }
 
         public AppServiceOryxArguments()
         {
@@ -230,5 +230,6 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
         }
 
         public bool SkipKuduSync { get; set; }
+
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 524a151d..c99231b8 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -1,48 +1,132 @@
-using Kudu.Core.SourceControl;
+using Kudu.Contracts.Settings;
+using Kudu.Core.Deployment.Generator;
+using Kudu.Core.Infrastructure;
 using System;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace Kudu.Core.Deployment.Oryx
 {
-    public class ExpressBuilder
+    public class ExpressBuilder : ExternalCommandBuilder
     {
-        public static void SetupExpressBuilderArtifacts(string outputPath)
+        public override string ProjectType => "OryxBuild";
+
+        public ExpressBuilder(IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string sourcePath)
+            : base(environment, settings, propertyProvider, sourcePath)
         {
-            string framework = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkSetting);
 
-            if (string.IsNullOrEmpty(framework))
+        }
+
+        public void SetupExpressBuilderArtifacts(string outputPath, DeploymentContext context, IOryxArguments args)
+        {     
+            if(args.Flags != BuildOptimizationsFlags.UseExpressBuild)
             {
                 return;
             }
 
-            Framework oryxFramework = SupportedFrameworks.ParseLanguage(framework);
             string root = "/home/data/SitePackages";
             string packageNameFile = Path.Combine(root, "packagename.txt");
             string packagePathFile = Path.Combine(root, "packagepath.txt");
 
-            CreateSitePackagesDirectory(root);
+            FileSystemHelpers.EnsureDirectory(root);
+
             string packageName = "";
-            if(oryxFramework == Framework.NodeJs)
+
+            if(args.Language == Framework.NodeJs)
             {
                 // For App service express mode
                 // Generate packagename.txt and packagepath
                 packageName = "node_modules.zip:/node_modules";
             }
-            else if(oryxFramework == Framework.Python)
+            else if(args.Language == Framework.Python)
+            {
+                packageName = $"{args.VirtualEnv}.zip:/home/site/wwwroot/{args.VirtualEnv}";
+            }
+            else if(args.Language == Framework.DotNETCore)
             {
-                // not supported
+                string artifactName = SetupNetCoreAppExpressArtifacts(context, root, outputPath);
+                packageName = artifactName;
             }
 
             File.WriteAllText(packageNameFile, packageName);
             File.WriteAllText(packagePathFile, outputPath);
         }
 
-        private static void CreateSitePackagesDirectory(string path)
+        private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string sitePackages, string outputPath)
+        {
+
+            // Create NetCore Zip and copy it to sitePackages
+            string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+
+            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, outputPath, zipAppName, BuildArtifactType.Zip, numBuildArtifacts: -1);
+
+            var copyExe = ExternalCommandFactory.BuildExternalCommandExecutable(OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup, sitePackages, context.Logger);
+
+            var copyToPath = Path.Combine(sitePackages, zipAppName);
+
+            try
+            {
+                copyExe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"cp {createdZip} {copyToPath}");
+            }
+            catch (Exception)
+            {
+                context.GlobalLogger.LogError();
+                throw;
+            }
+
+            // Remove the old zips
+            DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);
+
+            return zipAppName;
+        }
+
+        /// <summary>
+        /// Package every files and sub directories from a source folder
+        /// </summary>
+        /// <param name="context">The deployment context in current scope</param>
+        /// <param name="srcDirectory">The source directory to be packed</param>
+        /// <param name="artifactDirectory">The destination directory to eject the build artifact</param>
+        /// <param name="artifactFilename">The filename of the build artifact</param>
+        /// <param name="artifactType">The method for packing the artifact</param>
+        /// <param name="numBuildArtifacts">The number of temporary artifacts should be hold in the destination directory</param>
+        /// <returns></returns>
+        private string PackageArtifactFromFolder(DeploymentContext context, string srcDirectory, string artifactDirectory, string artifactFilename, BuildArtifactType artifactType, int numBuildArtifacts = 0)
         {
-            if (!Directory.Exists(path))
+            context.Logger.Log($"Writing the artifacts to a {artifactType.ToString()} file");
+            string file = Path.Combine(artifactDirectory, artifactFilename);
+            var exe = ExternalCommandFactory.BuildExternalCommandExecutable(srcDirectory, artifactDirectory, context.Logger);
+            try
+            {
+                switch (artifactType)
+                {
+                    case BuildArtifactType.Zip:
+                        exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"zip -r -0 -q {file} .");
+                        break;
+                    case BuildArtifactType.Squashfs:
+                        exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"mksquashfs . {file} -noappend");
+                        break;
+                    default:
+                        throw new ArgumentException($"Received unknown file extension {artifactType.ToString()}");
+                }
+            }
+            catch (Exception)
             {
-                Directory.CreateDirectory(path);
+                context.GlobalLogger.LogError();
+                throw;
             }
+
+            // Just to be sure that we don't keep adding build artifacts here
+            if (numBuildArtifacts > 0)
+            {
+                DeploymentHelper.PurgeBuildArtifactsIfNecessary(artifactDirectory, artifactType, context.Tracer, numBuildArtifacts);
+            }
+
+            return file;
+        }
+
+        public override Task Build(DeploymentContext context)
+        {
+            throw new NotImplementedException();
         }
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index edae7556..a84d6ed7 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -12,6 +12,10 @@ public class FunctionAppOryxArguments : IOryxArguments
 
         protected readonly WorkerRuntime FunctionsWorkerRuntime;
         public bool SkipKuduSync { get; set; }
+        public string Version { get; set; }
+        public Framework Language { get; set; }
+        public string PublishFolder { get; set; }
+        public string VirtualEnv { get; set; }
 
         public FunctionAppOryxArguments()
         {
@@ -60,18 +64,22 @@ protected void AddLanguage(StringBuilder args, WorkerRuntime workerRuntime)
             switch (workerRuntime)
             {
                 case WorkerRuntime.DotNet:
+                    Language = Framework.DotNETCore;
                     OryxArgumentsHelper.AddLanguage(args, "dotnet");
                     break;
 
                 case WorkerRuntime.Node:
+                    Language = Framework.NodeJs;
                     OryxArgumentsHelper.AddLanguage(args, "nodejs");
                     break;
 
                 case WorkerRuntime.Python:
+                    Language = Framework.Python;
                     OryxArgumentsHelper.AddLanguage(args, "python");
                     break;
 
                 case WorkerRuntime.PHP:
+                    Language = Framework.PHP;
                     OryxArgumentsHelper.AddLanguage(args, "php");
                     break;
             }
@@ -82,6 +90,7 @@ protected void AddLanguageVersion(StringBuilder args, WorkerRuntime workerRuntim
             var workerVersion = ResolveWorkerRuntimeVersion(FunctionsWorkerRuntime);
             if (!string.IsNullOrEmpty(workerVersion))
             {
+                Version = workerVersion;
                 OryxArgumentsHelper.AddLanguageVersion(args, workerVersion);
             }
         }
diff --git a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
index 70c48826..a0106cbb 100644
--- a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
@@ -13,5 +13,12 @@ public interface IOryxArguments
         bool SkipKuduSync { get; set; }
 
         string GenerateOryxBuildCommand(DeploymentContext context);
+
+        string Version { get; set; }
+
+        Framework Language { get; set; }
+
+        string PublishFolder { get; set; }
+        string VirtualEnv { get; set; }
     }
 }
diff --git a/Kudu.Services.Web/Tracing/TraceMiddleware.cs b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
index e0703b35..10836499 100644
--- a/Kudu.Services.Web/Tracing/TraceMiddleware.cs
+++ b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
@@ -33,7 +33,7 @@ public class TraceMiddleware
 
         private const string KuduLiteTrackingHeader = "X-KUDULITE-RESPONSE";
 
-        private static List<string> whiteListedPaths = new List<string>(new string[] { "isDeploying", "default.cshtml" });
+        private static List<string> whiteListedPaths = new List<string>(new string[] { "/api/isdeploying", "default.cshtml" });
 
         private static readonly Lazy<string> KuduVersion = new Lazy<string>(() =>
         {
@@ -210,7 +210,7 @@ private static string GetStatusDescription(int statusCode)
 
         private static void LogEndRequest(HttpContext httpContext)
         {
-            if (whiteListedPaths.FindIndex(x => x.Equals(httpContext.Request.Path.ToString(),
+            if (whiteListedPaths.FindIndex(x => x.Contains(httpContext.Request.Path.ToString(),
                     StringComparison.OrdinalIgnoreCase)) != -1)
             {
                 return;
@@ -348,7 +348,7 @@ private static void TraceHeartbeat()
 
         private static void LogBeginRequest(HttpContext httpContext)
         {
-            if (whiteListedPaths.FindIndex(x => x.Equals(httpContext.Request.Path.ToString(),
+            if (whiteListedPaths.FindIndex(x => x.Contains(httpContext.Request.Path.ToString(),
                     StringComparison.OrdinalIgnoreCase)) != -1)
             {
                 return;

From 2b56c65f07d597c4aafdb065bf1b1f17dc9e27c0 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 20 Sep 2019 13:10:44 -0700
Subject: [PATCH 120/245] Modified python compress arguments

---
 Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs | 6 +++++-
 Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs     | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index ea4288d6..9e046b54 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -201,7 +201,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     }
                     else if (Language == Framework.Python)
                     {
-                        OryxArgumentsHelper.AddPythonCompressOption(args);
+                        OryxArgumentsHelper.AddPythonCompressOption(args, "tar-gz");
                     }
 
                     break;
@@ -212,6 +212,10 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     {
                         OryxArgumentsHelper.AddNodeCompressOption(args, "zip");
                     }
+                    else if (Language == Framework.Python)
+                    {
+                        OryxArgumentsHelper.AddPythonCompressOption(args, "zip");
+                    }
 
                     break;
 
diff --git a/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs b/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
index 48a88efd..c63c959e 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
@@ -31,9 +31,9 @@ internal static void AddNodeCompressOption(StringBuilder args, string format)
             args.AppendFormat(" -p compress_node_modules={0}", format);
         }
 
-        internal static void AddPythonCompressOption(StringBuilder args)
+        internal static void AddPythonCompressOption(StringBuilder args, string format)
         {
-            args.AppendFormat(" -p zip_venv_dir");
+            args.AppendFormat(" -p compress_virtualenv={0}", format);
         }
 
         internal static void AddPythonVirtualEnv(StringBuilder args, string virtualEnv)

From bd22d65e41e10de60f187db82dbdaddd51eeee12 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 20 Sep 2019 16:13:29 -0700
Subject: [PATCH 121/245] Added debug arguments for oryx build

---
 Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs | 3 ++-
 Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs     | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 9e046b54..54c84994 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -111,7 +111,6 @@ private void SetVirtualEnvironment()
         public string GenerateOryxBuildCommand(DeploymentContext context)
         {
             StringBuilder args = new StringBuilder();
-
             // Language
             switch (Language)
             {
@@ -230,6 +229,8 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                 OryxArgumentsHelper.AddPythonVirtualEnv(args, VirtualEnv);
             }
 
+            OryxArgumentsHelper.AddDebugLog(args);
+
             return args.ToString();
         }
 
diff --git a/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs b/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
index c63c959e..098f202e 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArgumentsHelper.cs
@@ -50,5 +50,10 @@ internal static void AddPublishedOutputPath(StringBuilder args, string path)
         {
             args.AppendFormat(" -publishedOutputPath {0}", path);
         }
+
+        internal static void AddDebugLog(StringBuilder args)
+        {
+            args.AppendFormat(" --log-file /tmp/test.log ");
+        }
     }
 }

From ce6324be376235443e0829cf3578ca859d6686d4 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 20 Sep 2019 17:50:03 -0700
Subject: [PATCH 122/245] Added a fix for NETCore express build scenario +
 Removing Oryx Manifest file for Zip Deploy

---
 .../Oryx/AppServiceOryxArguments.cs           | 13 +++++--
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   | 34 ++++++-------------
 .../Deployment/PushDeploymentController.cs    | 12 +++++--
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 54c84994..8710fc1a 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Kudu.Core.Deployment.Oryx;
+using LibGit2Sharp;
 
 namespace Kudu.Core.Deployment
 {
@@ -132,8 +133,16 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                     break;
 
                 case Framework.DotNETCore:
-                    // Input/Output [For .NET core, the source path is the RepositoryPath]
-                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.OutputPath);
+                    if (Flags == BuildOptimizationsFlags.UseExpressBuild)
+                    {
+                        // We don't want to copy the built artifacts to wwwroot for ExpressBuild scenario
+                        OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.BuildTempPath);
+                    }
+                    else
+                    {
+                        // Input/Output [For .NET core, the source path is the RepositoryPath]
+                        OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.OutputPath);
+                    }
                     OryxArgumentsHelper.AddLanguage(args, "dotnet");
                     break;
 
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index c99231b8..e484003a 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -24,11 +24,11 @@ public void SetupExpressBuilderArtifacts(string outputPath, DeploymentContext co
                 return;
             }
 
-            string root = "/home/data/SitePackages";
-            string packageNameFile = Path.Combine(root, "packagename.txt");
-            string packagePathFile = Path.Combine(root, "packagepath.txt");
+            string sitePackagesDir = "/home/data/SitePackages";
+            string packageNameFile = Path.Combine(sitePackagesDir, "packagename.txt");
+            string packagePathFile = Path.Combine(sitePackagesDir, "packagepath.txt");
 
-            FileSystemHelpers.EnsureDirectory(root);
+            FileSystemHelpers.EnsureDirectory(sitePackagesDir);
 
             string packageName = "";
 
@@ -44,36 +44,24 @@ public void SetupExpressBuilderArtifacts(string outputPath, DeploymentContext co
             }
             else if(args.Language == Framework.DotNETCore)
             {
-                string artifactName = SetupNetCoreAppExpressArtifacts(context, root, outputPath);
-                packageName = artifactName;
+                // store the zipped artifacts at site packages dir
+                string artifactName = SetupNetCoreAppExpressArtifacts(context, sitePackagesDir, outputPath);
+                packageName = $"{artifactName:/home/site/wwwroot}";
             }
 
             File.WriteAllText(packageNameFile, packageName);
             File.WriteAllText(packagePathFile, outputPath);
         }
 
-        private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string sitePackages, string outputPath)
+        private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string sitePackages,string outputPath)
         {
+            context.Logger.Log($"Express Build enabled for NETCore app");
 
-            // Create NetCore Zip and copy it to sitePackages
+            // Create NetCore Zip at tm build folder where artifact were build and copy it to sitePackages
             string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
 
             string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, outputPath, zipAppName, BuildArtifactType.Zip, numBuildArtifacts: -1);
 
-            var copyExe = ExternalCommandFactory.BuildExternalCommandExecutable(OryxBuildConstants.FunctionAppBuildSettings.ExpressBuildSetup, sitePackages, context.Logger);
-
-            var copyToPath = Path.Combine(sitePackages, zipAppName);
-
-            try
-            {
-                copyExe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"cp {createdZip} {copyToPath}");
-            }
-            catch (Exception)
-            {
-                context.GlobalLogger.LogError();
-                throw;
-            }
-
             // Remove the old zips
             DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);
 
@@ -92,7 +80,7 @@ private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string
         /// <returns></returns>
         private string PackageArtifactFromFolder(DeploymentContext context, string srcDirectory, string artifactDirectory, string artifactFilename, BuildArtifactType artifactType, int numBuildArtifacts = 0)
         {
-            context.Logger.Log($"Writing the artifacts to a {artifactType.ToString()} file");
+            context.Logger.Log($"Writing the artifacts to {artifactType.ToString()} file at {artifactDirectory}");
             string file = Path.Combine(artifactDirectory, artifactFilename);
             var exe = ExternalCommandFactory.BuildExternalCommandExecutable(srcDirectory, artifactDirectory, context.Logger);
             try
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index c5f27a81..6a8ea8d3 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -92,9 +92,7 @@ public async Task<IActionResult> ZipPushDeploy(
                     // for post deployment sync triggers.
                     deploymentInfo.SyncFunctionsTriggersPath =
                         Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-                }
-
-                ;
+                };
 
                 return await PushDeployAsync(deploymentInfo, isAsync, HttpContext);
             }
@@ -210,6 +208,14 @@ private string GetZipURLFromJSON(JObject requestObject)
         private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentInfo, bool isAsync,
             HttpContext context)
         {
+
+            var oryxManifestFile = Path.Combine(_environment.WebRootPath, "oryx-manifest.toml");
+            if (FileSystemHelpers.FileExists(oryxManifestFile))
+            {
+                _tracer.Step("Removing previous build artifact's manifest file");
+                FileSystemHelpers.DeleteFileSafe(oryxManifestFile);
+            }
+
             var zipFilePath = Path.Combine(_environment.ZipTempPath, Guid.NewGuid() + ".zip");
             if (_settings.RunFromLocalZip())
             {

From 538cfdfe20cda04e5e25b732f98f063887bee419 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 18 Sep 2019 16:22:29 -0700
Subject: [PATCH 123/245] test

---
 Kudu.Contracts/IEnvironment.cs | 3 ++-
 Kudu.Core/Environment.cs       | 4 +++-
 Kudu.Services.Web/Startup.cs   | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Kudu.Contracts/IEnvironment.cs b/Kudu.Contracts/IEnvironment.cs
index a48e40d2..6c63a290 100644
--- a/Kudu.Contracts/IEnvironment.cs
+++ b/Kudu.Contracts/IEnvironment.cs
@@ -2,7 +2,7 @@
 {
     public interface IEnvironment
     {
-        string RootPath { get; }                // e.g. /
+        string RootPath { get; set; }                // e.g. /
         string SiteRootPath { get; }            // e.g. /site
         string RepositoryPath { get; set; }     // e.g. /site/repository
         string WebRootPath { get; }             // e.g. /site/wwwroot
@@ -31,5 +31,6 @@ public interface IEnvironment
         string KuduConsoleFullPath { get; }     // e.g. KuduConsole/kudu.dll
         string SitePackagesPath { get; }        // e.g. /data/SitePackages
         bool IsOnLinuxConsumption { get; }      // e.g. True on Linux Consumption. False on App Service.
+        bool IsOnK8 { get; }      
     }
 }
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 3ec45edb..954b77a4 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -230,7 +230,7 @@ public string SSHKeyPath
         public string RootPath
         {
             get;
-            private set;
+            set;
         }
 
         public string SiteRootPath
@@ -461,6 +461,8 @@ public static string TenantId
             }
         }
 
+        public bool IsOnK8 => true;
+
         public static string GetFreeSpaceHtml(string path)
         {
             try
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 519f2f50..15c7cbbd 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -318,6 +318,8 @@ public void Configure(IApplicationBuilder app,
                 app.UseExceptionHandler("/Error");
             }
 
+             app.UseKubeMiddleware();
+
             if (_webAppRuntimeEnvironment.IsOnLinuxConsumption)
             {
                 app.UseLinuxConsumptionRouteMiddleware();

From 26efa368dd2062763f3cc16ff639f10d16fdbdf7 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 18 Sep 2019 16:28:27 -0700
Subject: [PATCH 124/245] test

---
 Kudu.Services.Web/KubeMiddleware.cs | 87 +++++++++++++++++++++++++++++
 Kudu.Services.Web/Startup.cs        |  2 +-
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 Kudu.Services.Web/KubeMiddleware.cs

diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
new file mode 100644
index 00000000..773241ef
--- /dev/null
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -0,0 +1,87 @@
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Kudu.Services.Infrastructure.Authorization;
+using Kudu.Services.Infrastructure.Authentication;
+using System;
+using System.Text.RegularExpressions;
+using Kudu.Core.Tracing;
+using Kudu.Core.Infrastructure;
+using Kudu.Contracts.Settings;
+using Kudu.Services.Infrastructure;
+using Microsoft.AspNetCore.Http.Extensions;
+using Kudu.Core;
+using Microsoft.AspNetCore.Mvc;
+using System.Text;
+
+namespace Kudu.Services.Web
+{
+    /// <summary>
+    /// Middleware to filter out unnecessary routes when running in Linux Consumption
+    /// </summary>
+    public class KubeMiddleware
+    {
+
+        private readonly RequestDelegate _next;
+
+        /// <summary>
+        /// Filter out unnecessary routes for Linux Consumption
+        /// </summary>
+        /// <param name="next">The next request middleware to be passed in</param>
+        public KubeMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        /// <summary>
+        /// Detect if a route matches any of whitelisted prefixes
+        /// </summary>
+        /// <param name="context">Http request context</param>
+        /// <param name="authorizationService">Authorization service for each request</param>
+        /// <returns>Response be set to 404 if the route is not whitelisted</returns>
+        public async Task Invoke(HttpContext context, IEnvironment environment)
+        {
+            if (IsGitRoute(context.Request.Path))
+            {
+                string[] pathParts = context.Request.Path.ToString().Split("/");
+
+                if (pathParts != null && pathParts.Length != 0)
+                {
+                    string appName = pathParts[pathParts.Length - 1];
+                    appName = appName.Trim().Replace(".git", "");
+                    if(!FileSystemHelpers.DirectoryExists("/home/apps/"+appName))
+                    {
+                        context.Response.StatusCode = 500;
+                        await context.Response.WriteAsync("repo does not exist", Encoding.UTF8);
+                        return;
+                    }
+                    else
+                    {
+                        environment.RootPath = "/home/apps/"+appName;
+                    }
+                }
+            }
+            await _next.Invoke(context);
+        }
+        private bool IsGitRoute(PathString routePath)
+        {
+            return routePath.ToString().EndsWith(".git");
+        }
+    }
+     
+    /// <summary>
+    /// Extension wrapper for using Kube Middleware
+    /// </summary>
+    public static class KubeMiddlewareExtension
+    {
+        public static IApplicationBuilder UseKubeMiddleware(this IApplicationBuilder builder)
+        {
+            return builder.UseMiddleware<KubeMiddleware>();
+        }
+    }
+}
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 15c7cbbd..10b95c40 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -318,7 +318,7 @@ public void Configure(IApplicationBuilder app,
                 app.UseExceptionHandler("/Error");
             }
 
-             app.UseKubeMiddleware();
+            app.UseKubeMiddleware();
 
             if (_webAppRuntimeEnvironment.IsOnLinuxConsumption)
             {

From fbaf9a8e1b0b99d7afe17ffa5e681d8c59f3f2bd Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 18 Sep 2019 23:00:20 -0700
Subject: [PATCH 125/245] test

---
 Kudu.Contracts/IEnvironment.cs                | 12 ++++----
 .../Infrastructure/IServerConfiguration.cs    |  2 +-
 .../Infrastructure/ServerConfiguration.cs     |  9 ++++++
 Kudu.Services.Web/KubeMiddleware.cs           | 28 ++++++++++++-----
 Kudu.Services.Web/Startup.cs                  | 30 ++++++++-----------
 5 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/Kudu.Contracts/IEnvironment.cs b/Kudu.Contracts/IEnvironment.cs
index 6c63a290..28d76caa 100644
--- a/Kudu.Contracts/IEnvironment.cs
+++ b/Kudu.Contracts/IEnvironment.cs
@@ -3,14 +3,14 @@
     public interface IEnvironment
     {
         string RootPath { get; set; }                // e.g. /
-        string SiteRootPath { get; }            // e.g. /site
+        string SiteRootPath { get; set; }            // e.g. /site
         string RepositoryPath { get; set; }     // e.g. /site/repository
-        string WebRootPath { get; }             // e.g. /site/wwwroot
-        string DeploymentsPath { get; }         // e.g. /site/deployments
-        string DeploymentToolsPath { get; }     // e.g. /site/deployments/tools
+        string WebRootPath { get; set; }             // e.g. /site/wwwroot
+        string DeploymentsPath { get; set; }         // e.g. /site/deployments
+        string DeploymentToolsPath { get; set; }     // e.g. /site/deployments/tools
         string SiteExtensionSettingsPath { get; }     // e.g. /site/siteextensions
-        string DiagnosticsPath { get; }         // e.g. /site/diagnostics
-        string LocksPath { get; }               // e.g. /site/locks
+        string DiagnosticsPath { get; set; }         // e.g. /site/diagnostics
+        string LocksPath { get; set; }               // e.g. /site/locks
         string SSHKeyPath { get; }
         string TempPath { get; }
         string ZipTempPath { get; }             // e.g. ${TempPath}/zipdeploy
diff --git a/Kudu.Core/Infrastructure/IServerConfiguration.cs b/Kudu.Core/Infrastructure/IServerConfiguration.cs
index ed473c10..fd7e5134 100644
--- a/Kudu.Core/Infrastructure/IServerConfiguration.cs
+++ b/Kudu.Core/Infrastructure/IServerConfiguration.cs
@@ -4,6 +4,6 @@ public interface IServerConfiguration
     {
         string ApplicationName { get; }
 
-        string GitServerRoot { get; }
+        string GitServerRoot { get; set; }
     }
 }
diff --git a/Kudu.Core/Infrastructure/ServerConfiguration.cs b/Kudu.Core/Infrastructure/ServerConfiguration.cs
index ed995430..de64b2bb 100644
--- a/Kudu.Core/Infrastructure/ServerConfiguration.cs
+++ b/Kudu.Core/Infrastructure/ServerConfiguration.cs
@@ -6,6 +6,8 @@ public class ServerConfiguration : IServerConfiguration
     {
         private string _applicationName;
 
+        private string gitRoot = "";
+
         public string ApplicationName
         {
             get
@@ -22,12 +24,19 @@ public string GitServerRoot
         {
             get
             {
+                if(!String.IsNullOrEmpty(gitRoot))
+                {
+                    return gitRoot;
+                }
+
                 if (String.IsNullOrEmpty(ApplicationName))
                 {
                     return "git";
                 }
                 return ApplicationName + ".git";
             }
+
+            set { gitRoot = value; }
         }
 
         public static string GetApplicationName()
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 773241ef..3a4af261 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -44,25 +44,32 @@ public KubeMiddleware(RequestDelegate next)
         /// <param name="context">Http request context</param>
         /// <param name="authorizationService">Authorization service for each request</param>
         /// <returns>Response be set to 404 if the route is not whitelisted</returns>
-        public async Task Invoke(HttpContext context, IEnvironment environment)
+        public async Task Invoke(HttpContext context, IEnvironment environment, IServerConfiguration serverConfig)
         {
             if (IsGitRoute(context.Request.Path))
             {
                 string[] pathParts = context.Request.Path.ToString().Split("/");
 
-                if (pathParts != null && pathParts.Length != 0)
+                if (pathParts != null && pathParts.Length >= 1)
                 {
-                    string appName = pathParts[pathParts.Length - 1];
+                    string appName = pathParts[1];
                     appName = appName.Trim().Replace(".git", "");
-                    if(!FileSystemHelpers.DirectoryExists("/home/apps/"+appName))
+                    if(!FileSystemHelpers.DirectoryExists("/home/apps" + appName))
                     {
-                        context.Response.StatusCode = 500;
-                        await context.Response.WriteAsync("repo does not exist", Encoding.UTF8);
+                        context.Response.StatusCode = 404;
+                        await context.Response.WriteAsync("The repository does not exist", Encoding.UTF8);
                         return;
                     }
                     else
                     {
-                        environment.RootPath = "/home/apps/"+appName;
+                        serverConfig.GitServerRoot = appName + ".git";
+                        environment.RepositoryPath = "/home/apps/" + appName + "/site/repository";
+                        environment.RootPath = "/home/apps/" + appName;
+                        environment.SiteRootPath = "/home/apps/"+appName+"/site";
+                        environment.WebRootPath = "/home/apps/" + appName + "/site/wwwroot";
+                        environment.DeploymentsPath = "/home/apps/" + appName + "/site/deployments";
+                        environment.LocksPath = "/home/apps/" + appName + "/site/deployments";
+
                     }
                 }
             }
@@ -70,7 +77,12 @@ public async Task Invoke(HttpContext context, IEnvironment environment)
         }
         private bool IsGitRoute(PathString routePath)
         {
-            return routePath.ToString().EndsWith(".git");
+            string[] pathParts = routePath.ToString().Split("/");
+            if (pathParts != null && pathParts.Length >= 1)
+            {
+                return pathParts[1].EndsWith(".git");
+            }
+            return false;
         }
     }
      
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 10b95c40..9a3a45ca 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -146,7 +146,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddLinuxConsumptionAuthorization(environment);
 
             // General
-            services.AddSingleton<IServerConfiguration>(ServerConfiguration);
+            services.AddScoped<IServerConfiguration, ServerConfiguration>();
 
             // CORE TODO Looks like this doesn't ever actually do anything, can refactor out?
             services.AddSingleton<IBuildPropertyProvider>(new BuildPropertyProvider());
@@ -318,7 +318,7 @@ public void Configure(IApplicationBuilder app,
                 app.UseExceptionHandler("/Error");
             }
 
-            app.UseKubeMiddleware();
+             app.UseKubeMiddleware();
 
             if (_webAppRuntimeEnvironment.IsOnLinuxConsumption)
             {
@@ -375,12 +375,17 @@ public void Configure(IApplicationBuilder app,
 
             // CORE TODO concept of "deprecation" in routes for traces, Do we need this for linux ?
 
-            // Push url
-            foreach (var url in new[] {"/git-receive-pack", $"/{configuration.GitServerRoot}/git-receive-pack"})
-            {
-                app.Map(url, appBranch => appBranch.RunReceivePackHandler());
-            }
 
+            app.MapWhen(
+                c => c.Request.Path.ToString().EndsWith("/git-receive-pack", StringComparison.OrdinalIgnoreCase),
+                appBranch => appBranch.RunReceivePackHandler());
+
+            app.MapWhen(
+                c => c.Request.Path.ToString().EndsWith("/git-upload-pack", StringComparison.OrdinalIgnoreCase),
+                appBranch => appBranch.RunUploadPackHandler());
+            //app.MapWhen("/{repository}/git-upload-pack", appBranch => appBranch.RunUploadPackHandler());
+
+            // Push url
             // Fetch hook
             app.Map("/deploy", appBranch => appBranch.RunFetchHandler());
 
@@ -389,16 +394,7 @@ public void Configure(IApplicationBuilder app,
 
 
             // Clone url
-            foreach (var url in new[] {"/git-upload-pack", $"/{configuration.GitServerRoot}/git-upload-pack"})
-            {
-                app.Map(url, appBranch => appBranch.RunUploadPackHandler());
-            }
-
             // Custom GIT repositories, which can be served from any directory that has a git repo
-            foreach (var url in new[] {"/git-custom-repository", "/git/{*path}"})
-            {
-                app.Map(url, appBranch => appBranch.RunCustomGitRepositoryHandler());
-            }
 
             // Sets up the file server to web app's wwwroot
             KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.WebRootPath, "/wwwroot");
@@ -421,7 +417,7 @@ public void Configure(IApplicationBuilder app,
 
                 // Git Service
                 routes.MapRoute("git-info-refs-root", "info/refs", new {controller = "InfoRefs", action = "Execute"});
-                routes.MapRoute("git-info-refs", configuration.GitServerRoot + "/info/refs",
+                routes.MapRoute("git-info-refs", "{repository}" + "/info/refs",
                     new {controller = "InfoRefs", action = "Execute"});
 
                 // Scm (deployment repository)

From e16a48494f6de709602e82827f7fc9da6e84c0a5 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 18 Sep 2019 23:07:02 -0700
Subject: [PATCH 126/245] test

---
 Kudu.Core/Environment.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 954b77a4..72d5726e 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -463,6 +463,12 @@ public static string TenantId
 
         public bool IsOnK8 => true;
 
+        string IEnvironment.SiteRootPath { get; set; }
+        string IEnvironment.WebRootPath { get; set; }
+        string IEnvironment.DeploymentsPath { get; set; }
+        string IEnvironment.DeploymentToolsPath { get; set; }
+        string IEnvironment.DiagnosticsPath { get; set; }
+        string IEnvironment.LocksPath { get; set; }
         public static string GetFreeSpaceHtml(string path)
         {
             try

From 9a4374ff2c174da0649e7e325fa6d891d57c122c Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 18 Sep 2019 23:39:57 -0700
Subject: [PATCH 127/245] test'

---
 Kudu.Services.Web/KubeMiddleware.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 3a4af261..0bb0a0fb 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -54,7 +54,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
                 {
                     string appName = pathParts[1];
                     appName = appName.Trim().Replace(".git", "");
-                    if(!FileSystemHelpers.DirectoryExists("/home/apps" + appName))
+                    if(!FileSystemHelpers.DirectoryExists("/home/apps/" + appName))
                     {
                         context.Response.StatusCode = 404;
                         await context.Response.WriteAsync("The repository does not exist", Encoding.UTF8);

From 5374c470a2aaf7665aa19e71b76e4b3a7040eca9 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 19 Sep 2019 00:24:54 -0700
Subject: [PATCH 128/245] test

---
 Kudu.Contracts/IEnvironment.cs      | 14 +++++++-------
 Kudu.Core/Environment.cs            |  6 ------
 Kudu.Services.Web/KubeMiddleware.cs |  6 ------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Kudu.Contracts/IEnvironment.cs b/Kudu.Contracts/IEnvironment.cs
index 28d76caa..ae918d8d 100644
--- a/Kudu.Contracts/IEnvironment.cs
+++ b/Kudu.Contracts/IEnvironment.cs
@@ -2,15 +2,15 @@
 {
     public interface IEnvironment
     {
-        string RootPath { get; set; }                // e.g. /
-        string SiteRootPath { get; set; }            // e.g. /site
+        string RootPath { get; }                // e.g. /
+        string SiteRootPath { get; }            // e.g. /site
         string RepositoryPath { get; set; }     // e.g. /site/repository
-        string WebRootPath { get; set; }             // e.g. /site/wwwroot
-        string DeploymentsPath { get; set; }         // e.g. /site/deployments
-        string DeploymentToolsPath { get; set; }     // e.g. /site/deployments/tools
+        string WebRootPath { get; }             // e.g. /site/wwwroot
+        string DeploymentsPath { get;  }         // e.g. /site/deployments
+        string DeploymentToolsPath { get;  }     // e.g. /site/deployments/tools
         string SiteExtensionSettingsPath { get; }     // e.g. /site/siteextensions
-        string DiagnosticsPath { get; set; }         // e.g. /site/diagnostics
-        string LocksPath { get; set; }               // e.g. /site/locks
+        string DiagnosticsPath { get; }         // e.g. /site/diagnostics
+        string LocksPath { get; }               // e.g. /site/locks
         string SSHKeyPath { get; }
         string TempPath { get; }
         string ZipTempPath { get; }             // e.g. ${TempPath}/zipdeploy
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 72d5726e..954b77a4 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -463,12 +463,6 @@ public static string TenantId
 
         public bool IsOnK8 => true;
 
-        string IEnvironment.SiteRootPath { get; set; }
-        string IEnvironment.WebRootPath { get; set; }
-        string IEnvironment.DeploymentsPath { get; set; }
-        string IEnvironment.DeploymentToolsPath { get; set; }
-        string IEnvironment.DiagnosticsPath { get; set; }
-        string IEnvironment.LocksPath { get; set; }
         public static string GetFreeSpaceHtml(string path)
         {
             try
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 0bb0a0fb..29356533 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -64,12 +64,6 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
                     {
                         serverConfig.GitServerRoot = appName + ".git";
                         environment.RepositoryPath = "/home/apps/" + appName + "/site/repository";
-                        environment.RootPath = "/home/apps/" + appName;
-                        environment.SiteRootPath = "/home/apps/"+appName+"/site";
-                        environment.WebRootPath = "/home/apps/" + appName + "/site/wwwroot";
-                        environment.DeploymentsPath = "/home/apps/" + appName + "/site/deployments";
-                        environment.LocksPath = "/home/apps/" + appName + "/site/deployments";
-
                     }
                 }
             }

From c49726b9b3acf108e7021451049b36f87ca29bc5 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 19 Sep 2019 00:37:25 -0700
Subject: [PATCH 129/245] test

---
 Kudu.Services.Web/Startup.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 9a3a45ca..76be860b 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -416,7 +416,6 @@ public void Configure(IApplicationBuilder app,
                     template: "{controller}/{action=Index}/{id?}");
 
                 // Git Service
-                routes.MapRoute("git-info-refs-root", "info/refs", new {controller = "InfoRefs", action = "Execute"});
                 routes.MapRoute("git-info-refs", "{repository}" + "/info/refs",
                     new {controller = "InfoRefs", action = "Execute"});
 

From e3a084545a8ed306cced6feb41bc1e64d4799376 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 19 Sep 2019 08:23:48 -0700
Subject: [PATCH 130/245] TesT

---
 Kudu.Services.Web/KubeMiddleware.cs | 18 ++++++++++++++++--
 Kudu.Services.Web/Startup.cs        |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 29356533..8abe4c99 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -18,6 +18,7 @@
 using Kudu.Core;
 using Microsoft.AspNetCore.Mvc;
 using System.Text;
+using Kudu.Core.Helpers;
 
 namespace Kudu.Services.Web
 {
@@ -50,11 +51,24 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             {
                 string[] pathParts = context.Request.Path.ToString().Split("/");
 
+                string homeDir = "";
+                string siteRepoDir = "";
+                if (OSDetector.IsOnWindows())
+                {
+                    homeDir = "F:\\repos\\apps\\";
+                    siteRepoDir = "\\site\\repository";
+                }
+                else
+                {
+                    homeDir = "/home/apps/";
+                    siteRepoDir = "/site/repository";
+                }
+
                 if (pathParts != null && pathParts.Length >= 1)
                 {
                     string appName = pathParts[1];
                     appName = appName.Trim().Replace(".git", "");
-                    if(!FileSystemHelpers.DirectoryExists("/home/apps/" + appName))
+                    if(!FileSystemHelpers.DirectoryExists(homeDir + appName))
                     {
                         context.Response.StatusCode = 404;
                         await context.Response.WriteAsync("The repository does not exist", Encoding.UTF8);
@@ -63,7 +77,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
                     else
                     {
                         serverConfig.GitServerRoot = appName + ".git";
-                        environment.RepositoryPath = "/home/apps/" + appName + "/site/repository";
+                        environment.RepositoryPath = homeDir + appName + siteRepoDir;
                     }
                 }
             }
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 76be860b..374edc75 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -416,7 +416,7 @@ public void Configure(IApplicationBuilder app,
                     template: "{controller}/{action=Index}/{id?}");
 
                 // Git Service
-                routes.MapRoute("git-info-refs", "{repository}" + "/info/refs",
+                routes.MapRoute("git-info-refs", "/{repository}" + "/info/refs",
                     new {controller = "InfoRefs", action = "Execute"});
 
                 // Scm (deployment repository)

From d826e9033509dd727f094d846178e144350138db Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 19 Sep 2019 09:38:39 -0700
Subject: [PATCH 131/245] test

---
 Kudu.Core/Deployment/Generator/OryxBuilder.cs        | 2 +-
 Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 5698d95b..2f0a7d8d 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -48,7 +48,7 @@ public override Task Build(DeploymentContext context)
 
                 FileLogHelper.Log("Running KuduSync with  " + kuduSyncCommand);
 
-                RunCommand(context, kuduSyncCommand, false, "Oryx-Build: Running kudu sync...");
+                //RunCommand(context, kuduSyncCommand, false, "Oryx-Build: Running kudu sync...");
             }
 
             if (args.RunOryxBuild)
diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index e7404044..2b54e329 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -25,7 +25,7 @@ public SiteBuilderFactory(IBuildPropertyProvider propertyProvider, IEnvironment
 
         public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSettingsManager settings, IRepository repository)
         {
-            string repositoryRoot = repository.RepositoryPath;
+            string repositoryRoot = _environment.RepositoryPath;
 
             // Use the cached vs projects file finder for: a. better performance, b. ignoring solutions/projects under node_modules
             var fileFinder = new CachedVsProjectsFileFinder(repository);

From 1d5479f5cb9ff512f5d39ba2f26ae8afa478f00a Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 19 Sep 2019 13:48:29 -0700
Subject: [PATCH 132/245] tesT

---
 Kudu.Core/Tracing/TextLogger.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Kudu.Core/Tracing/TextLogger.cs b/Kudu.Core/Tracing/TextLogger.cs
index 347b88ba..fd9dfba0 100644
--- a/Kudu.Core/Tracing/TextLogger.cs
+++ b/Kudu.Core/Tracing/TextLogger.cs
@@ -43,10 +43,15 @@ public void WriteLine(string value, int depth)
                 strb.Append(DateTime.UtcNow.ToString("s"));
                 strb.Append(GetIndentation(depth + 1));
                 strb.Append(value);
-
-                using (StreamWriter writer = new StreamWriter(FileSystemHelpers.OpenFile(_logFile, FileMode.Append, FileAccess.Write, FileShare.ReadWrite)))
+                try
+                {
+                    using (StreamWriter writer = new StreamWriter(FileSystemHelpers.OpenFile(_logFile, FileMode.Append, FileAccess.Write, FileShare.ReadWrite)))
+                    {
+                        writer.WriteLine(strb.ToString());
+                    }
+                } catch(Exception)
                 {
-                    writer.WriteLine(strb.ToString());
+
                 }
             }
 

From f0f35ea536cce7e0de3549f61ee9c5a3e962ce10 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 19 Sep 2019 15:09:20 -0700
Subject: [PATCH 133/245] test

---
 Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 8710fc1a..6c456d34 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -122,7 +122,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
 
                 case Framework.NodeJs:
                     // Input/Output
-                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.RepositoryPath.Replace("repository","wwwroot"));
                     OryxArgumentsHelper.AddLanguage(args, "nodejs");
                     break;
 

From e664b4d5f29bdb7d1b2a6536c4ce538f4d89f6f7 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Sun, 22 Sep 2019 09:16:39 -0700
Subject: [PATCH 134/245] test

---
 Kudu.Console/Kudu.Console.csproj           |  1 +
 Kudu.Console/Program.cs                    | 18 ++++++++++++++++++
 Kudu.Core/Kudu.Core.csproj                 |  1 +
 Kudu.Services.Web/Kudu.Services.Web.csproj |  1 +
 4 files changed, 21 insertions(+)

diff --git a/Kudu.Console/Kudu.Console.csproj b/Kudu.Console/Kudu.Console.csproj
index 3cfc0393..43de69bd 100644
--- a/Kudu.Console/Kudu.Console.csproj
+++ b/Kudu.Console/Kudu.Console.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="KubernetesClient" Version="1.5.25" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
   </ItemGroup>
 
diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index cfbf6dc2..7d9f9c63 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -22,6 +22,7 @@
 using Kudu.Core.Tracing;
 using System.Reflection;
 using XmlSettings;
+using k8s;
 
 namespace Kudu.Console
 {
@@ -198,6 +199,23 @@ private static int PerformDeploy(
                 }
                 finally
                 {
+                    // Load from in-cluster configuration:
+                    var config = KubernetesClientConfiguration.InClusterConfig();
+
+                    // Use the config object to create a client.
+                    var client = new Kubernetes(config);
+
+                    var namespaces = client.ListNamespace();
+                    foreach (var ns in namespaces.Items)
+                    {
+                        System.Console.WriteLine("Kube NS: "+ns.Metadata.Name);
+                        var list = client.ListNamespacedPod(ns.Metadata.Name);
+                        foreach (var item in list.Items)
+                        {
+                            System.Console.WriteLine("Kube NS Items: " + item.Metadata.Name);
+                        }
+                    }
+
                     System.Console.WriteLine("Deployment Logs : '"+
                         env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
                         gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index d75282c2..ddbe0481 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -24,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="KubernetesClient" Version="1.5.25" />
     <PackageReference Include="LibGit2Sharp" Version="0.25.2" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Mercurial.Net" Version="1.1.1.607" />
diff --git a/Kudu.Services.Web/Kudu.Services.Web.csproj b/Kudu.Services.Web/Kudu.Services.Web.csproj
index 8a3dc344..b02f7676 100644
--- a/Kudu.Services.Web/Kudu.Services.Web.csproj
+++ b/Kudu.Services.Web/Kudu.Services.Web.csproj
@@ -23,6 +23,7 @@
   </Target>
   <ItemGroup>
     <PackageReference Include="AspNetCore.RouteAnalyzer" Version="0.5.3" />
+    <PackageReference Include="KubernetesClient" Version="1.5.25" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>

From e1802666ebba5c6045780f6482078356b76c7c17 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Sun, 22 Sep 2019 09:45:43 -0700
Subject: [PATCH 135/245] test

---
 Kudu.Console/Program.cs | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 7d9f9c63..45c987fe 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -204,21 +204,31 @@ private static int PerformDeploy(
 
                     // Use the config object to create a client.
                     var client = new Kubernetes(config);
-
-                    var namespaces = client.ListNamespace();
-                    foreach (var ns in namespaces.Items)
+                    try
                     {
-                        System.Console.WriteLine("Kube NS: "+ns.Metadata.Name);
-                        var list = client.ListNamespacedPod(ns.Metadata.Name);
-                        foreach (var item in list.Items)
+                        var namespaces = client.ListNamespace();
+                        foreach (var ns in namespaces.Items)
                         {
-                            System.Console.WriteLine("Kube NS Items: " + item.Metadata.Name);
+                            System.Console.WriteLine("Kube NS: " + ns.Metadata.Name);
+                            var list = client.ListNamespacedPod(ns.Metadata.Name);
+                            foreach (var item in list.Items)
+                            {
+                                System.Console.WriteLine("Kube NS Items: " + item.Metadata.Name);
+                            }
                         }
                     }
+                    catch (Microsoft.Rest.HttpOperationException httpOperationException)
+                    {
+                        var phase = httpOperationException.Response.ReasonPhrase;
+                        //Bad Request
+                        var content = httpOperationException.Response.Content;
+                        System.Console.WriteLine("K8 Client errror");
+                        System.Console.WriteLine(content);
+                    }
 
                     System.Console.WriteLine("Deployment Logs : '"+
-                        env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
-                        gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
+                    env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
+                    gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
                 }
             }
 

From c833c3bedbf1f4628e1162d121b4aa822a2ab7c6 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Sun, 22 Sep 2019 13:26:44 -0700
Subject: [PATCH 136/245] test'

---
 Kudu.Console/Program.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 45c987fe..2f5ba843 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -200,7 +200,9 @@ private static int PerformDeploy(
                 finally
                 {
                     // Load from in-cluster configuration:
-                    var config = KubernetesClientConfiguration.InClusterConfig();
+                    //var config = KubernetesClientConfiguration.InClusterConfig();
+
+                    var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
 
                     // Use the config object to create a client.
                     var client = new Kubernetes(config);

From ececdd462d9ae40fb7449920a21d3990b5fcd540 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Sun, 22 Sep 2019 14:29:52 -0700
Subject: [PATCH 137/245] test

---
 Kudu.Console/Program.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 2f5ba843..9589d024 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -200,10 +200,9 @@ private static int PerformDeploy(
                 finally
                 {
                     // Load from in-cluster configuration:
+                    var config = KubernetesClientConfiguration.InClusterConfig();
                     //var config = KubernetesClientConfiguration.InClusterConfig();
 
-                    var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
-
                     // Use the config object to create a client.
                     var client = new Kubernetes(config);
                     try

From 9cdd3d7449878ca7dab51ec18dde087af4e27591 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Sun, 22 Sep 2019 15:44:28 -0700
Subject: [PATCH 138/245] test'

---
 Kudu.Console/Program.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 9589d024..35ff9042 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -207,7 +207,17 @@ private static int PerformDeploy(
                     var client = new Kubernetes(config);
                     try
                     {
-                        var namespaces = client.ListNamespace();
+                        var deployments = client.ListDeploymentForAllNamespaces();
+                        foreach (var deployment in deployments.Items)
+                        {
+                            System.Console.WriteLine("Kube Deployment Metadata name: " + deployment.Metadata.Name);
+                            if ()
+                            {
+
+                            }
+                        }
+
+                        /*
                         foreach (var ns in namespaces.Items)
                         {
                             System.Console.WriteLine("Kube NS: " + ns.Metadata.Name);
@@ -217,6 +227,7 @@ private static int PerformDeploy(
                                 System.Console.WriteLine("Kube NS Items: " + item.Metadata.Name);
                             }
                         }
+                        */
                     }
                     catch (Microsoft.Rest.HttpOperationException httpOperationException)
                     {

From 07a0d8477ff16a5ffadccb775363d9b6be08d843 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Sun, 22 Sep 2019 15:50:47 -0700
Subject: [PATCH 139/245] test'

---
 Kudu.Console/Program.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 35ff9042..5836b87a 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -211,10 +211,6 @@ private static int PerformDeploy(
                         foreach (var deployment in deployments.Items)
                         {
                             System.Console.WriteLine("Kube Deployment Metadata name: " + deployment.Metadata.Name);
-                            if ()
-                            {
-
-                            }
                         }
 
                         /*

From 4d3eeabbf627835d55f57d8c2988a79fd2083766 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Sun, 22 Sep 2019 16:19:22 -0700
Subject: [PATCH 140/245] test

---
 Kudu.Console/Program.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 5836b87a..51f927e1 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -210,7 +210,11 @@ private static int PerformDeploy(
                         var deployments = client.ListDeploymentForAllNamespaces();
                         foreach (var deployment in deployments.Items)
                         {
-                            System.Console.WriteLine("Kube Deployment Metadata name: " + deployment.Metadata.Name);
+                            if(deployment.Metadata.Name.Equals("second",StringComparison.OrdinalIgnoreCase))
+                            {
+                                var containerData = deployment.Spec.Selector.MatchLabels["containers"];
+                                System.Console.WriteLine("container data :::: "+ containerData);
+                            }
                         }
 
                         /*

From 1e867a0646bcc401d8fd8d91fd69f8dbf68f056d Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 12:46:17 -0700
Subject: [PATCH 141/245] Test

---
 Kudu.Console/Program.cs | 64 +++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 51f927e1..eac7403d 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -23,12 +23,19 @@
 using System.Reflection;
 using XmlSettings;
 using k8s;
+using k8s.Models;
+using Microsoft.AspNetCore.JsonPatch;
+using LibGit2Sharp;
+using System.Threading;
 
 namespace Kudu.Console
 {
     internal class Program
     {
-        
+        private static IEnvironment env;
+        private static IDeploymentSettingsManager settingsManager;
+
+
         private static int Main(string[] args)
         {
             // Turn flag on in app.config to wait for debugger on launch
@@ -61,9 +68,9 @@ private static int Main(string[] args)
             string deployer = args.Length == 2 ? null : args[2];
             string requestId = System.Environment.GetEnvironmentVariable(Constants.RequestIdHeader);
 
-            IEnvironment env = GetEnvironment(appRoot, requestId);
+            env = GetEnvironment(appRoot, requestId);
             ISettings settings = new XmlSettings.Settings(GetSettingsPath(env));
-            IDeploymentSettingsManager settingsManager = new DeploymentSettingsManager(settings);
+            settingsManager = new DeploymentSettingsManager(settings);
 
             // Setup the trace
             TraceLevel level = settingsManager.GetTraceLevel();
@@ -199,6 +206,7 @@ private static int PerformDeploy(
                 }
                 finally
                 {
+                    /*
                     // Load from in-cluster configuration:
                     var config = KubernetesClientConfiguration.InClusterConfig();
                     //var config = KubernetesClientConfiguration.InClusterConfig();
@@ -208,26 +216,24 @@ private static int PerformDeploy(
                     try
                     {
                         var deployments = client.ListDeploymentForAllNamespaces();
+                        //client.PatchNamespacedDeployment1('{"spec":{"template":{"spec":{"containers":[{"name":"nginx","image":"nginx:1.11"}]}}}}');
+                        
                         foreach (var deployment in deployments.Items)
                         {
-                            if(deployment.Metadata.Name.Equals("second",StringComparison.OrdinalIgnoreCase))
-                            {
-                                var containerData = deployment.Spec.Selector.MatchLabels["containers"];
-                                System.Console.WriteLine("container data :::: "+ containerData);
-                            }
-                        }
-
-                        /*
-                        foreach (var ns in namespaces.Items)
-                        {
-                            System.Console.WriteLine("Kube NS: " + ns.Metadata.Name);
-                            var list = client.ListNamespacedPod(ns.Metadata.Name);
-                            foreach (var item in list.Items)
+                            if(deployment.Spec.Template.Metadata.Name.Equals("second"))
                             {
-                                System.Console.WriteLine("Kube NS Items: " + item.Metadata.Name);
+                                foreach (var container in deployment.Spec.Template.Spec.Containers)
+                                {
+                                    foreach (var volumeMount in container.VolumeMounts)
+                                    {
+                                        volumeMount.SubPath = "apps/kudutestmount";
+                                        client.PatchNamespacedDeployment(new V1Patch<V1Deployment>(deployment), "second", "default");
+                                    }
+                                }
+                                var jdoc = new JsonPatchDocument<V1Deployment>();
+                                //jdoc.Add("spec/template/spec/containers/volumeMounts/mountPath/subPath", "apps/kudutestmount");
                             }
                         }
-                        */
                     }
                     catch (Microsoft.Rest.HttpOperationException httpOperationException)
                     {
@@ -237,8 +243,28 @@ private static int PerformDeploy(
                         System.Console.WriteLine("K8 Client errror");
                         System.Console.WriteLine(content);
                     }
+                    */
+                    // IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string repositoryPath
+                    Process _executingProcess = new Process()
+                    {
+                        StartInfo = new ProcessStartInfo
+                        {
+                            FileName = "/bin/bash",
+                            Arguments = "-c \" /patch.sh second newkududeployment \"",
+                            RedirectStandardOutput = true,
+                            UseShellExecute = false,
+                            CreateNoWindow = true,
+                        }
+                    };
+                    _executingProcess.Start();
+                    while (!_executingProcess.HasExited)
+                    {
+                        System.Console.WriteLine("Waiting for restart command to complete");
+                        Thread.Sleep(1000);
+                    }
+                    //ExternalCommandBuilder restartApp = new ExternalCommandBuilder(env, settingsManager, buildPropertyProvider,env.RepositoryPath);
 
-                    System.Console.WriteLine("Deployment Logs : '"+
+                        System.Console.WriteLine("Deployment Logs : '"+
                     env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
                     gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
                 }

From 3a9485d1353f8ab967d2e4af4a9958c17a596085 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 12:51:04 -0700
Subject: [PATCH 142/245] test

---
 Kudu.Console/Program.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index eac7403d..c77da0af 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -27,6 +27,7 @@
 using Microsoft.AspNetCore.JsonPatch;
 using LibGit2Sharp;
 using System.Threading;
+using IRepository = Kudu.Core.SourceControl.IRepository;
 
 namespace Kudu.Console
 {

From 01d49184801678c63e1131afb3e47646a6126d9f Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 13:51:26 -0700
Subject: [PATCH 143/245] test

---
 Kudu.Console/Program.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index c77da0af..8008c50c 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -35,7 +35,7 @@ internal class Program
     {
         private static IEnvironment env;
         private static IDeploymentSettingsManager settingsManager;
-
+        private static string appRoot;
 
         private static int Main(string[] args)
         {
@@ -64,7 +64,7 @@ private static int Main(string[] args)
             System.Console.Error.NewLine = "\n";
             System.Console.Out.NewLine = "\n";
 
-            string appRoot = args[0];
+            appRoot = args[0];
             string wapTargets = args[1];
             string deployer = args.Length == 2 ? null : args[2];
             string requestId = System.Environment.GetEnvironmentVariable(Constants.RequestIdHeader);
@@ -246,18 +246,22 @@ private static int PerformDeploy(
                     }
                     */
                     // IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string repositoryPath
+                    string appName = appRoot.Replace("/home/apps/","").Split("/")[0];
+                    System.Console.WriteLine("Restarting Pods for App Service App :");
+                    System.Console.WriteLine("App Name: " + appName);
                     Process _executingProcess = new Process()
                     {
                         StartInfo = new ProcessStartInfo
                         {
                             FileName = "/bin/bash",
-                            Arguments = "-c \" /patch.sh second newkududeployment \"",
+                            Arguments = $"-c \" /patch.sh {appRoot.} newkududeployment \"",
                             RedirectStandardOutput = true,
                             UseShellExecute = false,
                             CreateNoWindow = true,
                         }
                     };
                     _executingProcess.Start();
+                    _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
                     while (!_executingProcess.HasExited)
                     {
                         System.Console.WriteLine("Waiting for restart command to complete");

From b2cec8a2280e6f83461a2437b3c0b4db75acf6ae Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 13:52:21 -0700
Subject: [PATCH 144/245] test

---
 Kudu.Console/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 8008c50c..f189855e 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -254,7 +254,7 @@ private static int PerformDeploy(
                         StartInfo = new ProcessStartInfo
                         {
                             FileName = "/bin/bash",
-                            Arguments = $"-c \" /patch.sh {appRoot.} newkududeployment \"",
+                            Arguments = $"-c \" /patch.sh {appRoot} {gitRepository.GetChangeSet(settingsManager.GetBranch()).Id} \"",
                             RedirectStandardOutput = true,
                             UseShellExecute = false,
                             CreateNoWindow = true,

From dd0dc8fb86e94e79288509d769f34ff485c39575 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 14:57:59 -0700
Subject: [PATCH 145/245] tesT

---
 Kudu.Console/Program.cs                         | 10 ++++++----
 Kudu.Core/SourceControl/Git/GitExeRepository.cs |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index f189855e..c468e3e0 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -246,15 +246,17 @@ private static int PerformDeploy(
                     }
                     */
                     // IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string repositoryPath
-                    string appName = appRoot.Replace("/home/apps/","").Split("/")[0];
-                    System.Console.WriteLine("Restarting Pods for App Service App :");
-                    System.Console.WriteLine("App Name: " + appName);
+                    string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
+
+                    System.Console.WriteLine("Restarting Pods for App Service App : ");
+                    System.Console.WriteLine("App Name: " + appName + $" Patch Args :::::: -c \" /patch.sh {appRoot} {gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
+
                     Process _executingProcess = new Process()
                     {
                         StartInfo = new ProcessStartInfo
                         {
                             FileName = "/bin/bash",
-                            Arguments = $"-c \" /patch.sh {appRoot} {gitRepository.GetChangeSet(settingsManager.GetBranch()).Id} \"",
+                            Arguments = $"-c \" /patch.sh {appRoot} {gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"",
                             RedirectStandardOutput = true,
                             UseShellExecute = false,
                             CreateNoWindow = true,
diff --git a/Kudu.Core/SourceControl/Git/GitExeRepository.cs b/Kudu.Core/SourceControl/Git/GitExeRepository.cs
index c34ae9b5..938ad102 100644
--- a/Kudu.Core/SourceControl/Git/GitExeRepository.cs
+++ b/Kudu.Core/SourceControl/Git/GitExeRepository.cs
@@ -185,7 +185,7 @@ public void Initialize()
                     sb.AppendLine("#!/bin/sh");
                     sb.AppendLine("read i");
                     sb.AppendLine("echo $i > pushinfo");
-                    sb.AppendLine(KnownEnvironment.KUDUCOMMAND);
+                    sb.AppendLine(KnownEnvironment.KUDUCOMMAND.Replace("$KUDU_APPPATH",_environment.RepositoryPath));
                     if (OSDetector.IsOnWindows())
                     {
                         FileSystemHelpers.WriteAllText(PostReceiveHookPath, sb.ToString());

From 13d4271945bb82b29982e7c144f5adcf18906376 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 17:38:11 -0700
Subject: [PATCH 146/245] test

---
 Kudu.Console/Program.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index c468e3e0..39684668 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -249,19 +249,20 @@ private static int PerformDeploy(
                     string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
 
                     System.Console.WriteLine("Restarting Pods for App Service App : ");
-                    System.Console.WriteLine("App Name: " + appName + $" Patch Args :::::: -c \" /patch.sh {appRoot} {gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
+                    System.Console.WriteLine("App Name: " + appName + $" Patch Args :::::: -c \" /patch.sh {appName} {gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
 
                     Process _executingProcess = new Process()
                     {
                         StartInfo = new ProcessStartInfo
                         {
                             FileName = "/bin/bash",
-                            Arguments = $"-c \" /patch.sh {appRoot} {gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"",
+                            Arguments = $"-c \" /patch.sh {appRoot} {appRoot}/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"",
                             RedirectStandardOutput = true,
                             UseShellExecute = false,
                             CreateNoWindow = true,
                         }
                     };
+
                     _executingProcess.Start();
                     _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
                     while (!_executingProcess.HasExited)

From e668df775f0f0370077bd10d87b2b0dc1a9fa762 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 17:56:44 -0700
Subject: [PATCH 147/245] test

---
 Kudu.Console/Program.cs                       |  5 ++--
 Kudu.Contracts/IEnvironment.cs                |  1 +
 .../Oryx/AppServiceOryxArguments.cs           |  3 +++
 Kudu.Core/Deployment/Oryx/BuildFlags.cs       |  3 ++-
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   | 23 ++++++++++++++++++-
 Kudu.Core/Environment.cs                      |  2 ++
 6 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 39684668..f8e7c85c 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -147,6 +147,7 @@ private static int PerformDeploy(
             {
                 gitRepository = new GitExeRepository(env, settingsManager, traceFactory);
             }
+            env.CurrId = gitRepository.GetChangeSet(settingsManager.GetBranch()).Id;
 
             IServerConfiguration serverConfiguration = new ServerConfiguration();
             IAnalytics analytics = new Analytics(settingsManager, serverConfiguration, traceFactory);
@@ -162,7 +163,6 @@ private static int PerformDeploy(
                                                           deploymentLock,
                                                           GetLogger(env, level, logger),
                                                           hooksManager);
-
             var step = tracer.Step(XmlTracer.ExecutingExternalProcessTrace, new Dictionary<string, string>
             {
                 { "type", "process" },
@@ -347,12 +347,13 @@ private static IEnvironment GetEnvironment(string siteRoot, string requestId)
             }
 
             // CORE TODO Handing in a null IHttpContextAccessor (and KuduConsoleFullPath) again
-            return new Kudu.Core.Environment(root,
+            var env=  new Kudu.Core.Environment(root,
                 EnvironmentHelper.NormalizeBinPath(binPath),
                 repositoryPath,
                 requestId,
                 Path.Combine(AppContext.BaseDirectory, "KuduConsole", "kudu.dll"),
                 null);
+            return env;
         }
     }
 }
\ No newline at end of file
diff --git a/Kudu.Contracts/IEnvironment.cs b/Kudu.Contracts/IEnvironment.cs
index ae918d8d..104b1432 100644
--- a/Kudu.Contracts/IEnvironment.cs
+++ b/Kudu.Contracts/IEnvironment.cs
@@ -2,6 +2,7 @@
 {
     public interface IEnvironment
     {
+        string CurrId { get; set; }
         string RootPath { get; }                // e.g. /
         string SiteRootPath { get; }            // e.g. /site
         string RepositoryPath { get; set; }     // e.g. /site/repository
diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 6c456d34..3fe05066 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -230,6 +230,9 @@ public string GenerateOryxBuildCommand(DeploymentContext context)
                 case BuildOptimizationsFlags.UseTempDirectory:
                     OryxArgumentsHelper.AddTempDirectoryOption(args, context.BuildTempPath);
                     break;
+                case BuildOptimizationsFlags.UseK8SquashFs:
+                    OryxArgumentsHelper.AddTempDirectoryOption(args, context.BuildTempPath);
+                    break;
             }
 
             // Virtual Env?
diff --git a/Kudu.Core/Deployment/Oryx/BuildFlags.cs b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
index 7b278476..df326609 100644
--- a/Kudu.Core/Deployment/Oryx/BuildFlags.cs
+++ b/Kudu.Core/Deployment/Oryx/BuildFlags.cs
@@ -10,7 +10,8 @@ public enum BuildOptimizationsFlags
         None,
         CompressModules,
         UseExpressBuild,
-        UseTempDirectory
+        UseTempDirectory,
+        UseK8SquashFs
     }
 
     public class BuildFlagsHelper
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index e484003a..ea33e209 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -10,11 +10,15 @@ namespace Kudu.Core.Deployment.Oryx
     public class ExpressBuilder : ExternalCommandBuilder
     {
         public override string ProjectType => "OryxBuild";
+        public IEnvironment environment;
+        IDeploymentSettingsManager settings;
+        IBuildPropertyProvider propertyProvider;
 
         public ExpressBuilder(IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string sourcePath)
             : base(environment, settings, propertyProvider, sourcePath)
         {
-
+            this.environment = environment;
+            this.settings = settings;
         }
 
         public void SetupExpressBuilderArtifacts(string outputPath, DeploymentContext context, IOryxArguments args)
@@ -68,6 +72,23 @@ private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string
             return zipAppName;
         }
 
+
+        private string SetupNodeAppExpressArtifacts(DeploymentContext context, string sitePackages, string outputPath)
+        {
+            context.Logger.Log($"Express Build enabled for Node app");
+
+            // Create NetCore Zip at tm build folder where artifact were build and copy it to sitePackages, .GetBranch()
+            string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+
+            context.Logger.Log($"From {context.BuildTempPath} to {environment.RepositoryPath} ");
+            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, environment.RepositoryPath +"/artifacts/" +environment.CurrId, zipAppName, BuildArtifactType.Squashfs, numBuildArtifacts: -1);
+
+            // Remove the old zips
+            DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);
+
+            return zipAppName;
+        }
+
         /// <summary>
         /// Package every files and sub directories from a source folder
         /// </summary>
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 954b77a4..95047335 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -463,6 +463,8 @@ public static string TenantId
 
         public bool IsOnK8 => true;
 
+        public string CurrId { get; set; }
+
         public static string GetFreeSpaceHtml(string path)
         {
             try

From 156f9e470ec760ed732a70d1b72d129a6297f0dc Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 19:32:54 -0700
Subject: [PATCH 148/245] TEsT

---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index ea33e209..1ac699ae 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -40,7 +40,8 @@ public void SetupExpressBuilderArtifacts(string outputPath, DeploymentContext co
             {
                 // For App service express mode
                 // Generate packagename.txt and packagepath
-                packageName = "node_modules.zip:/node_modules";
+                //packageName = "node_modules.zip:/node_modules";
+                SetupNodeAppExpressArtifacts(context, sitePackagesDir, outputPath);
             }
             else if(args.Language == Framework.Python)
             {

From 52c3dccd8c72c63ea09dc698d2adc136ba213f15 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 19:46:32 -0700
Subject: [PATCH 149/245] test

---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 1ac699ae..903afd52 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -81,8 +81,10 @@ private string SetupNodeAppExpressArtifacts(DeploymentContext context, string si
             // Create NetCore Zip at tm build folder where artifact were build and copy it to sitePackages, .GetBranch()
             string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
 
-            context.Logger.Log($"From {context.BuildTempPath} to {environment.RepositoryPath} ");
-            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, environment.RepositoryPath +"/artifacts/" +environment.CurrId, zipAppName, BuildArtifactType.Squashfs, numBuildArtifacts: -1);
+            context.Logger.Log($"From {context.BuildTempPath} to {(environment.RepositoryPath + "../artifacts/" + environment.CurrId)} ");
+            FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "../artifacts/");
+            FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "../artifacts/" + environment.CurrId);
+            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, environment.RepositoryPath +"../artifacts/" +environment.CurrId, zipAppName, BuildArtifactType.Squashfs, numBuildArtifacts: -1);
 
             // Remove the old zips
             DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);

From c2160979145121832f31cea764da497abf4a976e Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 20:00:19 -0700
Subject: [PATCH 150/245] Test

---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 903afd52..7751f3e4 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -81,10 +81,10 @@ private string SetupNodeAppExpressArtifacts(DeploymentContext context, string si
             // Create NetCore Zip at tm build folder where artifact were build and copy it to sitePackages, .GetBranch()
             string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
 
-            context.Logger.Log($"From {context.BuildTempPath} to {(environment.RepositoryPath + "../artifacts/" + environment.CurrId)} ");
-            FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "../artifacts/");
-            FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "../artifacts/" + environment.CurrId);
-            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, environment.RepositoryPath +"../artifacts/" +environment.CurrId, zipAppName, BuildArtifactType.Squashfs, numBuildArtifacts: -1);
+            context.Logger.Log($"From {context.BuildTempPath} to {(environment.RepositoryPath + "/../artifacts/" + environment.CurrId)} ");
+            FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "/../artifacts/");
+            FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "/../artifacts/" + environment.CurrId);
+            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, environment.RepositoryPath +"/../artifacts/" +environment.CurrId, zipAppName, BuildArtifactType.Squashfs, numBuildArtifacts: -1);
 
             // Remove the old zips
             DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);

From c32153e4dffe3838753c36e1f7c5055358d886f6 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 22:23:37 -0700
Subject: [PATCH 151/245] test

---
 Kudu.Console/Program.cs                       |  2 +-
 .../Pages/NewUI/artifacts.cshtml.cs           | 19 +++++++++++++++++++
 Kudu.Services.Web/Startup.cs                  |  9 +++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml.cs

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index f8e7c85c..087dc8bf 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -249,7 +249,7 @@ private static int PerformDeploy(
                     string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
 
                     System.Console.WriteLine("Restarting Pods for App Service App : ");
-                    System.Console.WriteLine("App Name: " + appName + $" Patch Args :::::: -c \" /patch.sh {appName} {gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
+                    System.Console.WriteLine("App Name: " + appName + $" Patch Args :::::: -c \" /patch.sh {appName} {appRoot}/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
 
                     Process _executingProcess = new Process()
                     {
diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml.cs b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml.cs
new file mode 100644
index 00000000..3ad12782
--- /dev/null
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Kudu.Services.Web.Pages.NewUI
+{
+    public class artifactsModel : PageModel
+    {
+        public string appName { get; set; }
+
+        public void OnGet()
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 374edc75..4ad488ea 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -339,6 +339,15 @@ public void Configure(IApplicationBuilder app,
                 await context.Response.WriteAsync("Kestrel Running");
             }));
 
+            var containsRelativeProvisionPath = new Func<HttpContext, bool>(i =>
+                i.Request.Path.Value.StartsWith("/api/provision", StringComparison.OrdinalIgnoreCase));
+
+            app.MapWhen(containsRelativeProvisionPath, application => application.Run(async context =>
+            {
+                FileSystemHelpers.EnsureDirectory("/apps/"+context.Request.Path.Value.Replace("/api/provision/", ""));
+                await context.Response.WriteAsync("App Provisioned");
+            }));
+
             var containsRelativePath2 = new Func<HttpContext, bool>(i =>
                 i.Request.Path.Value.StartsWith("/info", StringComparison.OrdinalIgnoreCase));
 

From 230dc6c0ba98636436c89e38300eaa14b0122e34 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 23:32:27 -0700
Subject: [PATCH 152/245] test

---
 .../SourceControl/Git/GitExeRepository.cs     |   2 +-
 .../Pages/NewUI/artifacts.cshtml              | 330 ++++++++++++++++++
 2 files changed, 331 insertions(+), 1 deletion(-)
 create mode 100644 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml

diff --git a/Kudu.Core/SourceControl/Git/GitExeRepository.cs b/Kudu.Core/SourceControl/Git/GitExeRepository.cs
index 938ad102..62980f97 100644
--- a/Kudu.Core/SourceControl/Git/GitExeRepository.cs
+++ b/Kudu.Core/SourceControl/Git/GitExeRepository.cs
@@ -185,7 +185,7 @@ public void Initialize()
                     sb.AppendLine("#!/bin/sh");
                     sb.AppendLine("read i");
                     sb.AppendLine("echo $i > pushinfo");
-                    sb.AppendLine(KnownEnvironment.KUDUCOMMAND.Replace("$KUDU_APPPATH",_environment.RepositoryPath));
+                    sb.AppendLine(KnownEnvironment.KUDUCOMMAND.Replace("$KUDU_APPPATH",_environment.RepositoryPath.Replace("/repository","")));
                     if (OSDetector.IsOnWindows())
                     {
                         FileSystemHelpers.WriteAllText(PostReceiveHookPath, sb.ToString());
diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
new file mode 100644
index 00000000..b30819d9
--- /dev/null
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -0,0 +1,330 @@
+@page "{appName}"
+
+@model Kudu.Services.Web.Pages.NewUI.artifactsModel
+@{
+    ViewData["Title"] = "artifacts";
+}
+<style>
+
+    img {
+        vertical-align: middle;
+    }
+
+    .img-responsive {
+        display: block;
+        height: auto;
+        max-width: 100%;
+    }
+
+    .img-rounded {
+        border-radius: 3px;
+    }
+
+    .img-thumbnail {
+        background-color: #fff;
+        border: 1px solid #ededf0;
+        border-radius: 3px;
+        display: inline-block;
+        height: auto;
+        line-height: 1.428571429;
+        max-width: 100%;
+        moz-transition: all .2s ease-in-out;
+        o-transition: all .2s ease-in-out;
+        padding: 2px;
+        transition: all .2s ease-in-out;
+        webkit-transition: all .2s ease-in-out;
+    }
+
+    .img-circle {
+        border-radius: 50%;
+    }
+
+    .timeline-centered {
+        position: relative;
+        margin-bottom: 30px;
+    }
+
+        .timeline-centered:before, .timeline-centered:after {
+            content: " ";
+            display: table;
+        }
+
+        .timeline-centered:after {
+            clear: both;
+        }
+
+        .timeline-centered:before, .timeline-centered:after {
+            content: " ";
+            display: table;
+        }
+
+        .timeline-centered:after {
+            clear: both;
+        }
+
+        .timeline-centered:before {
+            content: '';
+            position: absolute;
+            display: block;
+            width: 4px;
+            background: #f5f5f6;
+            left: 50%;
+            top: 20px;
+            bottom: 20px;
+            margin-left: -4px;
+        }
+
+        .timeline-centered .timeline-entry {
+            position: relative;
+            width: 50%;
+            float: right;
+            margin-bottom: 70px;
+            clear: both;
+        }
+
+            .timeline-centered .timeline-entry:before, .timeline-centered .timeline-entry:after {
+                content: " ";
+                display: table;
+            }
+
+            .timeline-centered .timeline-entry:after {
+                clear: both;
+            }
+
+            .timeline-centered .timeline-entry:before, .timeline-centered .timeline-entry:after {
+                content: " ";
+                display: table;
+            }
+
+            .timeline-centered .timeline-entry:after {
+                clear: both;
+            }
+
+            .timeline-centered .timeline-entry.begin {
+                margin-bottom: 0;
+            }
+
+            .timeline-centered .timeline-entry.left-aligned {
+                float: left;
+            }
+
+                .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner {
+                    margin-left: 0;
+                    margin-right: -18px;
+                }
+
+                    .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-time {
+                        left: auto;
+                        right: -100px;
+                        text-align: left;
+                    }
+
+                    .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-icon {
+                        float: right;
+                    }
+
+                    .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-label {
+                        margin-left: 0;
+                        margin-right: 70px;
+                    }
+
+                        .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-label:after {
+                            left: auto;
+                            right: 0;
+                            margin-left: 0;
+                            margin-right: -9px;
+                            -moz-transform: rotate(180deg);
+                            -o-transform: rotate(180deg);
+                            -webkit-transform: rotate(180deg);
+                            -ms-transform: rotate(180deg);
+                            transform: rotate(180deg);
+                        }
+
+            .timeline-centered .timeline-entry .timeline-entry-inner {
+                position: relative;
+                margin-left: -22px;
+            }
+
+                .timeline-centered .timeline-entry .timeline-entry-inner:before, .timeline-centered .timeline-entry .timeline-entry-inner:after {
+                    content: " ";
+                    display: table;
+                }
+
+                .timeline-centered .timeline-entry .timeline-entry-inner:after {
+                    clear: both;
+                }
+
+                .timeline-centered .timeline-entry .timeline-entry-inner:before, .timeline-centered .timeline-entry .timeline-entry-inner:after {
+                    content: " ";
+                    display: table;
+                }
+
+                .timeline-centered .timeline-entry .timeline-entry-inner:after {
+                    clear: both;
+                }
+
+                .timeline-centered .timeline-entry .timeline-entry-inner .timeline-time {
+                    position: absolute;
+                    left: -100px;
+                    text-align: right;
+                    padding: 10px;
+                    -webkit-box-sizing: border-box;
+                    -moz-box-sizing: border-box;
+                    box-sizing: border-box;
+                }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-time > span {
+                        display: block;
+                    }
+
+                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-time > span:first-child {
+                            font-size: 15px;
+                            font-weight: bold;
+                        }
+
+                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-time > span:last-child {
+                            font-size: 12px;
+                        }
+
+                .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon {
+                    background: #fff;
+                    color: #737881;
+                    display: block;
+                    width: 40px;
+                    height: 40px;
+                    -webkit-background-clip: padding-box;
+                    -moz-background-clip: padding;
+                    background-clip: padding-box;
+                    -webkit-border-radius: 20px;
+                    -moz-border-radius: 20px;
+                    border-radius: 20px;
+                    text-align: center;
+                    -moz-box-shadow: 0 0 0 5px #f5f5f6;
+                    -webkit-box-shadow: 0 0 0 5px #f5f5f6;
+                    box-shadow: 0 0 0 5px #f5f5f6;
+                    line-height: 40px;
+                    font-size: 15px;
+                    float: left;
+                }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-primary {
+                        background-color: #303641;
+                        color: #fff;
+                    }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-secondary {
+                        background-color: #ee4749;
+                        color: #fff;
+                    }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-success {
+                        background-color: #00a651;
+                        color: #fff;
+                    }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-info {
+                        background-color: #21a9e1;
+                        color: #fff;
+                    }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-warning {
+                        background-color: #fad839;
+                        color: #fff;
+                    }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-danger {
+                        background-color: #cc2424;
+                        color: #fff;
+                    }
+
+                .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label {
+                    position: relative;
+                    background: #f5f5f6;
+                    padding: 1.7em;
+                    margin-left: 70px;
+                    -webkit-background-clip: padding-box;
+                    -moz-background-clip: padding;
+                    background-clip: padding-box;
+                    -webkit-border-radius: 3px;
+                    -moz-border-radius: 3px;
+                    border-radius: 3px;
+                }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label:after {
+                        content: '';
+                        display: block;
+                        position: absolute;
+                        width: 0;
+                        height: 0;
+                        border-style: solid;
+                        border-width: 9px 9px 9px 0;
+                        border-color: transparent #f5f5f6 transparent transparent;
+                        left: 0;
+                        top: 10px;
+                        margin-left: -9px;
+                    }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label h2, .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label p {
+                        color: #737881;
+                        font-family: "Noto Sans",sans-serif;
+                        font-size: 12px;
+                        margin: 0;
+                        line-height: 1.428571429;
+                    }
+
+                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label p + p {
+                            margin-top: 15px;
+                        }
+
+                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label h2 {
+                        font-size: 16px;
+                        margin-bottom: 10px;
+                    }
+
+                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label h2 a {
+                            color: #303641;
+                        }
+
+                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label h2 span {
+                            -webkit-opacity: .6;
+                            -moz-opacity: .6;
+                            opacity: .6;
+                            -ms-filter: alpha(opacity=60);
+                            filter: alpha(opacity=60);
+                        }
+</style>
+
+<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
+<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
+<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
+<!------ Include the above in your HEAD tag ---------->
+
+<div class="container">
+    <div class="row">
+        <div class="timeline-centered">
+
+            @foreach (var dir in System.IO.Directory.GetDirectories("/home/apps/" + @Model.appName + "/site/artifacts"))
+            {
+                <article class="timeline-entry">
+                    <div class="timeline-entry-inner">
+                        <time class="timeline-time" datetime="2014-01-10T03:45"><span>03:45 AM</span> <span>Today</span></time>
+                        <div class="timeline-icon bg-success">
+                            <i class="entypo-feather"></i>
+                        </div>
+                        <div class="timeline-label">
+                            <h2><a href="#">@dir</a> <span></span></h2>
+                            <p>Redeploy</p>
+                        </div>
+                    </div>
+                </article>
+            }
+            <article class="timeline-entry begin">
+                <div class="timeline-entry-inner">
+                    <div class="timeline-icon" style="-webkit-transform: rotate(-90deg); -moz-transform: rotate(-90deg);">
+                        <i class="entypo-flight"></i>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </div>
+</div>
\ No newline at end of file

From 06387bc9656fac4d5053bf9cd6bde4a221ea258f Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 23 Sep 2019 23:53:46 -0700
Subject: [PATCH 153/245] test'

---
 Kudu.Services.Web/Startup.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 4ad488ea..becf4968 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -344,7 +344,8 @@ public void Configure(IApplicationBuilder app,
 
             app.MapWhen(containsRelativeProvisionPath, application => application.Run(async context =>
             {
-                FileSystemHelpers.EnsureDirectory("/apps/"+context.Request.Path.Value.Replace("/api/provision/", ""));
+                FileSystemHelpers.EnsureDirectory("/home/apps/"+context.Request.Path.Value.Replace("/api/provision/", ""));
+                FileSystemHelpers.EnsureDirectory("/home/apps/" + context.Request.Path.Value.Replace("/api/provision/", "")+"/site");
                 await context.Response.WriteAsync("App Provisioned");
             }));
 

From 80b26a88d5a8238afbbd192b7850ee78a7808270 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 24 Sep 2019 00:12:07 -0700
Subject: [PATCH 154/245] test

---
 Kudu.Console/Program.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 087dc8bf..4c6686f5 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -28,6 +28,8 @@
 using LibGit2Sharp;
 using System.Threading;
 using IRepository = Kudu.Core.SourceControl.IRepository;
+using log4net;
+using log4net.Config;
 
 namespace Kudu.Console
 {
@@ -39,6 +41,8 @@ internal class Program
 
         private static int Main(string[] args)
         {
+            var logRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+            XmlConfigurator.Configure(logRepository, new FileInfo("log4net.config"));
             // Turn flag on in app.config to wait for debugger on launch
             if (ConfigurationManager.AppSettings["WaitForDebuggerOnStart"] == "true")
             {
@@ -249,7 +253,7 @@ private static int PerformDeploy(
                     string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
 
                     System.Console.WriteLine("Restarting Pods for App Service App : ");
-                    System.Console.WriteLine("App Name: " + appName + $" Patch Args :::::: -c \" /patch.sh {appName} {appRoot}/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
+                    System.Console.WriteLine("App Name: " + appName + $" Patch Args :::::: -c \" /patch.sh {appName} apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
 
                     Process _executingProcess = new Process()
                     {

From a914ecc35a7a2335c05bdf99be217f2030f92f08 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 24 Sep 2019 00:23:52 -0700
Subject: [PATCH 155/245] test

---
 Kudu.Console/Program.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 4c6686f5..448dcc02 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -266,17 +266,21 @@ private static int PerformDeploy(
                             CreateNoWindow = true,
                         }
                     };
-
-                    _executingProcess.Start();
+                    StreamReader myStreamReader = _executingProcess.StandardError;
+                    // Read the standard error of net.exe and write it on to console.
                     _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
+                    _executingProcess.Start();
                     while (!_executingProcess.HasExited)
                     {
                         System.Console.WriteLine("Waiting for restart command to complete");
                         Thread.Sleep(1000);
                     }
+                    _executingProcess.WaitForExit();
+                    System.Console.WriteLine("Process exit code : "+_executingProcess.ExitCode);
+                    System.Console.WriteLine(myStreamReader.ReadLine());
                     //ExternalCommandBuilder restartApp = new ExternalCommandBuilder(env, settingsManager, buildPropertyProvider,env.RepositoryPath);
 
-                        System.Console.WriteLine("Deployment Logs : '"+
+                    System.Console.WriteLine("Deployment Logs : '"+
                     env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
                     gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
                 }

From 24a49ec6708571ea26828c592013c5db0424b38d Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 24 Sep 2019 00:31:10 -0700
Subject: [PATCH 156/245] test

---
 Kudu.Console/Program.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 448dcc02..59d4d022 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -266,7 +266,6 @@ private static int PerformDeploy(
                             CreateNoWindow = true,
                         }
                     };
-                    StreamReader myStreamReader = _executingProcess.StandardError;
                     // Read the standard error of net.exe and write it on to console.
                     _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
                     _executingProcess.Start();
@@ -277,7 +276,6 @@ private static int PerformDeploy(
                     }
                     _executingProcess.WaitForExit();
                     System.Console.WriteLine("Process exit code : "+_executingProcess.ExitCode);
-                    System.Console.WriteLine(myStreamReader.ReadLine());
                     //ExternalCommandBuilder restartApp = new ExternalCommandBuilder(env, settingsManager, buildPropertyProvider,env.RepositoryPath);
 
                     System.Console.WriteLine("Deployment Logs : '"+

From 09d42b525d10fbb831ac40a4b1c77c5f37ac3640 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 24 Sep 2019 00:39:29 -0700
Subject: [PATCH 157/245] test'

---
 Kudu.Console/Program.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 59d4d022..5fbe82d4 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -269,11 +269,11 @@ private static int PerformDeploy(
                     // Read the standard error of net.exe and write it on to console.
                     _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
                     _executingProcess.Start();
-                    while (!_executingProcess.HasExited)
-                    {
-                        System.Console.WriteLine("Waiting for restart command to complete");
-                        Thread.Sleep(1000);
-                    }
+                    //* Read the output (or the error)
+                    string output = _executingProcess.StandardOutput.ReadToEnd();
+                    System.Console.WriteLine(output);
+                    string err = _executingProcess.StandardError.ReadToEnd();
+                    System.Console.WriteLine(err);
                     _executingProcess.WaitForExit();
                     System.Console.WriteLine("Process exit code : "+_executingProcess.ExitCode);
                     //ExternalCommandBuilder restartApp = new ExternalCommandBuilder(env, settingsManager, buildPropertyProvider,env.RepositoryPath);

From 7d60e90b10a9c183038d42b751728a9760949308 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 24 Sep 2019 00:52:51 -0700
Subject: [PATCH 158/245] test

---
 Kudu.Console/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 5fbe82d4..6984287f 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -260,7 +260,7 @@ private static int PerformDeploy(
                         StartInfo = new ProcessStartInfo
                         {
                             FileName = "/bin/bash",
-                            Arguments = $"-c \" /patch.sh {appRoot} {appRoot}/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"",
+                            Arguments = $"-c \" /patch.sh {appName} {appName}/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"",
                             RedirectStandardOutput = true,
                             UseShellExecute = false,
                             CreateNoWindow = true,

From 781a914bf08bf288820cc399fc197f3d17e6b79d Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 24 Sep 2019 01:49:48 -0700
Subject: [PATCH 159/245] test'

---
 Kudu.Console/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 6984287f..21aaa9ff 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -260,7 +260,7 @@ private static int PerformDeploy(
                         StartInfo = new ProcessStartInfo
                         {
                             FileName = "/bin/bash",
-                            Arguments = $"-c \" /patch.sh {appName} {appName}/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"",
+                            Arguments = $"-c \" /patch.sh {appName} apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"",
                             RedirectStandardOutput = true,
                             UseShellExecute = false,
                             CreateNoWindow = true,

From 969566853880d4a42a130521c0f5ddf48b4b211f Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 24 Sep 2019 10:35:26 -0700
Subject: [PATCH 160/245] test

---
 Kudu.Console/Program.cs                       | 14 ++++----
 .../Pages/NewUI/artifacts.cshtml              | 33 +++++++++++++------
 .../Pages/NewUI/artifacts.cshtml.cs           |  2 --
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 21aaa9ff..70356bde 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -252,8 +252,8 @@ private static int PerformDeploy(
                     // IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string repositoryPath
                     string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
 
-                    System.Console.WriteLine("Restarting Pods for App Service App : ");
-                    System.Console.WriteLine("App Name: " + appName + $" Patch Args :::::: -c \" /patch.sh {appName} apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
+                    System.Console.WriteLine("Restarting Pods for App Service App : " + appName);
+                    System.Console.WriteLine($" Patch Args :::::: -c \" /patch.sh {appName} apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
 
                     Process _executingProcess = new Process()
                     {
@@ -270,12 +270,14 @@ private static int PerformDeploy(
                     _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
                     _executingProcess.Start();
                     //* Read the output (or the error)
-                    string output = _executingProcess.StandardOutput.ReadToEnd();
-                    System.Console.WriteLine(output);
-                    string err = _executingProcess.StandardError.ReadToEnd();
-                    System.Console.WriteLine(err);
+                    //string output = _executingProcess.StandardOutput.ReadToEnd();
+                    //System.Console.WriteLine(output);
+                    //string err = _executingProcess.StandardError.ReadToEnd();
+                    //System.Console.WriteLine(err);
                     _executingProcess.WaitForExit();
                     System.Console.WriteLine("Process exit code : "+_executingProcess.ExitCode);
+                    System.Console.WriteLine("All Pods Restarted!");
+
                     //ExternalCommandBuilder restartApp = new ExternalCommandBuilder(env, settingsManager, buildPropertyProvider,env.RepositoryPath);
 
                     System.Console.WriteLine("Deployment Logs : '"+
diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index b30819d9..83d64d27 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -1,4 +1,4 @@
-@page "{appName}"
+@page
 
 @model Kudu.Services.Web.Pages.NewUI.artifactsModel
 @{
@@ -76,7 +76,7 @@
 
         .timeline-centered .timeline-entry {
             position: relative;
-            width: 50%;
+            width: 70%;
             float: right;
             margin-bottom: 70px;
             clear: both;
@@ -128,7 +128,7 @@
                         margin-right: 70px;
                     }
 
-                        .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-label:after {
+                    .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-label:after {
                             left: auto;
                             right: 0;
                             margin-left: 0;
@@ -138,7 +138,7 @@
                             -webkit-transform: rotate(180deg);
                             -ms-transform: rotate(180deg);
                             transform: rotate(180deg);
-                        }
+                    }
 
             .timeline-centered .timeline-entry .timeline-entry-inner {
                 position: relative;
@@ -303,21 +303,34 @@
     <div class="row">
         <div class="timeline-centered">
 
-            @foreach (var dir in System.IO.Directory.GetDirectories("/home/apps/" + @Model.appName + "/site/artifacts"))
-            {
                 <article class="timeline-entry">
                     <div class="timeline-entry-inner">
-                        <time class="timeline-time" datetime="2014-01-10T03:45"><span>03:45 AM</span> <span>Today</span></time>
+                        <time class="timeline-time" datetime="2014-01-10T03:45"><span>4 Hours</span> <span>Ago</span></time>
                         <div class="timeline-icon bg-success">
                             <i class="entypo-feather"></i>
                         </div>
                         <div class="timeline-label">
-                            <h2><a href="#">@dir</a> <span></span></h2>
-                            <p>Redeploy</p>
+                            <h2><a href="#">ddbcbcc74</a> <span></span></h2>
+                            <p>
+                                <button type="button" class="btn btn-success">Production</button>
+                            </p>
                         </div>
                     </div>
                 </article>
-            }
+
+                <article class="timeline-entry">
+                    <div class="timeline-entry-inner">
+                        <time class="timeline-time" datetime="2014-01-10T03:45"><span>7 Hours</span> <span>Ago</span></time>
+                        <div class="timeline-icon bg-success">
+                            <i class="entypo-feather"></i>
+                        </div>
+                        <div class="timeline-label">
+                            <h2><a href="#">7fd7cc46d9</a><span></span></h2>
+                            <button type="button" class="btn btn-secondary">Redeploy Deployment</button>
+                            <button type="button" class="btn btn-danger">Revert App State</button>
+                        </div>
+                    </div>
+                </article>            
             <article class="timeline-entry begin">
                 <div class="timeline-entry-inner">
                     <div class="timeline-icon" style="-webkit-transform: rotate(-90deg); -moz-transform: rotate(-90deg);">
diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml.cs b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml.cs
index 3ad12782..32b2fc6a 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml.cs
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml.cs
@@ -9,8 +9,6 @@ namespace Kudu.Services.Web.Pages.NewUI
 {
     public class artifactsModel : PageModel
     {
-        public string appName { get; set; }
-
         public void OnGet()
         {
 

From 6e3375bab67190405f3196e63a69655b00d4b0f6 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 10 Oct 2019 22:08:34 -0700
Subject: [PATCH 161/245] test

---
 Kudu.Console/Program.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 70356bde..49be405f 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -211,6 +211,21 @@ private static int PerformDeploy(
                 }
                 finally
                 {
+                    var config = KubernetesClientConfiguration.InClusterConfig();
+                    var client = new Kubernetes(config);
+                    var replicaSets = client.ListReplicaSetForAllNamespaces();
+                    string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
+
+                    foreach (var replicaSet in replicaSets.Items)
+                    {
+                        System.Console.WriteLine(" Replica Set name : "+ replicaSet.Metadata.Name);
+                        System.Console.WriteLine(" Replica Set avail : " + replicaSet.Status.AvailableReplicas);
+                        if (replicaSet.Metadata.Name.Equals(appName, StringComparison.OrdinalIgnoreCase)
+                            && (replicaSet.Status.AvailableReplicas > 0))
+                        {
+                            System.Console.WriteLine("Revision Number: "+replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
+                        }
+                    }
                     /*
                     // Load from in-cluster configuration:
                     var config = KubernetesClientConfiguration.InClusterConfig();
@@ -250,7 +265,7 @@ private static int PerformDeploy(
                     }
                     */
                     // IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string repositoryPath
-                    string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
+                    //string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
 
                     System.Console.WriteLine("Restarting Pods for App Service App : " + appName);
                     System.Console.WriteLine($" Patch Args :::::: -c \" /patch.sh {appName} apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");

From 36c6ae40b0292a8c4309150c51a709a85cade7ab Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 10 Oct 2019 22:22:25 -0700
Subject: [PATCH 162/245] test

---
 Kudu.Console/Program.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 49be405f..e051ff1a 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -218,12 +218,12 @@ private static int PerformDeploy(
 
                     foreach (var replicaSet in replicaSets.Items)
                     {
-                        System.Console.WriteLine(" Replica Set name : "+ replicaSet.Metadata.Name);
-                        System.Console.WriteLine(" Replica Set avail : " + replicaSet.Status.AvailableReplicas);
-                        if (replicaSet.Metadata.Name.Equals(appName, StringComparison.OrdinalIgnoreCase)
+                        if (replicaSet.Metadata.Name.IndexOf(appName, StringComparison.OrdinalIgnoreCase) >= 0
                             && (replicaSet.Status.AvailableReplicas > 0))
                         {
-                            System.Console.WriteLine("Revision Number: "+replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
+                            System.Console.WriteLine("Found it");
+                            System.Console.WriteLine("######### Current Revision Number: "+replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
+                            File.WriteAllText($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision", replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
                         }
                     }
                     /*

From 83efe2993b7f17b79cf266e9c2247fad4a1bfd7c Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 10 Oct 2019 23:03:13 -0700
Subject: [PATCH 163/245] test'

---
 Kudu.Console/Program.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index e051ff1a..8b795bd9 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -30,6 +30,7 @@
 using IRepository = Kudu.Core.SourceControl.IRepository;
 using log4net;
 using log4net.Config;
+using Newtonsoft.Json;
 
 namespace Kudu.Console
 {
@@ -223,6 +224,22 @@ private static int PerformDeploy(
                         {
                             System.Console.WriteLine("Found it");
                             System.Console.WriteLine("######### Current Revision Number: "+replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
+                            FileSystemHelpers.EnsureDirectory($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
+                            FileSystemHelpers.CreateFile($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision");
+
+                            if (!FileSystemHelpers.FileExists($"apps/{appName}/site/artifacts/current"))
+                            {
+                                FileSystemHelpers.CreateFile($"apps/{appName}/site/artifacts/current");
+                            }
+
+                            IDeploymentStatusFile statusFile = deploymentStatusManager.Open(gitRepository.GetChangeSet(settingsManager.GetBranch()).Id);
+                            var jObj = JsonConvert.SerializeObject(statusFile);
+                            if (!FileSystemHelpers.FileExists($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json"))
+                            {
+                                FileSystemHelpers.CreateFile($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
+                                File.WriteAllText($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", jObj.ToString());
+                            }
+                            File.WriteAllText($"apps/{appName}/site/artifacts/current", $"{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
                             File.WriteAllText($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision", replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
                         }
                     }

From fa30fc24a0439172c93dadc4ce25fc656e3f6f53 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 10 Oct 2019 23:05:27 -0700
Subject: [PATCH 164/245] test'

---
 Kudu.Console/Program.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 8b795bd9..d903db7e 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -224,23 +224,23 @@ private static int PerformDeploy(
                         {
                             System.Console.WriteLine("Found it");
                             System.Console.WriteLine("######### Current Revision Number: "+replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
-                            FileSystemHelpers.EnsureDirectory($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
-                            FileSystemHelpers.CreateFile($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision");
+                            FileSystemHelpers.EnsureDirectory($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
+                            FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision");
 
-                            if (!FileSystemHelpers.FileExists($"apps/{appName}/site/artifacts/current"))
+                            if (!FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/current"))
                             {
-                                FileSystemHelpers.CreateFile($"apps/{appName}/site/artifacts/current");
+                                FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/current");
                             }
 
                             IDeploymentStatusFile statusFile = deploymentStatusManager.Open(gitRepository.GetChangeSet(settingsManager.GetBranch()).Id);
                             var jObj = JsonConvert.SerializeObject(statusFile);
-                            if (!FileSystemHelpers.FileExists($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json"))
+                            if (!FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json"))
                             {
-                                FileSystemHelpers.CreateFile($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
-                                File.WriteAllText($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", jObj.ToString());
+                                FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
+                                File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", jObj.ToString());
                             }
-                            File.WriteAllText($"apps/{appName}/site/artifacts/current", $"{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
-                            File.WriteAllText($"apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision", replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
+                            File.WriteAllText($"/home/apps/{appName}/site/artifacts/current", $"{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
+                            File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision", replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
                         }
                     }
                     /*

From b4c08946469e6c04c48c0ec790a2c1ef8a6d896b Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 10 Oct 2019 23:20:49 -0700
Subject: [PATCH 165/245] test

---
 Kudu.Services.Web/RevisionController.cs | 79 +++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 Kudu.Services.Web/RevisionController.cs

diff --git a/Kudu.Services.Web/RevisionController.cs b/Kudu.Services.Web/RevisionController.cs
new file mode 100644
index 00000000..a16d56ae
--- /dev/null
+++ b/Kudu.Services.Web/RevisionController.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.IO.Abstractions;
+using System.Linq;
+using System.Threading.Tasks;
+using Kudu.Core.Deployment;
+using Kudu.Core.Infrastructure;
+using Microsoft.AspNetCore.Mvc;
+
+// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+
+namespace Kudu.Services.Web
+{
+    [Route("api/revisions")]
+    [ApiController]
+    public class RevisionController : ControllerBase
+    {
+        public class revisiondata
+        {
+            public string revisionId;
+            public string deploymentId;
+            public bool active;
+            public IDeploymentStatusFile status;
+        }
+
+        // GET api/values
+        [HttpGet("{appName=all}")]
+        public IActionResult GetAllRevisions([FromRoute] string appName = "all")
+        {
+            List<revisiondata> ret = new List<revisiondata>();
+            string active = "";
+            if (FileSystemHelpers.FileExists($"/home/apps/{appName}/Site/artifacts/active"))
+            {
+                active = FileSystemHelpers.ReadAllText($"/home/apps/{appName}/Site/artifacts/active");
+            }
+
+            if (FileSystemHelpers.DirectoryExists($"/home/apps/{appName}"))
+            {
+                foreach(var dir in FileSystemHelpers.GetDirectories($"/home/apps/{appName}/Site/artifacts"))
+                {
+                    string rev = "";
+                   if( FileSystemHelpers.FileExists($"{dir}/revision"))
+                   {
+                        rev = FileSystemHelpers.ReadAllText($"{dir}/revision");
+                   }
+                    bool isCurr = active.Equals(dir.Replace($"/home/apps/{appName}/Site/artifacts/", ""));
+                    //string status2 = FileSystemHelpers.ReadAllText($"{dir}/metadata.json");
+                    ret.Add(new revisiondata() { active = isCurr, revisionId = rev });
+                }
+            }
+            return Ok(ret);
+        }
+
+        // GET api/values/5
+        [HttpPost("revision/{id}")]
+        public ActionResult<string> Get(int id)
+        {
+            return "value";
+        }
+
+        // POST api/values
+        [HttpPost("revision/{id}")]
+        public void Post([FromBody] string value)
+        {
+        }
+
+        // PUT api/values/5
+        [HttpPut("{id}")]
+        public void Put(int id, [FromBody] string value)
+        {
+        }
+
+        // DELETE api/values/5
+        [HttpDelete("{id}")]
+        public void Delete(int id)
+        {
+        }
+    }
+}

From 7f078a9fb1f9a21fcb2d7a437885c80710e09fb0 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 10 Oct 2019 23:41:01 -0700
Subject: [PATCH 166/245] test2

---
 Kudu.Console/Program.cs                 | 32 ++++++++++++++++++++++---
 Kudu.Services.Web/RevisionController.cs | 10 +++++++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index d903db7e..0cd602ca 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -224,6 +224,7 @@ private static int PerformDeploy(
                         {
                             System.Console.WriteLine("Found it");
                             System.Console.WriteLine("######### Current Revision Number: "+replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
+
                             FileSystemHelpers.EnsureDirectory($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
                             FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision");
 
@@ -231,13 +232,22 @@ private static int PerformDeploy(
                             {
                                 FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/current");
                             }
-
+                            
                             IDeploymentStatusFile statusFile = deploymentStatusManager.Open(gitRepository.GetChangeSet(settingsManager.GetBranch()).Id);
-                            var jObj = JsonConvert.SerializeObject(statusFile);
+                            statusFile.Save();
+                            revisiondata rv = new revisiondata()
+                            {
+                                StartTime = statusFile.StartTime,
+                                EndTime = statusFile.EndTime,
+                                Deployer = statusFile.Deployer,
+                                ReceivedTime = statusFile.ReceivedTime,
+                            };
+                            var json = Newtonsoft.Json.JsonConvert.SerializeObject(rv);
+
                             if (!FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json"))
                             {
                                 FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
-                                File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", jObj.ToString());
+                                File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", json.ToString());
                             }
                             File.WriteAllText($"/home/apps/{appName}/site/artifacts/current", $"{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
                             File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision", replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
@@ -346,6 +356,22 @@ private static ITracer GetTracer(IEnvironment env, TraceLevel level)
             return NullTracer.Instance;
         }
 
+        public class revisiondata
+        {
+            public string revisionId;
+            public string deploymentId;
+            public bool active;
+            public DeployStatus Status { get; set; }
+            public string StatusText { get; set; }
+            public string AuthorEmail { get; set; }
+            public string Author { get; set; }
+            public string Message { get; set; }
+            public string Deployer { get; set; }
+            public DateTime ReceivedTime { get; set; }
+            public DateTime StartTime { get; set; }
+            public DateTime? EndTime { get; set; }
+        }
+
         private static ILogger GetLogger(IEnvironment env, TraceLevel level, ILogger primary)
         {
             if (level > TraceLevel.Off)
diff --git a/Kudu.Services.Web/RevisionController.cs b/Kudu.Services.Web/RevisionController.cs
index a16d56ae..2eb8494e 100644
--- a/Kudu.Services.Web/RevisionController.cs
+++ b/Kudu.Services.Web/RevisionController.cs
@@ -20,7 +20,15 @@ public class revisiondata
             public string revisionId;
             public string deploymentId;
             public bool active;
-            public IDeploymentStatusFile status;
+            public DeployStatus Status { get; set; }
+            public string StatusText { get; set; }
+            public string AuthorEmail { get; set; }
+            public string Author { get; set; }
+            public string Message { get; set; }
+            public string Deployer { get; set; }
+            public DateTime ReceivedTime { get; set; }
+            public DateTime StartTime { get; set; }
+            public DateTime? EndTime { get; set; }
         }
 
         // GET api/values

From 92e58e070f71dfca7298035dc1a7b2aacc94d89a Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 10 Oct 2019 23:57:09 -0700
Subject: [PATCH 167/245] test'

---
 Kudu.Console/Program.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 0cd602ca..0695085c 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -246,9 +246,11 @@ private static int PerformDeploy(
 
                             if (!FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json"))
                             {
+                                Thread.Sleep(1000);
                                 FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
-                                File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", json.ToString());
                             }
+
+                            File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", json.ToString());
                             File.WriteAllText($"/home/apps/{appName}/site/artifacts/current", $"{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
                             File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision", replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
                         }

From 2f78eef2fb101fe1a644d87c933ac6328dab3a17 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 03:59:49 -0700
Subject: [PATCH 168/245] test

---
 Kudu.Console/Program.cs                 | 27 ++++----
 Kudu.Services.Web/RevisionController.cs | 87 -------------------------
 2 files changed, 13 insertions(+), 101 deletions(-)
 delete mode 100644 Kudu.Services.Web/RevisionController.cs

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 0695085c..08de62f9 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -31,6 +31,7 @@
 using log4net;
 using log4net.Config;
 using Newtonsoft.Json;
+using System.IO.Abstractions;
 
 namespace Kudu.Console
 {
@@ -226,13 +227,12 @@ private static int PerformDeploy(
                             System.Console.WriteLine("######### Current Revision Number: "+replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
 
                             FileSystemHelpers.EnsureDirectory($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
-                            FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision");
+                            FileStream stream = File.Create($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision");
+                            stream.Close();
+                            FileSystemHelpers.DeleteFileSafe($"/home/apps/{appName}/site/artifacts/current");
+                            FileStream stream2 = File.Create($"/home/apps/{appName}/site/artifacts/current");
+                            stream2.Close();
 
-                            if (!FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/current"))
-                            {
-                                FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/current");
-                            }
-                            
                             IDeploymentStatusFile statusFile = deploymentStatusManager.Open(gitRepository.GetChangeSet(settingsManager.GetBranch()).Id);
                             statusFile.Save();
                             revisiondata rv = new revisiondata()
@@ -241,18 +241,17 @@ private static int PerformDeploy(
                                 EndTime = statusFile.EndTime,
                                 Deployer = statusFile.Deployer,
                                 ReceivedTime = statusFile.ReceivedTime,
+                                Author = statusFile.Author,
+                                AuthorEmail = statusFile.AuthorEmail,
+                                Message = statusFile.Message,
+                                Status = statusFile.Status
                             };
                             var json = Newtonsoft.Json.JsonConvert.SerializeObject(rv);
-
-                            if (!FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json"))
-                            {
-                                Thread.Sleep(1000);
-                                FileSystemHelpers.CreateFile($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
-                            }
-
-                            File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", json.ToString());
+                            FileStream stream3 = File.Create($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
+                            stream3.Close();
                             File.WriteAllText($"/home/apps/{appName}/site/artifacts/current", $"{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
                             File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision", replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
+                            File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", json.ToString());
                         }
                     }
                     /*
diff --git a/Kudu.Services.Web/RevisionController.cs b/Kudu.Services.Web/RevisionController.cs
deleted file mode 100644
index 2eb8494e..00000000
--- a/Kudu.Services.Web/RevisionController.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO.Abstractions;
-using System.Linq;
-using System.Threading.Tasks;
-using Kudu.Core.Deployment;
-using Kudu.Core.Infrastructure;
-using Microsoft.AspNetCore.Mvc;
-
-// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
-
-namespace Kudu.Services.Web
-{
-    [Route("api/revisions")]
-    [ApiController]
-    public class RevisionController : ControllerBase
-    {
-        public class revisiondata
-        {
-            public string revisionId;
-            public string deploymentId;
-            public bool active;
-            public DeployStatus Status { get; set; }
-            public string StatusText { get; set; }
-            public string AuthorEmail { get; set; }
-            public string Author { get; set; }
-            public string Message { get; set; }
-            public string Deployer { get; set; }
-            public DateTime ReceivedTime { get; set; }
-            public DateTime StartTime { get; set; }
-            public DateTime? EndTime { get; set; }
-        }
-
-        // GET api/values
-        [HttpGet("{appName=all}")]
-        public IActionResult GetAllRevisions([FromRoute] string appName = "all")
-        {
-            List<revisiondata> ret = new List<revisiondata>();
-            string active = "";
-            if (FileSystemHelpers.FileExists($"/home/apps/{appName}/Site/artifacts/active"))
-            {
-                active = FileSystemHelpers.ReadAllText($"/home/apps/{appName}/Site/artifacts/active");
-            }
-
-            if (FileSystemHelpers.DirectoryExists($"/home/apps/{appName}"))
-            {
-                foreach(var dir in FileSystemHelpers.GetDirectories($"/home/apps/{appName}/Site/artifacts"))
-                {
-                    string rev = "";
-                   if( FileSystemHelpers.FileExists($"{dir}/revision"))
-                   {
-                        rev = FileSystemHelpers.ReadAllText($"{dir}/revision");
-                   }
-                    bool isCurr = active.Equals(dir.Replace($"/home/apps/{appName}/Site/artifacts/", ""));
-                    //string status2 = FileSystemHelpers.ReadAllText($"{dir}/metadata.json");
-                    ret.Add(new revisiondata() { active = isCurr, revisionId = rev });
-                }
-            }
-            return Ok(ret);
-        }
-
-        // GET api/values/5
-        [HttpPost("revision/{id}")]
-        public ActionResult<string> Get(int id)
-        {
-            return "value";
-        }
-
-        // POST api/values
-        [HttpPost("revision/{id}")]
-        public void Post([FromBody] string value)
-        {
-        }
-
-        // PUT api/values/5
-        [HttpPut("{id}")]
-        public void Put(int id, [FromBody] string value)
-        {
-        }
-
-        // DELETE api/values/5
-        [HttpDelete("{id}")]
-        public void Delete(int id)
-        {
-        }
-    }
-}

From 760a2b62ca4f1acb052fdac86b8f3a13879d3ada Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 05:07:51 -0700
Subject: [PATCH 169/245] test

---
 .../Diagnostics/RevisionController.cs         | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 Kudu.Services/Diagnostics/RevisionController.cs

diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
new file mode 100644
index 00000000..0d9d2f98
--- /dev/null
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -0,0 +1,63 @@
+using Kudu.Core.Deployment;
+using Kudu.Core.Infrastructure;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Services.Diagnostics
+{
+    [Route("api/revisions")]
+    [ApiController]
+    public class RevisionController : ControllerBase
+    {
+        public class revisiondata
+        {
+            public string revisionId;
+            public string deploymentId;
+            public bool active;
+            public DeployStatus Status { get; set; }
+            public string StatusText { get; set; }
+            public string AuthorEmail { get; set; }
+            public string Author { get; set; }
+            public string Message { get; set; }
+            public string Deployer { get; set; }
+            public DateTime ReceivedTime { get; set; }
+            public DateTime StartTime { get; set; }
+            public DateTime? EndTime { get; set; }
+        }
+
+        // GET api/values
+        [HttpGet("{appName=all}")]
+        public IActionResult GetAllRevisions([FromRoute] string appName = "all")
+        {
+            List<revisiondata> ret = new List<revisiondata>();
+            string active = "";
+            if (FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/active"))
+            {
+                active = FileSystemHelpers.ReadAllText($"/home/apps/{appName}/site/artifacts/active");
+            }
+
+            if (FileSystemHelpers.DirectoryExists($"/home/apps/{appName}"))
+            {
+                foreach (var dir in FileSystemHelpers.GetDirectories($"/home/apps/{appName}/ite/artifacts"))
+                {
+                    string rev = "";
+                    if (FileSystemHelpers.FileExists($"{dir}/revision"))
+                    {
+                        rev = FileSystemHelpers.ReadAllText($"{dir}/revision");
+                    }
+                    bool isCurr = active.Equals(dir.Replace($"/home/apps/{appName}/site/artifacts/", ""));
+                    string status2 = FileSystemHelpers.ReadAllText($"{dir}/metadata.json");
+                    var revData = JsonConvert.DeserializeObject<revisiondata>(status2);
+                    ret.Add(new revisiondata() { active = isCurr, revisionId = rev, EndTime = revData.EndTime, Deployer = revData.Deployer, Author = revData.Author, AuthorEmail = revData.AuthorEmail, ReceivedTime = revData.ReceivedTime, StartTime = revData.StartTime, Status = revData.Status, Message = revData.Message });
+                }
+            }
+            return Ok(ret);
+        }
+
+      
+        
+    }
+}

From 65af6d0fd97e958e4b8c0521ede124d009b37ee6 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 05:21:15 -0700
Subject: [PATCH 170/245] test

---
 Kudu.Services/Diagnostics/RevisionController.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index 0d9d2f98..5c388e89 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -29,7 +29,7 @@ public class revisiondata
         }
 
         // GET api/values
-        [HttpGet("{appName=all}")]
+        [HttpGet("data/{appName=all}")]
         public IActionResult GetAllRevisions([FromRoute] string appName = "all")
         {
             List<revisiondata> ret = new List<revisiondata>();
@@ -56,8 +56,5 @@ public IActionResult GetAllRevisions([FromRoute] string appName = "all")
             }
             return Ok(ret);
         }
-
-      
-        
     }
 }

From bfd765096d5f0d186fd9e0a9190235d6c7336083 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 05:29:42 -0700
Subject: [PATCH 171/245] test

---
 Kudu.Services.Web/Startup.cs                    | 5 +++++
 Kudu.Services/Diagnostics/RevisionController.cs | 9 +++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index becf4968..537e96f3 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -510,6 +510,11 @@ public void Configure(IApplicationBuilder app,
                     new {controller = "Deployment", action = "GetDeploymentScript"},
                     new {verb = new HttpMethodRouteConstraint("GET")});
 
+                // Revision script
+                routes.MapRoute("get-deployment-revision", "api/revisions/{appName}",
+                    new { controller = "Revision", action = "GetMyRevisions" },
+                    new { verb = new HttpMethodRouteConstraint("GET") });
+
                 // IsDeploying status 
                 routes.MapRoute("is-deployment-underway", "api/isdeploying",
                     new {controller = "Deployment", action = "IsDeploying"},
diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index 5c388e89..cfbb750f 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -8,9 +8,7 @@
 
 namespace Kudu.Services.Diagnostics
 {
-    [Route("api/revisions")]
-    [ApiController]
-    public class RevisionController : ControllerBase
+    public class RevisionController : Controller
     {
         public class revisiondata
         {
@@ -28,9 +26,8 @@ public class revisiondata
             public DateTime? EndTime { get; set; }
         }
 
-        // GET api/values
-        [HttpGet("data/{appName=all}")]
-        public IActionResult GetAllRevisions([FromRoute] string appName = "all")
+
+        public IActionResult GetMyRevisions([FromRoute] string appName = "all")
         {
             List<revisiondata> ret = new List<revisiondata>();
             string active = "";

From 6cf850f695b23525494343f21fa37080ef6657cf Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 07:01:21 -0700
Subject: [PATCH 172/245] test

---
 Kudu.Services/Diagnostics/RevisionController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index cfbb750f..84cb62ee 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -26,7 +26,7 @@ public class revisiondata
             public DateTime? EndTime { get; set; }
         }
 
-
+        [HttpGet]
         public IActionResult GetMyRevisions([FromRoute] string appName = "all")
         {
             List<revisiondata> ret = new List<revisiondata>();

From dcd580f51ac14df4fb715d26865142ada428656e Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 07:37:20 -0700
Subject: [PATCH 173/245] test

---
 .../Pages/NewUI/artifacts.cshtml              | 790 +++++++++++-------
 .../Diagnostics/RevisionController.cs         |   2 +-
 2 files changed, 468 insertions(+), 324 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 83d64d27..5fbf4854 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -5,339 +5,483 @@
     ViewData["Title"] = "artifacts";
 }
 <style>
+body {
+  background-color: #edeff0;
+  box-sizing: border-box;
+  font-family: 'Varela Round', sans-serif;
+  letter-spacing: 0.05em;
+}
+
+body,
+html {
+  width: 100%;
+  margin: 0;
+}
+
+#wrapper > div {
+  font-size: 0;
+}
+
+.card.course-id-1 .card-backgrund-color {
+  background-color: #80ACE9;
+}
+
+.card-assignment-icon:before {
+  background-color: rgba(128, 172, 233, 0.4);
+}
+
+.card.course-id-2 .card-backgrund-color {
+  background-color: #68CF8C;
+}
+
+.card.course-id-4 .card-backgrund-color {
+  background-color: #ED7070;
+}
+
+.card-group-heading {
+  margin: 0;
+  color: #566265;
+}
+
+.card-container {
+  font-size: 0;
+}
+
+.card,
+.card * {
+  box-sizing: border-box;
+}
+
+.card {
+  width: calc(100% - 40px);
+  min-width: 300px;
+  border-radius: 5px;
+  background-color: white;
+  text-align: center;
+  height: 300px;
+  position: relative;
+  display: inline-block;
+  margin: 20px;
+  cursor: pointer;
+  -webkit-transition: -webkit-transform .2s ease-in, box-shadow .1s ease-in;
+  /*   -moz-transition: -moz-transform .1s ease-in, box-shadow .1s ease-in; */
+  transition: transform .2s ease-in, box-shadow .1s ease-in;
+  box-shadow: 0px 2px 2px #dfe6f0;
+}
+
+/* card shadow */
+
+.card:hover {
+  box-shadow: 0px 5px 10px #dfe6f0;
+  -webkit-transform: translateY(-5px);
+  transform: translateY(-5px);
+}
+
+
+/* header, footer, and body */
+
+.card-header,
+.card-footer,
+.card-body {
+  position: absolute;
+  left: 0;
+  right: 0;
+  padding: 10px 20px;
+  overflow: hidden;
+}
+
+.card-header {
+  top: 0;
+  height: 50px;
+  border-radius: 5px 5px 0 0;
+}
+
+.card-footer {
+  bottom: 0;
+  height: 50px;
+  border-radius: 0 0 5px 5px;
+  background-color: #F4F6F8;
+}
+
+.card-body {
+  top: 50px;
+  bottom: 50px;
+}
+
+.card-header > h2,
+.card-body > p,
+.card-footer > p {
+  margin: 0;
+}
+
+
+/* header content */
+
+.card-header > h2 {
+  font-size: 16px;
+  padding: 6px;
+  /* (30 - font-size) / 2 */
+  color: white;
+}
+
+
+/* body content*/
+
+
+/* card-info */
+
+.card-info {
+  height: 60%;
+  display: flex;
+  justify-content: center;
+}
+
+.card-info-element {
+  align-self: center;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.card-info-element {
+  width: 30%;
+}
+
+.card-info-description {
+  text-transform: uppercase;
+  font-size: 10px;
+  font-weight: bold;
+  color: #B3BAC1;
+  margin-bottom: 10px;
+}
+
+.card-info-value {
+  color: #576366;
+  font-weight: bold;
+  font-size: 30px;
+  height: 37px;
+  vertical-align: bottom;
+}
+
+.card-info-assignment-level,
+.card-info-deadline {
+  color: white;
+  background-color: #B3BAC1;
+  display: inline-block;
+  display: inline-flex;
+  justify-content: center;
+  /* align horizontal */
+  align-items: center;
+  /* align vertical */
+  border-radius: 100px;
+}
+
+.card-info-assignment-level {
+  width: 40px;
+  height: 40px;
+  line-height: 30px;
+  padding-top: 2px;
+}
+
+.card-info-deadline {
+  font-size: 12px;
+  padding: 6px 10px;
+  margin-bottom: 4px;
+  vertical-align: middle;
+}
+
+
+/* delimiter */
+
+.card-body-delimiter {
+  background-color: #EDEFF1;
+  width: 40px;
+  height: 3px;
+  border-radius: 2px;
+  position: absolute;
+  top: 112px;
+  /* should be info-height + body-padding - delimiter-height / 2 = 108 + 10 - 2 = 116, but since info-values contains a kind of padding it is hardcoded */
+  left: calc(50% - 20px);
+  /* (body-width - delimiter-width) / 2 = (300 - 40) / 2 = 130 */
+}
 
-    img {
-        vertical-align: middle;
-    }
-
-    .img-responsive {
-        display: block;
-        height: auto;
-        max-width: 100%;
-    }
-
-    .img-rounded {
-        border-radius: 3px;
-    }
-
-    .img-thumbnail {
-        background-color: #fff;
-        border: 1px solid #ededf0;
-        border-radius: 3px;
-        display: inline-block;
-        height: auto;
-        line-height: 1.428571429;
-        max-width: 100%;
-        moz-transition: all .2s ease-in-out;
-        o-transition: all .2s ease-in-out;
-        padding: 2px;
-        transition: all .2s ease-in-out;
-        webkit-transition: all .2s ease-in-out;
-    }
-
-    .img-circle {
-        border-radius: 50%;
-    }
-
-    .timeline-centered {
-        position: relative;
-        margin-bottom: 30px;
-    }
-
-        .timeline-centered:before, .timeline-centered:after {
-            content: " ";
-            display: table;
-        }
-
-        .timeline-centered:after {
-            clear: both;
-        }
-
-        .timeline-centered:before, .timeline-centered:after {
-            content: " ";
-            display: table;
-        }
-
-        .timeline-centered:after {
-            clear: both;
-        }
-
-        .timeline-centered:before {
-            content: '';
-            position: absolute;
-            display: block;
-            width: 4px;
-            background: #f5f5f6;
-            left: 50%;
-            top: 20px;
-            bottom: 20px;
-            margin-left: -4px;
-        }
-
-        .timeline-centered .timeline-entry {
-            position: relative;
-            width: 70%;
-            float: right;
-            margin-bottom: 70px;
-            clear: both;
-        }
-
-            .timeline-centered .timeline-entry:before, .timeline-centered .timeline-entry:after {
-                content: " ";
-                display: table;
-            }
-
-            .timeline-centered .timeline-entry:after {
-                clear: both;
-            }
-
-            .timeline-centered .timeline-entry:before, .timeline-centered .timeline-entry:after {
-                content: " ";
-                display: table;
-            }
-
-            .timeline-centered .timeline-entry:after {
-                clear: both;
-            }
-
-            .timeline-centered .timeline-entry.begin {
-                margin-bottom: 0;
-            }
-
-            .timeline-centered .timeline-entry.left-aligned {
-                float: left;
-            }
-
-                .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner {
-                    margin-left: 0;
-                    margin-right: -18px;
-                }
-
-                    .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-time {
-                        left: auto;
-                        right: -100px;
-                        text-align: left;
-                    }
-
-                    .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-icon {
-                        float: right;
-                    }
-
-                    .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-label {
-                        margin-left: 0;
-                        margin-right: 70px;
-                    }
-
-                    .timeline-centered .timeline-entry.left-aligned .timeline-entry-inner .timeline-label:after {
-                            left: auto;
-                            right: 0;
-                            margin-left: 0;
-                            margin-right: -9px;
-                            -moz-transform: rotate(180deg);
-                            -o-transform: rotate(180deg);
-                            -webkit-transform: rotate(180deg);
-                            -ms-transform: rotate(180deg);
-                            transform: rotate(180deg);
-                    }
-
-            .timeline-centered .timeline-entry .timeline-entry-inner {
-                position: relative;
-                margin-left: -22px;
-            }
-
-                .timeline-centered .timeline-entry .timeline-entry-inner:before, .timeline-centered .timeline-entry .timeline-entry-inner:after {
-                    content: " ";
-                    display: table;
-                }
-
-                .timeline-centered .timeline-entry .timeline-entry-inner:after {
-                    clear: both;
-                }
-
-                .timeline-centered .timeline-entry .timeline-entry-inner:before, .timeline-centered .timeline-entry .timeline-entry-inner:after {
-                    content: " ";
-                    display: table;
-                }
-
-                .timeline-centered .timeline-entry .timeline-entry-inner:after {
-                    clear: both;
-                }
-
-                .timeline-centered .timeline-entry .timeline-entry-inner .timeline-time {
-                    position: absolute;
-                    left: -100px;
-                    text-align: right;
-                    padding: 10px;
-                    -webkit-box-sizing: border-box;
-                    -moz-box-sizing: border-box;
-                    box-sizing: border-box;
-                }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-time > span {
-                        display: block;
-                    }
-
-                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-time > span:first-child {
-                            font-size: 15px;
-                            font-weight: bold;
-                        }
-
-                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-time > span:last-child {
-                            font-size: 12px;
-                        }
-
-                .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon {
-                    background: #fff;
-                    color: #737881;
-                    display: block;
-                    width: 40px;
-                    height: 40px;
-                    -webkit-background-clip: padding-box;
-                    -moz-background-clip: padding;
-                    background-clip: padding-box;
-                    -webkit-border-radius: 20px;
-                    -moz-border-radius: 20px;
-                    border-radius: 20px;
-                    text-align: center;
-                    -moz-box-shadow: 0 0 0 5px #f5f5f6;
-                    -webkit-box-shadow: 0 0 0 5px #f5f5f6;
-                    box-shadow: 0 0 0 5px #f5f5f6;
-                    line-height: 40px;
-                    font-size: 15px;
-                    float: left;
-                }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-primary {
-                        background-color: #303641;
-                        color: #fff;
-                    }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-secondary {
-                        background-color: #ee4749;
-                        color: #fff;
-                    }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-success {
-                        background-color: #00a651;
-                        color: #fff;
-                    }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-info {
-                        background-color: #21a9e1;
-                        color: #fff;
-                    }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-warning {
-                        background-color: #fad839;
-                        color: #fff;
-                    }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-icon.bg-danger {
-                        background-color: #cc2424;
-                        color: #fff;
-                    }
-
-                .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label {
-                    position: relative;
-                    background: #f5f5f6;
-                    padding: 1.7em;
-                    margin-left: 70px;
-                    -webkit-background-clip: padding-box;
-                    -moz-background-clip: padding;
-                    background-clip: padding-box;
-                    -webkit-border-radius: 3px;
-                    -moz-border-radius: 3px;
-                    border-radius: 3px;
-                }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label:after {
-                        content: '';
-                        display: block;
-                        position: absolute;
-                        width: 0;
-                        height: 0;
-                        border-style: solid;
-                        border-width: 9px 9px 9px 0;
-                        border-color: transparent #f5f5f6 transparent transparent;
-                        left: 0;
-                        top: 10px;
-                        margin-left: -9px;
-                    }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label h2, .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label p {
-                        color: #737881;
-                        font-family: "Noto Sans",sans-serif;
-                        font-size: 12px;
-                        margin: 0;
-                        line-height: 1.428571429;
-                    }
-
-                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label p + p {
-                            margin-top: 15px;
-                        }
-
-                    .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label h2 {
-                        font-size: 16px;
-                        margin-bottom: 10px;
-                    }
-
-                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label h2 a {
-                            color: #303641;
-                        }
-
-                        .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label h2 span {
-                            -webkit-opacity: .6;
-                            -moz-opacity: .6;
-                            opacity: .6;
-                            -ms-filter: alpha(opacity=60);
-                            filter: alpha(opacity=60);
-                        }
+
+/* tags */
+
+.card-tags {
+  height: 40%;
+  display: flex;
+  justify-content: center;
+}
+
+.card-tag {
+  background-color: #BDC5CD;
+  align-self: center;
+  display: inline-block;
+  padding: 5px 10px;
+  margin: 4px;
+  border-radius: 5px;
+  text-transform: uppercase;
+  font-weight: bold;
+  color: white;
+  font-size: 12px;
+}
+
+
+/* assignment type content */
+
+.card-assignment-icon {
+  display: inline-block;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  height: 80px;
+  width: 80px;
+  position: absolute;
+  top: 20px;
+  left: calc(50% - 40px);
+}
+
+.card-assignment-icon:before {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  opacity: 1;
+  border-radius: 50%;
+}
+
+.card-assignment-text {
+  height: 40%;
+  font-size: 14px;
+  line-height: 18px;
+  color: #a6b0b2;
+  position: absolute;
+  top: 60%;
+  left: 20px;
+  right: 20px;
+}
+
+.ml-page-checks:after,
+.ml-cross-check:after {
+  content: "";
+  background: url("https://cdn0.iconfinder.com/data/icons/outline-business/512/file.png");
+  background-size: 50px;
+  width: 48px;
+  height: 49px;
+  display: inline-block;
+  background-repeat: no-repeat;
+}
+
+
+/* progress bar */
+
+.card-progress-bar {
+  background-color: #DFE4E9;
+  border-radius: 4px;
+  height: 8px;
+  display: block;
+  margin: 11px 0;
+  position: relative;
+}
+
+.card-progress-bar-status {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 0;
+  border-radius: 4px;
+  -webkit-transition: width 1s ease-in-out;
+  -moz-transition: width 1s ease-in-out;
+  -o-transition: width 1s ease-in-out;
+  transition: width 1s ease-in-out;
+}
+
+
+/* footer content */
+
+.card-footer-text {
+  display: inline-block;
+  color: #576366;
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 30px;
+  height: 30px;
+  vertical-align: middle;
+}
+
+.card-footer-icon {
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  display: inline-block;
+  color: white;
+  font-size: 14px;
+  padding: 2px 0;
+  margin: 2px 5px 2px 0;
+}
+
+.ml-checkmark:after {
+  content: "✔";
+}
+ul.timeline {
+    list-style-type: none;
+    position: relative;
+}
+
+ul.timeline:before {
+    content: ' ';
+    background: #d4d9df;
+    display: inline-block;
+    position: absolute;
+    left: 29px;
+    width: 2px;
+    height: 100%;
+    z-index: 400;
+}
+ul.timeline > li {
+    margin: 20px 0;
+    padding-left: 20px;
+}
+
+mytimeline.ul.timeline > li:before {
+    content: ' ';
+    background: white;
+    display: inline-block;
+    position: absolute;
+    border-radius: 50%;
+    border: 3px solid #22c0e8;
+    left: 20px;
+    width: 20px;
+    height: 20px;
+    z-index: 400;
+}
+            
 </style>
+<style>
+  
 
+</style>
 <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
 <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
 <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
 <!------ Include the above in your HEAD tag ---------->
 
-<div class="container">
+<div style="margin-left:30px">
     <div class="row">
-        <div class="timeline-centered">
-
-                <article class="timeline-entry">
-                    <div class="timeline-entry-inner">
-                        <time class="timeline-time" datetime="2014-01-10T03:45"><span>4 Hours</span> <span>Ago</span></time>
-                        <div class="timeline-icon bg-success">
-                            <i class="entypo-feather"></i>
-                        </div>
-                        <div class="timeline-label">
-                            <h2><a href="#">ddbcbcc74</a> <span></span></h2>
-                            <p>
-                                <button type="button" class="btn btn-success">Production</button>
-                            </p>
-                        </div>
-                    </div>
-                </article>
-
-                <article class="timeline-entry">
-                    <div class="timeline-entry-inner">
-                        <time class="timeline-time" datetime="2014-01-10T03:45"><span>7 Hours</span> <span>Ago</span></time>
-                        <div class="timeline-icon bg-success">
-                            <i class="entypo-feather"></i>
-                        </div>
-                        <div class="timeline-label">
-                            <h2><a href="#">7fd7cc46d9</a><span></span></h2>
-                            <button type="button" class="btn btn-secondary">Redeploy Deployment</button>
-                            <button type="button" class="btn btn-danger">Revert App State</button>
-                        </div>
-                    </div>
-                </article>            
-            <article class="timeline-entry begin">
-                <div class="timeline-entry-inner">
-                    <div class="timeline-icon" style="-webkit-transform: rotate(-90deg); -moz-transform: rotate(-90deg);">
-                        <i class="entypo-flight"></i>
-                    </div>
+        <div class="mt-5 mb-5">
+            <div class="row">
+                <div class="col-md-6 offset-md-3">
+                    <h4>Past Deployments</h4>
+                    <ul class="timeline mytimeline.">
+                        <li>
+                            <article class="card assignment-card course-id-2">
+                                <header class="card-header card-backgrund-color">
+                                    <h2>Deployment : 12343288934</h2>
+                                </header>
+                                <section class="card-body">
+                                    <div class="card-info">
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">Ago</div>
+                                            <div class="card-info-value">02</div>
+                                        </div>
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">By</div>
+                                            <div class="card-info-value">60</div>
+                                        </div>
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">Time</div>
+                                            <div class="card-info-value"><span class="card-info-assignment-level">C</span></div>
+                                        </div>
+                                    </div>
+                                    <p class="card-body-delimiter"></p>
+                                    <p class="card-tags">
+                                        <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
+                                        <span class="card-tag">Revert State</span>
+                                        <span class="card-tag">Revision Metadata</span>
+                                    </p>
+                                </section>
+                                <footer class="card-footer">
+                                    <p>
+                                        <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
+                                    </p>
+                                </footer>
+                            </article>
+                        </li>
+                        <li>
+                            <article class="card assignment-card course-id-1">
+                                <header class="card-header card-backgrund-color">
+                                    <h2>Deployment : 12343288934</h2>
+                                </header>
+                                <section class="card-body">
+                                    <div class="card-info">
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">Ago</div>
+                                            <div class="card-info-value">02</div>
+                                        </div>
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">By</div>
+                                            <div class="card-info-value">60</div>
+                                        </div>
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">Time</div>
+                                            <div class="card-info-value"><span class="card-info-assignment-level">C</span></div>
+                                        </div>
+                                    </div>
+                                    <p class="card-body-delimiter"></p>
+                                    <p class="card-tags">
+                                        <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
+                                        <span class="card-tag">Revert State</span>
+                                        <span class="card-tag">Revision Metadata</span>
+                                    </p>
+                                </section>
+                                <footer class="card-footer">
+                                    <p>
+                                        <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
+                                    </p>
+                                </footer>
+                            </article>
+                        </li>
+                        <li>
+                            <article class="card assignment-card course-id-1">
+                                <header class="card-header card-backgrund-color">
+                                    <h2>Deployment : 12343288934</h2>
+                                </header>
+                                <section class="card-body">
+                                    <div class="card-info">
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">Ago</div>
+                                            <div class="card-info-value">02</div>
+                                        </div>
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">By</div>
+                                            <div class="card-info-value">60</div>
+                                        </div>
+                                        <div class="card-info-element">
+                                            <div class="card-info-description">Time</div>
+                                            <div class="card-info-value"><span class="card-info-assignment-level">C</span></div>
+                                        </div>
+                                    </div>
+                                    <p class="card-body-delimiter"></p>
+                                    <p class="card-tags">
+                                        <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
+                                        <span class="card-tag">Revert State</span>
+                                        <span class="card-tag">Revision Metadata</span>
+                                    </p>
+                                </section>
+                                <footer class="card-footer">
+                                    <p>
+                                        <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
+                                    </p>
+                                </footer>
+                            </article>
+                        </li>
+                    </ul>
                 </div>
-            </article>
+            </div>
         </div>
+
     </div>
 </div>
\ No newline at end of file
diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index 84cb62ee..33cea061 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -38,7 +38,7 @@ public IActionResult GetMyRevisions([FromRoute] string appName = "all")
 
             if (FileSystemHelpers.DirectoryExists($"/home/apps/{appName}"))
             {
-                foreach (var dir in FileSystemHelpers.GetDirectories($"/home/apps/{appName}/ite/artifacts"))
+                foreach (var dir in FileSystemHelpers.GetDirectories($"/home/apps/{appName}/site/artifacts"))
                 {
                     string rev = "";
                     if (FileSystemHelpers.FileExists($"{dir}/revision"))

From 91088dd1208b5a33ba8e58587bdf1d068d767efe Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 08:20:09 -0700
Subject: [PATCH 174/245] test

---
 .../Pages/NewUI/artifacts.cshtml              | 213 +++++++++---------
 Kudu.Services.Web/Startup.cs                  |   5 +
 .../Diagnostics/RevisionController.cs         |  40 +++-
 3 files changed, 152 insertions(+), 106 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 5fbf4854..b277794e 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -368,116 +368,121 @@ mytimeline.ul.timeline > li:before {
 <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
 <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
 <!------ Include the above in your HEAD tag ---------->
-
+<script>
+    $(document).ready(function () {
+        var json = JSON.parse('[{"revisionId":"19","deploymentId":null,"active":false,"Status":0,"StatusText":null,"AuthorEmail":null,"Author":null,"Message":null,"Deployer":"","ReceivedTime":"2019-10-11T11:49:30.1250327Z","StartTime":"2019-10-11T11:49:30.4290369Z","EndTime":"2019-10-11T11:51:32.9365332Z","id":"98439nkj98"}]');
+        var jsonData;
+        $.ajax({ 
+            type: "GET",
+            crossDomain: true,
+            url: "http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo",
+            success: function(data){        
+                alert(data);
+            }
+        });
+      //http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo  
+    for (var i in json)
+    {   
+        var revisionId = json[i].revisionId;
+        var author = json[i].Author;
+        if (author === "") {
+            author = 'sanchit';
+        }
+        var id = json[i].Id;
+        var ago = '4H';
+        var liObj = '<li><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">By</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj2 = '<li><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">By</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var timeline = $('#revisions-timeline');
+        if (json[i].active)
+        {
+            timeline.append(liObj);
+        }
+        else
+        {
+            timeline.append(liObj2);
+        }
+    }
+    });
+
+</script>
 <div style="margin-left:30px">
     <div class="row">
         <div class="mt-5 mb-5">
             <div class="row">
                 <div class="col-md-6 offset-md-3">
                     <h4>Past Deployments</h4>
-                    <ul class="timeline mytimeline.">
-                        <li>
-                            <article class="card assignment-card course-id-2">
-                                <header class="card-header card-backgrund-color">
-                                    <h2>Deployment : 12343288934</h2>
-                                </header>
-                                <section class="card-body">
-                                    <div class="card-info">
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">Ago</div>
-                                            <div class="card-info-value">02</div>
-                                        </div>
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">By</div>
-                                            <div class="card-info-value">60</div>
-                                        </div>
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">Time</div>
-                                            <div class="card-info-value"><span class="card-info-assignment-level">C</span></div>
-                                        </div>
-                                    </div>
-                                    <p class="card-body-delimiter"></p>
-                                    <p class="card-tags">
-                                        <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
-                                        <span class="card-tag">Revert State</span>
-                                        <span class="card-tag">Revision Metadata</span>
-                                    </p>
-                                </section>
-                                <footer class="card-footer">
-                                    <p>
-                                        <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
-                                    </p>
-                                </footer>
-                            </article>
-                        </li>
-                        <li>
-                            <article class="card assignment-card course-id-1">
-                                <header class="card-header card-backgrund-color">
-                                    <h2>Deployment : 12343288934</h2>
-                                </header>
-                                <section class="card-body">
-                                    <div class="card-info">
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">Ago</div>
-                                            <div class="card-info-value">02</div>
-                                        </div>
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">By</div>
-                                            <div class="card-info-value">60</div>
-                                        </div>
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">Time</div>
-                                            <div class="card-info-value"><span class="card-info-assignment-level">C</span></div>
-                                        </div>
-                                    </div>
-                                    <p class="card-body-delimiter"></p>
-                                    <p class="card-tags">
-                                        <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
-                                        <span class="card-tag">Revert State</span>
-                                        <span class="card-tag">Revision Metadata</span>
-                                    </p>
-                                </section>
-                                <footer class="card-footer">
-                                    <p>
-                                        <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
-                                    </p>
-                                </footer>
-                            </article>
-                        </li>
-                        <li>
-                            <article class="card assignment-card course-id-1">
-                                <header class="card-header card-backgrund-color">
-                                    <h2>Deployment : 12343288934</h2>
-                                </header>
-                                <section class="card-body">
-                                    <div class="card-info">
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">Ago</div>
-                                            <div class="card-info-value">02</div>
-                                        </div>
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">By</div>
-                                            <div class="card-info-value">60</div>
-                                        </div>
-                                        <div class="card-info-element">
-                                            <div class="card-info-description">Time</div>
-                                            <div class="card-info-value"><span class="card-info-assignment-level">C</span></div>
-                                        </div>
-                                    </div>
-                                    <p class="card-body-delimiter"></p>
-                                    <p class="card-tags">
-                                        <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
-                                        <span class="card-tag">Revert State</span>
-                                        <span class="card-tag">Revision Metadata</span>
-                                    </p>
-                                </section>
-                                <footer class="card-footer">
-                                    <p>
-                                        <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
-                                    </p>
-                                </footer>
-                            </article>
-                        </li>
+                    <ul class="timeline" id="revisions-timeline">
+
+                        <!--
+    <li>
+        <article class="card assignment-card course-id-1">
+            <header class="card-header card-backgrund-color">
+                <h2>Deployment : 12343288934</h2>
+            </header>
+            <section class="card-body">
+                <div class="card-info">
+                    <div class="card-info-element">
+                        <div class="card-info-description">Ago</div>
+                        <div class="card-info-value">02</div>
+                    </div>
+                    <div class="card-info-element">
+                        <div class="card-info-description">By</div>
+                        <div class="card-info-value">60</div>
+                    </div>
+                    <div class="card-info-element">
+                        <div class="card-info-description">Revision</div>
+                        <div class="card-info-value"><span class="card-info-assignment-level">18</span></div>
+                    </div>
+                </div>
+                <p class="card-body-delimiter"></p>
+                <p class="card-tags">
+                    <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
+                    <span class="card-tag">Revert State</span>
+                    <span class="card-tag">Revision Metadata</span>
+                </p>
+            </section>
+            <footer class="card-footer">
+                <p>
+                    <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
+                </p>
+            </footer>
+        </article>
+    </li>
+    <li>
+        <article class="card assignment-card course-id-1">
+            <header class="card-header card-backgrund-color">
+                <h2>Deployment : 12343288934</h2>
+            </header>
+            <section class="card-body">
+                <div class="card-info">
+                    <div class="card-info-element">
+                        <div class="card-info-description">Ago</div>
+                        <div class="card-info-value">02</div>
+                    </div>
+                    <div class="card-info-element">
+                        <div class="card-info-description">By</div>
+                        <div class="card-info-value">60</div>
+                    </div>
+                    <div class="card-info-element">
+                        <div class="card-info-description">Revision</div>
+                        <div class="card-info-value"><span class="card-info-assignment-level">18</span></div>
+                    </div>
+                </div>
+                <p class="card-body-delimiter"></p>
+                <p class="card-tags">
+                    <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
+                    <span class="card-tag">Revert State</span>
+                    <span class="card-tag">Revision Metadata</span>
+                </p>
+            </section>
+            <footer class="card-footer">
+                <p>
+                    <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
+                </p>
+            </footer>
+        </article>
+    </li>
+        -->
                     </ul>
                 </div>
             </div>
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 537e96f3..53fbc1f9 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -515,6 +515,11 @@ public void Configure(IApplicationBuilder app,
                     new { controller = "Revision", action = "GetMyRevisions" },
                     new { verb = new HttpMethodRouteConstraint("GET") });
 
+                // Revision script
+                routes.MapRoute("revert-deployment-revision", "api/revisions",
+                    new { controller = "Revision", action = "RedployDeployemnt" },
+                    new { verb = new HttpMethodRouteConstraint("POST") });
+
                 // IsDeploying status 
                 routes.MapRoute("is-deployment-underway", "api/isdeploying",
                     new {controller = "Deployment", action = "IsDeploying"},
diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index 33cea061..f430f523 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -1,9 +1,11 @@
 using Kudu.Core.Deployment;
 using Kudu.Core.Infrastructure;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text;
 
 namespace Kudu.Services.Diagnostics
@@ -26,14 +28,15 @@ public class revisiondata
             public DateTime? EndTime { get; set; }
         }
 
+        [EnableCors]
         [HttpGet]
         public IActionResult GetMyRevisions([FromRoute] string appName = "all")
         {
             List<revisiondata> ret = new List<revisiondata>();
             string active = "";
-            if (FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/active"))
+            if (FileSystemHelpers.FileExists($"/home/apps/{appName}/site/artifacts/current"))
             {
-                active = FileSystemHelpers.ReadAllText($"/home/apps/{appName}/site/artifacts/active");
+                active = FileSystemHelpers.ReadAllText($"/home/apps/{appName}/site/artifacts/current");
             }
 
             if (FileSystemHelpers.DirectoryExists($"/home/apps/{appName}"))
@@ -53,5 +56,38 @@ public IActionResult GetMyRevisions([FromRoute] string appName = "all")
             }
             return Ok(ret);
         }
+
+        [EnableCors]
+        [HttpPost]
+        public IActionResult RedployDeployemnt([FromBody] string appName, [FromBody] string deploymentId)
+        {
+            System.Console.WriteLine("Restarting Pods for App Service App : " + appName);
+            System.Console.WriteLine($" Patch Args :::::: -c \" /patch.sh {appName} apps/{appName}/site/artifacts/{deploymentId}\"");
+
+            Process _executingProcess = new Process()
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    FileName = "/bin/bash",
+                    Arguments = $"-c \" /patch.sh {appName} apps/{appName}/site/artifacts/{deploymentId}\"",
+                    RedirectStandardOutput = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                }
+            };
+            // Read the standard error of net.exe and write it on to console.
+            _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
+            _executingProcess.Start();
+            //* Read the output (or the error)
+            //string output = _executingProcess.StandardOutput.ReadToEnd();
+            //System.Console.WriteLine(output);
+            //string err = _executingProcess.StandardError.ReadToEnd();
+            //System.Console.WriteLine(err);
+            _executingProcess.WaitForExit();
+            System.Console.WriteLine("Process exit code : " + _executingProcess.ExitCode);
+            System.Console.WriteLine("All Pods Restarted!");
+            FileSystemHelpers.WriteAllText($"/home/apps/{appName}/site/artifacts/active", deploymentId);
+            return Ok();
+        }
     }
 }

From f50f1f525b673c1ed1d05c80c0ff71da5f39f334 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 08:46:24 -0700
Subject: [PATCH 175/245] test

---
 .../Pages/NewUI/artifacts.cshtml              | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index b277794e..a0d6ca3f 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -369,15 +369,30 @@ mytimeline.ul.timeline > li:before {
 <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
 <!------ Include the above in your HEAD tag ---------->
 <script>
+    function revertDeployment(appName, deploymentId){
+        $.ajax({
+            url: 'http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions',
+            type: 'post',
+            data: {'appName' : appName, 'deploymentId': deploymentId},
+                success: function(){
+                    alert('Reverted');
+                },
+                error: function (errorThrown) {
+                    alert('error');
+                    console.log( errorThrown );
+                }
+            });
+
+            e.preventDefault();
+        }
     $(document).ready(function () {
         var json = JSON.parse('[{"revisionId":"19","deploymentId":null,"active":false,"Status":0,"StatusText":null,"AuthorEmail":null,"Author":null,"Message":null,"Deployer":"","ReceivedTime":"2019-10-11T11:49:30.1250327Z","StartTime":"2019-10-11T11:49:30.4290369Z","EndTime":"2019-10-11T11:51:32.9365332Z","id":"98439nkj98"}]');
-        var jsonData;
         $.ajax({ 
             type: "GET",
             crossDomain: true,
             url: "http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo",
             success: function(data){        
-                alert(data);
+                json = JSON.parse(data);
             }
         });
       //http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo  
@@ -390,8 +405,8 @@ mytimeline.ul.timeline > li:before {
         }
         var id = json[i].Id;
         var ago = '4H';
-        var liObj = '<li><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">By</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
-        var liObj2 = '<li><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">By</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj = '<li><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">By</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(jennydemo,'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj2 = '<li><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">By</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(jennydemo,'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
         var timeline = $('#revisions-timeline');
         if (json[i].active)
         {

From cd9bd6fd350966c1cee38c4d78a8d0b142dea545 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 09:11:31 -0700
Subject: [PATCH 176/245] test

---
 .../Pages/NewUI/artifacts.cshtml              | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index a0d6ca3f..6f4999f1 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -157,7 +157,7 @@ html {
 .card-info-value {
   color: #576366;
   font-weight: bold;
-  font-size: 30px;
+  font-size: 20px;
   height: 37px;
   vertical-align: bottom;
 }
@@ -369,12 +369,22 @@ mytimeline.ul.timeline > li:before {
 <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
 <!------ Include the above in your HEAD tag ---------->
 <script>
-    function revertDeployment(appName, deploymentId){
-        $.ajax({
-            url: 'http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions',
-            type: 'post',
-            data: {'appName' : appName, 'deploymentId': deploymentId},
-                success: function(){
+        function revertDeployment(appName, deploymentId) {
+            var obj = $('#' + deploymentId);
+            var objData = $('#' + deploymentId+'-data');
+            $.ajax({
+                url: 'http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions',
+                type: 'post',
+                data: {'appName' : appName, 'deploymentId': deploymentId},
+                success: function () {
+                    obj.removeClass('course-id-1');
+                    obj.addClass('course-id-2');
+                    objData.animate(
+                        { x: 100 },
+                        {
+                            duration: 2000,
+                            step: function(now) { $(this).attr("data-status", now); }
+                        });;
                     alert('Reverted');
                 },
                 error: function (errorThrown) {
@@ -386,7 +396,7 @@ mytimeline.ul.timeline > li:before {
             e.preventDefault();
         }
     $(document).ready(function () {
-        var json = JSON.parse('[{"revisionId":"19","deploymentId":null,"active":false,"Status":0,"StatusText":null,"AuthorEmail":null,"Author":null,"Message":null,"Deployer":"","ReceivedTime":"2019-10-11T11:49:30.1250327Z","StartTime":"2019-10-11T11:49:30.4290369Z","EndTime":"2019-10-11T11:51:32.9365332Z","id":"98439nkj98"}]');
+        var json = JSON.parse('[{"revisionId":"19","deploymentId":null,"active":false,"Status":0,"StatusText":null,"AuthorEmail":null,"Author":null,"Message":null,"Deployer":"","ReceivedTime":"2019-10-11T11:49:30.1250327Z","StartTime":"2019-10-11T11:49:30.4290369Z","EndTime":"2019-10-11T11:51:32.9365332Z"},{"revisionId":"20","deploymentId":null,"active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"test","Deployer":"","ReceivedTime":"2019-10-11T15:33:23.23481Z","StartTime":"2019-10-11T15:33:23.6683488Z","EndTime":"2019-10-11T15:35:35.4489149Z"}]');
         $.ajax({ 
             type: "GET",
             crossDomain: true,
@@ -399,14 +409,11 @@ mytimeline.ul.timeline > li:before {
     for (var i in json)
     {   
         var revisionId = json[i].revisionId;
-        var author = json[i].Author;
-        if (author === "") {
-            author = 'sanchit';
-        }
+        var author = 'Git';
         var id = json[i].Id;
         var ago = '4H';
-        var liObj = '<li><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">By</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(jennydemo,'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
-        var liObj2 = '<li><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">By</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(jennydemo,'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(jennydemo,'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(jennydemo,'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
         var timeline = $('#revisions-timeline');
         if (json[i].active)
         {

From 8ca3a4452a2dce921e0ecd8a51f1938ece42796a Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 09:22:08 -0700
Subject: [PATCH 177/245] test

---
 Kudu.Console/Program.cs                         | 3 ++-
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml  | 6 +++---
 Kudu.Services/Diagnostics/RevisionController.cs | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 08de62f9..cd793c7b 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -244,7 +244,8 @@ private static int PerformDeploy(
                                 Author = statusFile.Author,
                                 AuthorEmail = statusFile.AuthorEmail,
                                 Message = statusFile.Message,
-                                Status = statusFile.Status
+                                Status = statusFile.Status,
+                                deploymentId = gitRepository.GetChangeSet(settingsManager.GetBranch()).Id
                             };
                             var json = Newtonsoft.Json.JsonConvert.SerializeObject(rv);
                             FileStream stream3 = File.Create($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 6f4999f1..bd185533 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -410,10 +410,10 @@ mytimeline.ul.timeline > li:before {
     {   
         var revisionId = json[i].revisionId;
         var author = 'Git';
-        var id = json[i].Id;
+        var id = json[i].Id.substring(0, 8).toUpperCase();;
         var ago = '4H';
-        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(jennydemo,'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
-        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(jennydemo,'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
         var timeline = $('#revisions-timeline');
         if (json[i].active)
         {
diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index f430f523..0b6863ec 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -51,7 +51,7 @@ public IActionResult GetMyRevisions([FromRoute] string appName = "all")
                     bool isCurr = active.Equals(dir.Replace($"/home/apps/{appName}/site/artifacts/", ""));
                     string status2 = FileSystemHelpers.ReadAllText($"{dir}/metadata.json");
                     var revData = JsonConvert.DeserializeObject<revisiondata>(status2);
-                    ret.Add(new revisiondata() { active = isCurr, revisionId = rev, EndTime = revData.EndTime, Deployer = revData.Deployer, Author = revData.Author, AuthorEmail = revData.AuthorEmail, ReceivedTime = revData.ReceivedTime, StartTime = revData.StartTime, Status = revData.Status, Message = revData.Message });
+                    ret.Add(new revisiondata() { deploymentId = revData.deploymentId ,active = isCurr, revisionId = rev, EndTime = revData.EndTime, Deployer = revData.Deployer, Author = revData.Author, AuthorEmail = revData.AuthorEmail, ReceivedTime = revData.ReceivedTime, StartTime = revData.StartTime, Status = revData.Status, Message = revData.Message });
                 }
             }
             return Ok(ret);

From e7f2d212525314fc7d27f01046bff95a64a6c93a Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 09:33:36 -0700
Subject: [PATCH 178/245] test

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index bd185533..0525bea2 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -396,21 +396,21 @@ mytimeline.ul.timeline > li:before {
             e.preventDefault();
         }
     $(document).ready(function () {
-        var json = JSON.parse('[{"revisionId":"19","deploymentId":null,"active":false,"Status":0,"StatusText":null,"AuthorEmail":null,"Author":null,"Message":null,"Deployer":"","ReceivedTime":"2019-10-11T11:49:30.1250327Z","StartTime":"2019-10-11T11:49:30.4290369Z","EndTime":"2019-10-11T11:51:32.9365332Z"},{"revisionId":"20","deploymentId":null,"active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"test","Deployer":"","ReceivedTime":"2019-10-11T15:33:23.23481Z","StartTime":"2019-10-11T15:33:23.6683488Z","EndTime":"2019-10-11T15:35:35.4489149Z"}]');
+        var json = JSON.parse('[{"revisionId":"21","deploymentId":null,"active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"shs","Deployer":"","ReceivedTime":"2019-10-11T16:24:40.9421286Z","StartTime":"2019-10-11T16:24:41.4071646Z","EndTime":"2019-10-11T16:27:08.9458579Z"}]');
         $.ajax({ 
             type: "GET",
             crossDomain: true,
             url: "http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo",
             success: function(data){        
-                json = JSON.parse(data);
+                json = data;
             }
         });
       //http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo  
     for (var i in json)
     {   
         var revisionId = json[i].revisionId;
-        var author = 'Git';
-        var id = json[i].Id.substring(0, 8).toUpperCase();;
+        var author = json[i].author;
+        var id = json[i].Id.toString().substring(0, 8).toUpperCase();;
         var ago = '4H';
         var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
         var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';

From 22fa909ab3d64f975fed7baa61bcb8b40518135a Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 09:38:55 -0700
Subject: [PATCH 179/245] test

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 0525bea2..8017a77d 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -410,7 +410,7 @@ mytimeline.ul.timeline > li:before {
     {   
         var revisionId = json[i].revisionId;
         var author = json[i].author;
-        var id = json[i].Id.toString().substring(0, 8).toUpperCase();;
+        var id = json[i].Id;
         var ago = '4H';
         var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
         var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';

From 0150fd1000462b1b8e07e5fea76bba513d6b2e64 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 09:57:22 -0700
Subject: [PATCH 180/245] Test

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 8017a77d..cafb708f 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -410,10 +410,10 @@ mytimeline.ul.timeline > li:before {
     {   
         var revisionId = json[i].revisionId;
         var author = json[i].author;
-        var id = json[i].Id;
+        var id = json[i].deploymentId;
         var ago = '4H';
-        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
-        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Type</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
         var timeline = $('#revisions-timeline');
         if (json[i].active)
         {

From 082566b38d81530994ac4841e6ae53852de1d918 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 10:55:02 -0700
Subject: [PATCH 181/245] test

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index cafb708f..440acd0e 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -379,6 +379,7 @@ mytimeline.ul.timeline > li:before {
                 success: function () {
                     obj.removeClass('course-id-1');
                     obj.addClass('course-id-2');
+                    $('#' + id + '-redep-btn').innerHTML = "Currently Deployed";
                     objData.animate(
                         { x: 100 },
                         {
@@ -396,7 +397,7 @@ mytimeline.ul.timeline > li:before {
             e.preventDefault();
         }
     $(document).ready(function () {
-        var json = JSON.parse('[{"revisionId":"21","deploymentId":null,"active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"shs","Deployer":"","ReceivedTime":"2019-10-11T16:24:40.9421286Z","StartTime":"2019-10-11T16:24:41.4071646Z","EndTime":"2019-10-11T16:27:08.9458579Z"}]');
+        var json = JSON.parse('[{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"24","deploymentId":"3b80bfc51f6c753e5caf5448c22db0538ba476a5","active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"}]');
         $.ajax({ 
             type: "GET",
             crossDomain: true,
@@ -409,11 +410,13 @@ mytimeline.ul.timeline > li:before {
     for (var i in json)
     {   
         var revisionId = json[i].revisionId;
-        var author = json[i].author;
-        var id = json[i].deploymentId;
+        var author = json[i].Author;
+        var id = json[i].deploymentId.toString().trim();
+        alert(id);
+        var idShort = id.substring(0, 8);
         var ago = '4H';
-        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
-        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+id+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" onclick="revertDeployment(\"jennydemo\",'+id+')">Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment(\"jennydemo\",\"'+id+'\")>Currently Deployed</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="80" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment(\"jennydemo\",\"'+id+'\")>Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
         var timeline = $('#revisions-timeline');
         if (json[i].active)
         {

From 410a4c6e69987294ef4f146ac06e162489bf8409 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 13:09:03 -0700
Subject: [PATCH 182/245] test

---
 .../Pages/NewUI/artifacts.cshtml              | 14 +++++-----
 .../Diagnostics/RevisionController.cs         | 26 +++++++++++++++----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 440acd0e..acee5e38 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -385,11 +385,9 @@ mytimeline.ul.timeline > li:before {
                         {
                             duration: 2000,
                             step: function(now) { $(this).attr("data-status", now); }
-                        });;
-                    alert('Reverted');
+                        });
                 },
                 error: function (errorThrown) {
-                    alert('error');
                     console.log( errorThrown );
                 }
             });
@@ -412,19 +410,19 @@ mytimeline.ul.timeline > li:before {
         var revisionId = json[i].revisionId;
         var author = json[i].Author;
         var id = json[i].deploymentId.toString().trim();
-        alert(id);
         var idShort = id.substring(0, 8);
         var ago = '4H';
-        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment(\"jennydemo\",\"'+id+'\")>Currently Deployed</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="80" style="width: 30%;"></span></span> </p></footer> </article> </li>';
-        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <span class="card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment(\"jennydemo\",\"'+id+'\")>Redeploy Deployment</span> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var appName = "jennydemo".trim();
+        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <button type="button" class=" card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment\(\''+appName+'\',\''+id+'\'\)\"> Currently Deployed</button> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="80" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <button type="button" class=" card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment\(\''+appName+'\',\''+id+'\'\)\"> Redeploy Deployment</button> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
         var timeline = $('#revisions-timeline');
         if (json[i].active)
         {
-            timeline.append(liObj);
+            timeline.append(liObj.replace('=""','=""'));
         }
         else
         {
-            timeline.append(liObj2);
+            timeline.append(liObj2.replace('=""','=""'));
         }
     }
     });
diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index 0b6863ec..c8f6c532 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -57,24 +58,34 @@ public IActionResult GetMyRevisions([FromRoute] string appName = "all")
             return Ok(ret);
         }
 
+        public class RevisionPost
+        {
+            public string appName;
+            public string deploymentId;
+        }
+
         [EnableCors]
         [HttpPost]
-        public IActionResult RedployDeployemnt([FromBody] string appName, [FromBody] string deploymentId)
+        public IActionResult RedployDeployemnt([FromForm] RevisionPost rev)
         {
-            System.Console.WriteLine("Restarting Pods for App Service App : " + appName);
-            System.Console.WriteLine($" Patch Args :::::: -c \" /patch.sh {appName} apps/{appName}/site/artifacts/{deploymentId}\"");
+            try { 
+            //var rev = Newtonsoft.Json.JsonConvert.DeserializeObject<RevisionPost>(
+             //                   jsonData.ToString(Formatting.None));
+            System.Console.WriteLine("Restarting Pods for App Service App : " + rev.appName);
+            System.Console.WriteLine($" Patch Args :::::: -c \" /patch.sh {rev.appName} apps/{rev.appName}/site/artifacts/{rev.deploymentId}\"");
 
             Process _executingProcess = new Process()
             {
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = "/bin/bash",
-                    Arguments = $"-c \" /patch.sh {appName} apps/{appName}/site/artifacts/{deploymentId}\"",
+                    Arguments = $"-c \" /patch.sh {rev.appName} apps/{rev.appName}/site/artifacts/{rev.deploymentId}\"",
                     RedirectStandardOutput = true,
                     UseShellExecute = false,
                     CreateNoWindow = true,
                 }
             };
+
             // Read the standard error of net.exe and write it on to console.
             _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
             _executingProcess.Start();
@@ -86,7 +97,12 @@ public IActionResult RedployDeployemnt([FromBody] string appName, [FromBody] str
             _executingProcess.WaitForExit();
             System.Console.WriteLine("Process exit code : " + _executingProcess.ExitCode);
             System.Console.WriteLine("All Pods Restarted!");
-            FileSystemHelpers.WriteAllText($"/home/apps/{appName}/site/artifacts/active", deploymentId);
+            FileSystemHelpers.WriteAllText($"/home/apps/{rev.appName}/site/artifacts/active", rev.deploymentId);
+            }
+            catch (Exception e)
+            {
+
+            }
             return Ok();
         }
     }

From 38bfd65ba4366987338c7c1b63d3efe9d58d682b Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 13:18:28 -0700
Subject: [PATCH 183/245] TEST

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index acee5e38..014bd8e8 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -391,8 +391,6 @@ mytimeline.ul.timeline > li:before {
                     console.log( errorThrown );
                 }
             });
-
-            e.preventDefault();
         }
     $(document).ready(function () {
         var json = JSON.parse('[{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"24","deploymentId":"3b80bfc51f6c753e5caf5448c22db0538ba476a5","active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"}]');

From 76f753e22ede4869e21e9911d1c3fec1e1073c3d Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 13:45:39 -0700
Subject: [PATCH 184/245] test

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 014bd8e8..04135e09 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -377,9 +377,16 @@ mytimeline.ul.timeline > li:before {
                 type: 'post',
                 data: {'appName' : appName, 'deploymentId': deploymentId},
                 success: function () {
+                    $('#' + deploymentId + '-redep-btn').innerHTML = "Currently Deployed";
+                    var listItems = $("#revisions-timeline li");
+                        listItems.each(function(idx, li) {
+                        var item = $(li);
+                            item.removeClass('course-id-2');
+                            item.addClass('course-id-1');
+                        // and the rest of your code
+                        });
                     obj.removeClass('course-id-1');
                     obj.addClass('course-id-2');
-                    $('#' + id + '-redep-btn').innerHTML = "Currently Deployed";
                     objData.animate(
                         { x: 100 },
                         {

From 0127f7c244c139680950aa655f82aaf46da35c6b Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 14:14:56 -0700
Subject: [PATCH 185/245] test

---
 .../Pages/NewUI/artifacts.cshtml              |  4 +--
 Kudu.Services.Web/Startup.cs                  |  4 +--
 .../Diagnostics/RevisionController.cs         | 26 ++++++++-----------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 04135e09..fef15cdc 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -373,8 +373,8 @@ mytimeline.ul.timeline > li:before {
             var obj = $('#' + deploymentId);
             var objData = $('#' + deploymentId+'-data');
             $.ajax({
-                url: 'http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions',
-                type: 'post',
+                url: 'http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/redeploy/' + appName + '/' + deploymentId + '',
+                type: 'GET',
                 data: {'appName' : appName, 'deploymentId': deploymentId},
                 success: function () {
                     $('#' + deploymentId + '-redep-btn').innerHTML = "Currently Deployed";
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 53fbc1f9..3fc263ec 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -516,9 +516,9 @@ public void Configure(IApplicationBuilder app,
                     new { verb = new HttpMethodRouteConstraint("GET") });
 
                 // Revision script
-                routes.MapRoute("revert-deployment-revision", "api/revisions",
+                routes.MapRoute("revert-deployment-revision", "api/revisions/redeploy/{appName}/{deploymentId}",
                     new { controller = "Revision", action = "RedployDeployemnt" },
-                    new { verb = new HttpMethodRouteConstraint("POST") });
+                    new { verb = new HttpMethodRouteConstraint("GET") });
 
                 // IsDeploying status 
                 routes.MapRoute("is-deployment-underway", "api/isdeploying",
diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index c8f6c532..b04fa772 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -7,6 +7,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
+using System.Net;
 using System.Text;
 
 namespace Kudu.Services.Diagnostics
@@ -65,21 +67,20 @@ public class RevisionPost
         }
 
         [EnableCors]
-        [HttpPost]
-        public IActionResult RedployDeployemnt([FromForm] RevisionPost rev)
+        [HttpGet]
+        public IActionResult RedployDeployemnt([FromRoute] string appName, [FromRoute] string deploymentId)
         {
-            try { 
-            //var rev = Newtonsoft.Json.JsonConvert.DeserializeObject<RevisionPost>(
-             //                   jsonData.ToString(Formatting.None));
-            System.Console.WriteLine("Restarting Pods for App Service App : " + rev.appName);
-            System.Console.WriteLine($" Patch Args :::::: -c \" /patch.sh {rev.appName} apps/{rev.appName}/site/artifacts/{rev.deploymentId}\"");
+            try {
+
+            System.Console.WriteLine("Restarting Pods for App Service App : " + appName);
+            System.Console.WriteLine($" Patch Args :::::: -c \" /patch.sh {appName} apps/{appName}/site/artifacts/{deploymentId}\"");
 
             Process _executingProcess = new Process()
             {
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = "/bin/bash",
-                    Arguments = $"-c \" /patch.sh {rev.appName} apps/{rev.appName}/site/artifacts/{rev.deploymentId}\"",
+                    Arguments = $"-c \" /patch.sh {appName} apps/{appName}/site/artifacts/{deploymentId}\"",
                     RedirectStandardOutput = true,
                     UseShellExecute = false,
                     CreateNoWindow = true,
@@ -89,19 +90,14 @@ public IActionResult RedployDeployemnt([FromForm] RevisionPost rev)
             // Read the standard error of net.exe and write it on to console.
             _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
             _executingProcess.Start();
-            //* Read the output (or the error)
-            //string output = _executingProcess.StandardOutput.ReadToEnd();
-            //System.Console.WriteLine(output);
-            //string err = _executingProcess.StandardError.ReadToEnd();
-            //System.Console.WriteLine(err);
             _executingProcess.WaitForExit();
             System.Console.WriteLine("Process exit code : " + _executingProcess.ExitCode);
             System.Console.WriteLine("All Pods Restarted!");
-            FileSystemHelpers.WriteAllText($"/home/apps/{rev.appName}/site/artifacts/active", rev.deploymentId);
+            FileSystemHelpers.WriteAllText($"/home/apps/{appName}/site/artifacts/active", deploymentId);
             }
             catch (Exception e)
             {
-
+                Console.WriteLine("error : "+e.Message);
             }
             return Ok();
         }

From a977c743ee31453316643ffe0ae0ca89fc707c7b Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 14:35:25 -0700
Subject: [PATCH 186/245] tes

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index fef15cdc..764db658 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -400,7 +400,7 @@ mytimeline.ul.timeline > li:before {
             });
         }
     $(document).ready(function () {
-        var json = JSON.parse('[{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"24","deploymentId":"3b80bfc51f6c753e5caf5448c22db0538ba476a5","active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"}]');
+        var json = JSON.parse('[{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"24","deploymentId":"06bb11472ded5bfebd740944044b2b2603b68a2b","active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"}]');
         $.ajax({ 
             type: "GET",
             crossDomain: true,

From 46209fbd8bb3893aa9edad0e78896831d3b972b0 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 11 Oct 2019 14:43:51 -0700
Subject: [PATCH 187/245] tes

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 764db658..ec43ce82 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -400,7 +400,7 @@ mytimeline.ul.timeline > li:before {
             });
         }
     $(document).ready(function () {
-        var json = JSON.parse('[{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"24","deploymentId":"06bb11472ded5bfebd740944044b2b2603b68a2b","active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"}]');
+        var json = JSON.parse('[{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"24","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895","active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"}]');
         $.ajax({ 
             type: "GET",
             crossDomain: true,

From bc775adf8b4d25a8e7c2ebd47ee136ca1a14df92 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 14 Oct 2019 09:53:22 -0700
Subject: [PATCH 188/245] test

---
 .../Pages/NewUI/artifacts.cshtml              | 54 ++++++++++++-------
 .../Diagnostics/RevisionController.cs         |  4 ++
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index ec43ce82..034ea53c 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -358,7 +358,15 @@ mytimeline.ul.timeline > li:before {
     height: 20px;
     z-index: 400;
 }
-            
+
+.pbar-green {
+    background-color: #68CF8C !important;
+}
+
+.progress-bar {
+    -webkit-transition: width 4s ease;
+    transition: width 4s ease;
+}            
 </style>
 <style>
   
@@ -371,28 +379,33 @@ mytimeline.ul.timeline > li:before {
 <script>
         function revertDeployment(appName, deploymentId) {
             var obj = $('#' + deploymentId);
-            var objData = $('#' + deploymentId+'-data');
+            var objData = $('#' + deploymentId + '-data');
+
             $.ajax({
                 url: 'http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/redeploy/' + appName + '/' + deploymentId + '',
                 type: 'GET',
                 data: {'appName' : appName, 'deploymentId': deploymentId},
                 success: function () {
-                    $('#' + deploymentId + '-redep-btn').innerHTML = "Currently Deployed";
+                    $('#' + deploymentId + '-redep-btn').html("Currently Deployed");
                     var listItems = $("#revisions-timeline li");
-                        listItems.each(function(idx, li) {
+                    listItems.each(function(idx, li) {
                         var item = $(li);
-                            item.removeClass('course-id-2');
-                            item.addClass('course-id-1');
-                        // and the rest of your code
-                        });
-                    obj.removeClass('course-id-1');
-                    obj.addClass('course-id-2');
-                    objData.animate(
-                        { x: 100 },
-                        {
-                            duration: 2000,
-                            step: function(now) { $(this).attr("data-status", now); }
-                        });
+                        if (item.attr('id') != deploymentId) {
+                            var liId = item.attr('id');
+                            $('#' + liId + '-redep-btn').html("Redeploy Deployment");
+                            $('#' + liId+'-article').removeClass('course-id-2');
+                            $('#' + liId + '-article').addClass('course-id-1');
+                            $('#' + liId + '-progress').css({ "visibility": "hidden" });
+                            $('#' + liId + "-progress-bar").css('width', '0%');
+                    }
+                    else {
+                            $('#' + deploymentId + "-progress-bar").css('width', '0%');
+                            $('#' + deploymentId+'-article').removeClass('course-id-1');
+                            $('#' + deploymentId + '-article').addClass('course-id-2');
+                            $('#' + deploymentId + '-progress').css({ "visibility": "visible" });
+                            $('#' + deploymentId + "-progress-bar").css('width', '100%');
+                    }
+                    });
                 },
                 error: function (errorThrown) {
                     console.log( errorThrown );
@@ -400,13 +413,13 @@ mytimeline.ul.timeline > li:before {
             });
         }
     $(document).ready(function () {
-        var json = JSON.parse('[{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"24","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895","active":true,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"}]');
+        var json = JSON.parse('[{"revisionId":"32","deploymentId":"06bb11472ded5bfebd740944044b2b2603b68a2b","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"changed clr","Deployer":"","ReceivedTime":"2019-10-11T21:26:54.2635576Z","StartTime":"2019-10-11T21:26:54.6443279Z","EndTime":"2019-10-11T21:27:04.8177288Z"},{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"25","deploymentId":"b308f7575fb514e768a4d5b97b23434d51e7958d","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"TEST","Deployer":"","ReceivedTime":"2019-10-11T19:26:37.2324323Z","StartTime":"2019-10-11T19:26:37.6684099Z","EndTime":"2019-10-11T19:29:05.5728312Z"},{"revisionId":"30","deploymentId":"32c5c48c6d52d4ce06bdc989c395281dc363d773","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"Test","Deployer":"","ReceivedTime":"2019-10-11T21:23:43.5351849Z","StartTime":"2019-10-11T21:23:43.8960041Z","EndTime":"2019-10-11T21:23:55.1829356Z"},{"revisionId":"24","deploymentId":"3b80bfc51f6c753e5caf5448c22db0538ba476a5","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"},{"revisionId":"28","deploymentId":"aa060d61311068b18e6240d4caff26c4463f0adf","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"basic","Deployer":"","ReceivedTime":"2019-10-11T21:21:37.3448059Z","StartTime":"2019-10-11T21:21:38.652415Z","EndTime":"2019-10-11T21:21:51.2469904Z"},{"revisionId":"33","deploymentId":"139b34ab6e7dbe80797a10b34807e99ab306de7c","active":true,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"test","Deployer":"","ReceivedTime":"2019-10-11T21:28:07.188486Z","StartTime":"2019-10-11T21:28:07.7113288Z","EndTime":"2019-10-11T21:28:17.940069Z"}]');
         $.ajax({ 
             type: "GET",
             crossDomain: true,
             url: "http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo",
             success: function(data){        
-                json = data;
+                this.json = data;
             }
         });
       //http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo  
@@ -418,8 +431,8 @@ mytimeline.ul.timeline > li:before {
         var idShort = id.substring(0, 8);
         var ago = '4H';
         var appName = "jennydemo".trim();
-        var liObj = '<li id="'+id+'"><article class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <button type="button" class=" card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment\(\''+appName+'\',\''+id+'\'\)\"> Currently Deployed</button> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" id="'+id+'-status" data-status="80" style="width: 30%;"></span></span> </p></footer> </article> </li>';
-        var liObj2 = '<li id="'+id+'"><article class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <button type="button" class=" card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment\(\''+appName+'\',\''+id+'\'\)\"> Redeploy Deployment</button> <span class="card-tag">Revert State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="card-progress-bar" style="display:hidden"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span> </p></footer> </article> </li>';
+        var liObj = '<li id="'+id+'"><article id="'+id+'-article" class="card assignment-card course-id-2"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <button type="button" class="card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment\(\''+appName+'\',\''+id+'\'\)\"> Currently Deployed</button> <span class="card-tag">Revert App State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="progress" style="height: 12px;visibility: hidden;" id="'+id+'-progress"><span class="progress-bar" id="'+id+'-progress-bar" role="progressbar" style="width: 10%; background-color: #68CF8C !important" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></span></span> </p></footer> </article> </li>';
+        var liObj2 = '<li id="'+id+'"><article id="'+id+'-article" class="card assignment-card course-id-1"><header class="card-header card-backgrund-color"><h2>'+idShort+'</h2></header><section class="card-body"> <div class="card-info"> <div class="card-info-element"> <div class="card-info-description">Ago</div><div class="card-info-value">'+ago+'</div></div><div class="card-info-element"> <div class="card-info-description">Author</div><div class="card-info-value">'+author+'</div></div><div class="card-info-element"> <div class="card-info-description">Revision</div><div class="card-info-value"><span class="card-info-assignment-level">'+revisionId+'</span></div></div></div><p class="card-body-delimiter"></p><p class="card-tags"> <button type="button" class="card-tag card-backgrund-color" id="'+id+'-redep-btn" onclick="revertDeployment\(\''+appName+'\',\''+id+'\'\)\"> Redeploy Deployment</button> <span class="card-tag">Revert App State</span> <span class="card-tag">Revision Metadata</span> </p></section> <footer class="card-footer"> <p> <span class="progress" style="height: 12px;visibility: hidden;" id="'+id+'-progress"><span class="progress-bar" id="'+id+'-progress-bar" role="progressbar" style="width: 10%; background-color: #68CF8C !important" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></span></span> </p></footer> </article> </li>';
         var timeline = $('#revisions-timeline');
         if (json[i].active)
         {
@@ -432,6 +445,7 @@ mytimeline.ul.timeline > li:before {
     }
     });
 
+
 </script>
 <div style="margin-left:30px">
     <div class="row">
diff --git a/Kudu.Services/Diagnostics/RevisionController.cs b/Kudu.Services/Diagnostics/RevisionController.cs
index b04fa772..b2a55d43 100644
--- a/Kudu.Services/Diagnostics/RevisionController.cs
+++ b/Kudu.Services/Diagnostics/RevisionController.cs
@@ -57,6 +57,10 @@ public IActionResult GetMyRevisions([FromRoute] string appName = "all")
                     ret.Add(new revisiondata() { deploymentId = revData.deploymentId ,active = isCurr, revisionId = rev, EndTime = revData.EndTime, Deployer = revData.Deployer, Author = revData.Author, AuthorEmail = revData.AuthorEmail, ReceivedTime = revData.ReceivedTime, StartTime = revData.StartTime, Status = revData.Status, Message = revData.Message });
                 }
             }
+            if (ret.Count != 0)
+            {
+                ret.Reverse();
+            }
             return Ok(ret);
         }
 

From 59800dc15ed459c07d177e62e5a269972a79dc67 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 14 Oct 2019 12:12:00 -0700
Subject: [PATCH 189/245] test

---
 .../Pages/NewUI/artifacts.cshtml              | 219 +++++++++++-------
 1 file changed, 136 insertions(+), 83 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 034ea53c..9f23fae7 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -50,6 +50,7 @@ html {
 .card,
 .card * {
   box-sizing: border-box;
+  border-radius: 15px;
 }
 
 .card {
@@ -93,13 +94,13 @@ html {
 .card-header {
   top: 0;
   height: 50px;
-  border-radius: 5px 5px 0 0;
+  border-radius: 15px 15px 0 0;
 }
 
 .card-footer {
   bottom: 0;
   height: 50px;
-  border-radius: 0 0 5px 5px;
+  border-radius: 0 0 15px 15px;
   background-color: #F4F6F8;
 }
 
@@ -352,7 +353,7 @@ mytimeline.ul.timeline > li:before {
     display: inline-block;
     position: absolute;
     border-radius: 50%;
-    border: 3px solid #22c0e8;
+    border: 5px solid #c8c8c8;
     left: 20px;
     width: 20px;
     height: 20px;
@@ -366,11 +367,62 @@ mytimeline.ul.timeline > li:before {
 .progress-bar {
     -webkit-transition: width 4s ease;
     transition: width 4s ease;
-}            
+}          
+
+#header1 .caption {
+	text-align: center;
+    color: #fff;
+}
+
+#header1 .caption .title {
+	margin-bottom: 1.5rem;
+} 
+
+#header1 .caption .text {
+	margin-bottom: 1.5rem;
+}
+
+#header1 .caption .action {
+	margin-bottom: 1rem;
+	padding-left: 3rem;
+	padding-right: 3rem;
+	border-radius: 15px;
+}
+
+.speech-bubble {
+    background-color: #F4F6F8;
+    border: 1px solid #c8c8c8;
+    border-radius: 10px;
+    width: 250px;
+    text-align: center;
+    padding: 10px;
+    position: absolute;
+}  
+.speech-bubble .arrow {
+    border-style: solid;
+    position: absolute;
+}
+ 
+.bottom {
+    border-color: #c8c8c8 transparent transparent transparent;
+    border-width: 8px 8px 0px 8px;
+    bottom: -9px;
+    left: 20px;
+}
+.bottom:after {
+    border-color: #f8f8f8 transparent transparent transparent;
+    border-style: solid;
+    border-width: 7px 7px 0px 7px;
+    bottom: 1px;
+    content: "";
+    position: absolute;
+    left: -20px;
+}
+.sidebar {
+    padding-top: 0px;    
+}
 </style>
 <style>
-  
-
 </style>
 <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet" id="bootstrap-css">
 <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
@@ -413,8 +465,8 @@ mytimeline.ul.timeline > li:before {
             });
         }
     $(document).ready(function () {
-        var json = JSON.parse('[{"revisionId":"32","deploymentId":"06bb11472ded5bfebd740944044b2b2603b68a2b","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"changed clr","Deployer":"","ReceivedTime":"2019-10-11T21:26:54.2635576Z","StartTime":"2019-10-11T21:26:54.6443279Z","EndTime":"2019-10-11T21:27:04.8177288Z"},{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"25","deploymentId":"b308f7575fb514e768a4d5b97b23434d51e7958d","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"TEST","Deployer":"","ReceivedTime":"2019-10-11T19:26:37.2324323Z","StartTime":"2019-10-11T19:26:37.6684099Z","EndTime":"2019-10-11T19:29:05.5728312Z"},{"revisionId":"30","deploymentId":"32c5c48c6d52d4ce06bdc989c395281dc363d773","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"Test","Deployer":"","ReceivedTime":"2019-10-11T21:23:43.5351849Z","StartTime":"2019-10-11T21:23:43.8960041Z","EndTime":"2019-10-11T21:23:55.1829356Z"},{"revisionId":"24","deploymentId":"3b80bfc51f6c753e5caf5448c22db0538ba476a5","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"},{"revisionId":"28","deploymentId":"aa060d61311068b18e6240d4caff26c4463f0adf","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"basic","Deployer":"","ReceivedTime":"2019-10-11T21:21:37.3448059Z","StartTime":"2019-10-11T21:21:38.652415Z","EndTime":"2019-10-11T21:21:51.2469904Z"},{"revisionId":"33","deploymentId":"139b34ab6e7dbe80797a10b34807e99ab306de7c","active":true,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"test","Deployer":"","ReceivedTime":"2019-10-11T21:28:07.188486Z","StartTime":"2019-10-11T21:28:07.7113288Z","EndTime":"2019-10-11T21:28:17.940069Z"}]');
-        $.ajax({ 
+        var json = JSON.parse('[{"revisionId":"33","deploymentId":"139b34ab6e7dbe80797a10b34807e99ab306de7c","active":true,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"test","Deployer":"","ReceivedTime":"2019-10-11T21:28:07.188486Z","StartTime":"2019-10-11T21:28:07.7113288Z","EndTime":"2019-10-11T21:28:17.940069Z"},{"revisionId":"28","deploymentId":"aa060d61311068b18e6240d4caff26c4463f0adf","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"basic","Deployer":"","ReceivedTime":"2019-10-11T21:21:37.3448059Z","StartTime":"2019-10-11T21:21:38.652415Z","EndTime":"2019-10-11T21:21:51.2469904Z"},{"revisionId":"24","deploymentId":"3b80bfc51f6c753e5caf5448c22db0538ba476a5","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"2345","Deployer":"","ReceivedTime":"2019-10-11T17:29:17.8700342Z","StartTime":"2019-10-11T17:29:18.3541755Z","EndTime":"2019-10-11T17:31:45.0052705Z"},{"revisionId":"30","deploymentId":"32c5c48c6d52d4ce06bdc989c395281dc363d773","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"Test","Deployer":"","ReceivedTime":"2019-10-11T21:23:43.5351849Z","StartTime":"2019-10-11T21:23:43.8960041Z","EndTime":"2019-10-11T21:23:55.1829356Z"},{"revisionId":"25","deploymentId":"b308f7575fb514e768a4d5b97b23434d51e7958d","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"TEST","Deployer":"","ReceivedTime":"2019-10-11T19:26:37.2324323Z","StartTime":"2019-10-11T19:26:37.6684099Z","EndTime":"2019-10-11T19:29:05.5728312Z"},{"revisionId":"23","deploymentId":"85499beba8f391099b473dfb9db6f7bb2470895a","active":false,"Status":4,"StatusText":null,"AuthorEmail":"sanchit.mehta602@gmail.com","Author":"Sanchit Mehta","Message":"453","Deployer":"","ReceivedTime":"2019-10-11T16:49:52.5561165Z","StartTime":"2019-10-11T16:49:53.1425998Z","EndTime":"2019-10-11T16:52:08.6700642Z"},{"revisionId":"32","deploymentId":"06bb11472ded5bfebd740944044b2b2603b68a2b","active":false,"Status":4,"StatusText":null,"AuthorEmail":"root@KubeCtlVm.luvkdcpd5g4epksxdxdfwlp5xd.xx.internal.cloudapp.net","Author":"root","Message":"changed clr","Deployer":"","ReceivedTime":"2019-10-11T21:26:54.2635576Z","StartTime":"2019-10-11T21:26:54.6443279Z","EndTime":"2019-10-11T21:27:04.8177288Z"}]');
+        $.ajax({
             type: "GET",
             crossDomain: true,
             url: "http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo",
@@ -444,90 +496,91 @@ mytimeline.ul.timeline > li:before {
         }
     }
     });
-
-
 </script>
 <div style="margin-left:30px">
     <div class="row">
         <div class="mt-5 mb-5">
             <div class="row">
                 <div class="col-md-6 offset-md-3">
-                    <h4>Past Deployments</h4>
-                    <ul class="timeline" id="revisions-timeline">
-
-                        <!--
-    <li>
-        <article class="card assignment-card course-id-1">
-            <header class="card-header card-backgrund-color">
-                <h2>Deployment : 12343288934</h2>
-            </header>
-            <section class="card-body">
-                <div class="card-info">
-                    <div class="card-info-element">
-                        <div class="card-info-description">Ago</div>
-                        <div class="card-info-value">02</div>
+                    <div class="speech-bubble">
+                        <div class="arrow bottom right"></div>
+                        <h3 style="font-weight: 300;color: #34495e">Past Deployments</h3>
                     </div>
-                    <div class="card-info-element">
-                        <div class="card-info-description">By</div>
-                        <div class="card-info-value">60</div>
+                        <ul class="timeline" style="margin-top:80px" id="revisions-timeline">
+
+                            <!--
+            <li>
+                <article class="card assignment-card course-id-1">
+                    <header class="card-header card-backgrund-color">
+                        <h2>Deployment : 12343288934</h2>
+                    </header>
+                    <section class="card-body">
+                        <div class="card-info">
+                            <div class="card-info-element">
+                                <div class="card-info-description">Ago</div>
+                                <div class="card-info-value">02</div>
+                            </div>
+                            <div class="card-info-element">
+                                <div class="card-info-description">By</div>
+                                <div class="card-info-value">60</div>
+                            </div>
+                            <div class="card-info-element">
+                                <div class="card-info-description">Revision</div>
+                                <div class="card-info-value"><span class="card-info-assignment-level">18</span></div>
+                            </div>
+                        </div>
+                        <p class="card-body-delimiter"></p>
+                        <p class="card-tags">
+                            <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
+                            <span class="card-tag">Revert State</span>
+                            <span class="card-tag">Revision Metadata</span>
+                        </p>
+                    </section>
+                    <footer class="card-footer">
+                        <p>
+                            <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
+                        </p>
+                    </footer>
+                </article>
+            </li>
+            <li>
+                <article class="card assignment-card course-id-1">
+                    <header class="card-header card-backgrund-color">
+                        <h2>Deployment : 12343288934</h2>
+                    </header>
+                    <section class="card-body">
+                        <div class="card-info">
+                            <div class="card-info-element">
+                                <div class="card-info-description">Ago</div>
+                                <div class="card-info-value">02</div>
+                            </div>
+                            <div class="card-info-element">
+                                <div class="card-info-description">By</div>
+                                <div class="card-info-value">60</div>
+                            </div>
+                            <div class="card-info-element">
+                                <div class="card-info-description">Revision</div>
+                                <div class="card-info-value"><span class="card-info-assignment-level">18</span></div>
+                            </div>
+                        </div>
+                        <p class="card-body-delimiter"></p>
+                        <p class="card-tags">
+                            <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
+                            <span class="card-tag">Revert State</span>
+                            <span class="card-tag">Revision Metadata</span>
+                        </p>
+                    </section>
+                    <footer class="card-footer">
+                        <p>
+                            <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
+                        </p>
+                    </footer>
+                </article>
+            </li>
+                -->
+                        </ul>
                     </div>
-                    <div class="card-info-element">
-                        <div class="card-info-description">Revision</div>
-                        <div class="card-info-value"><span class="card-info-assignment-level">18</span></div>
-                    </div>
-                </div>
-                <p class="card-body-delimiter"></p>
-                <p class="card-tags">
-                    <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
-                    <span class="card-tag">Revert State</span>
-                    <span class="card-tag">Revision Metadata</span>
-                </p>
-            </section>
-            <footer class="card-footer">
-                <p>
-                    <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
-                </p>
-            </footer>
-        </article>
-    </li>
-    <li>
-        <article class="card assignment-card course-id-1">
-            <header class="card-header card-backgrund-color">
-                <h2>Deployment : 12343288934</h2>
-            </header>
-            <section class="card-body">
-                <div class="card-info">
-                    <div class="card-info-element">
-                        <div class="card-info-description">Ago</div>
-                        <div class="card-info-value">02</div>
-                    </div>
-                    <div class="card-info-element">
-                        <div class="card-info-description">By</div>
-                        <div class="card-info-value">60</div>
-                    </div>
-                    <div class="card-info-element">
-                        <div class="card-info-description">Revision</div>
-                        <div class="card-info-value"><span class="card-info-assignment-level">18</span></div>
-                    </div>
-                </div>
-                <p class="card-body-delimiter"></p>
-                <p class="card-tags">
-                    <span class="card-tag card-backgrund-color">Redeploy Deployment</span>
-                    <span class="card-tag">Revert State</span>
-                    <span class="card-tag">Revision Metadata</span>
-                </p>
-            </section>
-            <footer class="card-footer">
-                <p>
-                    <span class="card-progress-bar"><span class="card-progress-bar-status card-backgrund-color" data-status="30" style="width: 30%;"></span></span>
-                </p>
-            </footer>
-        </article>
-    </li>
-        -->
-                    </ul>
                 </div>
-            </div>
         </div>
 
     </div>

From 8ca373cdf2c3f37965e19d44307a4d45a5b5cdd9 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 14 Oct 2019 13:17:45 -0700
Subject: [PATCH 190/245] test

---
 Kudu.Services.Web/Pages/NewUI/artifacts.cshtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
index 9f23fae7..583dbdc1 100644
--- a/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/artifacts.cshtml
@@ -472,10 +472,7 @@ mytimeline.ul.timeline > li:before {
             url: "http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo",
             success: function(data){        
                 this.json = data;
-            }
-        });
-      //http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo  
-    for (var i in json)
+                for (var i in json)
     {   
         var revisionId = json[i].revisionId;
         var author = json[i].Author;
@@ -496,6 +493,9 @@ mytimeline.ul.timeline > li:before {
         }
     }
     });
+            }
+        });
+      //http://build.f422074646704c039cb3.eastus.aksapp.io/api/revisions/jennydemo  
 </script>
 <div style="margin-left:30px">
     <div class="row">

From 65b5e28ba613cb82f3a341dbf3e8b00eb730e5c0 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 2 Dec 2019 11:33:15 -0800
Subject: [PATCH 191/245] Added Basic Auth + Cache

---
 Kudu.Services.Web/KubeMiddleware.cs           |  8 ++
 .../Services/BasicAuthenticationHandler.cs    | 90 +++++++++++++++++++
 Kudu.Services.Web/Services/KuduMemCache.cs    | 47 ++++++++++
 Kudu.Services.Web/Startup.cs                  | 10 ++-
 4 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
 create mode 100644 Kudu.Services.Web/Services/KuduMemCache.cs

diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 8abe4c99..1db2f3e4 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -47,6 +47,14 @@ public KubeMiddleware(RequestDelegate next)
         /// <returns>Response be set to 404 if the route is not whitelisted</returns>
         public async Task Invoke(HttpContext context, IEnvironment environment, IServerConfiguration serverConfig)
         {
+            var result = await context.AuthenticateAsync();
+
+            if (result.Failure != null)
+            {
+                context.Response.StatusCode = 403;
+                await context.Response.WriteAsync(result.Failure.ToString(), Encoding.UTF8);
+            }
+
             if (IsGitRoute(context.Request.Path))
             {
                 string[] pathParts = context.Request.Path.ToString().Split("/");
diff --git a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
new file mode 100644
index 00000000..448eab08
--- /dev/null
+++ b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
@@ -0,0 +1,90 @@
+using k8s;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using System;
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+
+namespace Kudu.Services.Web.Services
+{
+    public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
+    {
+        public static string PublishingProfileSecretPrefix = "PUBLISHING-PROFILE-";
+
+        public BasicAuthenticationHandler(
+            IOptionsMonitor<AuthenticationSchemeOptions> options,
+            ILoggerFactory logger,
+            UrlEncoder encoder,
+            ISystemClock clock)
+            : base(options, logger , encoder, clock)
+        {
+        }
+
+        public static KuduMemCache<string> memCache = new KuduMemCache<string>();
+
+        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            if (!Request.Headers.ContainsKey("Authorization"))
+                return AuthenticateResult.Fail("Missing Authorization Header");
+
+            try
+            {
+                var authHeader = AuthenticationHeaderValue.Parse(Request.Headers["Authorization"]);
+                var credentialBytes = Convert.FromBase64String(authHeader.Parameter);
+                var credentials = Encoding.UTF8.GetString(credentialBytes).Split(new[] { ':' }, 2);
+                var username = credentials[0];
+                var password = credentials[1];
+
+                if ((memCache.GetOrCreate(username, GetAuthenticationData)).Equals(password))
+                {
+                    var claims = new[] {
+                        new Claim(ClaimTypes.NameIdentifier, username),
+                        new Claim(ClaimTypes.Name, username),
+                    };
+
+                    var identity = new ClaimsIdentity(claims, Scheme.Name);
+                    var principal = new ClaimsPrincipal(identity);
+                    var ticket = new AuthenticationTicket(principal, Scheme.Name);
+                    return AuthenticateResult.Success(ticket);
+                }
+                else
+                {
+                    return AuthenticateResult.Fail("Invalid Username or Password");
+                }
+
+            }
+            catch
+            {
+                return AuthenticateResult.Fail("Invalid Authorization Header");
+            }
+        }
+
+
+        public async Task<string> GetAuthenticationData(string username)
+        {
+             
+            var config = KubernetesClientConfiguration.InClusterConfig();
+            string password = "";
+
+            // Use the config object to create a client.
+            var client = new Kubernetes(config);
+            try
+            {
+                var secret = await client.ReadNamespacedSecretAsync($"{PublishingProfileSecretPrefix}{username.ToLower()}","");
+                password = System.Text.Encoding.UTF8.GetString(secret.Data["password"]);
+            }
+            catch (Microsoft.Rest.HttpOperationException httpOperationException)
+            {
+                var phase = httpOperationException.Response.ReasonPhrase;
+                var content = httpOperationException.Response.Content;
+                System.Console.WriteLine("K8 Client errror");
+                System.Console.WriteLine(content);
+            }
+            return password;
+        }
+    }
+}
diff --git a/Kudu.Services.Web/Services/KuduMemCache.cs b/Kudu.Services.Web/Services/KuduMemCache.cs
new file mode 100644
index 00000000..136878a6
--- /dev/null
+++ b/Kudu.Services.Web/Services/KuduMemCache.cs
@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Memory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Kudu.Services.Web.Services
+{
+    public class KuduMemCache<T>
+    {
+        private MemoryCache _cache = new MemoryCache(new MemoryCacheOptions()
+        {
+            SizeLimit = 1024
+        });
+
+        public T GetOrCreate(T key, Func<T, Task<T>> fetchCacheItem)
+        {
+            T cacheEntry;
+            if (!_cache.TryGetValue(key, out cacheEntry))// Look for cache key.
+            {
+                // Key not in cache, so get data.
+                cacheEntry = fetchCacheItem(key).Result;
+
+                // null entry implies this key doesn't exist, throw exception
+                if(cacheEntry == null)
+                {
+                    throw new Exception("Null Token");
+                }
+
+                var cacheEntryOptions = new MemoryCacheEntryOptions()
+                 .SetSize(1)//Size amount
+                            //Priority on removing when reaching size limit (memory pressure)
+                    .SetPriority(CacheItemPriority.High)
+                    // Keep in cache for this time, reset time if accessed.
+                    .SetSlidingExpiration(TimeSpan.FromSeconds(2))
+                    // Remove from cache after this time, regardless of sliding expiration
+                    .SetAbsoluteExpiration(TimeSpan.FromSeconds(10));
+
+                // Save data in cache.
+                _cache.Set(key, cacheEntry, cacheEntryOptions);
+            }
+
+            return cacheEntry;
+        }
+    }
+}
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 3fc263ec..ec93a9bf 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -42,6 +42,8 @@
 using Swashbuckle.AspNetCore.Swagger;
 using Environment = Kudu.Core.Environment;
 using ILogger = Kudu.Core.Deployment.ILogger;
+using Microsoft.AspNetCore.Authentication;
+using Kudu.Services.Web.Services;
 
 namespace Kudu.Services.Web
 {
@@ -76,6 +78,10 @@ public void ConfigureServices(IServiceCollection services)
         {
             Console.WriteLine(@"Configure Services : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
             FileSystemHelpers.DeleteDirectorySafe("/home/site/locks/deployment");
+            // configure basic authentication 
+            services.AddAuthentication("BasicAuthentication")
+                .AddScheme<AuthenticationSchemeOptions, BasicAuthenticationHandler>("BasicAuthentication", null);
+
             services.Configure<FormOptions>(options =>
             {
                 options.MultipartBodyLengthLimit = 52428800;
@@ -318,7 +324,9 @@ public void Configure(IApplicationBuilder app,
                 app.UseExceptionHandler("/Error");
             }
 
-             app.UseKubeMiddleware();
+            app.UseAuthentication();
+
+            app.UseKubeMiddleware();
 
             if (_webAppRuntimeEnvironment.IsOnLinuxConsumption)
             {

From 5777d71510f5140e4c23f1d7cb1dc502b709c339 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 2 Dec 2019 15:32:19 -0800
Subject: [PATCH 192/245] Minor fixes

---
 .../Services/BasicAuthenticationHandler.cs          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
index 448eab08..6679e950 100644
--- a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
+++ b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
@@ -66,23 +66,30 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 
         public async Task<string> GetAuthenticationData(string username)
         {
-             
+            Console.WriteLine("Getting kube config");
             var config = KubernetesClientConfiguration.InClusterConfig();
+            Console.WriteLine("Getting kube config - done");
             string password = "";
 
             // Use the config object to create a client.
             var client = new Kubernetes(config);
+            Console.WriteLine("K8 Client Init - done");
+
             try
             {
+                Console.WriteLine("Reading Secret");
                 var secret = await client.ReadNamespacedSecretAsync($"{PublishingProfileSecretPrefix}{username.ToLower()}","");
+                Console.WriteLine("Reading Secret - done");
                 password = System.Text.Encoding.UTF8.GetString(secret.Data["password"]);
+                Console.WriteLine("Password - " + password);
             }
             catch (Microsoft.Rest.HttpOperationException httpOperationException)
             {
-                var phase = httpOperationException.Response.ReasonPhrase;
+                Console.WriteLine("Errrorrr!!!!! "+httpOperationException.InnerException);
+                var phrase = httpOperationException.Response.ReasonPhrase;
                 var content = httpOperationException.Response.Content;
                 System.Console.WriteLine("K8 Client errror");
-                System.Console.WriteLine(content);
+                System.Console.WriteLine(phrase);
             }
             return password;
         }

From 171e34dc2fbca7edf96703f13a890a97403d1a1a Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 2 Dec 2019 17:36:55 -0800
Subject: [PATCH 193/245] Added host based app name config

---
 Kudu.Services.Web/KubeMiddleware.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 1db2f3e4..95fc97fb 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -23,7 +23,7 @@
 namespace Kudu.Services.Web
 {
     /// <summary>
-    /// Middleware to filter out unnecessary routes when running in Linux Consumption
+    /// Middleware to modify Kudu Context when running on an K8 Cluster
     /// </summary>
     public class KubeMiddleware
     {
@@ -48,12 +48,17 @@ public KubeMiddleware(RequestDelegate next)
         public async Task Invoke(HttpContext context, IEnvironment environment, IServerConfiguration serverConfig)
         {
             var result = await context.AuthenticateAsync();
-
             if (result.Failure != null)
             {
                 context.Response.StatusCode = 403;
                 await context.Response.WriteAsync(result.Failure.ToString(), Encoding.UTF8);
             }
+            
+
+            var host = context.Request.Headers["HTTP_HOST"].ToString();
+            var appName = host.Substring(0, host.IndexOf("."));
+
+            Console.WriteLine("APP : " + appName);
 
             if (IsGitRoute(context.Request.Path))
             {
@@ -74,7 +79,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
 
                 if (pathParts != null && pathParts.Length >= 1)
                 {
-                    string appName = pathParts[1];
+                    var appName = pathParts[1];
                     appName = appName.Trim().Replace(".git", "");
                     if(!FileSystemHelpers.DirectoryExists(homeDir + appName))
                     {

From 37804577addae52ffd95c5ebcff70071b0d79cc0 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 2 Dec 2019 22:00:54 -0800
Subject: [PATCH 194/245] Dynamic Environment support

---
 Common/Constants.cs                           |   1 +
 Kudu.Console/Program.cs                       |   3 +-
 Kudu.Core/Deployment/DeploymentManager.cs     |  26 +++-
 .../Deployment/FetchDeploymentManager.cs      |  39 +++--
 Kudu.Core/Helpers/PostDeploymentHelper.cs     |   9 +-
 Kudu.Services.Web/KubeMiddleware.cs           | 138 ++++++++++++------
 Kudu.Services.Web/KuduWebUtil.cs              |   7 +-
 .../Services/BasicAuthenticationHandler.cs    |   5 +-
 Kudu.Services.Web/Startup.cs                  |  17 ++-
 .../Deployment/DeploymentController.cs        |  21 ++-
 .../Deployment/PushDeploymentController.cs    |  20 ++-
 .../Diagnostics/ApplicationLogsReader.cs      |   2 +
 .../Diagnostics/DiagnosticsController.cs      |  11 +-
 Kudu.Services/Docker/DockerController.cs      |   9 +-
 .../Infrastructure/VfsControllerBase.cs       |   1 +
 Kudu.Services/Zip/ZipController.cs            |  21 ++-
 16 files changed, 245 insertions(+), 85 deletions(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 0867ec00..f7e687c2 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -153,5 +153,6 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string LinuxLogEventStreamName = "MS_KUDU_LOGS";
         public const string WebSiteHomeStampName = "WEBSITE_HOME_STAMPNAME";
         public const string WebSiteStampDeploymentId = "WEBSITE_STAMP_DEPLOYMENT_ID";
+        public const string KubernetesBuildService = "K8_BUILD_SERVICE";
     }
 }
diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index cd793c7b..fd5aee1a 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -168,7 +168,8 @@ private static int PerformDeploy(
                                                           deploymentStatusManager,
                                                           deploymentLock,
                                                           GetLogger(env, level, logger),
-                                                          hooksManager);
+                                                          hooksManager,
+                                                          null); // K8 todo
             var step = tracer.Step(XmlTracer.ExecutingExternalProcessTrace, new Dictionary<string, string>
             {
                 { "type", "process" },
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index ae716a35..f5d0c15e 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -15,6 +15,7 @@
 using Kudu.Core.Settings;
 using Kudu.Core.SourceControl;
 using Kudu.Core.Tracing;
+using Microsoft.AspNetCore.Http;
 
 namespace Kudu.Core.Deployment
 {
@@ -48,8 +49,9 @@ public DeploymentManager(ISiteBuilderFactory builderFactory,
                                  IDeploymentStatusManager status,
                                  IDictionary<string, IOperationLock> namedLocks,
                                  ILogger globalLogger,
-                                 IWebHooksManager hooksManager)
-            : this(builderFactory, environment, traceFactory, analytics, settings, status, namedLocks["deployment"], globalLogger, hooksManager)
+                                 IWebHooksManager hooksManager,
+                                 IHttpContextAccessor httpContextAccessor)
+            : this(builderFactory, environment, traceFactory, analytics, settings, status, namedLocks["deployment"], globalLogger, hooksManager, httpContextAccessor)
         { }
 
         public DeploymentManager(ISiteBuilderFactory builderFactory,
@@ -60,10 +62,11 @@ public DeploymentManager(ISiteBuilderFactory builderFactory,
                                  IDeploymentStatusManager status,
                                  IOperationLock deploymentLock,
                                  ILogger globalLogger,
-                                 IWebHooksManager hooksManager)
+                                 IWebHooksManager hooksManager,
+                                 IHttpContextAccessor httpContextAccessor)
         {
             _builderFactory = builderFactory;
-            _environment = environment;
+            _environment = GetEnvironment(httpContextAccessor, environment);
             _traceFactory = traceFactory;
             _analytics = analytics;
             _deploymentLock = deploymentLock;
@@ -73,6 +76,21 @@ public DeploymentManager(ISiteBuilderFactory builderFactory,
             _hooksManager = hooksManager;
         }
 
+        private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
+        {
+            IEnvironment _environment;
+            var context = accessor.HttpContext;
+            if (!PostDeploymentHelper.IsK8Environment())
+            {
+                _environment = environment;
+            }
+            else
+            {
+                _environment = (IEnvironment)context.Items["environment"];
+            }
+            return _environment;
+        }
+
         private bool IsDeploying
         {
             get
diff --git a/Kudu.Core/Deployment/FetchDeploymentManager.cs b/Kudu.Core/Deployment/FetchDeploymentManager.cs
index 1c813c7a..e880076f 100644
--- a/Kudu.Core/Deployment/FetchDeploymentManager.cs
+++ b/Kudu.Core/Deployment/FetchDeploymentManager.cs
@@ -13,6 +13,7 @@
 using Kudu.Core.Infrastructure;
 using Kudu.Core.SourceControl;
 using Kudu.Core.Tracing;
+using Microsoft.AspNetCore.Http;
 
 namespace Kudu.Core.Deployment
 {
@@ -24,6 +25,7 @@ public class FetchDeploymentManager : IFetchDeploymentManager
         private readonly IOperationLock _deploymentLock;
         private readonly IDeploymentManager _deploymentManager;
         private readonly IDeploymentStatusManager _status;
+        private IHttpContextAccessor _httpContextAccessor = null;
         private readonly string _markerFilePath;
 
         public FetchDeploymentManager(
@@ -33,8 +35,9 @@ public FetchDeploymentManager(
             //IOperationLock deploymentLock,
             IDictionary<string, IOperationLock> namedLocks,
             IDeploymentManager deploymentManager,
-            IDeploymentStatusManager status)
-            : this(settings, environment, tracer, namedLocks["deployment"], deploymentManager, status)
+            IDeploymentStatusManager status,
+            IHttpContextAccessor httpContextAccessor)
+            : this(settings, environment, tracer, namedLocks["deployment"], deploymentManager, status, httpContextAccessor)
         { }
 
         public FetchDeploymentManager(
@@ -43,15 +46,16 @@ public FetchDeploymentManager(
             ITracer tracer,
             IOperationLock deploymentLock,
             IDeploymentManager deploymentManager,
-            IDeploymentStatusManager status)
+            IDeploymentStatusManager status,
+            IHttpContextAccessor httpContextAccessor)
         {
             _settings = settings;
-            _environment = environment;
+            _environment = GetEnvironment(httpContextAccessor, environment);
+            _httpContextAccessor = httpContextAccessor;
             _tracer = tracer;
             _deploymentLock = deploymentLock;
             _deploymentManager = deploymentManager;
             _status = status;
-
             _markerFilePath = Path.Combine(environment.DeploymentsPath, "pending");
 
             // Prefer marker creation in ctor to delay create when needed.
@@ -69,6 +73,21 @@ public FetchDeploymentManager(
             }
         }
 
+        private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
+        {
+            IEnvironment _environment;
+            var context = accessor.HttpContext;
+            if (!PostDeploymentHelper.IsK8Environment())
+            {
+                _environment = environment;
+            }
+            else
+            {
+                _environment = (IEnvironment)context.Items["environment"];
+            }
+            return _environment;
+        }
+
         public async Task<FetchDeploymentRequestResult> FetchDeploy(
             DeploymentInfoBase deployInfo,
             bool asyncRequested,
@@ -107,7 +126,8 @@ public async Task<FetchDeploymentRequestResult> FetchDeploy(
                         _settings,
                         _tracer.TraceLevel,
                         requestUri,
-                        waitForTempDeploymentCreation);
+                        waitForTempDeploymentCreation,
+                        _httpContextAccessor);
 
                     return successfullyRequested
                     ? FetchDeploymentRequestResult.RunningAynschronously
@@ -293,7 +313,8 @@ public static async Task<bool> PerformBackgroundDeployment(
             IDeploymentSettingsManager settings,
             TraceLevel traceLevel,
             Uri uri,
-            bool waitForTempDeploymentCreation)
+            bool waitForTempDeploymentCreation,
+            IHttpContextAccessor _httpContextAccessor)
         {
             var tracer = traceLevel <= TraceLevel.Off ? NullTracer.Instance : new CascadeTracer(new XmlTracer(environment.TracePath, traceLevel), new ETWTracer(environment.RequestId, "POST"));
             var traceFactory = new TracerFactory(() => tracer);
@@ -330,8 +351,8 @@ public static async Task<bool> PerformBackgroundDeployment(
                     var deploymentStatusManager = new DeploymentStatusManager(environment, analytics, statusLock);
                     var siteBuilderFactory = new SiteBuilderFactory(new BuildPropertyProvider(), environment);
                     var webHooksManager = new WebHooksManager(tracer, environment, hooksLock);
-                    var deploymentManager = new DeploymentManager(siteBuilderFactory, environment, traceFactory, analytics, settings, deploymentStatusManager, deploymentLock, NullLogger.Instance, webHooksManager);
-                    var fetchDeploymentManager = new FetchDeploymentManager(settings, environment, tracer, deploymentLock, deploymentManager, deploymentStatusManager);
+                    var deploymentManager = new DeploymentManager(siteBuilderFactory, environment, traceFactory, analytics, settings, deploymentStatusManager, deploymentLock, NullLogger.Instance, webHooksManager, _httpContextAccessor);
+                    var fetchDeploymentManager = new FetchDeploymentManager(settings, environment, tracer, deploymentLock, deploymentManager, deploymentStatusManager, _httpContextAccessor);
 
                     IDisposable tempDeployment = null;
 
diff --git a/Kudu.Core/Helpers/PostDeploymentHelper.cs b/Kudu.Core/Helpers/PostDeploymentHelper.cs
index 0b8aa1fa..b25de37a 100644
--- a/Kudu.Core/Helpers/PostDeploymentHelper.cs
+++ b/Kudu.Core/Helpers/PostDeploymentHelper.cs
@@ -93,7 +93,14 @@ public static bool IsAzureEnvironment()
         {
             return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId));
         }
-        
+
+        // K8_BUILD_SERVICE not null or empty
+        public static bool IsK8Environment()
+        {
+            return true;
+            //return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.KubernetesBuildService));
+        }
+
         // WEBSITE_HOME_STAMPNAME = waws-prod-bay-001
         private static string HomeStamp
         {
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 95fc97fb..9eba9a05 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -1,24 +1,15 @@
-using System.Linq;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-using Kudu.Services.Infrastructure.Authorization;
-using Kudu.Services.Infrastructure.Authentication;
 using System;
-using System.Text.RegularExpressions;
-using Kudu.Core.Tracing;
 using Kudu.Core.Infrastructure;
 using Kudu.Contracts.Settings;
 using Kudu.Services.Infrastructure;
-using Microsoft.AspNetCore.Http.Extensions;
 using Kudu.Core;
-using Microsoft.AspNetCore.Mvc;
 using System.Text;
 using Kudu.Core.Helpers;
+using System.IO;
 
 namespace Kudu.Services.Web
 {
@@ -27,7 +18,8 @@ namespace Kudu.Services.Web
     /// </summary>
     public class KubeMiddleware
     {
-
+        private const string KuduConsoleFilename = "kudu.dll";
+        private const string KuduConsoleRelativePath = "KuduConsole";
         private readonly RequestDelegate _next;
 
         /// <summary>
@@ -48,52 +40,61 @@ public KubeMiddleware(RequestDelegate next)
         public async Task Invoke(HttpContext context, IEnvironment environment, IServerConfiguration serverConfig)
         {
             var result = await context.AuthenticateAsync();
-            if (result.Failure != null)
+            
+            
+            if (result.Succeeded == false)
             {
-                context.Response.StatusCode = 403;
-                await context.Response.WriteAsync(result.Failure.ToString(), Encoding.UTF8);
+                context.Response.StatusCode = 401;
+                context.Response.Headers["WWW-Authenticate"] = "Basic realm=\"site\"";
+                return;
             }
-            
 
-            var host = context.Request.Headers["HTTP_HOST"].ToString();
+            foreach(var header in context.Request.Headers)
+            {
+                Console.WriteLine($"{header.Key} : {header.Value}");
+            }
+
+            var host = context.Request.Headers["Host"].ToString();
+            Console.WriteLine("HOST: "+host);
             var appName = host.Substring(0, host.IndexOf("."));
+            //var appName = "test1";
+            Console.WriteLine("AppName: " + appName);
+            string homeDir = "";
+            string siteRepoDir = "";
+            if (OSDetector.IsOnWindows())
+            {
+                homeDir = "F:\\repos\\apps\\";
+                siteRepoDir = "\\site\\repository";
+            }
+            else
+            {
+                homeDir = "/home/apps/";
+                siteRepoDir = "/site/repository";
+            }
 
-            Console.WriteLine("APP : " + appName);
+            //Console.WriteLine("APP : " + appName);
+            //appName = "test1";
 
-            if (IsGitRoute(context.Request.Path))
-            {
-                string[] pathParts = context.Request.Path.ToString().Split("/");
 
-                string homeDir = "";
-                string siteRepoDir = "";
-                if (OSDetector.IsOnWindows())
-                {
-                    homeDir = "F:\\repos\\apps\\";
-                    siteRepoDir = "\\site\\repository";
-                }
-                else
-                {
-                    homeDir = "/home/apps/";
-                    siteRepoDir = "/site/repository";
-                }
+            context.Items.Add("environment", GetEnvironment(homeDir, appName));
+
 
-                if (pathParts != null && pathParts.Length >= 1)
+            string[] pathParts = context.Request.Path.ToString().Split("/");
+
+            if (pathParts != null && pathParts.Length >= 1 && IsGitRoute(context.Request.Path))
+            {
+                appName = pathParts[1];
+                appName = appName.Trim().Replace(".git", "");
+                if (!FileSystemHelpers.DirectoryExists(homeDir + appName))
                 {
-                    var appName = pathParts[1];
-                    appName = appName.Trim().Replace(".git", "");
-                    if(!FileSystemHelpers.DirectoryExists(homeDir + appName))
-                    {
-                        context.Response.StatusCode = 404;
-                        await context.Response.WriteAsync("The repository does not exist", Encoding.UTF8);
-                        return;
-                    }
-                    else
-                    {
-                        serverConfig.GitServerRoot = appName + ".git";
-                        environment.RepositoryPath = homeDir + appName + siteRepoDir;
-                    }
+                    context.Response.StatusCode = 404;
+                    await context.Response.WriteAsync("The repository does not exist", Encoding.UTF8);
+                    return;
                 }
             }
+
+            serverConfig.GitServerRoot = appName + ".git";
+            environment.RepositoryPath = homeDir + appName + siteRepoDir;
             await _next.Invoke(context);
         }
         private bool IsGitRoute(PathString routePath)
@@ -105,8 +106,49 @@ private bool IsGitRoute(PathString routePath)
             }
             return false;
         }
+
+        /// <summary>
+        /// Returns a specified environment configuration as the current webapp's
+        /// default configuration during the runtime.
+        /// </summary>
+        private static IEnvironment GetEnvironment(
+            string home,
+            string appName,
+            IDeploymentSettingsManager settings = null,
+            HttpContext httpContext = null)
+        {
+            var root = KubeMiddleware.ResolveRootPath(appName);
+            var siteRoot = Path.Combine(root, Constants.SiteFolder);
+            var repositoryPath = Path.Combine(siteRoot,
+                settings == null ? Constants.RepositoryPath : settings.GetRepositoryPath());
+            var binPath = AppContext.BaseDirectory;
+            var requestId = httpContext != null ? httpContext.Request.GetRequestId() : null;
+            var kuduConsoleFullPath =
+                Path.Combine(AppContext.BaseDirectory, KuduConsoleRelativePath, KuduConsoleFilename);
+            return new Core.Environment(root, EnvironmentHelper.NormalizeBinPath(binPath), repositoryPath, requestId,
+                kuduConsoleFullPath, null);
+        }
+
+        public static string ResolveRootPath(string appName)
+        {
+            // The HOME path should always be set correctly
+            var path = System.Environment.ExpandEnvironmentVariables(@"%HOME%");
+            path = Path.Combine(path, "apps", appName);
+            if (!Directory.Exists(path))
+                // We should never get here
+                throw new DirectoryNotFoundException("The site's home directory could not be located");
+            // For users running Windows Azure Pack 2 (WAP2), %HOME% actually points to the site folder,
+            // which we don't want here. So yank that segment if we detect it.
+            if (Path.GetFileName(path).Equals(Constants.SiteFolder, StringComparison.OrdinalIgnoreCase))
+            {
+                path = Path.GetDirectoryName(path);
+            }
+
+            return path;
+
+        }
     }
-     
+
     /// <summary>
     /// Extension wrapper for using Kube Middleware
     /// </summary>
diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 31727f0a..6604f78f 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -25,6 +25,7 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.AspNetCore.Authorization;
 using Environment = Kudu.Core.Environment;
+using Org.BouncyCastle.Asn1.Ocsp;
 
 namespace Kudu.Services.Web
 {
@@ -300,18 +301,18 @@ internal static ILogger GetDeploymentLogger(IServiceProvider serviceProvider)
         /// </summary>
         internal static IEnvironment GetEnvironment(IHostingEnvironment hostingEnvironment,
             IDeploymentSettingsManager settings = null,
-            IHttpContextAccessor httpContextAccessor = null)
+            HttpContext httpContext = null)
         {
             var root = PathResolver.ResolveRootPath();
             var siteRoot = Path.Combine(root, Constants.SiteFolder);
             var repositoryPath = Path.Combine(siteRoot,
                 settings == null ? Constants.RepositoryPath : settings.GetRepositoryPath());
             var binPath = AppContext.BaseDirectory;
-            var requestId = httpContextAccessor?.HttpContext.Request.GetRequestId();
+            var requestId = httpContext != null ? httpContext.Request.GetRequestId() : null;
             var kuduConsoleFullPath =
                 Path.Combine(AppContext.BaseDirectory, KuduConsoleRelativePath, KuduConsoleFilename);
             return new Environment(root, EnvironmentHelper.NormalizeBinPath(binPath), repositoryPath, requestId,
-                kuduConsoleFullPath, httpContextAccessor);
+                kuduConsoleFullPath, null);
         }
 
         /// <summary>
diff --git a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
index 6679e950..fefaeb31 100644
--- a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
+++ b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
@@ -77,8 +77,8 @@ public async Task<string> GetAuthenticationData(string username)
 
             try
             {
-                Console.WriteLine("Reading Secret");
-                var secret = await client.ReadNamespacedSecretAsync($"{PublishingProfileSecretPrefix}{username.ToLower()}","");
+                Console.WriteLine($"Reading Secret { PublishingProfileSecretPrefix}{ username.ToLower()}");
+                var secret = await client.ReadNamespacedSecretAsync($"{PublishingProfileSecretPrefix.ToLower()}{username.ToLower()}","k8seappspubpassword");
                 Console.WriteLine("Reading Secret - done");
                 password = System.Text.Encoding.UTF8.GetString(secret.Data["password"]);
                 Console.WriteLine("Password - " + password);
@@ -90,6 +90,7 @@ public async Task<string> GetAuthenticationData(string username)
                 var content = httpOperationException.Response.Content;
                 System.Console.WriteLine("K8 Client errror");
                 System.Console.WriteLine(phrase);
+                System.Console.WriteLine(content);
             }
             return password;
         }
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index ec93a9bf..93c1b1c4 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -161,6 +161,13 @@ public void ConfigureServices(IServiceCollection services)
                 new DeploymentSettingsManager(new XmlSettings.Settings(KuduWebUtil.GetSettingsPath(environment)));
             TraceServices.TraceLevel = _noContextDeploymentsSettingsManager.GetTraceLevel();
 
+            // Its required to register the IHttpContextAccessor first
+            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+            services.AddScoped<IEnvironment>(provider => {
+                var httpContext = provider.GetRequiredService<IHttpContextAccessor>().HttpContext;
+                return KuduWebUtil.GetEnvironment(_hostingEnvironment, provider.GetRequiredService<IDeploymentSettingsManager>(), httpContext);
+            });
+
             // Per request environment
             services.AddScoped(sp =>
                 KuduWebUtil.GetEnvironment(_hostingEnvironment, sp.GetRequiredService<IDeploymentSettingsManager>()));
@@ -324,10 +331,6 @@ public void Configure(IApplicationBuilder app,
                 app.UseExceptionHandler("/Error");
             }
 
-            app.UseAuthentication();
-
-            app.UseKubeMiddleware();
-
             if (_webAppRuntimeEnvironment.IsOnLinuxConsumption)
             {
                 app.UseLinuxConsumptionRouteMiddleware();
@@ -350,6 +353,10 @@ public void Configure(IApplicationBuilder app,
             var containsRelativeProvisionPath = new Func<HttpContext, bool>(i =>
                 i.Request.Path.Value.StartsWith("/api/provision", StringComparison.OrdinalIgnoreCase));
 
+            app.UseTraceMiddleware();
+            app.UseAuthentication();
+            app.UseKubeMiddleware();
+
             app.MapWhen(containsRelativeProvisionPath, application => application.Run(async context =>
             {
                 FileSystemHelpers.EnsureDirectory("/home/apps/"+context.Request.Path.Value.Replace("/api/provision/", ""));
@@ -373,8 +380,6 @@ public void Configure(IApplicationBuilder app,
 
             app.MapWhen(containsRelativePath3, builder => builder.UseMiddleware<DebugExtensionMiddleware>());
 
-            app.UseTraceMiddleware();
-
             applicationLifetime.ApplicationStopping.Register(OnShutdown);
 
             app.UseStaticFiles();
diff --git a/Kudu.Services/Deployment/DeploymentController.cs b/Kudu.Services/Deployment/DeploymentController.cs
index 023b05ba..fbafb724 100644
--- a/Kudu.Services/Deployment/DeploymentController.cs
+++ b/Kudu.Services/Deployment/DeploymentController.cs
@@ -36,7 +36,7 @@ public class DeploymentController : Controller
     {
         private static DeploymentsCacheItem _cachedDeployments = DeploymentsCacheItem.None;
 
-        private readonly IEnvironment _environment;
+        private IEnvironment _environment;
         private readonly IAnalytics _analytics;
         private readonly IDeploymentManager _deploymentManager;
         private readonly IDeploymentStatusManager _status;
@@ -53,16 +53,31 @@ public DeploymentController(ITracer tracer,
                                     IDeploymentSettingsManager settings,
                                     //IOperationLock deploymentLock,
                                     IDictionary<string, IOperationLock> namedLocks,
-                                    IRepositoryFactory repositoryFactory)
+                                    IRepositoryFactory repositoryFactory,
+                                    IHttpContextAccessor accessor)
         {
             _tracer = tracer;
-            _environment = environment;
             _analytics = analytics;
             _deploymentManager = deploymentManager;
             _status = status;
             _settings = settings;
             _deploymentLock = (AllSafeLinuxLock) namedLocks["deployment"];
             _repositoryFactory = repositoryFactory;
+            GetEnvironment(accessor, environment);
+        }
+
+
+        private void GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
+        {
+            var context = accessor.HttpContext;
+            if (!PostDeploymentHelper.IsK8Environment())
+            {
+                _environment = environment;
+            }
+            else
+            {
+                _environment = (IEnvironment) context.Items["environment"];
+            }
         }
 
         /// <summary>
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index 6a8ea8d3..e043a323 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -41,15 +41,31 @@ public PushDeploymentController(
             IFetchDeploymentManager deploymentManager,
             ITracer tracer,
             ITraceFactory traceFactory,
-            IDeploymentSettingsManager settings)
+            IDeploymentSettingsManager settings,
+            IHttpContextAccessor accessor)
         {
-            _environment = environment;
+
             _deploymentManager = deploymentManager;
             _tracer = tracer;
             _traceFactory = traceFactory;
             _settings = settings;
+            _environment = GetEnvironment(accessor, environment);
         }
 
+        private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
+        {
+            IEnvironment _environment;
+            var context = accessor.HttpContext;
+            if (!PostDeploymentHelper.IsK8Environment())
+            {
+                _environment = environment;
+            }
+            else
+            {
+                _environment = (IEnvironment)context.Items["environment"];
+            }
+            return _environment;
+        }
 
         [HttpPost]
         [DisableRequestSizeLimit]
diff --git a/Kudu.Services/Diagnostics/ApplicationLogsReader.cs b/Kudu.Services/Diagnostics/ApplicationLogsReader.cs
index ca92dcb1..bec9f424 100644
--- a/Kudu.Services/Diagnostics/ApplicationLogsReader.cs
+++ b/Kudu.Services/Diagnostics/ApplicationLogsReader.cs
@@ -8,8 +8,10 @@
 using Kudu.Contracts.Diagnostics;
 using Kudu.Contracts.Tracing;
 using Kudu.Core;
+using Kudu.Core.Helpers;
 using Kudu.Core.Infrastructure;
 using Kudu.Core.Tracing;
+using Microsoft.AspNetCore.Http;
 
 namespace Kudu.Services.Diagnostics
 {
diff --git a/Kudu.Services/Diagnostics/DiagnosticsController.cs b/Kudu.Services/Diagnostics/DiagnosticsController.cs
index f7597a1c..1db75330 100644
--- a/Kudu.Services/Diagnostics/DiagnosticsController.cs
+++ b/Kudu.Services/Diagnostics/DiagnosticsController.cs
@@ -17,6 +17,7 @@
 using Microsoft.AspNetCore.Http;
 using Kudu.Services.Infrastructure;
 using System.Threading.Tasks;
+using Kudu.Core.Helpers;
 
 namespace Kudu.Services.Performance
 {
@@ -46,8 +47,14 @@ public DiagnosticsController(IEnvironment environment, ITracer tracer, IApplicat
                 Path.Combine(environment.RootPath, Constants.LogFilesPath),
                 Path.Combine(environment.WebRootPath, Constants.NpmDebugLogFile),
             };
-
-            _environment = environment;
+            if (!PostDeploymentHelper.IsK8Environment())
+            {
+                _environment = environment;
+            }
+            else
+            {
+                _environment = (IEnvironment)HttpContext.Items["environment"];
+            }
             _applicationLogsReader = applicationLogsReader;
             _tracer = tracer;
             _settingsManager = new DiagnosticsSettingsManager(Path.Combine(environment.DiagnosticsPath, Constants.SettingsJsonFile), _tracer);
diff --git a/Kudu.Services/Docker/DockerController.cs b/Kudu.Services/Docker/DockerController.cs
index b2a989a1..68a3d871 100644
--- a/Kudu.Services/Docker/DockerController.cs
+++ b/Kudu.Services/Docker/DockerController.cs
@@ -20,7 +20,14 @@ public DockerController(ITraceFactory traceFactory, IDeploymentSettingsManager s
         {
             _traceFactory = traceFactory;
             _settings = settings;
-            _environment = environment;
+            if (!PostDeploymentHelper.IsK8Environment())
+            {
+                _environment = environment;
+            }
+            else
+            {
+                _environment = (IEnvironment)HttpContext.Items["environment"];
+            }
         }
 
         [HttpPost]
diff --git a/Kudu.Services/Infrastructure/VfsControllerBase.cs b/Kudu.Services/Infrastructure/VfsControllerBase.cs
index 31e74e87..e6a6fc92 100644
--- a/Kudu.Services/Infrastructure/VfsControllerBase.cs
+++ b/Kudu.Services/Infrastructure/VfsControllerBase.cs
@@ -40,6 +40,7 @@ protected VfsControllerBase(ITracer tracer, IEnvironment environment, string roo
             }
             Tracer = tracer;
             Environment = environment;
+
             RootPath = Path.GetFullPath(rootPath.TrimEnd(Path.DirectorySeparatorChar));
             MediaTypeMap = MediaTypeMap.Default;
         }
diff --git a/Kudu.Services/Zip/ZipController.cs b/Kudu.Services/Zip/ZipController.cs
index d9773d84..1f998955 100644
--- a/Kudu.Services/Zip/ZipController.cs
+++ b/Kudu.Services/Zip/ZipController.cs
@@ -13,6 +13,7 @@
 using Kudu.Core.Infrastructure;
 using Kudu.Core.Helpers;
 using System.Threading;
+using Microsoft.AspNetCore.Http;
 
 namespace Kudu.Services.Zip
 {
@@ -22,12 +23,26 @@ public class ZipController : VfsControllerBase
     {
         private ITracer _tracer;
         private IEnvironment _environment;
-        public ZipController(ITracer tracer, IEnvironment environment)
-            : base(tracer, environment, environment.RootPath)
+        public ZipController(ITracer tracer, IEnvironment environment, IHttpContextAccessor accessor)
+            : base(tracer, GetEnvironment(accessor, environment), GetEnvironment(accessor, environment).RootPath)
         {
             _tracer = tracer;
-            _environment = environment;
+            _environment = GetEnvironment(accessor, environment);
+        }
 
+        private static IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
+        {
+            IEnvironment _environment;
+            var context = accessor.HttpContext;
+            if (!PostDeploymentHelper.IsK8Environment())
+            {
+                _environment = environment;
+            }
+            else
+            {
+                _environment = (IEnvironment)context.Items["environment"];
+            }
+            return _environment;
         }
 
         protected override Task<IActionResult> CreateDirectoryGetResponse(DirectoryInfoBase info, string localFilePath)

From c7212ee45215fb78d7fedbeac6a7b98b4d4ab7b2 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 4 Dec 2019 16:15:39 -0800
Subject: [PATCH 195/245] Added support for zip deploy

---
 Kudu.Console/Program.cs                       | 71 +++----------------
 Kudu.Core/Deployment/DeploymentManager.cs     |  4 +-
 .../Git/LibGit2SharpRepository.cs             |  2 +-
 Kudu.Services.Web/KubeMiddleware.cs           |  3 +-
 .../Services/BasicAuthenticationHandler.cs    | 12 +---
 .../Deployment/DeploymentController.cs        |  3 +-
 .../Deployment/PushDeploymentController.cs    |  8 ++-
 7 files changed, 22 insertions(+), 81 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index fd5aee1a..c766d969 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -23,15 +23,9 @@
 using System.Reflection;
 using XmlSettings;
 using k8s;
-using k8s.Models;
-using Microsoft.AspNetCore.JsonPatch;
-using LibGit2Sharp;
-using System.Threading;
 using IRepository = Kudu.Core.SourceControl.IRepository;
 using log4net;
 using log4net.Config;
-using Newtonsoft.Json;
-using System.IO.Abstractions;
 
 namespace Kudu.Console
 {
@@ -89,7 +83,7 @@ private static int Main(string[] args)
             string deploymentLockPath = Path.Combine(lockPath, Constants.DeploymentLockFile);
 
             IOperationLock deploymentLock = DeploymentLockFile.GetInstance(deploymentLockPath, traceFactory);
-            
+
             if (deploymentLock.IsHeld)
             {
                 return PerformDeploy(appRoot, wapTargets, deployer, lockPath, env, settingsManager, level, tracer, traceFactory, deploymentLock);
@@ -132,7 +126,6 @@ private static int PerformDeploy(
 
             // Adjust repo path
             env.RepositoryPath = Path.Combine(env.SiteRootPath, settingsManager.GetRepositoryPath());
-
             string statusLockPath = Path.Combine(lockPath, Constants.StatusLockFile);
             string hooksLockPath = Path.Combine(lockPath, Constants.HooksLockFile);
 
@@ -153,13 +146,17 @@ private static int PerformDeploy(
             {
                 gitRepository = new GitExeRepository(env, settingsManager, traceFactory);
             }
+
             env.CurrId = gitRepository.GetChangeSet(settingsManager.GetBranch()).Id;
 
             IServerConfiguration serverConfiguration = new ServerConfiguration();
+
             IAnalytics analytics = new Analytics(settingsManager, serverConfiguration, traceFactory);
 
             IWebHooksManager hooksManager = new WebHooksManager(tracer, env, hooksLock);
+
             IDeploymentStatusManager deploymentStatusManager = new DeploymentStatusManager(env, analytics, statusLock);
+
             IDeploymentManager deploymentManager = new DeploymentManager(builderFactory,
                                                           env,
                                                           traceFactory,
@@ -170,6 +167,7 @@ private static int PerformDeploy(
                                                           GetLogger(env, level, logger),
                                                           hooksManager,
                                                           null); // K8 todo
+
             var step = tracer.Step(XmlTracer.ExecutingExternalProcessTrace, new Dictionary<string, string>
             {
                 { "type", "process" },
@@ -224,8 +222,6 @@ private static int PerformDeploy(
                         if (replicaSet.Metadata.Name.IndexOf(appName, StringComparison.OrdinalIgnoreCase) >= 0
                             && (replicaSet.Status.AvailableReplicas > 0))
                         {
-                            System.Console.WriteLine("Found it");
-                            System.Console.WriteLine("######### Current Revision Number: "+replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
 
                             FileSystemHelpers.EnsureDirectory($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
                             FileStream stream = File.Create($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision");
@@ -256,49 +252,6 @@ private static int PerformDeploy(
                             File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", json.ToString());
                         }
                     }
-                    /*
-                    // Load from in-cluster configuration:
-                    var config = KubernetesClientConfiguration.InClusterConfig();
-                    //var config = KubernetesClientConfiguration.InClusterConfig();
-
-                    // Use the config object to create a client.
-                    var client = new Kubernetes(config);
-                    try
-                    {
-                        var deployments = client.ListDeploymentForAllNamespaces();
-                        //client.PatchNamespacedDeployment1('{"spec":{"template":{"spec":{"containers":[{"name":"nginx","image":"nginx:1.11"}]}}}}');
-                        
-                        foreach (var deployment in deployments.Items)
-                        {
-                            if(deployment.Spec.Template.Metadata.Name.Equals("second"))
-                            {
-                                foreach (var container in deployment.Spec.Template.Spec.Containers)
-                                {
-                                    foreach (var volumeMount in container.VolumeMounts)
-                                    {
-                                        volumeMount.SubPath = "apps/kudutestmount";
-                                        client.PatchNamespacedDeployment(new V1Patch<V1Deployment>(deployment), "second", "default");
-                                    }
-                                }
-                                var jdoc = new JsonPatchDocument<V1Deployment>();
-                                //jdoc.Add("spec/template/spec/containers/volumeMounts/mountPath/subPath", "apps/kudutestmount");
-                            }
-                        }
-                    }
-                    catch (Microsoft.Rest.HttpOperationException httpOperationException)
-                    {
-                        var phase = httpOperationException.Response.ReasonPhrase;
-                        //Bad Request
-                        var content = httpOperationException.Response.Content;
-                        System.Console.WriteLine("K8 Client errror");
-                        System.Console.WriteLine(content);
-                    }
-                    */
-                    // IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string repositoryPath
-                    //string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
-
-                    System.Console.WriteLine("Restarting Pods for App Service App : " + appName);
-                    System.Console.WriteLine($" Patch Args :::::: -c \" /patch.sh {appName} apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"");
 
                     Process _executingProcess = new Process()
                     {
@@ -311,20 +264,12 @@ private static int PerformDeploy(
                             CreateNoWindow = true,
                         }
                     };
+
                     // Read the standard error of net.exe and write it on to console.
                     _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
                     _executingProcess.Start();
-                    //* Read the output (or the error)
-                    //string output = _executingProcess.StandardOutput.ReadToEnd();
-                    //System.Console.WriteLine(output);
-                    //string err = _executingProcess.StandardError.ReadToEnd();
-                    //System.Console.WriteLine(err);
                     _executingProcess.WaitForExit();
-                    System.Console.WriteLine("Process exit code : "+_executingProcess.ExitCode);
-                    System.Console.WriteLine("All Pods Restarted!");
-
-                    //ExternalCommandBuilder restartApp = new ExternalCommandBuilder(env, settingsManager, buildPropertyProvider,env.RepositoryPath);
-
+                    System.Console.WriteLine("Deployment Rollout Started!");
                     System.Console.WriteLine("Deployment Logs : '"+
                     env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
                     gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index f5d0c15e..1c8de040 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -79,13 +79,13 @@ public DeploymentManager(ISiteBuilderFactory builderFactory,
         private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
         {
             IEnvironment _environment;
-            var context = accessor.HttpContext;
-            if (!PostDeploymentHelper.IsK8Environment())
+            if (!PostDeploymentHelper.IsK8Environment() || accessor == null)
             {
                 _environment = environment;
             }
             else
             {
+                var context = accessor.HttpContext;
                 _environment = (IEnvironment)context.Items["environment"];
             }
             return _environment;
diff --git a/Kudu.Core/SourceControl/Git/LibGit2SharpRepository.cs b/Kudu.Core/SourceControl/Git/LibGit2SharpRepository.cs
index a7ac7599..c2a6e97a 100644
--- a/Kudu.Core/SourceControl/Git/LibGit2SharpRepository.cs
+++ b/Kudu.Core/SourceControl/Git/LibGit2SharpRepository.cs
@@ -108,7 +108,7 @@ public void Initialize()
                     var content = @"#!/bin/sh
 read i
 echo $i > pushinfo
-" + KnownEnvironment.KUDUCOMMAND + "\r\n";
+" + KnownEnvironment.KUDUCOMMAND.Replace("$KUDU_APPPATH", RepositoryPath.Replace("site/repository", "")) + "\r\n";
 
                     File.WriteAllText(PostReceiveHookPath, content);
                 }
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 9eba9a05..92396554 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -40,8 +40,7 @@ public KubeMiddleware(RequestDelegate next)
         public async Task Invoke(HttpContext context, IEnvironment environment, IServerConfiguration serverConfig)
         {
             var result = await context.AuthenticateAsync();
-            
-            
+         
             if (result.Succeeded == false)
             {
                 context.Response.StatusCode = 401;
diff --git a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
index fefaeb31..2db16a03 100644
--- a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
+++ b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
@@ -29,7 +29,9 @@ public BasicAuthenticationHandler(
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {
             if (!Request.Headers.ContainsKey("Authorization"))
+            {
                 return AuthenticateResult.Fail("Missing Authorization Header");
+            }
 
             try
             {
@@ -65,27 +67,19 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 
 
         public async Task<string> GetAuthenticationData(string username)
-        {
-            Console.WriteLine("Getting kube config");
+        {            
             var config = KubernetesClientConfiguration.InClusterConfig();
-            Console.WriteLine("Getting kube config - done");
             string password = "";
 
             // Use the config object to create a client.
             var client = new Kubernetes(config);
-            Console.WriteLine("K8 Client Init - done");
-
             try
             {
-                Console.WriteLine($"Reading Secret { PublishingProfileSecretPrefix}{ username.ToLower()}");
                 var secret = await client.ReadNamespacedSecretAsync($"{PublishingProfileSecretPrefix.ToLower()}{username.ToLower()}","k8seappspubpassword");
-                Console.WriteLine("Reading Secret - done");
                 password = System.Text.Encoding.UTF8.GetString(secret.Data["password"]);
-                Console.WriteLine("Password - " + password);
             }
             catch (Microsoft.Rest.HttpOperationException httpOperationException)
             {
-                Console.WriteLine("Errrorrr!!!!! "+httpOperationException.InnerException);
                 var phrase = httpOperationException.Response.ReasonPhrase;
                 var content = httpOperationException.Response.Content;
                 System.Console.WriteLine("K8 Client errror");
diff --git a/Kudu.Services/Deployment/DeploymentController.cs b/Kudu.Services/Deployment/DeploymentController.cs
index fbafb724..21f13ca9 100644
--- a/Kudu.Services/Deployment/DeploymentController.cs
+++ b/Kudu.Services/Deployment/DeploymentController.cs
@@ -401,7 +401,8 @@ public IActionResult GetDeployResults()
                 _tracer.Trace("Current Etag: {0}, Cached Etag: {1}", currentEtag, cachedDeployments.Etag);
             }
 
-            if (EtagEquals(Request, currentEtag))
+            // Avoid Caching when on K8
+            if (EtagEquals(Request, currentEtag) && !PostDeploymentHelper.IsK8Environment())
             {
                 result = StatusCode(StatusCodes.Status304NotModified);
             }
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index e043a323..fac20dff 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -372,9 +372,11 @@ private Task LocalZipFetch(IRepository repository, DeploymentInfoBase deployment
                 {
                     deploymentInfo.repositorySymlinks = zip.Extract(extractTargetDirectory);
 
-                    CreateZipSymlinks(deploymentInfo.repositorySymlinks, extractTargetDirectory);
-
-                    PermissionHelper.ChmodRecursive("777", extractTargetDirectory, tracer, TimeSpan.FromMinutes(1));
+                    if (!OSDetector.IsOnWindows())
+                    {
+                        CreateZipSymlinks(deploymentInfo.repositorySymlinks, extractTargetDirectory);
+                        PermissionHelper.ChmodRecursive("777", extractTargetDirectory, tracer, TimeSpan.FromMinutes(1));
+                    }
                 }
             }
 

From 74610fbee3db4dee34f5a6d544de2e413112ef15 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 4 Dec 2019 20:37:33 -0800
Subject: [PATCH 196/245] Increasing Cache Timeout

---
 Kudu.Services.Web/Services/KuduMemCache.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kudu.Services.Web/Services/KuduMemCache.cs b/Kudu.Services.Web/Services/KuduMemCache.cs
index 136878a6..3913de27 100644
--- a/Kudu.Services.Web/Services/KuduMemCache.cs
+++ b/Kudu.Services.Web/Services/KuduMemCache.cs
@@ -33,9 +33,9 @@ public T GetOrCreate(T key, Func<T, Task<T>> fetchCacheItem)
                             //Priority on removing when reaching size limit (memory pressure)
                     .SetPriority(CacheItemPriority.High)
                     // Keep in cache for this time, reset time if accessed.
-                    .SetSlidingExpiration(TimeSpan.FromSeconds(2))
+                    .SetSlidingExpiration(TimeSpan.FromMinutes(120))
                     // Remove from cache after this time, regardless of sliding expiration
-                    .SetAbsoluteExpiration(TimeSpan.FromSeconds(10));
+                    .SetAbsoluteExpiration(TimeSpan.FromMinutes(480));
 
                 // Save data in cache.
                 _cache.Set(key, cacheEntry, cacheEntryOptions);

From 191e6075383837800d0b4fc8a5dcd06b95180a2e Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 4 Dec 2019 22:37:47 -0800
Subject: [PATCH 197/245] Fixes to Deployment Status File

---
 Kudu.Console/Program.cs                       |  4 ++--
 .../Deployment/IDeploymentStatusManager.cs    |  6 ++---
 Kudu.Core/Deployment/DeploymentManager.cs     | 22 +++++++++----------
 .../Deployment/DeploymentStatusManager.cs     | 14 +++++-------
 .../Deployment/FetchDeploymentManager.cs      |  4 ++--
 Kudu.Core/Deployment/ProgressLogger.cs        |  6 +++--
 .../Deployment/DeploymentController.cs        |  8 +++----
 Kudu.Services/FetchHelpers/DropboxHelper.cs   |  4 ++--
 Kudu.Services/FetchHelpers/OneDriveHelper.cs  |  4 ++--
 9 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index c766d969..2704a3d0 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -194,7 +194,7 @@ private static int PerformDeploy(
                     {
                         string branch = settingsManager.GetBranch();
                         ChangeSet changeSet = gitRepository.GetChangeSet(branch);
-                        IDeploymentStatusFile statusFile = deploymentStatusManager.Open(changeSet.Id);
+                        IDeploymentStatusFile statusFile = deploymentStatusManager.Open(changeSet.Id, env);
                         if (statusFile != null && statusFile.Status == DeployStatus.Success)
                         {
                             PostDeploymentHelper.PerformAutoSwap(env.RequestId,
@@ -230,7 +230,7 @@ private static int PerformDeploy(
                             FileStream stream2 = File.Create($"/home/apps/{appName}/site/artifacts/current");
                             stream2.Close();
 
-                            IDeploymentStatusFile statusFile = deploymentStatusManager.Open(gitRepository.GetChangeSet(settingsManager.GetBranch()).Id);
+                            IDeploymentStatusFile statusFile = deploymentStatusManager.Open(gitRepository.GetChangeSet(settingsManager.GetBranch()).Id, env);
                             statusFile.Save();
                             revisiondata rv = new revisiondata()
                             {
diff --git a/Kudu.Contracts/Deployment/IDeploymentStatusManager.cs b/Kudu.Contracts/Deployment/IDeploymentStatusManager.cs
index b2802534..f75be539 100644
--- a/Kudu.Contracts/Deployment/IDeploymentStatusManager.cs
+++ b/Kudu.Contracts/Deployment/IDeploymentStatusManager.cs
@@ -5,9 +5,9 @@ namespace Kudu.Core.Deployment
 {
     public interface IDeploymentStatusManager
     {
-        IDeploymentStatusFile Create(string id);
-        IDeploymentStatusFile Open(string id);
-        void Delete(string id);
+        IDeploymentStatusFile Create(string id, IEnvironment environment);
+        IDeploymentStatusFile Open(string id, IEnvironment environment);
+        void Delete(string id, IEnvironment environment);
 
         IOperationLock Lock { get; }
 
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 1c8de040..8a1d65f7 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -177,7 +177,7 @@ public void Delete(string id)
                     throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, Resources.Error_UnableToDeleteDeploymentActive, id));
                 }
 
-                _status.Delete(id);
+                _status.Delete(id, _environment);
             }
         }
 
@@ -300,7 +300,7 @@ public async Task DeployAsync(
                     }
 
                     // Reload status file with latest updates
-                    statusFile = _status.Open(id);
+                    statusFile = _status.Open(id, _environment);
                     using (tracer.Step("Reloading status file with latest updates"))
                     {
                         if (statusFile != null)
@@ -324,7 +324,7 @@ public IDisposable CreateTemporaryDeployment(string statusText, out ChangeSet te
             using (tracer.Step("Creating temporary deployment"))
             {
                 changeSet = changeSet != null && changeSet.IsTemporary ? changeSet : CreateTemporaryChangeSet();
-                IDeploymentStatusFile statusFile = _status.Create(changeSet.Id);
+                IDeploymentStatusFile statusFile = _status.Create(changeSet.Id, _environment);
                 statusFile.Id = changeSet.Id;
                 statusFile.Message = changeSet.Message;
                 statusFile.Author = changeSet.AuthorName;
@@ -344,7 +344,7 @@ public IDisposable CreateTemporaryDeployment(string statusText, out ChangeSet te
             {
                 if (changeSet.IsTemporary)
                 {
-                    _status.Delete(changeSet.Id);
+                    _status.Delete(changeSet.Id, _environment);
                 }
             });
         }
@@ -412,7 +412,7 @@ internal IEnumerable<DeployResult> PurgeDeployments(IEnumerable<DeployResult> re
                     {
                         foreach (DeployResult delete in toDelete)
                         {
-                            _status.Delete(delete.Id);
+                            _status.Delete(delete.Id, _environment);
 
                             tracer.Trace("Remove {0}, {1}, received at {2}",
                                          delete.Id.Substring(0, Math.Min(delete.Id.Length, 9)),
@@ -516,11 +516,11 @@ IDeploymentStatusFile GetOrCreateStatusFile(ChangeSet changeSet, ITracer tracer,
             using (tracer.Step("Collecting changeset information"))
             {
                 // Check if the status file already exists. This would happen when we're doing a redeploy
-                IDeploymentStatusFile statusFile = _status.Open(id);
+                IDeploymentStatusFile statusFile = _status.Open(id, _environment);
                 if (statusFile == null)
                 {
                     // Create the status file and store information about the commit
-                    statusFile = _status.Create(id);
+                    statusFile = _status.Create(id, _environment);
                 }
                 statusFile.Message = changeSet.Message;
                 statusFile.Author = changeSet.AuthorName;
@@ -590,7 +590,7 @@ private async Task Build(
                 logger = GetLogger(id);
                 ILogger innerLogger = logger.Log(Resources.Log_PreparingDeployment, TrimId(id));
 
-                currentStatus = _status.Open(id);
+                currentStatus = _status.Open(id, _environment);
                 currentStatus.Complete = false;
                 currentStatus.StartTime = DateTime.UtcNow;
                 currentStatus.Status = DeployStatus.Building;
@@ -846,7 +846,7 @@ private IEnumerable<DeployResult> EnumerateResults()
         /// </summary>
         private IDeploymentStatusFile VerifyDeployment(string id, bool isDeploying)
         {
-            IDeploymentStatusFile statusFile = _status.Open(id);
+            IDeploymentStatusFile statusFile = _status.Open(id, _environment);
             
             if (statusFile == null)
             {
@@ -884,7 +884,7 @@ private void FinishDeployment(string id, IDisposable deployStep)
                 ILogger logger = GetLogger(id);
                 logger.Log(Resources.Log_DeploymentSuccessful);
 
-                IDeploymentStatusFile currentStatus = _status.Open(id);
+                IDeploymentStatusFile currentStatus = _status.Open(id, _environment);
                 MarkStatusComplete(currentStatus, success: true);
 
                 _status.ActiveDeploymentId = id;
@@ -949,7 +949,7 @@ public ILogger GetLogger(string id)
         {
             var path = GetLogPath(id);
             var logger = GetLoggerForFile(path);
-            return new ProgressLogger(id, _status, new CascadeLogger(logger, _globalLogger));
+            return new ProgressLogger(id, _status, new CascadeLogger(logger, _globalLogger), _environment);
         }
 
         /// <summary>
diff --git a/Kudu.Core/Deployment/DeploymentStatusManager.cs b/Kudu.Core/Deployment/DeploymentStatusManager.cs
index 0cff1902..b4d219fb 100644
--- a/Kudu.Core/Deployment/DeploymentStatusManager.cs
+++ b/Kudu.Core/Deployment/DeploymentStatusManager.cs
@@ -10,7 +10,6 @@ namespace Kudu.Core.Deployment
     public class DeploymentStatusManager : IDeploymentStatusManager
     {
         public static readonly TimeSpan LockTimeout = TimeSpan.FromSeconds(10);
-        private readonly IEnvironment _environment;
         private readonly IAnalytics _analytics;
         private readonly IOperationLock _statusLock;
         private readonly string _activeFile;
@@ -25,25 +24,24 @@ public DeploymentStatusManager(IEnvironment environment,
                                        IAnalytics analytics,
                                        IOperationLock statusLock)
         {
-            _environment = environment;
             _analytics = analytics;
             _statusLock = statusLock;
             _activeFile = Path.Combine(environment.DeploymentsPath, Constants.ActiveDeploymentFile);
         }
 
-        public IDeploymentStatusFile Create(string id)
+        public IDeploymentStatusFile Create(string id, IEnvironment environment)
         {
-            return DeploymentStatusFile.Create(id, _environment, _statusLock);
+            return DeploymentStatusFile.Create(id, environment, _statusLock);
         }
 
-        public IDeploymentStatusFile Open(string id)
+        public IDeploymentStatusFile Open(string id, IEnvironment environment)
         {
-            return DeploymentStatusFile.Open(id, _environment, _analytics, _statusLock);
+            return DeploymentStatusFile.Open(id, environment, _analytics, _statusLock);
         }
 
-        public void Delete(string id)
+        public void Delete(string id, IEnvironment environment)
         {
-            string path = Path.Combine(_environment.DeploymentsPath, id);
+            string path = Path.Combine(environment.DeploymentsPath, id);
 
             _statusLock.LockOperation(() =>
             {
diff --git a/Kudu.Core/Deployment/FetchDeploymentManager.cs b/Kudu.Core/Deployment/FetchDeploymentManager.cs
index e880076f..cb27b1c9 100644
--- a/Kudu.Core/Deployment/FetchDeploymentManager.cs
+++ b/Kudu.Core/Deployment/FetchDeploymentManager.cs
@@ -260,7 +260,7 @@ await _deploymentManager.DeployAsync(
                         // In case the commit or perhaps fetch do no-op.
                         if (deploymentInfo.TargetChangeset != null)
                         {
-                            IDeploymentStatusFile statusFile = _status.Open(deploymentInfo.TargetChangeset.Id);
+                            IDeploymentStatusFile statusFile = _status.Open(deploymentInfo.TargetChangeset.Id, _environment);
                             if (statusFile != null)
                             {
                                 statusFile.MarkFailed();
@@ -280,7 +280,7 @@ await _deploymentManager.DeployAsync(
 
             if (lastChange != null && PostDeploymentHelper.IsAutoSwapEnabled())
             {
-                IDeploymentStatusFile statusFile = _status.Open(lastChange.Id);
+                IDeploymentStatusFile statusFile = _status.Open(lastChange.Id, _environment);
                 if (statusFile.Status == DeployStatus.Success)
                 {
                     // if last change is not null and finish successfully, mean there was at least one deployoment happened
diff --git a/Kudu.Core/Deployment/ProgressLogger.cs b/Kudu.Core/Deployment/ProgressLogger.cs
index f68c0a09..c1057bb3 100644
--- a/Kudu.Core/Deployment/ProgressLogger.cs
+++ b/Kudu.Core/Deployment/ProgressLogger.cs
@@ -7,17 +7,19 @@ public class ProgressLogger : ILogger
         private readonly string _id;
         private readonly IDeploymentStatusManager _status;
         private readonly ILogger _innerLogger;
+        private readonly IEnvironment _environment;
 
-        public ProgressLogger(string id, IDeploymentStatusManager status, ILogger innerLogger)
+        public ProgressLogger(string id, IDeploymentStatusManager status, ILogger innerLogger, IEnvironment environment)
         {
             _id = id;
             _status = status;
             _innerLogger = innerLogger;
+            _environment = environment;
         }
 
         public ILogger Log(string value, LogEntryType type)
         {
-            IDeploymentStatusFile statusFile = _status.Open(_id);
+            IDeploymentStatusFile statusFile = _status.Open(_id, _environment);
             if (statusFile != null)
             {
                 statusFile.UpdateProgress(value);
diff --git a/Kudu.Services/Deployment/DeploymentController.cs b/Kudu.Services/Deployment/DeploymentController.cs
index 21f13ca9..931d24b9 100644
--- a/Kudu.Services/Deployment/DeploymentController.cs
+++ b/Kudu.Services/Deployment/DeploymentController.cs
@@ -235,7 +235,7 @@ await _deploymentLock.LockOperationAsync(async () =>
                                     changeSet = repository.GetChangeSet(targetBranch);
                                 }
 
-                                IDeploymentStatusFile statusFile = _status.Open(changeSet.Id);
+                                IDeploymentStatusFile statusFile = _status.Open(changeSet.Id, _environment);
                                 if (statusFile != null && statusFile.Status == DeployStatus.Success)
                                 {
                                     await PostDeploymentHelper.PerformAutoSwap(
@@ -267,14 +267,14 @@ public IActionResult CreateDeployment(DeployResult deployResult, string details)
         {
             var id = deployResult.Id;
             string path = Path.Combine(_environment.DeploymentsPath, id);
-            IDeploymentStatusFile statusFile = _status.Open(id);
+            IDeploymentStatusFile statusFile = _status.Open(id, _environment);
             if (statusFile != null)
             {
                 return StatusCode(StatusCodes.Status409Conflict, String.Format("Deployment with id '{0}' exists", id));
             }
 
             FileSystemHelpers.EnsureDirectory(path);
-            statusFile = _status.Create(id);
+            statusFile = _status.Create(id, _environment);
             statusFile.Status = deployResult.Status;
             statusFile.Message = deployResult.Message;
             statusFile.Deployer = deployResult.Deployer;
@@ -410,7 +410,7 @@ public IActionResult GetDeployResults()
             {
                 using (_tracer.Step("DeploymentService.GetDeployResults"))
                 {
-                    if (!currentEtag.Equals(cachedDeployments.Etag))
+                    if (!currentEtag.Equals(cachedDeployments.Etag) || PostDeploymentHelper.IsK8Environment())
                     {
                         cachedDeployments = new DeploymentsCacheItem
                         {
diff --git a/Kudu.Services/FetchHelpers/DropboxHelper.cs b/Kudu.Services/FetchHelpers/DropboxHelper.cs
index a95216b9..407688a6 100644
--- a/Kudu.Services/FetchHelpers/DropboxHelper.cs
+++ b/Kudu.Services/FetchHelpers/DropboxHelper.cs
@@ -197,7 +197,7 @@ internal async Task<ChangeSet> Sync(DropboxInfo dropboxInfo, string branch, IRep
 
                 Logger.Log(String.Format("{0} downloaded files, {1} successful retries.", _fileCount, _retriedCount));
 
-                IDeploymentStatusFile statusFile = _status.Open(dropboxInfo.TargetChangeset.Id);
+                IDeploymentStatusFile statusFile = _status.Open(dropboxInfo.TargetChangeset.Id, _environment);
                 statusFile.UpdateMessage(message);
                 statusFile.UpdateProgress(String.Format(CultureInfo.CurrentCulture, Resources.Dropbox_Committing, _successCount));
 
@@ -446,7 +446,7 @@ private string GetRepositoryPath(string parent, string path)
         private void UpdateStatusFile(object state)
         {
             string changeset = (string)state;
-            IDeploymentStatusFile statusFile = _status.Open(changeset);
+            IDeploymentStatusFile statusFile = _status.Open(changeset, _environment);
             statusFile.UpdateProgress(String.Format(CultureInfo.CurrentCulture,
                                         _failedCount == 0 ? Resources.Dropbox_SynchronizingProgress : Resources.Dropbox_SynchronizingProgressWithFailure,
                                         ((_successCount + _failedCount) * 100) / _totals,
diff --git a/Kudu.Services/FetchHelpers/OneDriveHelper.cs b/Kudu.Services/FetchHelpers/OneDriveHelper.cs
index 34afbe36..72373212 100644
--- a/Kudu.Services/FetchHelpers/OneDriveHelper.cs
+++ b/Kudu.Services/FetchHelpers/OneDriveHelper.cs
@@ -129,7 +129,7 @@ internal async Task<ChangeSet> Sync(OneDriveInfo info, IRepository repository, I
         private void UpdateStatusFile(object state)
         {
             string changeset = (string)state;
-            IDeploymentStatusFile statusFile = _status.Open(changeset);
+            IDeploymentStatusFile statusFile = _status.Open(changeset, _environment);
             statusFile.UpdateProgress(string.Format(CultureInfo.CurrentCulture,
                                         _failedCount == 0 ? Resources.OneDrive_SynchronizingProgress : Resources.OneDrive_SynchronizingProgressWithFailure,
                                         ((_successCount + _failedCount) * 100) / _totals,
@@ -215,7 +215,7 @@ private async Task<ChangesResult> GetChanges(string changeset, string accessToke
             requestUri = string.Format(CultureInfo.InvariantCulture, "{0}/{1}", await GetItemUri(accessToken, requestUri, rootUri), "view.changes");
 
             ChangesResult result = new ChangesResult();
-            IDeploymentStatusFile statusFile = _status.Open(changeset);
+            IDeploymentStatusFile statusFile = _status.Open(changeset, _environment);
             var loop = 0;
             using (var client = CreateHttpClient(accessToken))
             {

From 0270fd2849dda7d66606c123cfbfba9042a1ac6a Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 02:01:53 -0800
Subject: [PATCH 198/245] Added restart triggers for K8 Pods

---
 Kudu.Core/Deployment/DeploymentManager.cs     | 32 +++++++++++++++----
 .../DockerContainerRestartTrigger.cs          | 22 +++++++++++++
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 8a1d65f7..09f5c3d9 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -224,14 +224,18 @@ public async Task DeployAsync(
                         FileSystemHelpers.DeleteFileSafe(logPath);
 
                         statusFile = GetOrCreateStatusFile(changeSet, tracer, deployer);
+                        Console.WriteLine("Before MarkPending");
+
                         statusFile.MarkPending();
 
                         ILogger logger = GetLogger(changeSet.Id);
+                        Console.WriteLine("GetLogger");
 
                         if (needFileUpdate)
                         {
                             using (tracer.Step("Updating to specific changeset"))
                             {
+                                
                                 innerLogger = logger.Log(Resources.Log_UpdatingBranch, targetBranch ?? id);
 
                                 using (var writer = new ProgressWriter())
@@ -264,17 +268,30 @@ public async Task DeployAsync(
                         // set to null as Build() below takes over logging
                         innerLogger = null;
 
-                        // Perform the build deployment of this changeset
-                        await Build(changeSet, tracer, deployStep, repository, deploymentInfo, deploymentAnalytics, fullBuildByDefault);
+                    Console.WriteLine("Before build");
+                    // Perform the build deployment of this changeset
+                    await Build(changeSet, tracer, deployStep, repository, deploymentInfo, deploymentAnalytics, fullBuildByDefault);
 
-                        if (!(OSDetector.IsOnWindows() && 
+                        if ((!(OSDetector.IsOnWindows() && 
                               !EnvironmentHelper.IsWindowsContainers()) && 
-                            _settings.RestartAppContainerOnGitDeploy())
+                            _settings.RestartAppContainerOnGitDeploy()) ||
+                            PostDeploymentHelper.IsK8Environment())
                         {
-                            logger.Log(Resources.Log_TriggeringContainerRestart);
-                            DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason);
-                        }
+                            if(PostDeploymentHelper.IsK8Environment())
+                            {
+                                logger.Log($"Restarting pods!");
+                            }
+                        else
+                            {
+                               logger.Log(Resources.Log_TriggeringContainerRestart);
+                            }
+                        string appName = _environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0]; ;
+
+                        DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason);
+                        logger.Log($"Deployment Pod Rollout Started! Use kubectl watch deplotment {appName} to monitor the rollout status");
+
                     }
+                }
                     catch (Exception ex)
                     {
                         exception = ex;
@@ -587,6 +604,7 @@ private async Task Build(
 
             try
             {
+                Console.WriteLine("Build.");
                 logger = GetLogger(id);
                 ILogger innerLogger = logger.Log(Resources.Log_PreparingDeployment, TrimId(id));
 
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index 5b4e1ec0..8f7561d6 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using Kudu.Core.Helpers;
@@ -22,6 +23,27 @@ public static class DockerContainerRestartTrigger
 
         public static void RequestContainerRestart(IEnvironment environment, string reason)
         {
+            if(PostDeploymentHelper.IsK8Environment())
+            {
+                string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0]; ;
+                Process _executingProcess = new Process()
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = "/bin/bash",
+                        Arguments = $"-c \" /patch.sh {appName} apps/{appName}/site/artifacts/{environment.CurrId}\"",
+                        RedirectStandardOutput = true,
+                        UseShellExecute = false,
+                        CreateNoWindow = true,
+                    }
+                };
+                // Read the standard error of net.exe and write it on to console.
+                _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
+                _executingProcess.Start();
+                _executingProcess.WaitForExit();
+                return;
+            }
+
             if (OSDetector.IsOnWindows() && !EnvironmentHelper.IsWindowsContainers())
             {
                 throw new NotSupportedException("RequestContainerRestart is only supported on Linux and Windows Containers");

From 329bf2a8103b7c206d527faf7ddfd1caec840e4f Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 02:45:59 -0800
Subject: [PATCH 199/245] Some tracing

---
 Kudu.Contracts/Settings/DeploymentSettingsExtension.cs | 5 +++--
 Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs   | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs b/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
index 552d562e..56256ee1 100644
--- a/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
+++ b/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.SourceControl;
+using Kudu.Contracts.Tracing;
 
 namespace Kudu.Contracts.Settings
 {
@@ -242,10 +243,10 @@ public static bool RestartAppContainerOnGitDeploy(this IDeploymentSettingsManage
             return value == null || StringUtils.IsTrueLike(value);
         }
 
-        public static bool DoBuildDuringDeployment(this IDeploymentSettingsManager settings)
+        public static bool DoBuildDuringDeployment(this IDeploymentSettingsManager settings, ITracer tracer)
         {
             string value = settings.GetValue(SettingsKeys.DoBuildDuringDeployment);
-
+            tracer.Trace("DoBuildDuringDeployment value : "+value);
             // A default value should be set on a per-deployment basis depending on the context, but
             // returning true by default here as an indicator of generally expected behavior
             return value == null || StringUtils.IsTrueLike(value);
diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index 2b54e329..ffde5675 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -57,9 +57,12 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
             {
                 return new RunFromZipSiteBuilder();
             }
-            
+
+            tracer.Trace("Checking if build enabled: ");
+
             if (!settings.DoBuildDuringDeployment())
             {
+                tracer.Trace("Nope build is off");
                 var projectPath = !String.IsNullOrEmpty(targetProjectPath) ? targetProjectPath : repositoryRoot;
                 return new BasicBuilder(_environment, settings, _propertyProvider, repositoryRoot, projectPath);
             }
@@ -73,6 +76,9 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
                 }
             }
 
+            tracer.Trace("After Oryx determination.");
+
+
             if (!String.IsNullOrEmpty(targetProjectPath))
             {
                 // Try to resolve the project

From 0ed099e2d306a312355d22fb7e8e6a35721ccbcd Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 03:16:19 -0800
Subject: [PATCH 200/245] Modified basic builder

---
 .../Settings/DeploymentSettingsExtension.cs   |  3 +-
 Kudu.Core/Deployment/DeploymentManager.cs     |  5 +-
 .../Deployment/Generator/BasicBuilder.cs      | 53 +++++++++++++++++++
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs b/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
index 56256ee1..4a467c90 100644
--- a/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
+++ b/Kudu.Contracts/Settings/DeploymentSettingsExtension.cs
@@ -243,10 +243,9 @@ public static bool RestartAppContainerOnGitDeploy(this IDeploymentSettingsManage
             return value == null || StringUtils.IsTrueLike(value);
         }
 
-        public static bool DoBuildDuringDeployment(this IDeploymentSettingsManager settings, ITracer tracer)
+        public static bool DoBuildDuringDeployment(this IDeploymentSettingsManager settings)
         {
             string value = settings.GetValue(SettingsKeys.DoBuildDuringDeployment);
-            tracer.Trace("DoBuildDuringDeployment value : "+value);
             // A default value should be set on a per-deployment basis depending on the context, but
             // returning true by default here as an indicator of generally expected behavior
             return value == null || StringUtils.IsTrueLike(value);
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 09f5c3d9..0cb25329 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -215,6 +215,7 @@ public async Task DeployAsync(
                     }
 
                     string id = changeSet.Id;
+                    _environment.CurrId = id;
                     IDeploymentStatusFile statusFile = null;
                     try
                     {
@@ -224,13 +225,10 @@ public async Task DeployAsync(
                         FileSystemHelpers.DeleteFileSafe(logPath);
 
                         statusFile = GetOrCreateStatusFile(changeSet, tracer, deployer);
-                        Console.WriteLine("Before MarkPending");
 
                         statusFile.MarkPending();
 
                         ILogger logger = GetLogger(changeSet.Id);
-                        Console.WriteLine("GetLogger");
-
                         if (needFileUpdate)
                         {
                             using (tracer.Step("Updating to specific changeset"))
@@ -268,7 +266,6 @@ public async Task DeployAsync(
                         // set to null as Build() below takes over logging
                         innerLogger = null;
 
-                    Console.WriteLine("Before build");
                     // Perform the build deployment of this changeset
                     await Build(changeSet, tracer, deployStep, repository, deploymentInfo, deploymentAnalytics, fullBuildByDefault);
 
diff --git a/Kudu.Core/Deployment/Generator/BasicBuilder.cs b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
index 933749ad..cee86f40 100644
--- a/Kudu.Core/Deployment/Generator/BasicBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
@@ -1,12 +1,65 @@
 using Kudu.Contracts.Settings;
+using Kudu.Core.Deployment.Oryx;
+using System;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace Kudu.Core.Deployment.Generator
 {
     public class BasicBuilder : BaseBasicBuilder
     {
+        IEnvironment _environment;
         public BasicBuilder(IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string repositoryPath, string projectPath)
             : base(environment, settings, propertyProvider, repositoryPath, projectPath, "--basic")
         {
+            _environment = environment;
+        }
+
+        public override Task Build(DeploymentContext context)
+        {
+            ILogger customLogger = context.Logger.Log("In K8 Basic Builder");
+            context.Logger.Log("RepositoryPath "+ _environment.RepositoryPath);
+            context.Logger.Log("SiteRootPath " + _environment.SiteRootPath);
+            context.Logger.Log("CurrId "+ _environment.CurrId);
+            string src = _environment.RepositoryPath;
+            string artifactDir = Path.Combine(_environment.SiteRootPath, "atifacts", _environment.CurrId);
+            context.Logger.Log($"src : {src} dest {artifactDir}");
+            return Task.Factory.StartNew(() => PackageArtifactFromFolder(context, _environment.RepositoryPath, Path.Combine(_environment.SiteRootPath, "atifacts", _environment.CurrId),"artifact.zip" ,BuildArtifactType.Squashfs, 2));
+        }
+
+
+        private string PackageArtifactFromFolder(DeploymentContext context, string srcDirectory, string artifactDirectory, string artifactFilename, BuildArtifactType artifactType, int numBuildArtifacts = 0)
+        {
+            context.Logger.Log($"Writing the artifacts to {artifactType.ToString()} file at {artifactDirectory}");
+            string file = Path.Combine(artifactDirectory, artifactFilename);
+            var exe = ExternalCommandFactory.BuildExternalCommandExecutable(srcDirectory, artifactDirectory, context.Logger);
+            try
+            {
+                switch (artifactType)
+                {
+                    case BuildArtifactType.Zip:
+                        exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"zip -r -0 -q {file} .");
+                        break;
+                    case BuildArtifactType.Squashfs:
+                        exe.ExecuteWithProgressWriter(context.Logger, context.Tracer, $"mksquashfs . {file} -noappend");
+                        break;
+                    default:
+                        throw new ArgumentException($"Received unknown file extension {artifactType.ToString()}");
+                }
+            }
+            catch (Exception)
+            {
+                context.GlobalLogger.LogError();
+                throw;
+            }
+
+            // Just to be sure that we don't keep adding build artifacts here
+            if (numBuildArtifacts > 0)
+            {
+                DeploymentHelper.PurgeBuildArtifactsIfNecessary(artifactDirectory, artifactType, context.Tracer, numBuildArtifacts);
+            }
+
+            return file;
         }
 
         public override string ProjectType

From 0816c6be566e675a791bffda1d706d1552bd1a49 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 08:24:36 -0800
Subject: [PATCH 201/245] Express Build changes

---
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 7751f3e4..5e52428e 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -2,6 +2,7 @@
 using Kudu.Core.Deployment.Generator;
 using Kudu.Core.Infrastructure;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -28,20 +29,22 @@ public void SetupExpressBuilderArtifacts(string outputPath, DeploymentContext co
                 return;
             }
 
-            string sitePackagesDir = "/home/data/SitePackages";
-            string packageNameFile = Path.Combine(sitePackagesDir, "packagename.txt");
-            string packagePathFile = Path.Combine(sitePackagesDir, "packagepath.txt");
+            //string sitePackagesDir = "/home/data/SitePackages";
+            //string packageNameFile = Path.Combine(sitePackagesDir, "packagename.txt");
+            //string packagePathFile = Path.Combine(sitePackagesDir, "packagepath.txt");
 
-            FileSystemHelpers.EnsureDirectory(sitePackagesDir);
+            //FileSystemHelpers.EnsureDirectory(sitePackagesDir);
 
-            string packageName = "";
+            //string packageName = "";
 
+            SetupK8Artifacts(context, outputPath);
+            /*
             if(args.Language == Framework.NodeJs)
             {
                 // For App service express mode
                 // Generate packagename.txt and packagepath
                 //packageName = "node_modules.zip:/node_modules";
-                SetupNodeAppExpressArtifacts(context, sitePackagesDir, outputPath);
+                //SetupNodeAppExpressArtifacts(context, sitePackagesDir, outputPath);
             }
             else if(args.Language == Framework.Python)
             {
@@ -56,6 +59,7 @@ public void SetupExpressBuilderArtifacts(string outputPath, DeploymentContext co
 
             File.WriteAllText(packageNameFile, packageName);
             File.WriteAllText(packagePathFile, outputPath);
+            */
         }
 
         private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string sitePackages,string outputPath)
@@ -74,9 +78,9 @@ private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string
         }
 
 
-        private string SetupNodeAppExpressArtifacts(DeploymentContext context, string sitePackages, string outputPath)
+        private string SetupK8Artifacts(DeploymentContext context, string outputPath)
         {
-            context.Logger.Log($"Express Build enabled for Node app");
+            context.Logger.Log($"Building for K8.");
 
             // Create NetCore Zip at tm build folder where artifact were build and copy it to sitePackages, .GetBranch()
             string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
@@ -85,10 +89,6 @@ private string SetupNodeAppExpressArtifacts(DeploymentContext context, string si
             FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "/../artifacts/");
             FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "/../artifacts/" + environment.CurrId);
             string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, environment.RepositoryPath +"/../artifacts/" +environment.CurrId, zipAppName, BuildArtifactType.Squashfs, numBuildArtifacts: -1);
-
-            // Remove the old zips
-            DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);
-
             return zipAppName;
         }
 

From 0bd7f8e9d3a627f923e5d103c873b9dd8e78b881 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 11:59:31 -0800
Subject: [PATCH 202/245] Adding a default app for testing in KubeMiddleware

---
 Kudu.Services.Web/KubeMiddleware.cs | 37 ++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 92396554..32878d1b 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -48,15 +48,27 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
                 return;
             }
 
-            foreach(var header in context.Request.Headers)
+            var host = context.Request.Headers["Host"].ToString();
+            Console.WriteLine("HOST: "+host);
+            var appName = "";
+
+            if (host.IndexOf(".") <= 0)
             {
-                Console.WriteLine($"{header.Key} : {header.Value}");
+                appName = "test1";
+            }
+            else
+            {
+                try
+                {
+                    int res = Int32.Parse(host.Substring(0, host.IndexOf(".")));
+                    appName = "test1";
+                }
+                catch (FormatException)
+                {
+                    appName = host.Substring(0, host.IndexOf("."));
+                }
             }
 
-            var host = context.Request.Headers["Host"].ToString();
-            Console.WriteLine("HOST: "+host);
-            var appName = host.Substring(0, host.IndexOf("."));
-            //var appName = "test1";
             Console.WriteLine("AppName: " + appName);
             string homeDir = "";
             string siteRepoDir = "";
@@ -71,10 +83,6 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
                 siteRepoDir = "/site/repository";
             }
 
-            //Console.WriteLine("APP : " + appName);
-            //appName = "test1";
-
-
             context.Items.Add("environment", GetEnvironment(homeDir, appName));
 
 
@@ -116,7 +124,7 @@ private static IEnvironment GetEnvironment(
             IDeploymentSettingsManager settings = null,
             HttpContext httpContext = null)
         {
-            var root = KubeMiddleware.ResolveRootPath(appName);
+            var root = KubeMiddleware.ResolveRootPath(home, appName);
             var siteRoot = Path.Combine(root, Constants.SiteFolder);
             var repositoryPath = Path.Combine(siteRoot,
                 settings == null ? Constants.RepositoryPath : settings.GetRepositoryPath());
@@ -128,11 +136,12 @@ private static IEnvironment GetEnvironment(
                 kuduConsoleFullPath, null);
         }
 
-        public static string ResolveRootPath(string appName)
+        public static string ResolveRootPath(string home, string appName)
         {
             // The HOME path should always be set correctly
-            var path = System.Environment.ExpandEnvironmentVariables(@"%HOME%");
-            path = Path.Combine(path, "apps", appName);
+            //var path = System.Environment.ExpandEnvironmentVariables(@"%HOME%");
+            var path = home + appName;
+            Console.WriteLine("Checking site home : " + (home + appName));
             if (!Directory.Exists(path))
                 // We should never get here
                 throw new DirectoryNotFoundException("The site's home directory could not be located");

From f6da0fbe1d52706988af97fb2429c3eafdb40945 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 16:49:45 -0800
Subject: [PATCH 203/245] Fixed Zip Deploy support

---
 Kudu.Console/Program.cs                       |  6 +-
 .../Deployment/FetchDeploymentManager.cs      |  2 +-
 .../Deployment/Generator/BasicBuilder.cs      |  6 +-
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  2 +-
 .../Generator/SiteBuilderFactory.cs           | 21 ++++-
 .../Oryx/AppServiceOryxArguments.cs           | 36 +++++++-
 .../Oryx/FunctionAppOryxArguments.cs          |  2 +-
 Kudu.Core/Deployment/Oryx/IOryxArguments.cs   |  2 +-
 ...inuxConsumptionFunctionAppOryxArguments.cs |  2 +-
 Kudu.Services.Web/KubeMiddleware.cs           |  7 +-
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    | 82 ++++++++++---------
 11 files changed, 117 insertions(+), 51 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 2704a3d0..3e573f93 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -134,7 +134,7 @@ private static int PerformDeploy(
             IOperationLock hooksLock = new LockFile(hooksLockPath, traceFactory);
             
             IBuildPropertyProvider buildPropertyProvider = new BuildPropertyProvider();
-            ISiteBuilderFactory builderFactory = new SiteBuilderFactory(buildPropertyProvider, env);
+            ISiteBuilderFactory builderFactory = new SiteBuilderFactory(buildPropertyProvider, env, null);
             var logger = new ConsoleLogger();
 
             IRepository gitRepository;
@@ -179,6 +179,7 @@ private static int PerformDeploy(
             {
                 try
                 {
+                    System.Console.WriteLine("deploymentTask");
                     // although the api is called DeployAsync, most expensive works are done synchronously.
                     // need to launch separate task to go async explicitly (consistent with FetchDeploymentManager)
                     var deploymentTask = Task.Run(async () => await deploymentManager.DeployAsync(gitRepository, changeSet: null, deployer: deployer, clean: false));
@@ -205,6 +206,7 @@ private static int PerformDeploy(
                 }
                 catch (Exception e)
                 {
+                    System.Console.WriteLine(e.InnerException);
                     tracer.TraceError(e);
                     System.Console.Error.WriteLine(e.GetBaseException().Message);
                     System.Console.Error.WriteLine(Resources.Log_DeploymentError);
@@ -253,6 +255,7 @@ private static int PerformDeploy(
                         }
                     }
 
+                    /*
                     Process _executingProcess = new Process()
                     {
                         StartInfo = new ProcessStartInfo
@@ -270,6 +273,7 @@ private static int PerformDeploy(
                     _executingProcess.Start();
                     _executingProcess.WaitForExit();
                     System.Console.WriteLine("Deployment Rollout Started!");
+                    */
                     System.Console.WriteLine("Deployment Logs : '"+
                     env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
                     gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
diff --git a/Kudu.Core/Deployment/FetchDeploymentManager.cs b/Kudu.Core/Deployment/FetchDeploymentManager.cs
index cb27b1c9..d1a12f5b 100644
--- a/Kudu.Core/Deployment/FetchDeploymentManager.cs
+++ b/Kudu.Core/Deployment/FetchDeploymentManager.cs
@@ -349,7 +349,7 @@ public static async Task<bool> PerformBackgroundDeployment(
 
                     var analytics = new Analytics(settings, new ServerConfiguration(), traceFactory);
                     var deploymentStatusManager = new DeploymentStatusManager(environment, analytics, statusLock);
-                    var siteBuilderFactory = new SiteBuilderFactory(new BuildPropertyProvider(), environment);
+                    var siteBuilderFactory = new SiteBuilderFactory(new BuildPropertyProvider(), environment, _httpContextAccessor);
                     var webHooksManager = new WebHooksManager(tracer, environment, hooksLock);
                     var deploymentManager = new DeploymentManager(siteBuilderFactory, environment, traceFactory, analytics, settings, deploymentStatusManager, deploymentLock, NullLogger.Instance, webHooksManager, _httpContextAccessor);
                     var fetchDeploymentManager = new FetchDeploymentManager(settings, environment, tracer, deploymentLock, deploymentManager, deploymentStatusManager, _httpContextAccessor);
diff --git a/Kudu.Core/Deployment/Generator/BasicBuilder.cs b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
index cee86f40..5143d93a 100644
--- a/Kudu.Core/Deployment/Generator/BasicBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
@@ -18,13 +18,13 @@ public BasicBuilder(IEnvironment environment, IDeploymentSettingsManager setting
         public override Task Build(DeploymentContext context)
         {
             ILogger customLogger = context.Logger.Log("In K8 Basic Builder");
-            context.Logger.Log("RepositoryPath "+ _environment.RepositoryPath);
+            context.Logger.Log("RepositoryPath "+ _environment.ZipTempPath);
             context.Logger.Log("SiteRootPath " + _environment.SiteRootPath);
-            context.Logger.Log("CurrId "+ _environment.CurrId);
+            //context.Logger.Log("CurrId "+ _environment.);
             string src = _environment.RepositoryPath;
             string artifactDir = Path.Combine(_environment.SiteRootPath, "atifacts", _environment.CurrId);
             context.Logger.Log($"src : {src} dest {artifactDir}");
-            return Task.Factory.StartNew(() => PackageArtifactFromFolder(context, _environment.RepositoryPath, Path.Combine(_environment.SiteRootPath, "atifacts", _environment.CurrId),"artifact.zip" ,BuildArtifactType.Squashfs, 2));
+            return Task.Factory.StartNew(() => PackageArtifactFromFolder(context, _environment.ZipTempPath, Path.Combine(_environment.SiteRootPath, "atifacts", _environment.CurrId),"artifact.zip" ,BuildArtifactType.Squashfs, 2));
         }
 
 
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 2f0a7d8d..2f04e6e3 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -55,7 +55,7 @@ public override Task Build(DeploymentContext context)
             {
                 PreOryxBuild(context);
 
-                string buildCommand = args.GenerateOryxBuildCommand(context);
+                string buildCommand = args.GenerateOryxBuildCommand(context, environment);
                 RunCommand(context, buildCommand, false, "Running oryx build...");
 
                 //
diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index ffde5675..a0986870 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -6,9 +6,11 @@
 using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.Settings;
 using Kudu.Contracts.Tracing;
+using Kudu.Core.Helpers;
 using Kudu.Core.Infrastructure;
 using Kudu.Core.SourceControl;
 using Kudu.Core.Tracing;
+using Microsoft.AspNetCore.Http;
 
 namespace Kudu.Core.Deployment.Generator
 {
@@ -17,10 +19,25 @@ public class SiteBuilderFactory : ISiteBuilderFactory
         private readonly IEnvironment _environment;
         private readonly IBuildPropertyProvider _propertyProvider;
 
-        public SiteBuilderFactory(IBuildPropertyProvider propertyProvider, IEnvironment environment)
+        public SiteBuilderFactory(IBuildPropertyProvider propertyProvider, IEnvironment environment, IHttpContextAccessor accessor)
         {
             _propertyProvider = propertyProvider;
-            _environment = environment;
+            _environment = GetEnvironment(accessor, environment);
+        }
+
+        private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
+        {
+            IEnvironment _environment;
+            if (!PostDeploymentHelper.IsK8Environment() || accessor==null)
+            {
+                _environment = environment;
+            }
+            else
+            {
+                var context = accessor.HttpContext;
+                _environment = (IEnvironment)context.Items["environment"];
+            }
+            return _environment;
         }
 
         public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSettingsManager settings, IRepository repository)
diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 3fe05066..b1f2b503 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using k8s;
 using Kudu.Core.Deployment.Oryx;
+using Kudu.Core.Helpers;
 using LibGit2Sharp;
 
 namespace Kudu.Core.Deployment
@@ -109,8 +111,40 @@ private void SetVirtualEnvironment()
             VirtualEnv = virtualEnvName;
         }
 
-        public string GenerateOryxBuildCommand(DeploymentContext context)
+        public string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment environment)
         {
+            string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
+
+            if (PostDeploymentHelper.IsK8Environment())
+            {
+                var config = KubernetesClientConfiguration.InClusterConfig();
+                var client = new Kubernetes(config);
+
+                var deployment = client.ReadNamespacedDeployment(appName, "default");
+                foreach(var container in deployment.Spec.Template.Spec.Containers)
+                {
+                    if (container.Name.Equals(appName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        foreach(var env in container.Env)
+                        {
+                            if(env.Name.Equals("FRAMEWORK", StringComparison.OrdinalIgnoreCase))
+                            {
+                                Language = SupportedFrameworks.ParseLanguage(env.Value);
+                                if (Language == Framework.DotNETCore)
+                                {
+                                    // Skip kudu sync for .NET core builds
+                                    SkipKuduSync = true;
+                                }
+                            }
+                            else if(env.Name.Equals("FRAMEWORK_VERSION", StringComparison.OrdinalIgnoreCase))
+                            {
+                                Version = env.Value;
+                            }
+                        }
+                    }
+                }
+            }
+
             StringBuilder args = new StringBuilder();
             // Language
             switch (Language)
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index a84d6ed7..30a1eb2d 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -27,7 +27,7 @@ public FunctionAppOryxArguments()
             SkipKuduSync = Flags == BuildOptimizationsFlags.UseExpressBuild;
         }
 
-        public virtual string GenerateOryxBuildCommand(DeploymentContext context)
+        public virtual string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment environment)
         {
             StringBuilder args = new StringBuilder();
 
diff --git a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
index a0106cbb..a1ed26c3 100644
--- a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
@@ -12,7 +12,7 @@ public interface IOryxArguments
 
         bool SkipKuduSync { get; set; }
 
-        string GenerateOryxBuildCommand(DeploymentContext context);
+        string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment environment);
 
         string Version { get; set; }
 
diff --git a/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
index 1c377554..62677d7a 100644
--- a/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
@@ -12,7 +12,7 @@ public LinuxConsumptionFunctionAppOryxArguments() : base()
             Flags = BuildOptimizationsFlags.Off;
         }
 
-        public override string GenerateOryxBuildCommand(DeploymentContext context)
+        public override string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment environment)
         {
             StringBuilder args = new StringBuilder();
 
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 32878d1b..819d7366 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -10,6 +10,7 @@
 using System.Text;
 using Kudu.Core.Helpers;
 using System.IO;
+using System.Net.Http.Headers;
 
 namespace Kudu.Services.Web
 {
@@ -61,7 +62,11 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
                 try
                 {
                     int res = Int32.Parse(host.Substring(0, host.IndexOf(".")));
-                    appName = "test1";
+                    var authHeader = AuthenticationHeaderValue.Parse(context.Request.Headers["Authorization"]);
+                    var credentialBytes = Convert.FromBase64String(authHeader.Parameter);
+                    var credentials = Encoding.UTF8.GetString(credentialBytes).Split(new[] { ':' }, 2);
+                    var username = credentials[0];
+                    appName = username;
                 }
                 catch (FormatException)
                 {
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index d06f08a9..e9f0937a 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -1,9 +1,12 @@
 
 @page
 @using Kudu.Core.Deployment
+
+@using Kudu.Core
 @using Microsoft.AspNetCore.Hosting
 @inject IHostingEnvironment hostingEnvironment
 @inject IDeploymentManager deploymentManager
+@inject Microsoft.AspNetCore.Http.IHttpContextAccessor accessor
 
 @{
     ViewBag.Title = "title";
@@ -11,7 +14,9 @@
 }
 
 <style>
-    .bg-grad { background-image: linear-gradient(to right, #06B0BA, #2F3B61); }
+    .bg-grad {
+        background-image: linear-gradient(to right, #06B0BA, #2F3B61);
+    }
 </style>
 
 <script type="text/javascript">
@@ -45,18 +50,21 @@
     <div class="row border-between">
         <div class="col-md-7">
             <div class="row align-middle" style="margin-left: 1px">
-                <h3>Kudu<span style="font-weight: 200">Lite</span></h3>@version</div>
-            <small>Site UpTime: <i class="fas fa-circle" style="color: #26C281; font-size: x-small; margin-right: 5px"></i>@Tracing.TraceMiddleware.UpTime.ToString(@"dd\.hh\:mm\:ss") | Site Folder: @PathResolver.ResolveRootPath() | Temp Folder: @System.IO.Path.GetTempPath()</small>
-            <br> <small onclick="clickLink(this)" id="curr-instance" title="@workerIdHash">Kudu Attached to Instance: &nbsp;<i class="fas fa-desktop fa-style"></i>&nbsp;<a href="#">@workerIdShortHash </a>| <span class="dropdown">
-                <button class="btn btn-sm dropdown-toggle" type="button" style="background-color: rgb(244, 245, 247);border: none" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <i class="fas fa-network-wired fa-style text-sm"></i> <a href="#"> Switch Instance</a>
-                </button>
-                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                    <a class="dropdown-item" href="#">Instance 1</a>
-                    <a class="dropdown-item" href="#">Instance 2</a>
-                    <a class="dropdown-item" href="#">Instance 3</a>
-                </div>
-            </span> </small>
+                <h3>Kudu<span style="font-weight: 200">Lite</span></h3>@version
+            </div>
+            <small>Site UpTime: <i class="fas fa-circle" style="color: #26C281; font-size: x-small; margin-right: 5px"></i>@Tracing.TraceMiddleware.UpTime.ToString(@"dd\.hh\:mm\:ss") | Site Folder: @(((IEnvironment)accessor.HttpContext.Items["environment"]).SiteRootPath) | Temp Folder: @System.IO.Path.GetTempPath()</small>
+            <br> <small onclick="clickLink(this)" id="curr-instance" title="@workerIdHash">
+                Kudu Attached to Instance: &nbsp;<i class="fas fa-desktop fa-style"></i>&nbsp;<a href="#">@workerIdShortHash </a>| <span class="dropdown">
+                    <button class="btn btn-sm dropdown-toggle" type="button" style="background-color: rgb(244, 245, 247);border: none" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <i class="fas fa-network-wired fa-style text-sm"></i> <a href="#"> Switch Instance</a>
+                    </button>
+                    <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                        <a class="dropdown-item" href="#">Instance 1</a>
+                        <a class="dropdown-item" href="#">Instance 2</a>
+                        <a class="dropdown-item" href="#">Instance 3</a>
+                    </div>
+                </span>
+            </small>
         </div>
         <div class="col-md-5" id="is-deploying-banner" style="display: none">
             <div>
@@ -73,9 +81,9 @@
             <div class="progress" style="margin-left: 15px; margin-right: 10px">
                 <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%; background-color: #26C281"></div>
             </div>
-        </div>     
+        </div>
         <div class="col-md-5" id="just-deployed-banner" style="display: none">
-            
+
             <div class="col-md-10 row-fluid">
                 <h6 style="font-weight: 400; margin-bottom: -10px">
                     Deployment &nbsp;
@@ -112,10 +120,10 @@
             <div class="container" style="height: 100%; width: 100%; display: flex; align-items: center; vertical-align: middle">
                 <div class="row col-md-12 col-sm-12">
                     <div class="col-lg-6 col-md-12 col-sm-12 mb-10 mt-10 text-center">
-                            <button type="button" onclick="location.href = 'https://go.microsoft.com/fwlink/?linkid=2084231';" class="btn btn-primary btn-sm"><i class="fas fa-cloud-upload-alt"></i>Deploy your first app</button>      
+                        <button type="button" onclick="location.href = 'https://go.microsoft.com/fwlink/?linkid=2084231';" class="btn btn-primary btn-sm"><i class="fas fa-cloud-upload-alt"></i>Deploy your first app</button>
                     </div>
                     <div class="col-lg-6 col-sm-12 col-md-12 mb-10 mt-10 d-xs-none d-sm-none d-md-block text-center">
-                            <button type="button"  onclick="location.href = 'https://docs.microsoft.com/en-us/visualstudio/ide/quickstart-nodejs?view=vs-2019';" class="btn bkg-light-gray border-0 btn-sm"><i class="fas fa-cloud-upload-alt"></i> Learn Node <i class="fab fa-node-js"></i> Development</button>
+                        <button type="button" onclick="location.href = 'https://docs.microsoft.com/en-us/visualstudio/ide/quickstart-nodejs?view=vs-2019';" class="btn bkg-light-gray border-0 btn-sm"><i class="fas fa-cloud-upload-alt"></i> Learn Node <i class="fab fa-node-js"></i> Development</button>
                     </div>
                 </div>
             </div>
@@ -209,7 +217,7 @@
         $.ajax({
             url: "/api/isdeploying?trace=false",
             type: "GET",
-            success: function(data) {
+            success: function (data) {
                 console.log("deployment going on" + data["value"]);
 
                 $('#lock_msg').text(data["msg"]);
@@ -221,7 +229,7 @@
                     $.ajax({
                         url: "/api/deployments/latest?trace=false",
                         type: "GET",
-                        success: function(data) {
+                        success: function (data) {
                             console.log("latest deployment data");
                             console.log(data);
                             wasDeploying = true;
@@ -232,7 +240,7 @@
                     });
                 } else {
                     $('#is-deploying-banner').css("display", "none");
-                    console.log("Trying to show just deployed banner : wasDeploying value is "+wasDeploying);
+                    console.log("Trying to show just deployed banner : wasDeploying value is " + wasDeploying);
                     if (wasDeploying) {
                         UpdateLatestDeploymentStatus();
                     }
@@ -245,18 +253,18 @@
     }
 
     function UpdateLatestDeploymentStatus() {
-        console.log("Making latest API call "+wasDeploying);
+        console.log("Making latest API call " + wasDeploying);
         $.ajax({
             url: "/api/deployments/latest?trace=false",
             type: "GET",
-            success: function(data) {
+            success: function (data) {
                 if (!data["status"]) {
                     return;
                 }
-                console.log("API call done "+wasDeploying);
+                console.log("API call done " + wasDeploying);
                 $("#appsvc-welcome-banner").css("display", "none");
                 $("#just-deployed-banner").css("display", "none");
-                $("#diagnose-btn").css("display","none");
+                $("#diagnose-btn").css("display", "none");
                 if (!wasDeploying) {
                     $("#last-deployed-banner").css("display", "block");
                     if (data["status"] === 4) {
@@ -268,7 +276,7 @@
                             .html("Pending &nbsp;<i class=\"fas fa-exclamation-circle\" style=\"color: #fdcb6e;\"></i>")
                             .prop('title', 'Deployment Status');
                     } else {
-                        $("#diagnose-btn").css("display","inline-block");
+                        $("#diagnose-btn").css("display", "inline-block");
                         $("#latest-deployment-id")
                             .html("Failed &nbsp;<i class=\"fas fa-exclamation-circle\" style=\"color: #ff5e57;\"></i>")
                             .prop('title', 'Deployment Status');
@@ -291,7 +299,7 @@
                         "/newui/jsonviewer?view_url=/api/deployments/" + data["id"] + "/log");
 
                     $("#latest-deployment-deployer").prop("title", "Deployed by " + data["author"]);
-                } else {           
+                } else {
                     $("#just-deployed-banner").css("display", "inline-block");
                     setTimeout(timer, 1000);
                     wasDeploying = false;
@@ -301,19 +309,17 @@
     };
 
     var count = 10;
-    function timer()
-    {
-        count=count-1;
-        if (count <= 0)
-        {
+    function timer() {
+        count = count - 1;
+        if (count <= 0) {
             count = 10;
-            document.getElementById("timer").innerHTML="0"; 
-            document.getElementById("statusStrTimer").innerHTML="0"; 
+            document.getElementById("timer").innerHTML = "0";
+            document.getElementById("statusStrTimer").innerHTML = "0";
             setTimeout(UpdateLatestDeploymentStatus, 1000);
             return;
         }
-        document.getElementById("timer").innerHTML=count; 
-        document.getElementById("statusStrTimer").innerHTML=count; 
+        document.getElementById("timer").innerHTML = count;
+        document.getElementById("statusStrTimer").innerHTML = count;
         setTimeout(timer, 1000);
     }
 
@@ -347,8 +353,8 @@
         return Math.floor(seconds) + " seconds";
     }
 
-    setInterval(function() {
-            checkDeployingStatus(); // this will run after every 10 seconds
-        },
+    setInterval(function () {
+        checkDeployingStatus(); // this will run after every 10 seconds
+    },
         10000);
 </script>

From 60ef9a0414d6f0d6f57befbbd2a59d2dbedf59f6 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 19:49:36 -0800
Subject: [PATCH 204/245] debugging

---
 Kudu.Services.Web/Services/BasicAuthenticationHandler.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
index 2db16a03..0da3db93 100644
--- a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
+++ b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
@@ -40,7 +40,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
                 var credentials = Encoding.UTF8.GetString(credentialBytes).Split(new[] { ':' }, 2);
                 var username = credentials[0];
                 var password = credentials[1];
-
+                Console.WriteLine($"password supplied: {password}");
                 if ((memCache.GetOrCreate(username, GetAuthenticationData)).Equals(password))
                 {
                     var claims = new[] {
@@ -67,7 +67,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 
 
         public async Task<string> GetAuthenticationData(string username)
-        {            
+        {
             var config = KubernetesClientConfiguration.InClusterConfig();
             string password = "";
 
@@ -77,6 +77,7 @@ public async Task<string> GetAuthenticationData(string username)
             {
                 var secret = await client.ReadNamespacedSecretAsync($"{PublishingProfileSecretPrefix.ToLower()}{username.ToLower()}","k8seappspubpassword");
                 password = System.Text.Encoding.UTF8.GetString(secret.Data["password"]);
+                Console.WriteLine("Password retrieved: " + password);
             }
             catch (Microsoft.Rest.HttpOperationException httpOperationException)
             {

From 125c3cdc08998f91b8275044ded00be013aaee86 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 20:15:18 -0800
Subject: [PATCH 205/245] test

---
 Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index b1f2b503..f72db62e 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -156,13 +156,13 @@ public string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment e
 
                 case Framework.NodeJs:
                     // Input/Output
-                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.RepositoryPath.Replace("repository","wwwroot"));
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.BuildTempPath);
                     OryxArgumentsHelper.AddLanguage(args, "nodejs");
                     break;
 
                 case Framework.Python:
                     // Input/Output
-                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.BuildTempPath);
                     OryxArgumentsHelper.AddLanguage(args, "python");
                     break;
 

From d447af9850ee714a937ed541e4181b4ce344f41f Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 21:46:51 -0800
Subject: [PATCH 206/245] remove oryx env zip

---
 Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index f72db62e..a6ba379d 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -250,15 +250,6 @@ public string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment e
 
                 case BuildOptimizationsFlags.UseExpressBuild:
                     OryxArgumentsHelper.AddTempDirectoryOption(args, context.BuildTempPath);
-                    if (Language == Framework.NodeJs)
-                    {
-                        OryxArgumentsHelper.AddNodeCompressOption(args, "zip");
-                    }
-                    else if (Language == Framework.Python)
-                    {
-                        OryxArgumentsHelper.AddPythonCompressOption(args, "zip");
-                    }
-
                     break;
 
                 case BuildOptimizationsFlags.UseTempDirectory:

From 11984f7c7e54ba0a0f0ad175b5c747fd54f3d397 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 22:12:23 -0800
Subject: [PATCH 207/245] basic builder bug fix

---
 Kudu.Core/Deployment/Generator/BasicBuilder.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Generator/BasicBuilder.cs b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
index 5143d93a..441de8a4 100644
--- a/Kudu.Core/Deployment/Generator/BasicBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
@@ -1,5 +1,6 @@
 using Kudu.Contracts.Settings;
 using Kudu.Core.Deployment.Oryx;
+using Kudu.Core.Infrastructure;
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -22,7 +23,9 @@ public override Task Build(DeploymentContext context)
             context.Logger.Log("SiteRootPath " + _environment.SiteRootPath);
             //context.Logger.Log("CurrId "+ _environment.);
             string src = _environment.RepositoryPath;
-            string artifactDir = Path.Combine(_environment.SiteRootPath, "atifacts", _environment.CurrId);
+            string artifactDir = Path.Combine(_environment.SiteRootPath, "artifacts", _environment.CurrId);
+            FileSystemHelpers.EnsureDirectory(Path.Combine(_environment.SiteRootPath, "artifacts"));
+            FileSystemHelpers.EnsureDirectory(artifactDir);
             context.Logger.Log($"src : {src} dest {artifactDir}");
             return Task.Factory.StartNew(() => PackageArtifactFromFolder(context, _environment.ZipTempPath, Path.Combine(_environment.SiteRootPath, "atifacts", _environment.CurrId),"artifact.zip" ,BuildArtifactType.Squashfs, 2));
         }

From 56373f63d17019cab16f96b92e6252ebfb5e3668 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 22:12:33 -0800
Subject: [PATCH 208/245] basic builder

---
 Kudu.Console/JavaScriptSerializer.cs          |  9 ++++++
 Kudu.Core/Deployment/DeploymentStatusFile.cs  |  6 +++-
 .../Deployment/DeploymentStatusManager.cs     |  1 +
 .../Deployment/Generator/BasicBuilder.cs      |  7 ++--
 .../Deployment/Oryx/OryxDeploymentContext.cs  | 21 ++++++++++++
 .../Services/BasicAuthenticationHandler.cs    |  8 +++--
 Kudu.Services.Web/package-lock.json           | 32 +++++++++++++++++++
 .../Deployment/ArtifactsController.cs         | 11 +++++++
 8 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 Kudu.Console/JavaScriptSerializer.cs
 create mode 100644 Kudu.Core/Deployment/Oryx/OryxDeploymentContext.cs
 create mode 100644 Kudu.Services.Web/package-lock.json
 create mode 100644 Kudu.Services/Deployment/ArtifactsController.cs

diff --git a/Kudu.Console/JavaScriptSerializer.cs b/Kudu.Console/JavaScriptSerializer.cs
new file mode 100644
index 00000000..548f9397
--- /dev/null
+++ b/Kudu.Console/JavaScriptSerializer.cs
@@ -0,0 +1,9 @@
+namespace Kudu.Console
+{
+    internal class JavaScriptSerializer
+    {
+        public JavaScriptSerializer()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Kudu.Core/Deployment/DeploymentStatusFile.cs b/Kudu.Core/Deployment/DeploymentStatusFile.cs
index ae4327e3..8edfc76c 100644
--- a/Kudu.Core/Deployment/DeploymentStatusFile.cs
+++ b/Kudu.Core/Deployment/DeploymentStatusFile.cs
@@ -53,9 +53,10 @@ public static DeploymentStatusFile Open(string id, IEnvironment environment, IAn
             return statusLock.LockOperation(() =>
             {
                 string path = Path.Combine(environment.DeploymentsPath, id, StatusFile);
-
+                Console.WriteLine("path : " + path);
                 if (!FileSystemHelpers.FileExists(path))
                 {
+                    Console.WriteLine("path null " );
                     return null;
                 }
 
@@ -220,8 +221,11 @@ private static string GetSiteName(IEnvironment environment)
             string siteName = ServerConfiguration.GetApplicationName();
             if (String.IsNullOrEmpty(siteName))
             {
+                Console.WriteLine("Gettin Site Root");
                 // Otherwise get it from the root directory name
                 siteName = Path.GetFileName(environment.RootPath);
+                Console.WriteLine("siteName "+siteName);
+
             }
 
             return siteName;
diff --git a/Kudu.Core/Deployment/DeploymentStatusManager.cs b/Kudu.Core/Deployment/DeploymentStatusManager.cs
index b4d219fb..f87e0910 100644
--- a/Kudu.Core/Deployment/DeploymentStatusManager.cs
+++ b/Kudu.Core/Deployment/DeploymentStatusManager.cs
@@ -36,6 +36,7 @@ public IDeploymentStatusFile Create(string id, IEnvironment environment)
 
         public IDeploymentStatusFile Open(string id, IEnvironment environment)
         {
+            Console.WriteLine("Open status file");
             return DeploymentStatusFile.Open(id, environment, _analytics, _statusLock);
         }
 
diff --git a/Kudu.Core/Deployment/Generator/BasicBuilder.cs b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
index 441de8a4..c97c0636 100644
--- a/Kudu.Core/Deployment/Generator/BasicBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
@@ -22,18 +22,19 @@ public override Task Build(DeploymentContext context)
             context.Logger.Log("RepositoryPath "+ _environment.ZipTempPath);
             context.Logger.Log("SiteRootPath " + _environment.SiteRootPath);
             //context.Logger.Log("CurrId "+ _environment.);
-            string src = _environment.RepositoryPath;
+            string src = _environment.ZipTempPath;
             string artifactDir = Path.Combine(_environment.SiteRootPath, "artifacts", _environment.CurrId);
-            FileSystemHelpers.EnsureDirectory(Path.Combine(_environment.SiteRootPath, "artifacts"));
+            FileSystemHelpers.EnsureDirectory(Path.Combine(_environment.ZipTempPath, "artifacts"));
             FileSystemHelpers.EnsureDirectory(artifactDir);
             context.Logger.Log($"src : {src} dest {artifactDir}");
-            return Task.Factory.StartNew(() => PackageArtifactFromFolder(context, _environment.ZipTempPath, Path.Combine(_environment.SiteRootPath, "atifacts", _environment.CurrId),"artifact.zip" ,BuildArtifactType.Squashfs, 2));
+            return Task.Factory.StartNew(() => PackageArtifactFromFolder(context, Path.Combine(_environment.ZipTempPath, "extracted"), Path.Combine(_environment.SiteRootPath, "artifacts", _environment.CurrId),"artifact.zip" ,BuildArtifactType.Squashfs, 2));
         }
 
 
         private string PackageArtifactFromFolder(DeploymentContext context, string srcDirectory, string artifactDirectory, string artifactFilename, BuildArtifactType artifactType, int numBuildArtifacts = 0)
         {
             context.Logger.Log($"Writing the artifacts to {artifactType.ToString()} file at {artifactDirectory}");
+            FileSystemHelpers.EnsureDirectory(artifactDirectory);
             string file = Path.Combine(artifactDirectory, artifactFilename);
             var exe = ExternalCommandFactory.BuildExternalCommandExecutable(srcDirectory, artifactDirectory, context.Logger);
             try
diff --git a/Kudu.Core/Deployment/Oryx/OryxDeploymentContext.cs b/Kudu.Core/Deployment/Oryx/OryxDeploymentContext.cs
new file mode 100644
index 00000000..a1432ec7
--- /dev/null
+++ b/Kudu.Core/Deployment/Oryx/OryxDeploymentContext.cs
@@ -0,0 +1,21 @@
+
+namespace Kudu.Core.Deployment.Oryx
+{
+    class OryxDeploymentContext
+    {
+        public bool RunOryxBuild { get; set; }
+
+        public BuildOptimizationsFlags Flags { get; set; }
+
+        public Framework Language { get; set; }
+
+        public string Version { get; set; }
+
+        public string PublishFolder { get; set; }
+
+        public string VirtualEnv { get; set; }
+
+        public bool SkipKuduSync { get; set; }
+
+    }
+}
diff --git a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
index 0da3db93..4dabfd70 100644
--- a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
+++ b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
@@ -75,7 +75,9 @@ public async Task<string> GetAuthenticationData(string username)
             var client = new Kubernetes(config);
             try
             {
+                Console.WriteLine("Retrieving Password: " + password);
                 var secret = await client.ReadNamespacedSecretAsync($"{PublishingProfileSecretPrefix.ToLower()}{username.ToLower()}","k8seappspubpassword");
+                Console.WriteLine("secret retrieved: ");
                 password = System.Text.Encoding.UTF8.GetString(secret.Data["password"]);
                 Console.WriteLine("Password retrieved: " + password);
             }
@@ -83,9 +85,9 @@ public async Task<string> GetAuthenticationData(string username)
             {
                 var phrase = httpOperationException.Response.ReasonPhrase;
                 var content = httpOperationException.Response.Content;
-                System.Console.WriteLine("K8 Client errror");
-                System.Console.WriteLine(phrase);
-                System.Console.WriteLine(content);
+                Console.WriteLine("K8 Client errror");
+                Console.WriteLine(phrase);
+                Console.WriteLine(content);
             }
             return password;
         }
diff --git a/Kudu.Services.Web/package-lock.json b/Kudu.Services.Web/package-lock.json
new file mode 100644
index 00000000..08cb9780
--- /dev/null
+++ b/Kudu.Services.Web/package-lock.json
@@ -0,0 +1,32 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "commander": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz",
+      "integrity": "sha1-UNFlGGiuYOzP8KLZ80WVN2vGsEE=",
+      "requires": {
+        "keypress": "0.1.x"
+      }
+    },
+    "keypress": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz",
+      "integrity": "sha1-SjGI1CkbZrT2XtuZ+AaqmuKTWSo="
+    },
+    "kuduscript": {
+      "version": "https://github.com/projectkudu/KuduScript/tarball/16de31b5f5ca590ea085979e5fa5e74bb62f647e",
+      "integrity": "sha512-4GrGZJbJIn2feUIZjgqCHPqyK6IJwPwXZ6cgw0AXvuS5CFda9wynbsFwIx7JnafNsAzJqokuHkM2AWolGTZ2Yg==",
+      "requires": {
+        "commander": "~1.1.1",
+        "streamline": "~0.4.10"
+      }
+    },
+    "streamline": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz",
+      "integrity": "sha1-DjxPJKPwUrIxsS1QSQhaCgmb54I="
+    }
+  }
+}
diff --git a/Kudu.Services/Deployment/ArtifactsController.cs b/Kudu.Services/Deployment/ArtifactsController.cs
new file mode 100644
index 00000000..3bed8e64
--- /dev/null
+++ b/Kudu.Services/Deployment/ArtifactsController.cs
@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Services.Deployment
+{
+    class ArtifactsController : Controller
+    {
+    }
+}

From 860fab644d0da43ec5e2a183491b3d7d67bd6b4a Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 23:38:06 -0800
Subject: [PATCH 209/245] Removing extra log lines

---
 Kudu.Console/Program.cs                         | 2 +-
 Kudu.Core/Deployment/DeploymentManager.cs       | 1 -
 Kudu.Core/Deployment/DeploymentStatusFile.cs    | 2 --
 Kudu.Core/Deployment/DeploymentStatusManager.cs | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index 3e573f93..b775c248 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -179,7 +179,6 @@ private static int PerformDeploy(
             {
                 try
                 {
-                    System.Console.WriteLine("deploymentTask");
                     // although the api is called DeployAsync, most expensive works are done synchronously.
                     // need to launch separate task to go async explicitly (consistent with FetchDeploymentManager)
                     var deploymentTask = Task.Run(async () => await deploymentManager.DeployAsync(gitRepository, changeSet: null, deployer: deployer, clean: false));
@@ -214,6 +213,7 @@ private static int PerformDeploy(
                 }
                 finally
                 {
+                    /*
                     var config = KubernetesClientConfiguration.InClusterConfig();
                     var client = new Kubernetes(config);
                     var replicaSets = client.ListReplicaSetForAllNamespaces();
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 0cb25329..63d6e7e8 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -601,7 +601,6 @@ private async Task Build(
 
             try
             {
-                Console.WriteLine("Build.");
                 logger = GetLogger(id);
                 ILogger innerLogger = logger.Log(Resources.Log_PreparingDeployment, TrimId(id));
 
diff --git a/Kudu.Core/Deployment/DeploymentStatusFile.cs b/Kudu.Core/Deployment/DeploymentStatusFile.cs
index 8edfc76c..877e90da 100644
--- a/Kudu.Core/Deployment/DeploymentStatusFile.cs
+++ b/Kudu.Core/Deployment/DeploymentStatusFile.cs
@@ -53,10 +53,8 @@ public static DeploymentStatusFile Open(string id, IEnvironment environment, IAn
             return statusLock.LockOperation(() =>
             {
                 string path = Path.Combine(environment.DeploymentsPath, id, StatusFile);
-                Console.WriteLine("path : " + path);
                 if (!FileSystemHelpers.FileExists(path))
                 {
-                    Console.WriteLine("path null " );
                     return null;
                 }
 
diff --git a/Kudu.Core/Deployment/DeploymentStatusManager.cs b/Kudu.Core/Deployment/DeploymentStatusManager.cs
index f87e0910..b4d219fb 100644
--- a/Kudu.Core/Deployment/DeploymentStatusManager.cs
+++ b/Kudu.Core/Deployment/DeploymentStatusManager.cs
@@ -36,7 +36,6 @@ public IDeploymentStatusFile Create(string id, IEnvironment environment)
 
         public IDeploymentStatusFile Open(string id, IEnvironment environment)
         {
-            Console.WriteLine("Open status file");
             return DeploymentStatusFile.Open(id, environment, _analytics, _statusLock);
         }
 

From f5c8e48732de827b4c15996cec65cf9131a150ba Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Dec 2019 23:57:29 -0800
Subject: [PATCH 210/245] Test

---
 Kudu.Services/Deployment/PushDeploymentController.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index fac20dff..c13cc46c 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -74,6 +74,7 @@ public async Task<IActionResult> ZipPushDeploy(
             [FromQuery] bool isAsync = false,
             [FromQuery] string author = null,
             [FromQuery] string authorEmail = null,
+            [FromQuery] bool doBuild = false,
             [FromQuery] string deployer = DefaultDeployer,
             [FromQuery] string message = DefaultMessage)
         {
@@ -91,7 +92,7 @@ public async Task<IActionResult> ZipPushDeploy(
                     CommitId = null,
                     RepositoryType = RepositoryType.None,
                     Fetch = LocalZipHandler,
-                    DoFullBuildByDefault = false,
+                    DoFullBuildByDefault = doBuild,
                     Author = author,
                     AuthorEmail = authorEmail,
                     Message = message,

From b87c67fd28876931573657ff159c90241f5eca13 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Fri, 6 Dec 2019 07:05:43 -0800
Subject: [PATCH 211/245] SCM Build setting reinforced

---
 Kudu.Core/Deployment/DeploymentManager.cs |  1 +
 Kudu.Services/Editor/VfsController.cs     | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 63d6e7e8..23bcea4c 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -621,6 +621,7 @@ private async Task Build(
                 var perDeploymentSettings = DeploymentSettingsManager.BuildPerDeploymentSettingsManager(repository.RepositoryPath, settingsProviders);
 
                 string delayMaxInStr = perDeploymentSettings.GetValue(SettingsKeys.MaxRandomDelayInSec);
+                perDeploymentSettings.SetValue(SettingsKeys.DoBuildDuringDeployment, fullBuildByDefault.ToString());
                 if (!String.IsNullOrEmpty(delayMaxInStr))
                 {
                     int maxDelay;
diff --git a/Kudu.Services/Editor/VfsController.cs b/Kudu.Services/Editor/VfsController.cs
index 2ad29ff1..41149a19 100644
--- a/Kudu.Services/Editor/VfsController.cs
+++ b/Kudu.Services/Editor/VfsController.cs
@@ -13,6 +13,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Net.Http.Headers;
+using Kudu.Core.Helpers;
 
 namespace Kudu.Services.Editor
 {
@@ -21,8 +22,8 @@ namespace Kudu.Services.Editor
     /// </summary>
     public class VfsController : VfsControllerBase
     {
-        public VfsController(ITracer tracer, IEnvironment environment)
-            : base(tracer, environment, environment.RootPath)
+        public VfsController(ITracer tracer, IEnvironment environment, IHttpContextAccessor accessor)
+            : base(tracer, GetEnvironment(accessor, environment), GetEnvironment(accessor, environment).RootPath)
         {
         }
 
@@ -48,6 +49,21 @@ protected override Task<IActionResult> CreateDirectoryPutResponse(DirectoryInfoB
             return Task.FromResult((IActionResult)StatusCode(StatusCodes.Status201Created));
         }
 
+        private static IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
+        {
+            IEnvironment _environment;
+            if (!PostDeploymentHelper.IsK8Environment() || accessor == null)
+            {
+                _environment = environment;
+            }
+            else
+            {
+                var context = accessor.HttpContext;
+                _environment = (IEnvironment)context.Items["environment"];
+            }
+            return _environment;
+        }
+
         protected override Task<IActionResult> CreateItemGetResponse(FileSystemInfoBase info, string localFilePath)
         {
             var fileStream = GetFileReadStream(localFilePath);

From ca714c96e5daa9355f26d37edcd55b9c83179d05 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 3 Feb 2020 10:45:16 -0800
Subject: [PATCH 212/245] K8SE Custom object support

---
 Common/Constants.cs                           |   7 +
 Kudu.Console/Program.cs                       |  79 +--------
 Kudu.Contracts/IEnvironment.cs                |   3 +-
 Kudu.Contracts/K8SE/CustomResource.cs         |  38 ++++
 Kudu.Contracts/K8SE/K8SEApp.cs                |  89 ++++++++++
 Kudu.Contracts/Kudu.Contracts.csproj          |   1 +
 Kudu.Core/Deployment/DeploymentManager.cs     | 161 ++++++++---------
 .../Deployment/FetchDeploymentManager.cs      |  15 +-
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |   6 +
 .../Generator/SiteBuilderFactory.cs           |   3 +-
 .../Oryx/AppServiceOryxArguments.cs           |  51 ++----
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   |  88 +++++-----
 .../Oryx/FunctionAppOryxArguments.cs          |   1 +
 Kudu.Core/Deployment/Oryx/IOryxArguments.cs   |   1 +
 Kudu.Core/Environment.cs                      |  32 +++-
 Kudu.Core/Helpers/PostDeploymentHelper.cs     |   7 -
 .../DockerContainerRestartTrigger.cs          |  25 +--
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        | 165 ++++++++++++++++++
 Kudu.Core/Kudu.Core.csproj                    |   1 +
 Kudu.Core/Resources.Designer.cs               |  13 +-
 Kudu.Services.Web/KubeMiddleware.cs           |  63 +++----
 .../Services/BasicAuthenticationHandler.cs    |  95 ----------
 Kudu.Services.Web/Startup.cs                  |  11 +-
 .../Deployment/DeploymentController.cs        |   7 +-
 .../Deployment/PushDeploymentController.cs    |   3 +-
 .../Diagnostics/DiagnosticsController.cs      |   3 +-
 Kudu.Services/Docker/DockerController.cs      |   3 +-
 Kudu.Services/Editor/VfsController.cs         |   3 +-
 Kudu.Services/Zip/ZipController.cs            |   3 +-
 29 files changed, 554 insertions(+), 423 deletions(-)
 create mode 100644 Kudu.Contracts/K8SE/CustomResource.cs
 create mode 100644 Kudu.Contracts/K8SE/K8SEApp.cs
 create mode 100644 Kudu.Core/K8SE/K8SEDeploymentHelper.cs
 delete mode 100644 Kudu.Services.Web/Services/BasicAuthenticationHandler.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index f7e687c2..bb791f81 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -84,6 +84,13 @@ public static TimeSpan MaxAllowedExecutionTime
             get { return _maxAllowedExectionTime; }
         }
 
+        // K8SE Constants
+        public const string KubernetesConfigKind = "Config";
+        public const string KubernetesAppServiceApiGroup = "k8se.microsoft.com";
+        public const string KubernetesAppServiceApiVersion = "v1alpha1";
+        public static string KubernetesAppServiceAppPlural = "apps";
+        public static string KubernetesAppServiceAppNamespace = "k8se-apps";
+
         public const string ApplicationHostXdtFileName = "applicationHost.xdt";
         public const string ScmApplicationHostXdtFileName = "scmApplicationHost.xdt";
 
diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index b775c248..c0d76d7b 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -212,68 +212,7 @@ private static int PerformDeploy(
                     return 1;
                 }
                 finally
-                {
-                    /*
-                    var config = KubernetesClientConfiguration.InClusterConfig();
-                    var client = new Kubernetes(config);
-                    var replicaSets = client.ListReplicaSetForAllNamespaces();
-                    string appName = appRoot.Replace("/home/apps/", "").Split("/")[0];
-
-                    foreach (var replicaSet in replicaSets.Items)
-                    {
-                        if (replicaSet.Metadata.Name.IndexOf(appName, StringComparison.OrdinalIgnoreCase) >= 0
-                            && (replicaSet.Status.AvailableReplicas > 0))
-                        {
-
-                            FileSystemHelpers.EnsureDirectory($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
-                            FileStream stream = File.Create($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision");
-                            stream.Close();
-                            FileSystemHelpers.DeleteFileSafe($"/home/apps/{appName}/site/artifacts/current");
-                            FileStream stream2 = File.Create($"/home/apps/{appName}/site/artifacts/current");
-                            stream2.Close();
-
-                            IDeploymentStatusFile statusFile = deploymentStatusManager.Open(gitRepository.GetChangeSet(settingsManager.GetBranch()).Id, env);
-                            statusFile.Save();
-                            revisiondata rv = new revisiondata()
-                            {
-                                StartTime = statusFile.StartTime,
-                                EndTime = statusFile.EndTime,
-                                Deployer = statusFile.Deployer,
-                                ReceivedTime = statusFile.ReceivedTime,
-                                Author = statusFile.Author,
-                                AuthorEmail = statusFile.AuthorEmail,
-                                Message = statusFile.Message,
-                                Status = statusFile.Status,
-                                deploymentId = gitRepository.GetChangeSet(settingsManager.GetBranch()).Id
-                            };
-                            var json = Newtonsoft.Json.JsonConvert.SerializeObject(rv);
-                            FileStream stream3 = File.Create($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json");
-                            stream3.Close();
-                            File.WriteAllText($"/home/apps/{appName}/site/artifacts/current", $"{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}");
-                            File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/revision", replicaSet.Metadata.Annotations["deployment.kubernetes.io/revision"]);
-                            File.WriteAllText($"/home/apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}/metadata.json", json.ToString());
-                        }
-                    }
-
-                    /*
-                    Process _executingProcess = new Process()
-                    {
-                        StartInfo = new ProcessStartInfo
-                        {
-                            FileName = "/bin/bash",
-                            Arguments = $"-c \" /patch.sh {appName} apps/{appName}/site/artifacts/{gitRepository.GetChangeSet(settingsManager.GetBranch()).Id}\"",
-                            RedirectStandardOutput = true,
-                            UseShellExecute = false,
-                            CreateNoWindow = true,
-                        }
-                    };
-
-                    // Read the standard error of net.exe and write it on to console.
-                    _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
-                    _executingProcess.Start();
-                    _executingProcess.WaitForExit();
-                    System.Console.WriteLine("Deployment Rollout Started!");
-                    */
+                { 
                     System.Console.WriteLine("Deployment Logs : '"+
                     env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" + 
                     gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
@@ -308,22 +247,6 @@ private static ITracer GetTracer(IEnvironment env, TraceLevel level)
             return NullTracer.Instance;
         }
 
-        public class revisiondata
-        {
-            public string revisionId;
-            public string deploymentId;
-            public bool active;
-            public DeployStatus Status { get; set; }
-            public string StatusText { get; set; }
-            public string AuthorEmail { get; set; }
-            public string Author { get; set; }
-            public string Message { get; set; }
-            public string Deployer { get; set; }
-            public DateTime ReceivedTime { get; set; }
-            public DateTime StartTime { get; set; }
-            public DateTime? EndTime { get; set; }
-        }
-
         private static ILogger GetLogger(IEnvironment env, TraceLevel level, ILogger primary)
         {
             if (level > TraceLevel.Off)
diff --git a/Kudu.Contracts/IEnvironment.cs b/Kudu.Contracts/IEnvironment.cs
index 104b1432..0d452468 100644
--- a/Kudu.Contracts/IEnvironment.cs
+++ b/Kudu.Contracts/IEnvironment.cs
@@ -32,6 +32,7 @@ public interface IEnvironment
         string KuduConsoleFullPath { get; }     // e.g. KuduConsole/kudu.dll
         string SitePackagesPath { get; }        // e.g. /data/SitePackages
         bool IsOnLinuxConsumption { get; }      // e.g. True on Linux Consumption. False on App Service.
-        bool IsOnK8 { get; }      
+        bool IsK8SEApp { get; }
+        string K8SEAppName { get;  }
     }
 }
diff --git a/Kudu.Contracts/K8SE/CustomResource.cs b/Kudu.Contracts/K8SE/CustomResource.cs
new file mode 100644
index 00000000..f248dc75
--- /dev/null
+++ b/Kudu.Contracts/K8SE/CustomResource.cs
@@ -0,0 +1,38 @@
+using k8s;
+using k8s.Models;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Kudu.Contracts.K8SE
+{
+    public abstract class CustomResource : KubernetesObject
+    {
+        [JsonProperty(PropertyName = "metadata")]
+        public V1ObjectMeta Metadata { get; set; }
+    }
+
+    public abstract class CustomResource<TSpec, TStatus> : CustomResource
+    {
+        [JsonProperty(PropertyName = "spec")]
+        public TSpec Spec { get; set; }
+        public TStatus Status { get; set; }
+    }
+
+    public abstract class CustomResourceList<T> : KubernetesObject where T : CustomResource
+    {
+        public V1ObjectMeta Metadata { get; set; }
+        public V1ListMeta ListMetadata { get; set; }
+        public List<CustomResource> Items { get; set; }
+    }
+
+    public class CustomResourceDefinition
+    {
+        public string ApiVersion { get; set; }
+
+        public string PluralName { get; set; }
+
+        public string Kind { get; set; }
+
+        public string Namespace { get; set; }
+    }
+}
diff --git a/Kudu.Contracts/K8SE/K8SEApp.cs b/Kudu.Contracts/K8SE/K8SEApp.cs
new file mode 100644
index 00000000..11119a5f
--- /dev/null
+++ b/Kudu.Contracts/K8SE/K8SEApp.cs
@@ -0,0 +1,89 @@
+
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Kudu.Contracts.K8SE
+{
+        public enum AppKind
+        {
+            CodeWebApp = 0,
+            FunctionApp = 1,
+            ContainerApp = 2
+        }
+        public class AppSpec
+        {
+            [JsonProperty(PropertyName = "kind")]
+            public string Kind { get; set; }
+
+            [JsonProperty(PropertyName = "appPort")]
+            public int AppPort { get; set; }
+
+            [JsonProperty(PropertyName = "minReplicas")]
+            public int? MinReplicas { get; set; }
+
+            [JsonProperty(PropertyName = "maxReplicas")]
+            public int? MaxReplicas { get; set; }
+
+            [JsonProperty(PropertyName = "hostnames")]
+            public CodeAppSpec codeAppSpec { get; set; }
+
+            [JsonProperty(PropertyName = "containers")]
+            public List<ContainerSpec> Containers { get; set; }
+
+            [JsonProperty(PropertyName = "hostnames")]
+            public List<HostNameSpec> Hostnames { get; set; }
+        }
+
+        public class ContainerSpec
+        {
+            [JsonProperty(PropertyName = "type")]
+            public string Type { get; set; }
+
+            [JsonProperty(PropertyName = "name")]
+            public string Name { get; set; }
+
+            [JsonProperty(PropertyName = "image")]
+            public string Image { get; set; }
+
+            [JsonProperty(PropertyName = "ports")]
+            public List<PortSpec> Ports { get; set; }
+        }
+
+        public class HostNameSpec
+        {
+            [JsonProperty(PropertyName = "domain")]
+            public string Domain { get; set; }
+        }
+
+        public class CodeAppSpec
+        {
+            [JsonProperty(PropertyName = "framework")]
+            public string Framework { get; set; }
+
+            [JsonProperty(PropertyName = "frameworkVersion")]
+            public string FrameworkVersion { get; set; }
+
+            [JsonProperty(PropertyName = "functionRuntimeVersion")]
+            public string FunctionRuntimeVersion { get; set; }
+
+            [JsonProperty(PropertyName = "buildVersion")]
+            public string BuildVersion { get; set; }
+        }
+
+        public class PortSpec
+        {
+            [JsonProperty(PropertyName = "containerPort")]
+            public int ContainerPort { get; set; }
+
+            [JsonProperty(PropertyName = "name")]
+            public string Name { get; set; }
+        }
+
+        public class AppStatus
+        {
+        }
+
+        public class K8SEApp : CustomResource<AppSpec, AppStatus>
+        {
+        }
+}
diff --git a/Kudu.Contracts/Kudu.Contracts.csproj b/Kudu.Contracts/Kudu.Contracts.csproj
index 1ea09fef..e5c54011 100644
--- a/Kudu.Contracts/Kudu.Contracts.csproj
+++ b/Kudu.Contracts/Kudu.Contracts.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+      <PackageReference Include="KubernetesClient" Version="1.5.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 23bcea4c..117a7853 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -12,6 +12,7 @@
 using Kudu.Core.Helpers;
 using Kudu.Core.Hooks;
 using Kudu.Core.Infrastructure;
+using Kudu.Core.K8SE;
 using Kudu.Core.Settings;
 using Kudu.Core.SourceControl;
 using Kudu.Core.Tracing;
@@ -79,7 +80,7 @@ public DeploymentManager(ISiteBuilderFactory builderFactory,
         private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
         {
             IEnvironment _environment;
-            if (!PostDeploymentHelper.IsK8Environment() || accessor == null)
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment() || accessor == null)
             {
                 _environment = environment;
             }
@@ -110,7 +111,7 @@ public IEnumerable<DeployResult> GetResults()
 
         public DeployResult GetResult(string id)
         {
-             return GetResult(id, _status.ActiveDeploymentId, IsDeploying);   
+             return GetResult(id, _status.ActiveDeploymentId, IsDeploying);
         }
 
         public IEnumerable<LogEntry> GetLogEntries(string id)
@@ -217,101 +218,101 @@ public async Task DeployAsync(
                     string id = changeSet.Id;
                     _environment.CurrId = id;
                     IDeploymentStatusFile statusFile = null;
-                    try
-                    {
-                        deployStep = tracer.Step($"DeploymentManager.Deploy(id:{id})");
-                        // Remove the old log file for this deployment id
-                        string logPath = GetLogPath(id);
-                        FileSystemHelpers.DeleteFileSafe(logPath);
+                try
+                {
+                    deployStep = tracer.Step($"DeploymentManager.Deploy(id:{id})");
+                    // Remove the old log file for this deployment id
+                    string logPath = GetLogPath(id);
+                    FileSystemHelpers.DeleteFileSafe(logPath);
 
-                        statusFile = GetOrCreateStatusFile(changeSet, tracer, deployer);
+                    statusFile = GetOrCreateStatusFile(changeSet, tracer, deployer);
 
-                        statusFile.MarkPending();
+                    statusFile.MarkPending();
 
-                        ILogger logger = GetLogger(changeSet.Id);
-                        if (needFileUpdate)
+                    ILogger logger = GetLogger(changeSet.Id);
+                    if (needFileUpdate)
+                    {
+                        using (tracer.Step("Updating to specific changeset"))
                         {
-                            using (tracer.Step("Updating to specific changeset"))
+
+                            innerLogger = logger.Log(Resources.Log_UpdatingBranch, targetBranch ?? id);
+
+                            using (var writer = new ProgressWriter())
                             {
-                                
-                                innerLogger = logger.Log(Resources.Log_UpdatingBranch, targetBranch ?? id);
-
-                                using (var writer = new ProgressWriter())
-                                {
-                                    // Update to the specific changeset or branch
-                                    repository.Update(targetBranch ?? id);
-                                }
+                                // Update to the specific changeset or branch
+                                repository.Update(targetBranch ?? id);
                             }
                         }
+                    }
 
-                        if (_settings.ShouldUpdateSubmodules())
+                    if (_settings.ShouldUpdateSubmodules())
+                    {
+                        using (tracer.Step("Updating submodules"))
                         {
-                            using (tracer.Step("Updating submodules"))
-                            {
-                                innerLogger = logger.Log(Resources.Log_UpdatingSubmodules);
+                            innerLogger = logger.Log(Resources.Log_UpdatingSubmodules);
 
-                                repository.UpdateSubmodules();
-                            }
+                            repository.UpdateSubmodules();
                         }
+                    }
 
-                        if (clean)
-                        {
-                            tracer.Trace("Cleaning {0} repository", repository.RepositoryType);
+                    if (clean)
+                    {
+                        tracer.Trace("Cleaning {0} repository", repository.RepositoryType);
 
-                            innerLogger = logger.Log(Resources.Log_CleaningRepository, repository.RepositoryType);
+                        innerLogger = logger.Log(Resources.Log_CleaningRepository, repository.RepositoryType);
 
-                            repository.Clean();
-                        }
+                        repository.Clean();
+                    }
 
-                        // set to null as Build() below takes over logging
-                        innerLogger = null;
+                    // set to null as Build() below takes over logging
+                    innerLogger = null;
 
                     // Perform the build deployment of this changeset
                     await Build(changeSet, tracer, deployStep, repository, deploymentInfo, deploymentAnalytics, fullBuildByDefault);
 
-                        if ((!(OSDetector.IsOnWindows() && 
-                              !EnvironmentHelper.IsWindowsContainers()) && 
-                            _settings.RestartAppContainerOnGitDeploy()) ||
-                            PostDeploymentHelper.IsK8Environment())
+                    if ((!(OSDetector.IsOnWindows() &&
+                          !EnvironmentHelper.IsWindowsContainers()) &&
+                        _settings.RestartAppContainerOnGitDeploy()) ||
+                        K8SEDeploymentHelper.IsK8SEEnvironment())
+                    {
+                        if (K8SEDeploymentHelper.IsK8SEEnvironment())
                         {
-                            if(PostDeploymentHelper.IsK8Environment())
-                            {
-                                logger.Log($"Restarting pods!");
-                            }
+                            logger.Log(Resources.Log_TriggeringK8SERestart);
+                        }
                         else
-                            {
-                               logger.Log(Resources.Log_TriggeringContainerRestart);
-                            }
+                        {
+                            logger.Log(Resources.Log_TriggeringContainerRestart);
+                        }
+
                         string appName = _environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0]; ;
 
                         DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason);
                         logger.Log($"Deployment Pod Rollout Started! Use kubectl watch deplotment {appName} to monitor the rollout status");
-
                     }
                 }
-                    catch (Exception ex)
-                    {
-                        exception = ex;
+                catch (Exception ex)
+                {
+                    exception = ex;
 
-                        if (innerLogger != null)
-                        {
-                            innerLogger.Log(ex);
-                        }
+                    if (innerLogger != null)
+                    {
+                        innerLogger.Log(ex);
+                    }
 
-                        if (statusFile != null)
-                        {
-                            MarkStatusComplete(statusFile, success: false);
-                        }
+                    if (statusFile != null)
+                    {
+                        MarkStatusComplete(statusFile, success: false);
+                    }
 
-                        tracer.TraceError(ex);
+                    tracer.TraceError(ex);
 
-                        deploymentAnalytics.Error = ex.ToString();
+                    deploymentAnalytics.Error = ex.ToString();
 
-                        if (deployStep != null)
-                        {
-                            deployStep.Dispose();
-                        }
+                    if (deployStep != null)
+                    {
+                        deployStep.Dispose();
                     }
+                }
 
                     // Reload status file with latest updates
                     statusFile = _status.Open(id, _environment);
@@ -328,7 +329,7 @@ public async Task DeployAsync(
                         tracer.TraceError(exception);
                         throw new DeploymentFailedException(exception);
                     }
-           
+
             }
         }
 
@@ -377,7 +378,7 @@ private IEnumerable<DeployResult> PurgeAndGetDeployments()
             // Order the results by date (newest first). Previously, we supported OData to allow
             // arbitrary queries, but that was way overkill and brought in too many large binaries.
             IEnumerable<DeployResult> results;
-            results = EnumerateResults().OrderByDescending(t => t.ReceivedTime).ToList();                
+            results = EnumerateResults().OrderByDescending(t => t.ReceivedTime).ToList();
             try
             {
                 results = PurgeDeployments(results);
@@ -418,7 +419,7 @@ internal IEnumerable<DeployResult> PurgeDeployments(IEnumerable<DeployResult> re
                 toDelete.AddRange(GetPurgeTemporaryDeployments(results));
                 toDelete.AddRange(GetPurgeFailedDeployments(results));
                 toDelete.AddRange(GetPurgeObsoleteDeployments(results));
-                
+
                 if (toDelete.Any())
                 {
                     var tracer = _traceFactory.GetTracer();
@@ -549,7 +550,7 @@ IDeploymentStatusFile GetOrCreateStatusFile(ChangeSet changeSet, ITracer tracer,
 
         private DeployResult GetResult(string id, string activeDeploymentId, bool isDeploying)
         {
-            var file = VerifyDeployment(id, isDeploying);            
+            var file = VerifyDeployment(id, isDeploying);
             if (file == null)
             {
                 return null;
@@ -727,15 +728,15 @@ private async Task Build(
                         }
 
                         await PostDeploymentHelper.SyncFunctionsTriggers(
-                            _environment.RequestId, 
-                            new PostDeploymentTraceListener(tracer, logger), 
+                            _environment.RequestId,
+                            new PostDeploymentTraceListener(tracer, logger),
                             deploymentInfo?.SyncFunctionsTriggersPath);
 
                         if (_settings.TouchWatchedFileAfterDeployment())
                         {
                             TryTouchWatchedFile(context, deploymentInfo);
                         }
-                        
+
                         if (_settings.RunFromLocalZip() && deploymentInfo is ZipDeploymentInfo)
                         {
                             await PostDeploymentHelper.UpdatePackageName(deploymentInfo as ZipDeploymentInfo, _environment, logger);
@@ -769,7 +770,7 @@ await PostDeploymentHelper.SyncFunctionsTriggers(
 
         private void PreDeployment(ITracer tracer)
         {
-            if (Environment.IsAzureEnvironment() 
+            if (Environment.IsAzureEnvironment()
                 && FileSystemHelpers.DirectoryExists(_environment.SSHKeyPath)
                 && OSDetector.IsOnWindows())
             {
@@ -778,7 +779,7 @@ private void PreDeployment(ITracer tracer)
 
                 if (!String.Equals(src, dst, StringComparison.OrdinalIgnoreCase))
                 {
-                    // copy %HOME%\.ssh to %USERPROFILE%\.ssh key to workaround 
+                    // copy %HOME%\.ssh to %USERPROFILE%\.ssh key to workaround
                     // npm with private ssh git dependency
                     using (tracer.Step("Copying SSH keys"))
                     {
@@ -820,12 +821,12 @@ private static void FailDeployment(ITracer tracer, IDisposable deployStep, Deplo
         private static string GetOutputPath(DeploymentInfoBase deploymentInfo, IEnvironment environment, IDeploymentSettingsManager perDeploymentSettings)
         {
             string targetPath = perDeploymentSettings.GetTargetPath();
-            
+
             if (string.IsNullOrWhiteSpace(targetPath))
             {
                 targetPath = deploymentInfo?.TargetPath;
             }
-            
+
             if (!string.IsNullOrWhiteSpace(targetPath))
             {
                 targetPath = targetPath.Trim('\\', '/');
@@ -862,13 +863,13 @@ private IEnumerable<DeployResult> EnumerateResults()
         private IDeploymentStatusFile VerifyDeployment(string id, bool isDeploying)
         {
             IDeploymentStatusFile statusFile = _status.Open(id, _environment);
-            
+
             if (statusFile == null)
             {
                 return null;
             }
-            
-            
+
+
             if (statusFile.Complete)
             {
                 return statusFile;
@@ -910,7 +911,7 @@ private void FinishDeployment(string id, IDisposable deployStep)
         }
 
         private static void TryTouchWatchedFile(DeploymentContext context, DeploymentInfoBase deploymentInfo)
-        {	        
+        {
             try
             {
                 string watchedFileRelativePath = deploymentInfo?.WatchedFilePath;
@@ -918,7 +919,7 @@ private static void TryTouchWatchedFile(DeploymentContext context, DeploymentInf
                 {
                     watchedFileRelativePath = "web.config";
                 }
-                
+
                 string watchedFileAbsolutePath = Path.Combine(context.OutputPath, watchedFileRelativePath);
 
                 if (File.Exists(watchedFileAbsolutePath))
diff --git a/Kudu.Core/Deployment/FetchDeploymentManager.cs b/Kudu.Core/Deployment/FetchDeploymentManager.cs
index d1a12f5b..1e03c2a6 100644
--- a/Kudu.Core/Deployment/FetchDeploymentManager.cs
+++ b/Kudu.Core/Deployment/FetchDeploymentManager.cs
@@ -11,6 +11,7 @@
 using Kudu.Core.Helpers;
 using Kudu.Core.Hooks;
 using Kudu.Core.Infrastructure;
+using Kudu.Core.K8SE;
 using Kudu.Core.SourceControl;
 using Kudu.Core.Tracing;
 using Microsoft.AspNetCore.Http;
@@ -77,7 +78,7 @@ private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment
         {
             IEnvironment _environment;
             var context = accessor.HttpContext;
-            if (!PostDeploymentHelper.IsK8Environment())
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 _environment = environment;
             }
@@ -103,7 +104,7 @@ public async Task<FetchDeploymentRequestResult> FetchDeploy(
             {
                 return FetchDeploymentRequestResult.ForbiddenScmDisabled;
             }
-            
+
             // Else if this app is configured with a url in WEBSITE_USE_ZIP, then fail the deployment
             // since this is a RunFromZip site and the deployment has no chance of succeeding.
             else if (_settings.RunFromRemoteZip())
@@ -171,8 +172,8 @@ public async Task<FetchDeploymentRequestResult> FetchDeploy(
             }
         }
 
-        public async Task PerformDeployment(DeploymentInfoBase deploymentInfo, 
-            IDisposable tempDeployment = null, 
+        public async Task PerformDeployment(DeploymentInfoBase deploymentInfo,
+            IDisposable tempDeployment = null,
             ChangeSet tempChangeSet = null)
         {
             DateTime currentMarkerFileUTC;
@@ -286,8 +287,8 @@ await _deploymentManager.DeployAsync(
                     // if last change is not null and finish successfully, mean there was at least one deployoment happened
                     // since deployment is now done, trigger swap if enabled
                     await PostDeploymentHelper.PerformAutoSwap(
-                        _environment.RequestId, 
-                        new PostDeploymentTraceListener(_tracer, 
+                        _environment.RequestId,
+                        new PostDeploymentTraceListener(_tracer,
                         _deploymentManager.GetLogger(lastChange.Id)));
                 }
             }
@@ -332,7 +333,7 @@ public static async Task<bool> PerformBackgroundDeployment(
             // Needed for deployments where deferred deployment is not allowed. Will be set to false if
             // lock contention occurs and AllowDeferredDeployment is false, otherwise true.
             var deploymentWillOccurTcs = new TaskCompletionSource<bool>();
-            
+
             // This task will be let out of scope intentionally
             var deploymentTask = Task.Run(() =>
             {
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 2f04e6e3..0ed86e04 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -5,6 +5,7 @@
 using Kudu.Core.Helpers;
 using Kudu.Contracts.Settings;
 using Kudu.Core.Deployment.Oryx;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Core.Deployment.Generator
 {
@@ -36,6 +37,11 @@ public override Task Build(DeploymentContext context)
             // Initialize Oryx Args.
             IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
 
+            if(K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                args.appName = environment.K8SEAppName;
+            }
+
             if (!args.SkipKuduSync)
             {
                 // Step 1: Run kudusync
diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index a0986870..a7ff6c1d 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -8,6 +8,7 @@
 using Kudu.Contracts.Tracing;
 using Kudu.Core.Helpers;
 using Kudu.Core.Infrastructure;
+using Kudu.Core.K8SE;
 using Kudu.Core.SourceControl;
 using Kudu.Core.Tracing;
 using Microsoft.AspNetCore.Http;
@@ -28,7 +29,7 @@ public SiteBuilderFactory(IBuildPropertyProvider propertyProvider, IEnvironment
         private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
         {
             IEnvironment _environment;
-            if (!PostDeploymentHelper.IsK8Environment() || accessor==null)
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment() || accessor==null)
             {
                 _environment = environment;
             }
diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index a6ba379d..a8faceab 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -4,6 +4,7 @@
 using k8s;
 using Kudu.Core.Deployment.Oryx;
 using Kudu.Core.Helpers;
+using Kudu.Core.K8SE;
 using LibGit2Sharp;
 
 namespace Kudu.Core.Deployment
@@ -22,13 +23,27 @@ public class AppServiceOryxArguments : IOryxArguments
 
         public string VirtualEnv { get; set; }
 
+        public string appName { get; set; }
+
         public AppServiceOryxArguments()
         {
             RunOryxBuild = false;
             SkipKuduSync = false;
+            string framework = "";
+            string version = "";
 
-            string framework = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkSetting);
-            string version = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkVersionSetting);
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                // K8SE TODO: Inject Environment
+                var frameworkArr = K8SEDeploymentHelper.GetLinuxFxVersion(appName);
+                framework = frameworkArr.Split("|")[0];
+                version = frameworkArr.Split("|")[1];
+            }
+            else
+            {
+                framework = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkSetting);
+                version = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.FrameworkVersionSetting);
+            }
             string buildFlags = System.Environment.GetEnvironmentVariable(OryxBuildConstants.OryxEnvVars.BuildFlagsSetting);
 
             if (string.IsNullOrEmpty(framework) ||
@@ -113,38 +128,6 @@ private void SetVirtualEnvironment()
 
         public string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment environment)
         {
-            string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
-
-            if (PostDeploymentHelper.IsK8Environment())
-            {
-                var config = KubernetesClientConfiguration.InClusterConfig();
-                var client = new Kubernetes(config);
-
-                var deployment = client.ReadNamespacedDeployment(appName, "default");
-                foreach(var container in deployment.Spec.Template.Spec.Containers)
-                {
-                    if (container.Name.Equals(appName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        foreach(var env in container.Env)
-                        {
-                            if(env.Name.Equals("FRAMEWORK", StringComparison.OrdinalIgnoreCase))
-                            {
-                                Language = SupportedFrameworks.ParseLanguage(env.Value);
-                                if (Language == Framework.DotNETCore)
-                                {
-                                    // Skip kudu sync for .NET core builds
-                                    SkipKuduSync = true;
-                                }
-                            }
-                            else if(env.Name.Equals("FRAMEWORK_VERSION", StringComparison.OrdinalIgnoreCase))
-                            {
-                                Version = env.Value;
-                            }
-                        }
-                    }
-                }
-            }
-
             StringBuilder args = new StringBuilder();
             // Language
             switch (Language)
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 5e52428e..0344507d 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -1,6 +1,7 @@
 using Kudu.Contracts.Settings;
 using Kudu.Core.Deployment.Generator;
 using Kudu.Core.Infrastructure;
+using Kudu.Core.K8SE;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -13,7 +14,6 @@ public class ExpressBuilder : ExternalCommandBuilder
         public override string ProjectType => "OryxBuild";
         public IEnvironment environment;
         IDeploymentSettingsManager settings;
-        IBuildPropertyProvider propertyProvider;
 
         public ExpressBuilder(IEnvironment environment, IDeploymentSettingsManager settings, IBuildPropertyProvider propertyProvider, string sourcePath)
             : base(environment, settings, propertyProvider, sourcePath)
@@ -29,56 +29,45 @@ public void SetupExpressBuilderArtifacts(string outputPath, DeploymentContext co
                 return;
             }
 
-            //string sitePackagesDir = "/home/data/SitePackages";
-            //string packageNameFile = Path.Combine(sitePackagesDir, "packagename.txt");
-            //string packagePathFile = Path.Combine(sitePackagesDir, "packagepath.txt");
-
-            //FileSystemHelpers.EnsureDirectory(sitePackagesDir);
-
-            //string packageName = "";
-
-            SetupK8Artifacts(context, outputPath);
-            /*
-            if(args.Language == Framework.NodeJs)
-            {
-                // For App service express mode
-                // Generate packagename.txt and packagepath
-                //packageName = "node_modules.zip:/node_modules";
-                //SetupNodeAppExpressArtifacts(context, sitePackagesDir, outputPath);
-            }
-            else if(args.Language == Framework.Python)
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
-                packageName = $"{args.VirtualEnv}.zip:/home/site/wwwroot/{args.VirtualEnv}";
+                SetupK8Artifacts(context, environment, outputPath);
             }
-            else if(args.Language == Framework.DotNETCore)
+            else
             {
-                // store the zipped artifacts at site packages dir
-                string artifactName = SetupNetCoreAppExpressArtifacts(context, sitePackagesDir, outputPath);
-                packageName = $"{artifactName:/home/site/wwwroot}";
-            }
-
-            File.WriteAllText(packageNameFile, packageName);
-            File.WriteAllText(packagePathFile, outputPath);
-            */
-        }
 
-        private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string sitePackages,string outputPath)
-        {
-            context.Logger.Log($"Express Build enabled for NETCore app");
+                string sitePackagesDir = "/home/data/SitePackages";
+                string packageNameFile = Path.Combine(sitePackagesDir, "packagename.txt");
+                string packagePathFile = Path.Combine(sitePackagesDir, "packagepath.txt");
 
-            // Create NetCore Zip at tm build folder where artifact were build and copy it to sitePackages
-            string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+                FileSystemHelpers.EnsureDirectory(sitePackagesDir);
 
-            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, outputPath, zipAppName, BuildArtifactType.Zip, numBuildArtifacts: -1);
+                string packageName = "";
 
-            // Remove the old zips
-            DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);
+                if (args.Language == Framework.NodeJs)
+                {
+                    // For App service express mode
+                    // Generate packagename.txt and packagepath
+                    //packageName = "node_modules.zip:/node_modules";
+                    //SetupNodeAppExpressArtifacts(context, sitePackagesDir, outputPath);
+                }
+                else if (args.Language == Framework.Python)
+                {
+                    packageName = $"{args.VirtualEnv}.zip:/home/site/wwwroot/{args.VirtualEnv}";
+                }
+                else if (args.Language == Framework.DotNETCore)
+                {
+                    // store the zipped artifacts at site packages dir
+                    string artifactName = SetupNetCoreAppExpressArtifacts(context, sitePackagesDir, outputPath);
+                    packageName = $"{artifactName:/home/site/wwwroot}";
+                }
 
-            return zipAppName;
+                File.WriteAllText(packageNameFile, packageName);
+                File.WriteAllText(packagePathFile, outputPath);
+            }   
         }
 
-
-        private string SetupK8Artifacts(DeploymentContext context, string outputPath)
+        public string SetupK8Artifacts(DeploymentContext context, IEnvironment environment, string outputPath)
         {
             context.Logger.Log($"Building for K8.");
 
@@ -88,7 +77,22 @@ private string SetupK8Artifacts(DeploymentContext context, string outputPath)
             context.Logger.Log($"From {context.BuildTempPath} to {(environment.RepositoryPath + "/../artifacts/" + environment.CurrId)} ");
             FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "/../artifacts/");
             FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "/../artifacts/" + environment.CurrId);
-            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, environment.RepositoryPath +"/../artifacts/" +environment.CurrId, zipAppName, BuildArtifactType.Squashfs, numBuildArtifacts: -1);
+            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, environment.RepositoryPath + "/../artifacts/" + environment.CurrId, zipAppName, BuildArtifactType.Squashfs, numBuildArtifacts: -1);
+            return zipAppName;
+        }
+
+        private string SetupNetCoreAppExpressArtifacts(DeploymentContext context, string sitePackages,string outputPath)
+        {
+            context.Logger.Log($"Express Build enabled for NETCore app");
+
+            // Create NetCore Zip at tm build folder where artifact were build and copy it to sitePackages
+            string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+
+            string createdZip = PackageArtifactFromFolder(context, context.BuildTempPath, outputPath, zipAppName, BuildArtifactType.Zip, numBuildArtifacts: -1);
+
+            // Remove the old zips
+            DeploymentHelper.PurgeBuildArtifactsIfNecessary(sitePackages, BuildArtifactType.Zip, context.Tracer, totalAllowedFiles: 2);
+
             return zipAppName;
         }
 
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index 30a1eb2d..2f7c7950 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -16,6 +16,7 @@ public class FunctionAppOryxArguments : IOryxArguments
         public Framework Language { get; set; }
         public string PublishFolder { get; set; }
         public string VirtualEnv { get; set; }
+        public string appName { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
 
         public FunctionAppOryxArguments()
         {
diff --git a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
index a1ed26c3..1135ba26 100644
--- a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
@@ -20,5 +20,6 @@ public interface IOryxArguments
 
         string PublishFolder { get; set; }
         string VirtualEnv { get; set; }
+        string appName { get; set; }
     }
 }
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 95047335..599fb7ec 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Kudu.Core.Settings;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Core
 {
@@ -40,6 +41,8 @@ public class Environment : IEnvironment
         private readonly string _jobsBinariesPath;
         private readonly string _sitePackagesPath;
         private readonly string _secondaryJobsBinariesPath;
+        private readonly string _k8seAppName;
+
 
         // This ctor is used only in unit tests
         public Environment(
@@ -59,7 +62,8 @@ public Environment(
                 string siteExtensionSettingsPath,
                 string sitePackagesPath,
                 string requestId,
-                IHttpContextAccessor httpContextAccessor)
+                IHttpContextAccessor httpContextAccessor,
+                string k8seAppName = null)
         {
             if (repositoryPath == null)
             {
@@ -78,8 +82,8 @@ public Environment(
             _diagnosticsPath = diagnosticsPath;
             _locksPath = locksPath;
             _sshKeyPath = sshKeyPath;
-            Console.WriteLine("Root Path : "+rootPath);
-            Console.WriteLine("SSH Key Path : "+_sshKeyPath);
+            Console.WriteLine("Root Path : " + rootPath);
+            Console.WriteLine("SSH Key Path : " + _sshKeyPath);
             _scriptPath = scriptPath;
             _nodeModulesPath = nodeModulesPath;
 
@@ -98,6 +102,7 @@ public Environment(
 
             RequestId = !string.IsNullOrEmpty(requestId) ? requestId : Guid.Empty.ToString();
             _httpContextAccessor = httpContextAccessor;
+            _k8seAppName = k8seAppName;
         }
 
         public Environment(
@@ -106,7 +111,8 @@ public Environment(
                 string repositoryPath,
                 string requestId,
                 string kuduConsoleFullPath,
-                IHttpContextAccessor httpContextAccessor)
+                IHttpContextAccessor httpContextAccessor,
+                string k8seAppName = null)
         {
             RootPath = rootPath;
 
@@ -121,6 +127,7 @@ public Environment(
             _siteExtensionSettingsPath = Path.Combine(SiteRootPath, Constants.SiteExtensionsCachePath);
             _diagnosticsPath = Path.Combine(SiteRootPath, Constants.DiagnosticsPath);
             _locksPath = Path.Combine(SiteRootPath, Constants.LocksPath);
+            _k8seAppName = k8seAppName;
 
             if (OSDetector.IsOnWindows())
             {
@@ -130,7 +137,7 @@ public Environment(
             {
                 // in linux, rootPath is "/home", while .ssh folder need to under "/home/{user}"
                 string path2 = System.Environment.GetEnvironmentVariable("KUDU_RUN_USER");
-                if(path2 == null || path2.Equals(""))
+                if (path2 == null || path2.Equals(""))
                 {
                     path2 = "root";
                 }
@@ -461,10 +468,23 @@ public static string TenantId
             }
         }
 
-        public bool IsOnK8 => true;
+        public bool IsK8SEApp {
+            get
+            {
+                return K8SEDeploymentHelper.IsK8SEEnvironment();
+            }
+        }
 
         public string CurrId { get; set; }
 
+        public string K8SEAppName
+        {
+            get
+            {
+                return _k8seAppName;
+            }
+        }
+
         public static string GetFreeSpaceHtml(string path)
         {
             try
diff --git a/Kudu.Core/Helpers/PostDeploymentHelper.cs b/Kudu.Core/Helpers/PostDeploymentHelper.cs
index b25de37a..38cbc4c1 100644
--- a/Kudu.Core/Helpers/PostDeploymentHelper.cs
+++ b/Kudu.Core/Helpers/PostDeploymentHelper.cs
@@ -94,13 +94,6 @@ public static bool IsAzureEnvironment()
             return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.AzureWebsiteInstanceId));
         }
 
-        // K8_BUILD_SERVICE not null or empty
-        public static bool IsK8Environment()
-        {
-            return true;
-            //return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.KubernetesBuildService));
-        }
-
         // WEBSITE_HOME_STAMPNAME = waws-prod-bay-001
         private static string HomeStamp
         {
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index 8f7561d6..e27745fd 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.IO;
 using Kudu.Core.Helpers;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Core.Infrastructure
 {
@@ -23,24 +24,16 @@ public static class DockerContainerRestartTrigger
 
         public static void RequestContainerRestart(IEnvironment environment, string reason)
         {
-            if(PostDeploymentHelper.IsK8Environment())
+            if(K8SEDeploymentHelper.IsK8SEEnvironment())
             {
-                string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0]; ;
-                Process _executingProcess = new Process()
+                string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
+                string buildNumber = environment.CurrId;
+
+                if(!K8SEDeploymentHelper.UpdateBuildNumber(appName, buildNumber))
                 {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = "/bin/bash",
-                        Arguments = $"-c \" /patch.sh {appName} apps/{appName}/site/artifacts/{environment.CurrId}\"",
-                        RedirectStandardOutput = true,
-                        UseShellExecute = false,
-                        CreateNoWindow = true,
-                    }
-                };
-                // Read the standard error of net.exe and write it on to console.
-                _executingProcess.OutputDataReceived += (sender, args) => System.Console.WriteLine("{0}", args.Data);
-                _executingProcess.Start();
-                _executingProcess.WaitForExit();
+                    throw new Exception("Updating Build Version Failed");
+                }
+
                 return;
             }
 
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
new file mode 100644
index 00000000..3c9ed8cd
--- /dev/null
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -0,0 +1,165 @@
+using k8s;
+using Kudu.Contracts.K8SE;
+using Kudu.Contracts.Tracing;
+using Kudu.Core.Deployment;
+using Kudu.Core.Deployment.Generator;
+using Kudu.Core.Infrastructure;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Rest;
+using System;
+using System.IO;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace Kudu.Core.K8SE
+{
+    public static class K8SEDeploymentHelper
+    {
+
+        public static ITracer _tracer;
+        private static Kubernetes _client;
+
+        private static Kubernetes _k8seClient
+        {
+            get
+            {
+                if (_client == null)
+                {
+
+                    var config = KubernetesClientConfiguration.InClusterConfig();
+                    _client = new Kubernetes(config);
+                }
+                return _client;
+            }
+        }
+
+        // K8SE_BUILD_SERVICE not null or empty
+        public static bool IsK8SEEnvironment()
+        {
+            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.KubernetesBuildService));
+        }
+
+        public static string GetLinuxFxVersion(string appName)
+        {
+            K8SEApp app = GetK8SEApp(appName);
+            return $"{app.Spec.codeAppSpec.Framework}|{app.Spec.codeAppSpec.FrameworkVersion}";
+        }
+
+        public static bool UpdateBuildNumber(string appName, string buildNumber)
+        {
+            try
+            {
+
+                K8SEApp app = new K8SEApp()
+                {
+                    ApiVersion = Constants.KubernetesAppServiceApiVersion,
+                    Spec = new AppSpec()
+                };
+
+                app.Spec.codeAppSpec = new CodeAppSpec();
+
+                app.Spec.codeAppSpec.BuildVersion = buildNumber;
+
+                _k8seClient.PatchNamespacedCustomObject(
+                    app,
+                    Constants.KubernetesAppServiceApiGroup,
+                    Constants.KubernetesAppServiceApiVersion,
+                    Constants.KubernetesAppServiceAppNamespace,
+                    Constants.KubernetesAppServiceAppPlural,
+                    appName);
+                return true;
+            }
+            catch (HttpOperationException ex)
+            {
+                if ((ex.Response != null)
+                    && (ex.Response.StatusCode == HttpStatusCode.NotFound))
+                {
+                    return false;
+                }
+
+            }
+            return false;
+        }
+
+        public static string GetAppName(HttpContext context)
+        {
+            var host = context.Request.Headers["Host"].ToString();
+            var appName = "";
+
+            if (host.IndexOf(".") <= 0)
+            {
+                context.Response.StatusCode = 401;
+                // K8SE TODO: move this to resource map
+                throw new InvalidOperationException("Couldn't recognize AppName");
+            }
+            else
+            {
+                appName = host.Substring(0, host.IndexOf("."));
+            }
+
+            try
+            {
+                // block any internal service communication to build server
+                // K8SE TODO: Check source IP to be in the internal service range and block them
+                Int32.Parse(appName);
+                context.Response.StatusCode = 401;
+                // K8SE TODO: move this to resource map
+                throw new InvalidOperationException("Internal services prohibited to communicate with the build server.");
+            }
+            catch(Exception)
+            {
+                // pass
+            }
+
+            return appName;
+        }
+
+        public static K8SEApp GetK8SEApp(string siteName)
+        {
+            //Get the app
+            return ExecuteAsyncKubernetesTask<K8SEApp>((task) => GetAppFromCluster(siteName));
+        }
+
+        private static K8SEApp GetAppFromCluster(string appName)
+        {
+            try
+            {
+                var resultFromCluster = _k8seClient.GetNamespacedCustomObject(
+                                            Constants.KubernetesAppServiceApiGroup,
+                                            Constants.KubernetesAppServiceApiVersion,
+                                            Constants.KubernetesAppServiceAppNamespace,
+                                            Constants.KubernetesAppServiceAppPlural,
+                                            appName);
+
+                if (resultFromCluster == null)
+                {
+                    return null;
+                }
+
+                K8SEApp castedAksWebApp = ((Newtonsoft.Json.Linq.JObject)resultFromCluster).ToObject<K8SEApp>();
+
+                return castedAksWebApp;
+            }
+            catch (HttpOperationException ex)
+            {
+                if ((ex.Response != null)
+                    && (ex.Response.StatusCode == HttpStatusCode.NotFound))
+                {
+                    return null;
+                }
+
+            }
+
+            return null;
+        }
+
+        // Helper method to ensure that we get a different thread by avoiding use of ThreadPool's threads
+        // when calling Kubernetes client async methods.
+        private static T ExecuteAsyncKubernetesTask<T>(Func<object, T> action)
+        {
+            object result = Task.Factory.StartNew<T>(action, null, TaskCreationOptions.LongRunning).Result;
+
+            return (T)result;
+        }
+    }
+}
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index ddbe0481..6668011d 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -39,6 +39,7 @@
     <PackageReference Include="System.IO.Abstractions" Version="2.1.0.192" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
+    <PackageReference Include="KubernetesClient" Version="1.5.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Kudu.Core/Resources.Designer.cs b/Kudu.Core/Resources.Designer.cs
index 3887d526..64d4d6da 100644
--- a/Kudu.Core/Resources.Designer.cs
+++ b/Kudu.Core/Resources.Designer.cs
@@ -365,7 +365,18 @@ internal static string Log_TriggeringContainerRestart {
                 return ResourceManager.GetString("Log_TriggeringContainerRestart", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to K8SEApp will begin restart..
+        /// </summary>
+        internal static string Log_TriggeringK8SERestart
+        {
+            get
+            {
+                return ResourceManager.GetString("Log_TriggeringK8SERestart", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to An unknown error has occurred. Check the diagnostic log for details..
         /// </summary>
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 819d7366..89989f67 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -11,6 +11,7 @@
 using Kudu.Core.Helpers;
 using System.IO;
 using System.Net.Http.Headers;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Web
 {
@@ -40,56 +41,29 @@ public KubeMiddleware(RequestDelegate next)
         /// <returns>Response be set to 404 if the route is not whitelisted</returns>
         public async Task Invoke(HttpContext context, IEnvironment environment, IServerConfiguration serverConfig)
         {
-            var result = await context.AuthenticateAsync();
-         
-            if (result.Succeeded == false)
-            {
-                context.Response.StatusCode = 401;
-                context.Response.Headers["WWW-Authenticate"] = "Basic realm=\"site\"";
-                return;
-            }
-
-            var host = context.Request.Headers["Host"].ToString();
-            Console.WriteLine("HOST: "+host);
-            var appName = "";
+            string appName = K8SEDeploymentHelper.GetAppName(context);
 
-            if (host.IndexOf(".") <= 0)
-            {
-                appName = "test1";
-            }
-            else
-            {
-                try
-                {
-                    int res = Int32.Parse(host.Substring(0, host.IndexOf(".")));
-                    var authHeader = AuthenticationHeaderValue.Parse(context.Request.Headers["Authorization"]);
-                    var credentialBytes = Convert.FromBase64String(authHeader.Parameter);
-                    var credentials = Encoding.UTF8.GetString(credentialBytes).Split(new[] { ':' }, 2);
-                    var username = credentials[0];
-                    appName = username;
-                }
-                catch (FormatException)
-                {
-                    appName = host.Substring(0, host.IndexOf("."));
-                }
-            }
-
-            Console.WriteLine("AppName: " + appName);
             string homeDir = "";
             string siteRepoDir = "";
             if (OSDetector.IsOnWindows())
             {
+                // K8SE TODO : Move to constants
                 homeDir = "F:\\repos\\apps\\";
                 siteRepoDir = "\\site\\repository";
             }
             else
             {
+                // K8SE TODO : Move to constants
                 homeDir = "/home/apps/";
                 siteRepoDir = "/site/repository";
             }
 
+            // Cache the App Environment for this request
             context.Items.Add("environment", GetEnvironment(homeDir, appName));
 
+            // Cache the appName for this request
+            context.Items.Add("appName", appName);
+
 
             string[] pathParts = context.Request.Path.ToString().Split("/");
 
@@ -106,7 +80,8 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             }
 
             serverConfig.GitServerRoot = appName + ".git";
-            environment.RepositoryPath = homeDir + appName + siteRepoDir;
+            // TODO: Use Path.Combine
+            environment.RepositoryPath = $"{homeDir}{appName}{siteRepoDir}";
             await _next.Invoke(context);
         }
         private bool IsGitRoute(PathString routePath)
@@ -138,18 +113,24 @@ private static IEnvironment GetEnvironment(
             var kuduConsoleFullPath =
                 Path.Combine(AppContext.BaseDirectory, KuduConsoleRelativePath, KuduConsoleFilename);
             return new Core.Environment(root, EnvironmentHelper.NormalizeBinPath(binPath), repositoryPath, requestId,
-                kuduConsoleFullPath, null);
+                kuduConsoleFullPath, null, appName);
         }
 
+        /// <summary>
+        /// Resolves the root path for the app being served by
+        /// Multitenant Kudu
+        /// </summary>
+        /// <param name="home"></param>
+        /// <param name="appName"></param>
+        /// <returns></returns>
         public static string ResolveRootPath(string home, string appName)
         {
             // The HOME path should always be set correctly
             //var path = System.Environment.ExpandEnvironmentVariables(@"%HOME%");
-            var path = home + appName;
-            Console.WriteLine("Checking site home : " + (home + appName));
-            if (!Directory.Exists(path))
-                // We should never get here
-                throw new DirectoryNotFoundException("The site's home directory could not be located");
+            var path = $"{home}{appName}";
+
+            FileSystemHelpers.EnsureDirectory(path);
+            
             // For users running Windows Azure Pack 2 (WAP2), %HOME% actually points to the site folder,
             // which we don't want here. So yank that segment if we detect it.
             if (Path.GetFileName(path).Equals(Constants.SiteFolder, StringComparison.OrdinalIgnoreCase))
diff --git a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs b/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
deleted file mode 100644
index 4dabfd70..00000000
--- a/Kudu.Services.Web/Services/BasicAuthenticationHandler.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using k8s;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System;
-using System.Net.Http.Headers;
-using System.Security.Claims;
-using System.Text;
-using System.Text.Encodings.Web;
-using System.Threading.Tasks;
-
-namespace Kudu.Services.Web.Services
-{
-    public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
-    {
-        public static string PublishingProfileSecretPrefix = "PUBLISHING-PROFILE-";
-
-        public BasicAuthenticationHandler(
-            IOptionsMonitor<AuthenticationSchemeOptions> options,
-            ILoggerFactory logger,
-            UrlEncoder encoder,
-            ISystemClock clock)
-            : base(options, logger , encoder, clock)
-        {
-        }
-
-        public static KuduMemCache<string> memCache = new KuduMemCache<string>();
-
-        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            if (!Request.Headers.ContainsKey("Authorization"))
-            {
-                return AuthenticateResult.Fail("Missing Authorization Header");
-            }
-
-            try
-            {
-                var authHeader = AuthenticationHeaderValue.Parse(Request.Headers["Authorization"]);
-                var credentialBytes = Convert.FromBase64String(authHeader.Parameter);
-                var credentials = Encoding.UTF8.GetString(credentialBytes).Split(new[] { ':' }, 2);
-                var username = credentials[0];
-                var password = credentials[1];
-                Console.WriteLine($"password supplied: {password}");
-                if ((memCache.GetOrCreate(username, GetAuthenticationData)).Equals(password))
-                {
-                    var claims = new[] {
-                        new Claim(ClaimTypes.NameIdentifier, username),
-                        new Claim(ClaimTypes.Name, username),
-                    };
-
-                    var identity = new ClaimsIdentity(claims, Scheme.Name);
-                    var principal = new ClaimsPrincipal(identity);
-                    var ticket = new AuthenticationTicket(principal, Scheme.Name);
-                    return AuthenticateResult.Success(ticket);
-                }
-                else
-                {
-                    return AuthenticateResult.Fail("Invalid Username or Password");
-                }
-
-            }
-            catch
-            {
-                return AuthenticateResult.Fail("Invalid Authorization Header");
-            }
-        }
-
-
-        public async Task<string> GetAuthenticationData(string username)
-        {
-            var config = KubernetesClientConfiguration.InClusterConfig();
-            string password = "";
-
-            // Use the config object to create a client.
-            var client = new Kubernetes(config);
-            try
-            {
-                Console.WriteLine("Retrieving Password: " + password);
-                var secret = await client.ReadNamespacedSecretAsync($"{PublishingProfileSecretPrefix.ToLower()}{username.ToLower()}","k8seappspubpassword");
-                Console.WriteLine("secret retrieved: ");
-                password = System.Text.Encoding.UTF8.GetString(secret.Data["password"]);
-                Console.WriteLine("Password retrieved: " + password);
-            }
-            catch (Microsoft.Rest.HttpOperationException httpOperationException)
-            {
-                var phrase = httpOperationException.Response.ReasonPhrase;
-                var content = httpOperationException.Response.Content;
-                Console.WriteLine("K8 Client errror");
-                Console.WriteLine(phrase);
-                Console.WriteLine(content);
-            }
-            return password;
-        }
-    }
-}
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 93c1b1c4..ce986de8 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -44,6 +44,7 @@
 using ILogger = Kudu.Core.Deployment.ILogger;
 using Microsoft.AspNetCore.Authentication;
 using Kudu.Services.Web.Services;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Web
 {
@@ -79,8 +80,6 @@ public void ConfigureServices(IServiceCollection services)
             Console.WriteLine(@"Configure Services : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
             FileSystemHelpers.DeleteDirectorySafe("/home/site/locks/deployment");
             // configure basic authentication 
-            services.AddAuthentication("BasicAuthentication")
-                .AddScheme<AuthenticationSchemeOptions, BasicAuthenticationHandler>("BasicAuthentication", null);
 
             services.Configure<FormOptions>(options =>
             {
@@ -96,7 +95,6 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddMvcCore()
                 .AddRazorPages()
-                .AddAuthorization()
                 .AddJsonFormatters()
                 .AddJsonOptions(options => options.SerializerSettings.ContractResolver = new DefaultContractResolver())
                 .AddApplicationPart(kuduServicesAssembly).AddControllersAsServices()
@@ -354,9 +352,10 @@ public void Configure(IApplicationBuilder app,
                 i.Request.Path.Value.StartsWith("/api/provision", StringComparison.OrdinalIgnoreCase));
 
             app.UseTraceMiddleware();
-            app.UseAuthentication();
-            app.UseKubeMiddleware();
-
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                app.UseKubeMiddleware();
+            }
             app.MapWhen(containsRelativeProvisionPath, application => application.Run(async context =>
             {
                 FileSystemHelpers.EnsureDirectory("/home/apps/"+context.Request.Path.Value.Replace("/api/provision/", ""));
diff --git a/Kudu.Services/Deployment/DeploymentController.cs b/Kudu.Services/Deployment/DeploymentController.cs
index 931d24b9..a55a957e 100644
--- a/Kudu.Services/Deployment/DeploymentController.cs
+++ b/Kudu.Services/Deployment/DeploymentController.cs
@@ -29,6 +29,7 @@
 using Microsoft.Net.Http.Headers;
 using Kudu.Services.Zip;
 using System.IO.Compression;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Deployment
 {
@@ -70,7 +71,7 @@ public DeploymentController(ITracer tracer,
         private void GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
         {
             var context = accessor.HttpContext;
-            if (!PostDeploymentHelper.IsK8Environment())
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 _environment = environment;
             }
@@ -402,7 +403,7 @@ public IActionResult GetDeployResults()
             }
 
             // Avoid Caching when on K8
-            if (EtagEquals(Request, currentEtag) && !PostDeploymentHelper.IsK8Environment())
+            if (EtagEquals(Request, currentEtag) && !K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 result = StatusCode(StatusCodes.Status304NotModified);
             }
@@ -410,7 +411,7 @@ public IActionResult GetDeployResults()
             {
                 using (_tracer.Step("DeploymentService.GetDeployResults"))
                 {
-                    if (!currentEtag.Equals(cachedDeployments.Etag) || PostDeploymentHelper.IsK8Environment())
+                    if (!currentEtag.Equals(cachedDeployments.Etag) || K8SEDeploymentHelper.IsK8SEEnvironment())
                     {
                         cachedDeployments = new DeploymentsCacheItem
                         {
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index c13cc46c..9b3bf8e1 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -22,6 +22,7 @@
 using Kudu.Core.Helpers;
 using System.Threading;
 using System.Collections;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Deployment
 {
@@ -56,7 +57,7 @@ private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment
         {
             IEnvironment _environment;
             var context = accessor.HttpContext;
-            if (!PostDeploymentHelper.IsK8Environment())
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 _environment = environment;
             }
diff --git a/Kudu.Services/Diagnostics/DiagnosticsController.cs b/Kudu.Services/Diagnostics/DiagnosticsController.cs
index 1db75330..aabdf41a 100644
--- a/Kudu.Services/Diagnostics/DiagnosticsController.cs
+++ b/Kudu.Services/Diagnostics/DiagnosticsController.cs
@@ -18,6 +18,7 @@
 using Kudu.Services.Infrastructure;
 using System.Threading.Tasks;
 using Kudu.Core.Helpers;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Performance
 {
@@ -47,7 +48,7 @@ public DiagnosticsController(IEnvironment environment, ITracer tracer, IApplicat
                 Path.Combine(environment.RootPath, Constants.LogFilesPath),
                 Path.Combine(environment.WebRootPath, Constants.NpmDebugLogFile),
             };
-            if (!PostDeploymentHelper.IsK8Environment())
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 _environment = environment;
             }
diff --git a/Kudu.Services/Docker/DockerController.cs b/Kudu.Services/Docker/DockerController.cs
index 68a3d871..b82e3bd8 100644
--- a/Kudu.Services/Docker/DockerController.cs
+++ b/Kudu.Services/Docker/DockerController.cs
@@ -6,6 +6,7 @@
 using Kudu.Core;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Docker
 {
@@ -20,7 +21,7 @@ public DockerController(ITraceFactory traceFactory, IDeploymentSettingsManager s
         {
             _traceFactory = traceFactory;
             _settings = settings;
-            if (!PostDeploymentHelper.IsK8Environment())
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 _environment = environment;
             }
diff --git a/Kudu.Services/Editor/VfsController.cs b/Kudu.Services/Editor/VfsController.cs
index 41149a19..0b221161 100644
--- a/Kudu.Services/Editor/VfsController.cs
+++ b/Kudu.Services/Editor/VfsController.cs
@@ -14,6 +14,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Net.Http.Headers;
 using Kudu.Core.Helpers;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Editor
 {
@@ -52,7 +53,7 @@ protected override Task<IActionResult> CreateDirectoryPutResponse(DirectoryInfoB
         private static IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment environment)
         {
             IEnvironment _environment;
-            if (!PostDeploymentHelper.IsK8Environment() || accessor == null)
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment() || accessor == null)
             {
                 _environment = environment;
             }
diff --git a/Kudu.Services/Zip/ZipController.cs b/Kudu.Services/Zip/ZipController.cs
index 1f998955..e0320f80 100644
--- a/Kudu.Services/Zip/ZipController.cs
+++ b/Kudu.Services/Zip/ZipController.cs
@@ -14,6 +14,7 @@
 using Kudu.Core.Helpers;
 using System.Threading;
 using Microsoft.AspNetCore.Http;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Zip
 {
@@ -34,7 +35,7 @@ private static IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvir
         {
             IEnvironment _environment;
             var context = accessor.HttpContext;
-            if (!PostDeploymentHelper.IsK8Environment())
+            if (!K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 _environment = environment;
             }

From ceb8339b473bf9dd8c0be664c2e4088042cfe097 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 3 Feb 2020 12:54:11 -0800
Subject: [PATCH 213/245] Migrated to buildctl for K8SE Operations

---
 Common/Constants.cs                           |   9 +-
 Kudu.Contracts/K8SE/CustomResource.cs         |  38 -----
 Kudu.Contracts/K8SE/K8SEApp.cs                |  89 ----------
 Kudu.Contracts/Kudu.Contracts.csproj          |   1 -
 Kudu.Core/Deployment/DeploymentManager.cs     |   4 +-
 .../Deployment/Generator/BasicBuilder.cs      |  26 +--
 .../Generator/Deploymentv2BasicBuilder.cs     |  70 ++++++++
 .../Generator/ExternalCommandFactory.cs       |   1 -
 .../Generator/SiteBuilderFactory.cs           |   4 -
 .../DockerContainerRestartTrigger.cs          |   6 +-
 Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs     |  30 ++++
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        | 157 ++++++------------
 Kudu.Core/Kudu.Core.csproj                    |   1 -
 Kudu.Services.Web/KubeMiddleware.cs           |   3 +-
 Kudu.Services.Web/Kudu.Services.Web.csproj    |   1 +
 Kudu.Services.Web/Startup.cs                  |   2 +
 Kudu.Services/Kudu.Services.csproj            |   7 +
 17 files changed, 186 insertions(+), 263 deletions(-)
 delete mode 100644 Kudu.Contracts/K8SE/CustomResource.cs
 delete mode 100644 Kudu.Contracts/K8SE/K8SEApp.cs
 create mode 100644 Kudu.Core/Deployment/Generator/Deploymentv2BasicBuilder.cs
 create mode 100644 Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index bb791f81..50cf19d9 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -84,13 +84,6 @@ public static TimeSpan MaxAllowedExecutionTime
             get { return _maxAllowedExectionTime; }
         }
 
-        // K8SE Constants
-        public const string KubernetesConfigKind = "Config";
-        public const string KubernetesAppServiceApiGroup = "k8se.microsoft.com";
-        public const string KubernetesAppServiceApiVersion = "v1alpha1";
-        public static string KubernetesAppServiceAppPlural = "apps";
-        public static string KubernetesAppServiceAppNamespace = "k8se-apps";
-
         public const string ApplicationHostXdtFileName = "applicationHost.xdt";
         public const string ScmApplicationHostXdtFileName = "scmApplicationHost.xdt";
 
@@ -160,6 +153,6 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string LinuxLogEventStreamName = "MS_KUDU_LOGS";
         public const string WebSiteHomeStampName = "WEBSITE_HOME_STAMPNAME";
         public const string WebSiteStampDeploymentId = "WEBSITE_STAMP_DEPLOYMENT_ID";
-        public const string KubernetesBuildService = "K8_BUILD_SERVICE";
+        public const string IsK8SEEnvironment = "K8SE_BUILD_SERVICE";
     }
 }
diff --git a/Kudu.Contracts/K8SE/CustomResource.cs b/Kudu.Contracts/K8SE/CustomResource.cs
deleted file mode 100644
index f248dc75..00000000
--- a/Kudu.Contracts/K8SE/CustomResource.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using k8s;
-using k8s.Models;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-namespace Kudu.Contracts.K8SE
-{
-    public abstract class CustomResource : KubernetesObject
-    {
-        [JsonProperty(PropertyName = "metadata")]
-        public V1ObjectMeta Metadata { get; set; }
-    }
-
-    public abstract class CustomResource<TSpec, TStatus> : CustomResource
-    {
-        [JsonProperty(PropertyName = "spec")]
-        public TSpec Spec { get; set; }
-        public TStatus Status { get; set; }
-    }
-
-    public abstract class CustomResourceList<T> : KubernetesObject where T : CustomResource
-    {
-        public V1ObjectMeta Metadata { get; set; }
-        public V1ListMeta ListMetadata { get; set; }
-        public List<CustomResource> Items { get; set; }
-    }
-
-    public class CustomResourceDefinition
-    {
-        public string ApiVersion { get; set; }
-
-        public string PluralName { get; set; }
-
-        public string Kind { get; set; }
-
-        public string Namespace { get; set; }
-    }
-}
diff --git a/Kudu.Contracts/K8SE/K8SEApp.cs b/Kudu.Contracts/K8SE/K8SEApp.cs
deleted file mode 100644
index 11119a5f..00000000
--- a/Kudu.Contracts/K8SE/K8SEApp.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace Kudu.Contracts.K8SE
-{
-        public enum AppKind
-        {
-            CodeWebApp = 0,
-            FunctionApp = 1,
-            ContainerApp = 2
-        }
-        public class AppSpec
-        {
-            [JsonProperty(PropertyName = "kind")]
-            public string Kind { get; set; }
-
-            [JsonProperty(PropertyName = "appPort")]
-            public int AppPort { get; set; }
-
-            [JsonProperty(PropertyName = "minReplicas")]
-            public int? MinReplicas { get; set; }
-
-            [JsonProperty(PropertyName = "maxReplicas")]
-            public int? MaxReplicas { get; set; }
-
-            [JsonProperty(PropertyName = "hostnames")]
-            public CodeAppSpec codeAppSpec { get; set; }
-
-            [JsonProperty(PropertyName = "containers")]
-            public List<ContainerSpec> Containers { get; set; }
-
-            [JsonProperty(PropertyName = "hostnames")]
-            public List<HostNameSpec> Hostnames { get; set; }
-        }
-
-        public class ContainerSpec
-        {
-            [JsonProperty(PropertyName = "type")]
-            public string Type { get; set; }
-
-            [JsonProperty(PropertyName = "name")]
-            public string Name { get; set; }
-
-            [JsonProperty(PropertyName = "image")]
-            public string Image { get; set; }
-
-            [JsonProperty(PropertyName = "ports")]
-            public List<PortSpec> Ports { get; set; }
-        }
-
-        public class HostNameSpec
-        {
-            [JsonProperty(PropertyName = "domain")]
-            public string Domain { get; set; }
-        }
-
-        public class CodeAppSpec
-        {
-            [JsonProperty(PropertyName = "framework")]
-            public string Framework { get; set; }
-
-            [JsonProperty(PropertyName = "frameworkVersion")]
-            public string FrameworkVersion { get; set; }
-
-            [JsonProperty(PropertyName = "functionRuntimeVersion")]
-            public string FunctionRuntimeVersion { get; set; }
-
-            [JsonProperty(PropertyName = "buildVersion")]
-            public string BuildVersion { get; set; }
-        }
-
-        public class PortSpec
-        {
-            [JsonProperty(PropertyName = "containerPort")]
-            public int ContainerPort { get; set; }
-
-            [JsonProperty(PropertyName = "name")]
-            public string Name { get; set; }
-        }
-
-        public class AppStatus
-        {
-        }
-
-        public class K8SEApp : CustomResource<AppSpec, AppStatus>
-        {
-        }
-}
diff --git a/Kudu.Contracts/Kudu.Contracts.csproj b/Kudu.Contracts/Kudu.Contracts.csproj
index e5c54011..1ea09fef 100644
--- a/Kudu.Contracts/Kudu.Contracts.csproj
+++ b/Kudu.Contracts/Kudu.Contracts.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-      <PackageReference Include="KubernetesClient" Version="1.5.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 117a7853..180c6d63 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -277,7 +277,7 @@ public async Task DeployAsync(
                     {
                         if (K8SEDeploymentHelper.IsK8SEEnvironment())
                         {
-                            logger.Log(Resources.Log_TriggeringK8SERestart);
+                            //logger.Log(Resources.Log_TriggeringK8SERestart);
                         }
                         else
                         {
@@ -329,7 +329,6 @@ public async Task DeployAsync(
                         tracer.TraceError(exception);
                         throw new DeploymentFailedException(exception);
                     }
-
             }
         }
 
@@ -716,6 +715,7 @@ private async Task Build(
                     try
                     {
                         await builder.Build(context);
+
                         builder.PostBuild(context);
 
                         if (FunctionAppHelper.LooksLikeFunctionApp() && _environment.IsOnLinuxConsumption)
diff --git a/Kudu.Core/Deployment/Generator/BasicBuilder.cs b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
index c97c0636..6f1a0974 100644
--- a/Kudu.Core/Deployment/Generator/BasicBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/BasicBuilder.cs
@@ -1,6 +1,7 @@
 using Kudu.Contracts.Settings;
 using Kudu.Core.Deployment.Oryx;
 using Kudu.Core.Infrastructure;
+using Kudu.Core.K8SE;
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -18,19 +19,22 @@ public BasicBuilder(IEnvironment environment, IDeploymentSettingsManager setting
 
         public override Task Build(DeploymentContext context)
         {
-            ILogger customLogger = context.Logger.Log("In K8 Basic Builder");
-            context.Logger.Log("RepositoryPath "+ _environment.ZipTempPath);
-            context.Logger.Log("SiteRootPath " + _environment.SiteRootPath);
-            //context.Logger.Log("CurrId "+ _environment.);
-            string src = _environment.ZipTempPath;
-            string artifactDir = Path.Combine(_environment.SiteRootPath, "artifacts", _environment.CurrId);
-            FileSystemHelpers.EnsureDirectory(Path.Combine(_environment.ZipTempPath, "artifacts"));
-            FileSystemHelpers.EnsureDirectory(artifactDir);
-            context.Logger.Log($"src : {src} dest {artifactDir}");
-            return Task.Factory.StartNew(() => PackageArtifactFromFolder(context, Path.Combine(_environment.ZipTempPath, "extracted"), Path.Combine(_environment.SiteRootPath, "artifacts", _environment.CurrId),"artifact.zip" ,BuildArtifactType.Squashfs, 2));
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                // K8SE TODO: Move to a resources file
+                ILogger customLogger = context.Logger.Log("Builder : K8SE Basic Builder");
+                string src = _environment.ZipTempPath;
+                string artifactDir = Path.Combine(_environment.SiteRootPath, "artifacts", _environment.CurrId);
+                FileSystemHelpers.EnsureDirectory(Path.Combine(_environment.ZipTempPath, "artifacts"));
+                FileSystemHelpers.EnsureDirectory(artifactDir);
+                return Task.Factory.StartNew(() => PackageArtifactFromFolder(context, Path.Combine(_environment.ZipTempPath, "extracted"), Path.Combine(_environment.SiteRootPath, "artifacts", _environment.CurrId), "artifact.zip", BuildArtifactType.Squashfs, 2));
+            }
+            else
+            {
+                return Task.CompletedTask;
+            }
         }
 
-
         private string PackageArtifactFromFolder(DeploymentContext context, string srcDirectory, string artifactDirectory, string artifactFilename, BuildArtifactType artifactType, int numBuildArtifacts = 0)
         {
             context.Logger.Log($"Writing the artifacts to {artifactType.ToString()} file at {artifactDirectory}");
diff --git a/Kudu.Core/Deployment/Generator/Deploymentv2BasicBuilder.cs b/Kudu.Core/Deployment/Generator/Deploymentv2BasicBuilder.cs
new file mode 100644
index 00000000..13fe36fe
--- /dev/null
+++ b/Kudu.Core/Deployment/Generator/Deploymentv2BasicBuilder.cs
@@ -0,0 +1,70 @@
+using Kudu.Contracts.Settings;
+using Kudu.Contracts.Tracing;
+using Kudu.Core.Infrastructure;
+using Kudu.Core.SourceControl;
+using System;
+using System.IO;
+
+namespace Kudu.Core.Deployment.Generator
+{
+    class DeploymentV2BasicBuilder : BaseBasicBuilder
+    {
+        private readonly IEnvironment _environment;
+        private readonly ILogger _logger;
+        private readonly ITracer _tracer;
+        private readonly IRepository _repository;
+
+        public DeploymentV2BasicBuilder(IEnvironment environment, 
+            IDeploymentSettingsManager settings, 
+            IBuildPropertyProvider propertyProvider, 
+            DeploymentInfoBase deploymentInfo,
+            IRepository repository,
+            ILogger logger,
+            ITracer tracer,
+            string repositoryPath, 
+            string projectPath)
+            : base(environment, settings, propertyProvider, repositoryPath, projectPath, "--basic")
+        {
+            this._environment = environment;
+            this._logger = logger;
+            this._tracer = tracer;
+            this._repository = repository;
+            if(deploymentInfo is ZipDeploymentInfo)
+            {
+                var zipDeploymentInfo = ((ZipDeploymentInfo)deploymentInfo);
+                SetupArtifacts(zipDeploymentInfo);
+            }
+        }
+
+        public override string ProjectType
+        {
+            get { return "BASICV2"; }
+        }
+
+        private void SetupArtifacts(ZipDeploymentInfo deploymentInfo)
+        {
+            string deploymentsPath = _environment.DeploymentsPath;
+            string artifactPath = Path.Combine(deploymentsPath, _repository.CurrentId, "artifact");
+
+            FileSystemHelpers.EnsureDirectory(artifactPath);
+
+            string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+
+            var copyExe = ExternalCommandFactory.BuildExternalCommandExecutable(_environment.ZipTempPath, artifactPath, _logger);
+            var copyToPath = Path.Combine(artifactPath, zipAppName);
+
+            try
+            {
+                copyExe.ExecuteWithProgressWriter(_logger, _tracer, $"cp {deploymentInfo.RepositoryUrl} {copyToPath}");
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            // Update the packagename file to ensure latest app restart loads the new zip file
+            // K8SE TODO: Uncomment this and test
+            //DeploymentHelper.UpdateLatestAndPurgeOldArtifacts(_environment, zipAppName, artifactPath, _tracer);
+        }
+    }
+}
diff --git a/Kudu.Core/Deployment/Generator/ExternalCommandFactory.cs b/Kudu.Core/Deployment/Generator/ExternalCommandFactory.cs
index cf7dbc88..7791e697 100644
--- a/Kudu.Core/Deployment/Generator/ExternalCommandFactory.cs
+++ b/Kudu.Core/Deployment/Generator/ExternalCommandFactory.cs
@@ -75,7 +75,6 @@ public Executable BuildCommandExecutable(string commandPath, string workingDirec
             UpdateToDefaultIfNotSet(exe, WellKnownEnvironmentVariables.MSBuild15Dir, PathUtilityFactory.Instance.ResolveMSBuild15Dir(), logger);
             UpdateToDefaultIfNotSet(exe, WellKnownEnvironmentVariables.KuduSyncCommandKey, KuduSyncCommand, logger);
             UpdateToDefaultIfNotSet(exe, WellKnownEnvironmentVariables.NuGetExeCommandKey, NuGetExeCommand, logger);
-            UpdateToDefaultIfNotSet(exe, WellKnownEnvironmentVariables.NpmJsPathKey, PathUtilityFactory.Instance.ResolveNpmJsPath(), logger);
             UpdateToDefaultIfNotSet(exe, WellKnownEnvironmentVariables.DnvmPath, DnvmPath, logger);
             UpdateToDefaultIfNotSet(exe, WellKnownEnvironmentVariables.GypMsvsVersion, Constants.VCVersion, logger);
             UpdateToDefaultIfNotSet(exe, WellKnownEnvironmentVariables.VCTargetsPath, PathUtilityFactory.Instance.ResolveVCTargetsPath(), logger);
diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index a7ff6c1d..36eada30 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -6,7 +6,6 @@
 using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.Settings;
 using Kudu.Contracts.Tracing;
-using Kudu.Core.Helpers;
 using Kudu.Core.Infrastructure;
 using Kudu.Core.K8SE;
 using Kudu.Core.SourceControl;
@@ -76,11 +75,8 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
                 return new RunFromZipSiteBuilder();
             }
 
-            tracer.Trace("Checking if build enabled: ");
-
             if (!settings.DoBuildDuringDeployment())
             {
-                tracer.Trace("Nope build is off");
                 var projectPath = !String.IsNullOrEmpty(targetProjectPath) ? targetProjectPath : repositoryRoot;
                 return new BasicBuilder(_environment, settings, _propertyProvider, repositoryRoot, projectPath);
             }
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index e27745fd..4d955f39 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -29,11 +29,7 @@ public static void RequestContainerRestart(IEnvironment environment, string reas
                 string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
                 string buildNumber = environment.CurrId;
 
-                if(!K8SEDeploymentHelper.UpdateBuildNumber(appName, buildNumber))
-                {
-                    throw new Exception("Updating Build Version Failed");
-                }
-
+                K8SEDeploymentHelper.UpdateBuildNumber(appName, buildNumber);
                 return;
             }
 
diff --git a/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs b/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs
new file mode 100644
index 00000000..cb6658af
--- /dev/null
+++ b/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.K8SE
+{
+    internal class BuildCtlArgumentsHelper
+    {
+        internal static void AddBuildCtlCommand(StringBuilder args, string verb)
+        {
+            args.AppendFormat("buildctl {0} ", verb);
+        }
+
+        internal static void AddAppNameArgument(StringBuilder args, string appName)
+        {
+            args.AppendFormat(" -appName {0}", appName);
+        }
+
+        internal static void AddAppPropertyArgument(StringBuilder args, string appProperty)
+        {
+            args.AppendFormat(" -appProperty {0}", appProperty);
+        }
+
+        internal static void AddAppPropertyValueArgument(StringBuilder args, string appPropertyValue)
+        {
+            args.AppendFormat(" -appPropertyValue {0}", appPropertyValue);
+        }
+
+    }
+}
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 3c9ed8cd..636a3964 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -1,15 +1,9 @@
-using k8s;
-using Kudu.Contracts.K8SE;
-using Kudu.Contracts.Tracing;
+using Kudu.Contracts.Tracing;
 using Kudu.Core.Deployment;
-using Kudu.Core.Deployment.Generator;
-using Kudu.Core.Infrastructure;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Rest;
 using System;
-using System.IO;
-using System.Net;
-using System.Threading.Tasks;
+using System.Diagnostics;
+using System.Text;
 
 namespace Kudu.Core.K8SE
 {
@@ -17,68 +11,74 @@ public static class K8SEDeploymentHelper
     {
 
         public static ITracer _tracer;
-        private static Kubernetes _client;
-
-        private static Kubernetes _k8seClient
-        {
-            get
-            {
-                if (_client == null)
-                {
-
-                    var config = KubernetesClientConfiguration.InClusterConfig();
-                    _client = new Kubernetes(config);
-                }
-                return _client;
-            }
-        }
+        public static ILogger _logger;
 
         // K8SE_BUILD_SERVICE not null or empty
         public static bool IsK8SEEnvironment()
         {
-            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.KubernetesBuildService));
+            return !String.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(Constants.IsK8SEEnvironment));
         }
 
+        /// <summary>
+        /// Calls into buildctl to retrieve BuildVersion of
+        /// the K8SE App
+        /// </summary>
+        /// <param name="appName"></param>
+        /// <returns></returns>
         public static string GetLinuxFxVersion(string appName)
         {
-            K8SEApp app = GetK8SEApp(appName);
-            return $"{app.Spec.codeAppSpec.Framework}|{app.Spec.codeAppSpec.FrameworkVersion}";
+            var cmd = new StringBuilder();
+            BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "get");
+            BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
+            BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "linuxFxVersion");
+            return RunBuildCtlCommand(cmd.ToString(), "Running buildctl to retrieve framework info...");
         }
 
-        public static bool UpdateBuildNumber(string appName, string buildNumber)
+        /// <summary>
+        /// Calls into buildctl to update a BuildVersion of
+        /// the K8SE App
+        /// </summary>
+        /// <param name="appName"></param>
+        /// <returns></returns>
+        public static void UpdateBuildNumber(string appName, string buildNumber)
         {
-            try
-            {
-
-                K8SEApp app = new K8SEApp()
-                {
-                    ApiVersion = Constants.KubernetesAppServiceApiVersion,
-                    Spec = new AppSpec()
-                };
-
-                app.Spec.codeAppSpec = new CodeAppSpec();
-
-                app.Spec.codeAppSpec.BuildVersion = buildNumber;
+            var cmd = new StringBuilder();
+            BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "update");
+            BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
+            BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "buildVersion");
+            BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, buildNumber);
+            RunBuildCtlCommand(cmd.ToString(), "Running buildctl to retrieve framework info...");
+        }
 
-                _k8seClient.PatchNamespacedCustomObject(
-                    app,
-                    Constants.KubernetesAppServiceApiGroup,
-                    Constants.KubernetesAppServiceApiVersion,
-                    Constants.KubernetesAppServiceAppNamespace,
-                    Constants.KubernetesAppServiceAppPlural,
-                    appName);
-                return true;
-            }
-            catch (HttpOperationException ex)
+        private static string RunBuildCtlCommand(string args, string msg)
+        {
+            Console.WriteLine($"{msg} : {args}");
+            var process = new Process()
             {
-                if ((ex.Response != null)
-                    && (ex.Response.StatusCode == HttpStatusCode.NotFound))
+                StartInfo = new ProcessStartInfo
                 {
-                    return false;
+                    FileName = "/bin/bash",
+                    Arguments = $"-c \"{args}\"",
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
                 }
+            };
 
+            process.Start();
+            string output = process.StandardOutput.ReadToEnd();
+            string error = process.StandardError.ReadToEnd();
+            process.WaitForExit();
+
+            if (string.IsNullOrEmpty(error)) 
+            { 
+                return output; 
+            }
+            else 
+            { 
+                throw new Exception(error); 
             }
-            return false;
         }
 
         public static string GetAppName(HttpContext context)
@@ -96,6 +96,7 @@ public static string GetAppName(HttpContext context)
             {
                 appName = host.Substring(0, host.IndexOf("."));
             }
+            Console.WriteLine("AppName :::::::: " + appName);
 
             try
             {
@@ -113,53 +114,5 @@ public static string GetAppName(HttpContext context)
 
             return appName;
         }
-
-        public static K8SEApp GetK8SEApp(string siteName)
-        {
-            //Get the app
-            return ExecuteAsyncKubernetesTask<K8SEApp>((task) => GetAppFromCluster(siteName));
-        }
-
-        private static K8SEApp GetAppFromCluster(string appName)
-        {
-            try
-            {
-                var resultFromCluster = _k8seClient.GetNamespacedCustomObject(
-                                            Constants.KubernetesAppServiceApiGroup,
-                                            Constants.KubernetesAppServiceApiVersion,
-                                            Constants.KubernetesAppServiceAppNamespace,
-                                            Constants.KubernetesAppServiceAppPlural,
-                                            appName);
-
-                if (resultFromCluster == null)
-                {
-                    return null;
-                }
-
-                K8SEApp castedAksWebApp = ((Newtonsoft.Json.Linq.JObject)resultFromCluster).ToObject<K8SEApp>();
-
-                return castedAksWebApp;
-            }
-            catch (HttpOperationException ex)
-            {
-                if ((ex.Response != null)
-                    && (ex.Response.StatusCode == HttpStatusCode.NotFound))
-                {
-                    return null;
-                }
-
-            }
-
-            return null;
-        }
-
-        // Helper method to ensure that we get a different thread by avoiding use of ThreadPool's threads
-        // when calling Kubernetes client async methods.
-        private static T ExecuteAsyncKubernetesTask<T>(Func<object, T> action)
-        {
-            object result = Task.Factory.StartNew<T>(action, null, TaskCreationOptions.LongRunning).Result;
-
-            return (T)result;
-        }
     }
 }
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index 6668011d..ddbe0481 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -39,7 +39,6 @@
     <PackageReference Include="System.IO.Abstractions" Version="2.1.0.192" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
-    <PackageReference Include="KubernetesClient" Version="1.5.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 89989f67..92c51d67 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -84,6 +84,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             environment.RepositoryPath = $"{homeDir}{appName}{siteRepoDir}";
             await _next.Invoke(context);
         }
+
         private bool IsGitRoute(PathString routePath)
         {
             string[] pathParts = routePath.ToString().Split("/");
@@ -130,7 +131,7 @@ public static string ResolveRootPath(string home, string appName)
             var path = $"{home}{appName}";
 
             FileSystemHelpers.EnsureDirectory(path);
-            
+            FileSystemHelpers.EnsureDirectory($"{path}/site/artifacts/hostingstart");
             // For users running Windows Azure Pack 2 (WAP2), %HOME% actually points to the site folder,
             // which we don't want here. So yank that segment if we detect it.
             if (Path.GetFileName(path).Equals(Constants.SiteFolder, StringComparison.OrdinalIgnoreCase))
diff --git a/Kudu.Services.Web/Kudu.Services.Web.csproj b/Kudu.Services.Web/Kudu.Services.Web.csproj
index b02f7676..9fa0b730 100644
--- a/Kudu.Services.Web/Kudu.Services.Web.csproj
+++ b/Kudu.Services.Web/Kudu.Services.Web.csproj
@@ -10,6 +10,7 @@
     <NoWarn>$(NoWarn);NU1604</NoWarn>
     <NoWarn>$(NoWarn);NU1591</NoWarn>
     <NoWarn>$(NoWarn);NU1702</NoWarn>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index ce986de8..413a6f0a 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -352,10 +352,12 @@ public void Configure(IApplicationBuilder app,
                 i.Request.Path.Value.StartsWith("/api/provision", StringComparison.OrdinalIgnoreCase));
 
             app.UseTraceMiddleware();
+
             if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 app.UseKubeMiddleware();
             }
+
             app.MapWhen(containsRelativeProvisionPath, application => application.Run(async context =>
             {
                 FileSystemHelpers.EnsureDirectory("/home/apps/"+context.Request.Path.Value.Replace("/api/provision/", ""));
diff --git a/Kudu.Services/Kudu.Services.csproj b/Kudu.Services/Kudu.Services.csproj
index 52f96475..b1bfdb26 100644
--- a/Kudu.Services/Kudu.Services.csproj
+++ b/Kudu.Services/Kudu.Services.csproj
@@ -29,6 +29,13 @@
   </ItemGroup>
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1570</NoWarn>
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
+    <NoWarn>$(NoWarn);CS1572</NoWarn>
+    <NoWarn>$(NoWarn);CS1587</NoWarn>
+    <NoWarn>$(NoWarn);CS1998</NoWarn>
+    <NoWarn>$(NoWarn);CS0472</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>

From 18e3f18a02b10cb8252fa3d72ab3c60673204ef0 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Tue, 25 Feb 2020 16:01:09 -0800
Subject: [PATCH 214/245] Fixing git deployments

---
 Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index 36eada30..41ea76d2 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -75,7 +75,7 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
                 return new RunFromZipSiteBuilder();
             }
 
-            if (!settings.DoBuildDuringDeployment())
+            if (!settings.DoBuildDuringDeployment() && repository.RepositoryType != RepositoryType.Git)
             {
                 var projectPath = !String.IsNullOrEmpty(targetProjectPath) ? targetProjectPath : repositoryRoot;
                 return new BasicBuilder(_environment, settings, _propertyProvider, repositoryRoot, projectPath);

From 06fc6704445a226fdd0e55f28f6db8764bf0adfa Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 19 Mar 2020 11:31:18 -0700
Subject: [PATCH 215/245] Sanmeht/k8seslots (#111)

* Modifying app determination logic for slots support

* Minor fix to Kudu.Console

* Fix to oryx Argument Factory
---
 Kudu.Console/Program.cs                       |  7 ++++-
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  7 +----
 .../Oryx/AppServiceOryxArguments.cs           |  9 ++++--
 Kudu.Core/Deployment/Oryx/ExpressBuilder.cs   |  2 +-
 .../Oryx/FunctionAppOryxArguments.cs          |  4 +--
 Kudu.Core/Deployment/Oryx/IOryxArguments.cs   |  2 +-
 ...inuxConsumptionFunctionAppOryxArguments.cs |  2 +-
 .../Deployment/Oryx/OryxArgumentsFactory.cs   |  8 +++---
 Kudu.Core/Functions/FunctionManager.cs        |  2 +-
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        | 28 ++++---------------
 Kudu.Services.Web/KubeMiddleware.cs           |  2 --
 11 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index c0d76d7b..bd3298ed 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -271,6 +271,9 @@ private static string GetSettingsPath(IEnvironment environment)
         private static IEnvironment GetEnvironment(string siteRoot, string requestId)
         {
             string root = Path.GetFullPath(Path.Combine(siteRoot, ".."));
+            string appName = root.Replace("/home/apps/","");
+            System.Console.WriteLine("!!!!!!!!!!!! ROOT ::: "+root);
+            System.Console.WriteLine("!!!!!!!!!!!! AppNAME ::: " + appName);
 
             // CORE TODO : test by setting SCM_REPOSITORY_PATH 
             // REVIEW: this looks wrong because it ignores SCM_REPOSITORY_PATH
@@ -293,7 +296,9 @@ private static IEnvironment GetEnvironment(string siteRoot, string requestId)
                 repositoryPath,
                 requestId,
                 Path.Combine(AppContext.BaseDirectory, "KuduConsole", "kudu.dll"),
-                null);
+                null,
+                appName);
+
             return env;
         }
     }
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 0ed86e04..1204502d 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -35,12 +35,7 @@ public override Task Build(DeploymentContext context)
             context.RepositoryPath = RepositoryPath;
 
             // Initialize Oryx Args.
-            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
-
-            if(K8SEDeploymentHelper.IsK8SEEnvironment())
-            {
-                args.appName = environment.K8SEAppName;
-            }
+            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(environment);
 
             if (!args.SkipKuduSync)
             {
diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index a8faceab..e55ae34d 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -23,9 +23,9 @@ public class AppServiceOryxArguments : IOryxArguments
 
         public string VirtualEnv { get; set; }
 
-        public string appName { get; set; }
+        public string AppName { get; set; }
 
-        public AppServiceOryxArguments()
+        public AppServiceOryxArguments(IEnvironment environment)
         {
             RunOryxBuild = false;
             SkipKuduSync = false;
@@ -34,8 +34,11 @@ public AppServiceOryxArguments()
 
             if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
+                Console.WriteLine("Oryx App Name : " + environment.K8SEAppName);
+                this.AppName = environment.K8SEAppName;
+
                 // K8SE TODO: Inject Environment
-                var frameworkArr = K8SEDeploymentHelper.GetLinuxFxVersion(appName);
+                var frameworkArr = K8SEDeploymentHelper.GetLinuxFxVersion(AppName);
                 framework = frameworkArr.Split("|")[0];
                 version = frameworkArr.Split("|")[1];
             }
diff --git a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
index 0344507d..aa947d7f 100644
--- a/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
+++ b/Kudu.Core/Deployment/Oryx/ExpressBuilder.cs
@@ -72,7 +72,7 @@ public string SetupK8Artifacts(DeploymentContext context, IEnvironment environme
             context.Logger.Log($"Building for K8.");
 
             // Create NetCore Zip at tm build folder where artifact were build and copy it to sitePackages, .GetBranch()
-            string zipAppName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+            string zipAppName = $"artifact.zip";
 
             context.Logger.Log($"From {context.BuildTempPath} to {(environment.RepositoryPath + "/../artifacts/" + environment.CurrId)} ");
             FileSystemHelpers.EnsureDirectory(environment.RepositoryPath + "/../artifacts/");
diff --git a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
index 2f7c7950..1bb77449 100644
--- a/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/FunctionAppOryxArguments.cs
@@ -16,9 +16,9 @@ public class FunctionAppOryxArguments : IOryxArguments
         public Framework Language { get; set; }
         public string PublishFolder { get; set; }
         public string VirtualEnv { get; set; }
-        public string appName { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
+        public string AppName { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
 
-        public FunctionAppOryxArguments()
+        public FunctionAppOryxArguments(IEnvironment environment)
         {
             SkipKuduSync = false;
             FunctionsWorkerRuntime = ResolveWorkerRuntime();
diff --git a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
index 1135ba26..8d7d7dff 100644
--- a/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/IOryxArguments.cs
@@ -20,6 +20,6 @@ public interface IOryxArguments
 
         string PublishFolder { get; set; }
         string VirtualEnv { get; set; }
-        string appName { get; set; }
+        string AppName { get; set; }
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs b/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
index 62677d7a..64ca0195 100644
--- a/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/LinuxConsumptionFunctionAppOryxArguments.cs
@@ -6,7 +6,7 @@ namespace Kudu.Core.Deployment.Oryx
 {
     public class LinuxConsumptionFunctionAppOryxArguments : FunctionAppOryxArguments
     {
-        public LinuxConsumptionFunctionAppOryxArguments() : base()
+        public LinuxConsumptionFunctionAppOryxArguments(IEnvironment env) : base(env)
         {
             SkipKuduSync = true;
             Flags = BuildOptimizationsFlags.Off;
diff --git a/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs b/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
index 4d4d5cca..768b16c7 100644
--- a/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxArgumentsFactory.cs
@@ -4,18 +4,18 @@ namespace Kudu.Core.Deployment.Oryx
 {
     public class OryxArgumentsFactory
     {
-        public static IOryxArguments CreateOryxArguments()
+        public static IOryxArguments CreateOryxArguments(IEnvironment environment)
         {
             if (FunctionAppHelper.LooksLikeFunctionApp())
             {
                 if (FunctionAppHelper.HasScmRunFromPackage())
                 {
-                    return new LinuxConsumptionFunctionAppOryxArguments();
+                    return new LinuxConsumptionFunctionAppOryxArguments(environment);
                 } else {
-                    return new FunctionAppOryxArguments();
+                    return new FunctionAppOryxArguments(environment);
                 }
             }
-            return new AppServiceOryxArguments();
+            return new AppServiceOryxArguments(environment);
         }
     }
 }
diff --git a/Kudu.Core/Functions/FunctionManager.cs b/Kudu.Core/Functions/FunctionManager.cs
index fa1f98c3..f17792a6 100644
--- a/Kudu.Core/Functions/FunctionManager.cs
+++ b/Kudu.Core/Functions/FunctionManager.cs
@@ -444,7 +444,7 @@ private string GetFunctionSecretsFilePath(string functionName)
         /// <param name="zip">the <see cref="ZipArchive"/> to be populated with function app content.</param>
         /// <param name="includeAppSettings">Optional: indicates whether to add local.settings.json or not to the archive. Default is false.</param>
         /// <param name="includeCsproj">Optional: indicates whether to add a .csproj to the archive. Default is false.</param>
-        /// <param name="projectName">Optional: the name for *.csproj file if <paramref name="includeCsproj"/> is true. Default is appName.</param>
+        /// <param name="projectName">Optional: the name for *.csproj file if <paramref name="includeCsproj"/> is true. Default is AppName.</param>
         public void CreateArchive(ZipArchive zip, bool includeAppSettings = false, bool includeCsproj = false, string projectName = null)
         {
             var tracer = _traceFactory.GetTracer();
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 636a3964..ebf59d1b 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -31,7 +31,7 @@ public static string GetLinuxFxVersion(string appName)
             BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "get");
             BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
             BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "linuxFxVersion");
-            return RunBuildCtlCommand(cmd.ToString(), "Running buildctl to retrieve framework info...");
+            return RunBuildCtlCommand(cmd.ToString(), "Retrieving framework info...");
         }
 
         /// <summary>
@@ -47,7 +47,7 @@ public static void UpdateBuildNumber(string appName, string buildNumber)
             BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
             BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "buildVersion");
             BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, buildNumber);
-            RunBuildCtlCommand(cmd.ToString(), "Running buildctl to retrieve framework info...");
+            RunBuildCtlCommand(cmd.ToString(), "Updating build version...");
         }
 
         private static string RunBuildCtlCommand(string args, string msg)
@@ -83,34 +83,16 @@ private static string RunBuildCtlCommand(string args, string msg)
 
         public static string GetAppName(HttpContext context)
         {
-            var host = context.Request.Headers["Host"].ToString();
-            var appName = "";
+            var appName = context.Request.Headers["K8SE_APP_NAME"].ToString();
 
-            if (host.IndexOf(".") <= 0)
+            if (string.IsNullOrEmpty(appName))
             {
                 context.Response.StatusCode = 401;
                 // K8SE TODO: move this to resource map
                 throw new InvalidOperationException("Couldn't recognize AppName");
             }
-            else
-            {
-                appName = host.Substring(0, host.IndexOf("."));
-            }
-            Console.WriteLine("AppName :::::::: " + appName);
 
-            try
-            {
-                // block any internal service communication to build server
-                // K8SE TODO: Check source IP to be in the internal service range and block them
-                Int32.Parse(appName);
-                context.Response.StatusCode = 401;
-                // K8SE TODO: move this to resource map
-                throw new InvalidOperationException("Internal services prohibited to communicate with the build server.");
-            }
-            catch(Exception)
-            {
-                // pass
-            }
+            Console.WriteLine("AppName :::::::: " + appName);
 
             return appName;
         }
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 92c51d67..aa4b285d 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using System;
@@ -10,7 +9,6 @@
 using System.Text;
 using Kudu.Core.Helpers;
 using System.IO;
-using System.Net.Http.Headers;
 using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Web

From 36cd4c4cac910b060041eea4007eeda8706518e0 Mon Sep 17 00:00:00 2001
From: SatishRanjan <SatishRanjan@users.noreply.github.com>
Date: Fri, 3 Apr 2020 10:53:27 -0700
Subject: [PATCH 216/245] Update "triggers" information for the function apps
 (#112)

* Update "triggers" information for the function apps

* updating function trigger using new buildctl updatejson command

* Adding buildNumber in the functionApp trigger patch json payload

* Adding buildNumber in the functionApp trigger patch json payload

* Updating the method name to include triggers name to it
---
 Kudu.Core/Deployment/DeploymentManager.cs     |  80 ++++++------
 Kudu.Core/Functions/CodeSpec.cs               |  10 ++
 .../Functions/FunctionTriggerProvider.cs      |  30 +++++
 .../Functions/KedaFunctionTriggerProvider.cs  | 117 ++++++++++++++++++
 Kudu.Core/Functions/PackageReference.cs       |  10 ++
 Kudu.Core/Functions/PatchAppJson.cs           |  13 ++
 Kudu.Core/Functions/PatchSpec.cs              |  16 +++
 Kudu.Core/Functions/ScaleTrigger.cs           |  14 +++
 Kudu.Core/Functions/TriggerOptions.cs         |  17 +++
 .../DockerContainerRestartTrigger.cs          |  19 ++-
 Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs     |   5 +
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        |  65 +++++++++-
 12 files changed, 347 insertions(+), 49 deletions(-)
 create mode 100644 Kudu.Core/Functions/CodeSpec.cs
 create mode 100644 Kudu.Core/Functions/FunctionTriggerProvider.cs
 create mode 100644 Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
 create mode 100644 Kudu.Core/Functions/PackageReference.cs
 create mode 100644 Kudu.Core/Functions/PatchAppJson.cs
 create mode 100644 Kudu.Core/Functions/PatchSpec.cs
 create mode 100644 Kudu.Core/Functions/ScaleTrigger.cs
 create mode 100644 Kudu.Core/Functions/TriggerOptions.cs

diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 180c6d63..49a178ad 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -9,6 +9,7 @@
 using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.Settings;
 using Kudu.Contracts.Tracing;
+using Kudu.Core.Functions;
 using Kudu.Core.Helpers;
 using Kudu.Core.Hooks;
 using Kudu.Core.Infrastructure;
@@ -111,7 +112,7 @@ public IEnumerable<DeployResult> GetResults()
 
         public DeployResult GetResult(string id)
         {
-             return GetResult(id, _status.ActiveDeploymentId, IsDeploying);
+            return GetResult(id, _status.ActiveDeploymentId, IsDeploying);
         }
 
         public IEnumerable<LogEntry> GetLogEntries(string id)
@@ -194,30 +195,30 @@ public async Task DeployAsync(
             Console.WriteLine("Deploy Async");
             using (var deploymentAnalytics = new DeploymentAnalytics(_analytics, _settings))
             {
-                    Exception exception = null;
-                    ITracer tracer = _traceFactory.GetTracer();
-                    IDisposable deployStep = null;
-                    ILogger innerLogger = null;
-                    string targetBranch = null;
+                Exception exception = null;
+                ITracer tracer = _traceFactory.GetTracer();
+                IDisposable deployStep = null;
+                ILogger innerLogger = null;
+                string targetBranch = null;
+
+                // If we don't get a changeset, find out what branch we should be deploying and get the commit ID from it
+                if (changeSet == null)
+                {
+                    targetBranch = _settings.GetBranch();
+
+                    changeSet = repository.GetChangeSet(targetBranch);
 
-                    // If we don't get a changeset, find out what branch we should be deploying and get the commit ID from it
                     if (changeSet == null)
                     {
-                        targetBranch = _settings.GetBranch();
-
-                        changeSet = repository.GetChangeSet(targetBranch);
-
-                        if (changeSet == null)
-                        {
-                            throw new InvalidOperationException(String.Format(
-                                "The current deployment branch is '{0}', but nothing has been pushed to it",
-                                targetBranch));
-                        }
+                        throw new InvalidOperationException(String.Format(
+                            "The current deployment branch is '{0}', but nothing has been pushed to it",
+                            targetBranch));
                     }
+                }
 
-                    string id = changeSet.Id;
-                    _environment.CurrId = id;
-                    IDeploymentStatusFile statusFile = null;
+                string id = changeSet.Id;
+                _environment.CurrId = id;
+                IDeploymentStatusFile statusFile = null;
                 try
                 {
                     deployStep = tracer.Step($"DeploymentManager.Deploy(id:{id})");
@@ -284,9 +285,8 @@ public async Task DeployAsync(
                             logger.Log(Resources.Log_TriggeringContainerRestart);
                         }
 
-                        string appName = _environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0]; ;
-
-                        DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason);
+                        string appName = _environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
+                        DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason, deploymentInfo.RepositoryUrl);
                         logger.Log($"Deployment Pod Rollout Started! Use kubectl watch deplotment {appName} to monitor the rollout status");
                     }
                 }
@@ -314,21 +314,21 @@ public async Task DeployAsync(
                     }
                 }
 
-                    // Reload status file with latest updates
-                    statusFile = _status.Open(id, _environment);
-                    using (tracer.Step("Reloading status file with latest updates"))
+                // Reload status file with latest updates
+                statusFile = _status.Open(id, _environment);
+                using (tracer.Step("Reloading status file with latest updates"))
+                {
+                    if (statusFile != null)
                     {
-                        if (statusFile != null)
-                        {
-                            await _hooksManager.PublishEventAsync(HookEventTypes.PostDeployment, statusFile);
-                        }
+                        await _hooksManager.PublishEventAsync(HookEventTypes.PostDeployment, statusFile);
                     }
+                }
 
-                    if (exception != null)
-                    {
-                        tracer.TraceError(exception);
-                        throw new DeploymentFailedException(exception);
-                    }
+                if (exception != null)
+                {
+                    tracer.TraceError(exception);
+                    throw new DeploymentFailedException(exception);
+                }
             }
         }
 
@@ -681,11 +681,11 @@ private async Task Build(
                     NextManifestFilePath = GetDeploymentManifestPath(id),
                     PreviousManifestFilePath = GetActiveDeploymentManifestPath(),
                     IgnoreManifest = deploymentInfo != null && deploymentInfo.CleanupTargetDirectory,
-                                                                             // Ignoring the manifest will cause kudusync to delete sub-directories / files
-                                                                            // in the destination directory that are not present in the source directory,
-                                                                            // without checking the manifest to see if the file was copied over to the destination
-                                                                            // during a previous kudusync operation. This effectively performs a clean deployment
-                                                                            // from the source to the destination directory
+                    // Ignoring the manifest will cause kudusync to delete sub-directories / files
+                    // in the destination directory that are not present in the source directory,
+                    // without checking the manifest to see if the file was copied over to the destination
+                    // during a previous kudusync operation. This effectively performs a clean deployment
+                    // from the source to the destination directory
                     Tracer = tracer,
                     Logger = logger,
                     GlobalLogger = _globalLogger,
diff --git a/Kudu.Core/Functions/CodeSpec.cs b/Kudu.Core/Functions/CodeSpec.cs
new file mode 100644
index 00000000..4ba5c9e6
--- /dev/null
+++ b/Kudu.Core/Functions/CodeSpec.cs
@@ -0,0 +1,10 @@
+namespace Kudu.Core.Functions
+{
+    using Newtonsoft.Json;
+
+    public class CodeSpec
+    {
+        [JsonProperty(PropertyName = "packageRef")]
+        public PackageReference PackageRef { get; set; }
+    }
+}
diff --git a/Kudu.Core/Functions/FunctionTriggerProvider.cs b/Kudu.Core/Functions/FunctionTriggerProvider.cs
new file mode 100644
index 00000000..85e21737
--- /dev/null
+++ b/Kudu.Core/Functions/FunctionTriggerProvider.cs
@@ -0,0 +1,30 @@
+namespace Kudu.Core.Functions
+{
+    public class FunctionTriggerProvider
+    {
+        /// <summary>
+        /// Returns the function triggers from function.json files
+        /// </summary>
+        /// <param name="providerName">The the returns json string differs as per the format expected based upon providers.
+        /// e.g. for "KEDA" the json string is the serialzed string of IEnumerable<ScaleTrigger>object</param>
+        /// <param name="functionzipFilePath">The functions file path</param>
+        /// <returns>The josn string of triggers in function.json</returns>
+        public static T GetFunctionTriggers<T>(string providerName, string functionzipFilePath)
+        {
+            if (string.IsNullOrWhiteSpace(providerName))
+            {
+                return default;
+            }
+
+            switch (providerName.ToLower())
+            {
+                case "keda":
+                    var functionTriggerProvider = new KedaFunctionTriggerProvider();
+                    return (T)functionTriggerProvider.GetFunctionTriggers(functionzipFilePath);
+                default:
+                    functionTriggerProvider = new KedaFunctionTriggerProvider();
+                    return (T)functionTriggerProvider.GetFunctionTriggers(functionzipFilePath);
+            }
+        }
+    }
+}
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
new file mode 100644
index 00000000..d1a932fb
--- /dev/null
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -0,0 +1,117 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text;
+
+namespace Kudu.Core.Functions
+{
+    /// <summary>
+    /// Returns "<see cref="IEnumerable<ScaleTrigger>"/> for KEDA scalers" 
+    /// </summary>
+    public class KedaFunctionTriggerProvider
+    {
+        public IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath)
+        {
+            if (!File.Exists(zipFilePath))
+            {
+                return null;
+            }
+
+            List<ScaleTrigger> kedaScaleTriggers = new List<ScaleTrigger>();
+            using (var zip = ZipFile.OpenRead(zipFilePath))
+            {
+                var entries = zip.Entries
+                    .Where(e => IsFunctionJson(e.FullName));
+
+                foreach (var entry in entries)
+                {
+                    using (var stream = entry.Open())
+                    {
+                        using (var reader = new StreamReader(stream))
+                        {
+                            var functionTriggers = ParseFunctionJson(GetFunctionName(entry), reader.ReadToEnd());
+                            if (functionTriggers?.Any() == true)
+                            {
+                                kedaScaleTriggers.AddRange(functionTriggers);
+                            }
+                        }
+                    }
+                }
+            }
+
+            bool IsFunctionJson(string fullName)
+            {
+                return fullName.EndsWith(Constants.FunctionsConfigFile) &&
+                       fullName.Count(c => c == '/' || c == '\\') == 1;
+            }
+            
+            return kedaScaleTriggers;
+        }
+
+        public IEnumerable<ScaleTrigger> ParseFunctionJson(string functionName, string functionJson)
+        {
+            var json = JObject.Parse(functionJson);
+            if (json.TryGetValue("disabled", out JToken value))
+            {
+                string stringValue = value.ToString();
+                if (!bool.TryParse(stringValue, out bool disabled))
+                {
+                    string expandValue = System.Environment.GetEnvironmentVariable(stringValue);
+                    disabled = string.Equals(expandValue, "1", StringComparison.OrdinalIgnoreCase) ||
+                               string.Equals(expandValue, "true", StringComparison.OrdinalIgnoreCase);
+                }
+
+                if (disabled)
+                {
+                    return null;
+                }
+            }
+
+            var excluded = json.TryGetValue("excluded", out value) && (bool)value;
+            if (excluded)
+            {
+                return null;
+            }
+
+            var triggers = new List<ScaleTrigger>();
+            foreach (JObject binding in (JArray)json["bindings"])
+            {
+                var type = (string)binding["type"];
+                if (type.EndsWith("Trigger", StringComparison.OrdinalIgnoreCase))
+                {
+                    var scaleTrigger = new ScaleTrigger
+                    {
+                        Type = type,
+                        Metadata = new Dictionary<string, string>()
+                    };
+                    foreach (var property in binding)
+                    {
+                        if (property.Value.Type == JTokenType.String)
+                        {
+                            scaleTrigger.Metadata.Add(property.Key, property.Value.ToString());
+                        }
+                    }
+
+                    scaleTrigger.Metadata.Add("functionName", functionName);
+                    triggers.Add(scaleTrigger);
+                }
+            }
+
+            return triggers;
+        }
+
+        private static string GetFunctionName(ZipArchiveEntry zipEnetry)
+        {
+            if (string.IsNullOrWhiteSpace(zipEnetry?.FullName))
+            {
+                return string.Empty;
+            }
+
+            return zipEnetry.FullName.Split('/').Length == 2 ? zipEnetry.FullName.Split('/')[0] : zipEnetry.FullName.Split('\\')[0];
+        }
+    }
+}
diff --git a/Kudu.Core/Functions/PackageReference.cs b/Kudu.Core/Functions/PackageReference.cs
new file mode 100644
index 00000000..667b9ac1
--- /dev/null
+++ b/Kudu.Core/Functions/PackageReference.cs
@@ -0,0 +1,10 @@
+namespace Kudu.Core.Functions
+{
+    using Newtonsoft.Json;
+
+    public class PackageReference
+    {
+        [JsonProperty(PropertyName = "buildVersion")]
+        public string BuildVersion { get; set; }
+    }
+}
diff --git a/Kudu.Core/Functions/PatchAppJson.cs b/Kudu.Core/Functions/PatchAppJson.cs
new file mode 100644
index 00000000..b0fb6705
--- /dev/null
+++ b/Kudu.Core/Functions/PatchAppJson.cs
@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Functions
+{
+    public class PatchAppJson
+    {
+        [JsonProperty(PropertyName = "spec")]
+        public PatchSpec PatchSpec { get; set; }
+    }
+}
diff --git a/Kudu.Core/Functions/PatchSpec.cs b/Kudu.Core/Functions/PatchSpec.cs
new file mode 100644
index 00000000..111bba6e
--- /dev/null
+++ b/Kudu.Core/Functions/PatchSpec.cs
@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Core.Functions
+{
+    public class PatchSpec
+    {
+        [JsonProperty(PropertyName = "triggerOptions")]
+        public TriggerOptions TriggerOptions { get; set; }
+
+        [JsonProperty(PropertyName = "code")]
+        public CodeSpec Code { get; set; }
+    }
+}
diff --git a/Kudu.Core/Functions/ScaleTrigger.cs b/Kudu.Core/Functions/ScaleTrigger.cs
new file mode 100644
index 00000000..3d97c5c0
--- /dev/null
+++ b/Kudu.Core/Functions/ScaleTrigger.cs
@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Kudu.Core.Functions
+{
+    public class ScaleTrigger
+    {
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+
+        [JsonProperty(PropertyName = "metadata")]
+        public IDictionary<string, string> Metadata { get; set; }
+    }
+}
diff --git a/Kudu.Core/Functions/TriggerOptions.cs b/Kudu.Core/Functions/TriggerOptions.cs
new file mode 100644
index 00000000..68493871
--- /dev/null
+++ b/Kudu.Core/Functions/TriggerOptions.cs
@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Kudu.Core.Functions
+{
+    public class TriggerOptions
+    {
+        [JsonProperty(PropertyName = "triggers")]
+        public IEnumerable<ScaleTrigger> Triggers { get; set; }
+
+        [JsonProperty(PropertyName = "pollingInterval")]
+        public int? PollingInterval { get; set; }
+
+        [JsonProperty(PropertyName = "cooldownPeriod")]
+        public int? cooldownPeriod { get; set; }
+    }
+}
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index 4d955f39..f5020170 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -1,7 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
+using Kudu.Core.Functions;
 using Kudu.Core.Helpers;
 using Kudu.Core.K8SE;
 
@@ -22,14 +25,24 @@ public static class DockerContainerRestartTrigger
             "The last modification Kudu made to this file was at {0}, for the following reason: {1}.",
             System.Environment.NewLine);
 
-        public static void RequestContainerRestart(IEnvironment environment, string reason)
+        public static void RequestContainerRestart(IEnvironment environment, string reason, string repositoryUrl = null)
         {
-            if(K8SEDeploymentHelper.IsK8SEEnvironment())
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
                 string buildNumber = environment.CurrId;
+                var functionTriggers = FunctionTriggerProvider.GetFunctionTriggers<IEnumerable<ScaleTrigger>>("keda", repositoryUrl);
+
+                //Only for function apps functionTriggers will be non-null/non-empty 
+                if (functionTriggers?.Any() == true)
+                {
+                    K8SEDeploymentHelper.UpdateFunctionApp(appName, functionTriggers, buildNumber);
+                }
+                else
+                {
+                    K8SEDeploymentHelper.UpdateBuildNumber(appName, buildNumber);
+                }
 
-                K8SEDeploymentHelper.UpdateBuildNumber(appName, buildNumber);
                 return;
             }
 
diff --git a/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs b/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs
index cb6658af..a08d3766 100644
--- a/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs
+++ b/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs
@@ -26,5 +26,10 @@ internal static void AddAppPropertyValueArgument(StringBuilder args, string appP
             args.AppendFormat(" -appPropertyValue {0}", appPropertyValue);
         }
 
+        internal static void AddJsonToPatchValueArgument(StringBuilder args, string jsonToPatch)
+        {
+            args.AppendFormat(" -jsonToPatch {0}", jsonToPatch);
+        }
+
     }
 }
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index ebf59d1b..89cfbc60 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -1,8 +1,12 @@
 using Kudu.Contracts.Tracing;
 using Kudu.Core.Deployment;
+using Kudu.Core.Functions;
 using Microsoft.AspNetCore.Http;
+using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Text;
 
 namespace Kudu.Core.K8SE
@@ -50,6 +54,27 @@ public static void UpdateBuildNumber(string appName, string buildNumber)
             RunBuildCtlCommand(cmd.ToString(), "Updating build version...");
         }
 
+        /// <summary>
+        /// Updates the triggers for the function apps
+        /// </summary>
+        /// <param name="appName">The app name to update</param>
+        /// <param name="functionTriggers">The IEnumerable<ScaleTrigger></param>
+        /// <param name="buildNumber">Build number to update</param>
+        public static void UpdateFunctionAppTriggers(string appName, IEnumerable<ScaleTrigger> functionTriggers, string buildNumber)
+        {
+            var functionAppPatchJson = GetFunctionAppPatchJson(functionTriggers, buildNumber);
+            if (string.IsNullOrEmpty(functionAppPatchJson))
+            {
+                return;
+            }
+
+            var cmd = new StringBuilder();
+            BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "updatejson");
+            BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
+            BuildCtlArgumentsHelper.AddFunctionAppTriggerToPatchValueArgument(cmd, functionAppPatchJson);
+            RunBuildCtlCommand(cmd.ToString(), "Updating function app triggers...");
+        }
+
         private static string RunBuildCtlCommand(string args, string msg)
         {
             Console.WriteLine($"{msg} : {args}");
@@ -71,13 +96,13 @@ private static string RunBuildCtlCommand(string args, string msg)
             string error = process.StandardError.ReadToEnd();
             process.WaitForExit();
 
-            if (string.IsNullOrEmpty(error)) 
-            { 
-                return output; 
+            if (string.IsNullOrEmpty(error))
+            {
+                return output;
             }
-            else 
-            { 
-                throw new Exception(error); 
+            else
+            {
+                throw new Exception(error);
             }
         }
 
@@ -96,5 +121,33 @@ public static string GetAppName(HttpContext context)
 
             return appName;
         }
+
+        private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> functionTriggers, string buildNumber)
+        {
+            if (functionTriggers == null || !functionTriggers.Any())
+            {
+                return null;
+            }
+
+            var patchAppJson = new PatchAppJson
+            {
+                PatchSpec = new PatchSpec
+                {
+                    TriggerOptions = new TriggerOptions
+                    {
+                        Triggers = functionTriggers
+                    },
+                    Code = new CodeSpec
+                    {
+                        PackageRef = new PackageReference
+                        {
+                            BuildVersion = buildNumber
+                        }
+                    }
+                }
+            };
+
+            return JsonConvert.SerializeObject(patchAppJson, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+        }
     }
 }

From 6d9a031edad9b909b3c3412c3dddb875907bb4e7 Mon Sep 17 00:00:00 2001
From: SatishRanjan <SatishRanjan@users.noreply.github.com>
Date: Thu, 9 Apr 2020 11:08:20 -0700
Subject: [PATCH 217/245] Passing function app triggers string from KuduLite to
 buildctl command tool (#114)

* Json patch method name change and converting Json patch to string

* Correcting build version for the function trigger json patch

* Double quote escape and printing buildctl output

* Trigger type for KEDA scaler
---
 .../Functions/KedaFunctionTriggerProvider.cs  | 38 ++++++++++++++++++-
 .../DockerContainerRestartTrigger.cs          |  2 +-
 Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs     |  2 +-
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        | 10 +++--
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index d1a932fb..c4934a2e 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -48,7 +48,7 @@ bool IsFunctionJson(string fullName)
                 return fullName.EndsWith(Constants.FunctionsConfigFile) &&
                        fullName.Count(c => c == '/' || c == '\\') == 1;
             }
-            
+
             return kedaScaleTriggers;
         }
 
@@ -85,7 +85,7 @@ public IEnumerable<ScaleTrigger> ParseFunctionJson(string functionName, string f
                 {
                     var scaleTrigger = new ScaleTrigger
                     {
-                        Type = type,
+                        Type = GetKedaTriggerType(type),
                         Metadata = new Dictionary<string, string>()
                     };
                     foreach (var property in binding)
@@ -113,5 +113,39 @@ private static string GetFunctionName(ZipArchiveEntry zipEnetry)
 
             return zipEnetry.FullName.Split('/').Length == 2 ? zipEnetry.FullName.Split('/')[0] : zipEnetry.FullName.Split('\\')[0];
         }
+
+        private static string GetKedaTriggerType(string triggerType)
+        {
+            if (string.IsNullOrEmpty(triggerType))
+            {
+                throw new ArgumentNullException(nameof(triggerType));
+            }
+
+            triggerType = triggerType.ToLower();
+
+            switch (triggerType)
+            {
+                case "queuetrigger":
+                    return "azure-queue";
+
+                case "kafkatrigger":
+                    return "kafka";
+
+                case "blobtrigger":
+                    return "azure-blob";
+
+                case "servicebustrigger":
+                    return "azure-servicebus";
+
+                case "eventhubtrigger":
+                    return "azure-eventhub";
+
+                case "rabbitmqtrigger":
+                    return "rabbitmq";
+
+                default:
+                    return triggerType;
+            }
+        }
     }
 }
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index f5020170..1e40d2ae 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -36,7 +36,7 @@ public static void RequestContainerRestart(IEnvironment environment, string reas
                 //Only for function apps functionTriggers will be non-null/non-empty 
                 if (functionTriggers?.Any() == true)
                 {
-                    K8SEDeploymentHelper.UpdateFunctionApp(appName, functionTriggers, buildNumber);
+                    K8SEDeploymentHelper.UpdateFunctionAppTriggers(appName, functionTriggers, $"{buildNumber}|{appName}");
                 }
                 else
                 {
diff --git a/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs b/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs
index a08d3766..384e6974 100644
--- a/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs
+++ b/Kudu.Core/K8SE/BuildCtlArgumentsHelper.cs
@@ -26,7 +26,7 @@ internal static void AddAppPropertyValueArgument(StringBuilder args, string appP
             args.AppendFormat(" -appPropertyValue {0}", appPropertyValue);
         }
 
-        internal static void AddJsonToPatchValueArgument(StringBuilder args, string jsonToPatch)
+        internal static void AddFunctionTriggersJsonToPatchValueArgument(StringBuilder args, string jsonToPatch)
         {
             args.AppendFormat(" -jsonToPatch {0}", jsonToPatch);
         }
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 89cfbc60..6954c6f3 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -71,19 +71,20 @@ public static void UpdateFunctionAppTriggers(string appName, IEnumerable<ScaleTr
             var cmd = new StringBuilder();
             BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "updatejson");
             BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
-            BuildCtlArgumentsHelper.AddFunctionAppTriggerToPatchValueArgument(cmd, functionAppPatchJson);
+            BuildCtlArgumentsHelper.AddFunctionTriggersJsonToPatchValueArgument(cmd, functionAppPatchJson);
             RunBuildCtlCommand(cmd.ToString(), "Updating function app triggers...");
         }
 
         private static string RunBuildCtlCommand(string args, string msg)
         {
+            var escapedArgs = args.Replace("\"", "\\\"");
             Console.WriteLine($"{msg} : {args}");
             var process = new Process()
             {
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = "/bin/bash",
-                    Arguments = $"-c \"{args}\"",
+                    Arguments = $"-c \"{escapedArgs}\"",
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     UseShellExecute = false,
@@ -94,6 +95,7 @@ private static string RunBuildCtlCommand(string args, string msg)
             process.Start();
             string output = process.StandardOutput.ReadToEnd();
             string error = process.StandardError.ReadToEnd();
+            Console.WriteLine($"buildctl output:\n {output}");
             process.WaitForExit();
 
             if (string.IsNullOrEmpty(error))
@@ -147,7 +149,9 @@ private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> function
                 }
             };
 
-            return JsonConvert.SerializeObject(patchAppJson, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            var patchJson = JsonConvert.SerializeObject(patchAppJson, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            var patchJsonString = JsonConvert.ToString(patchJson);
+            return patchJsonString;
         }
     }
 }

From 1d20b324a362b28be46658de4ebde3b69991dbc8 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Wed, 30 Sep 2020 16:07:15 -0700
Subject: [PATCH 218/245] [K8SE] Add BetaMetadata options for 'feature/k8se'
 (#136)

* Modified buildversion to have build metadata json

* Minor fix to json patch

* Override scheme to https if running in K8SE Environment

* Implement API App Update for DevOps Deployment Scenario

* Added build headers for k8se

* Fix in site builder for repo path for zip deploy
---
 Kudu.Contracts/Deployment/BuildMetadata.cs    | 19 ++++++++
 .../Deployment/DeploymentInfoBase.cs          |  3 ++
 Kudu.Core/Deployment/DeploymentManager.cs     |  5 +-
 Kudu.Core/Deployment/Generator/OryxBuilder.cs |  8 ++++
 .../Generator/SiteBuilderFactory.cs           | 11 +++--
 Kudu.Core/Deployment/ISiteBuilderFactory.cs   |  2 +-
 .../Oryx/AppServiceOryxArguments.cs           |  4 +-
 .../DockerContainerRestartTrigger.cs          | 14 ++++--
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        | 47 ++++++++++++++-----
 Kudu.Services.Web/Startup.cs                  |  6 ++-
 .../Deployment/DeploymentController.cs        | 45 ++++++++++++++++++
 .../Deployment/PushDeploymentController.cs    | 26 +++++++++-
 12 files changed, 164 insertions(+), 26 deletions(-)
 create mode 100644 Kudu.Contracts/Deployment/BuildMetadata.cs

diff --git a/Kudu.Contracts/Deployment/BuildMetadata.cs b/Kudu.Contracts/Deployment/BuildMetadata.cs
new file mode 100644
index 00000000..32fedb0e
--- /dev/null
+++ b/Kudu.Contracts/Deployment/BuildMetadata.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Contracts.Deployment
+{
+    public class BuildMetadata
+    {
+        [JsonProperty(PropertyName = "appName")]
+        public string AppName;
+
+        [JsonProperty(PropertyName = "buildVersion")]
+        public string BuildVersion;
+
+        [JsonProperty(PropertyName = "appSubPath")]
+        public string AppSubPath;
+    }
+}
diff --git a/Kudu.Contracts/Deployment/DeploymentInfoBase.cs b/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
index fc8b5730..f64c02ec 100644
--- a/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
+++ b/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
@@ -72,5 +72,8 @@ public bool IsValid()
         // won't update until after a process restart. Therefore, we copy the needed
         // files into a separate folders and run sync triggers from there.
         public string SyncFunctionsTriggersPath { get; set; } = null;
+
+        // Used to set Publish Endpoint context
+        public bool ShouldBuildArtifact { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 49a178ad..d0046174 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -9,7 +9,6 @@
 using Kudu.Contracts.Infrastructure;
 using Kudu.Contracts.Settings;
 using Kudu.Contracts.Tracing;
-using Kudu.Core.Functions;
 using Kudu.Core.Helpers;
 using Kudu.Core.Hooks;
 using Kudu.Core.Infrastructure;
@@ -286,7 +285,7 @@ public async Task DeployAsync(
                         }
 
                         string appName = _environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
-                        DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason, deploymentInfo.RepositoryUrl);
+                        DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason, deploymentInfo.RepositoryUrl, deploymentInfo.TargetPath);
                         logger.Log($"Deployment Pod Rollout Started! Use kubectl watch deplotment {appName} to monitor the rollout status");
                     }
                 }
@@ -645,7 +644,7 @@ private async Task Build(
                 {
                     using (tracer.Step("Determining deployment builder"))
                     {
-                        builder = _builderFactory.CreateBuilder(tracer, innerLogger, perDeploymentSettings, repository);
+                        builder = _builderFactory.CreateBuilder(tracer, innerLogger, perDeploymentSettings, repository, deploymentInfo);
                         deploymentAnalytics.ProjectType = builder.ProjectType;
                         tracer.Trace("Builder is {0}", builder.GetType().Name);
                     }
diff --git a/Kudu.Core/Deployment/Generator/OryxBuilder.cs b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
index 1204502d..ce3fc9a6 100644
--- a/Kudu.Core/Deployment/Generator/OryxBuilder.cs
+++ b/Kudu.Core/Deployment/Generator/OryxBuilder.cs
@@ -56,11 +56,15 @@ public override Task Build(DeploymentContext context)
             {
                 PreOryxBuild(context);
 
+                args.Flags = BuildOptimizationsFlags.UseExpressBuild;
+
                 string buildCommand = args.GenerateOryxBuildCommand(context, environment);
                 RunCommand(context, buildCommand, false, "Running oryx build...");
 
                 //
                 // Run express build setups if needed
+                //
+
                 if (args.Flags == BuildOptimizationsFlags.UseExpressBuild)
                 {
                     if (FunctionAppHelper.LooksLikeFunctionApp())
@@ -73,6 +77,10 @@ public override Task Build(DeploymentContext context)
                         appServiceExpressBuilder.SetupExpressBuilderArtifacts(context.OutputPath, context, args);
                     }
                 }
+                else
+                {
+                    Console.WriteLine("No Express :(");
+                }
             }
             return Task.CompletedTask;
         }
diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index 41ea76d2..1528655d 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -40,9 +40,14 @@ private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment
             return _environment;
         }
 
-        public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSettingsManager settings, IRepository repository)
+        public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSettingsManager settings, IRepository repository, DeploymentInfoBase deploymentInfo)
         {
+
             string repositoryRoot = _environment.RepositoryPath;
+            if (!string.IsNullOrEmpty(repository.RepositoryPath))
+            {
+                repositoryRoot = repository.RepositoryPath;
+            }
 
             // Use the cached vs projects file finder for: a. better performance, b. ignoring solutions/projects under node_modules
             var fileFinder = new CachedVsProjectsFileFinder(repository);
@@ -75,14 +80,14 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
                 return new RunFromZipSiteBuilder();
             }
 
-            if (!settings.DoBuildDuringDeployment() && repository.RepositoryType != RepositoryType.Git)
+            if (!deploymentInfo.ShouldBuildArtifact && !settings.DoBuildDuringDeployment() && repository.RepositoryType != RepositoryType.Git)
             {
                 var projectPath = !String.IsNullOrEmpty(targetProjectPath) ? targetProjectPath : repositoryRoot;
                 return new BasicBuilder(_environment, settings, _propertyProvider, repositoryRoot, projectPath);
             }
 
             string enableOryxBuild = System.Environment.GetEnvironmentVariable("ENABLE_ORYX_BUILD");
-            if (!string.IsNullOrEmpty(enableOryxBuild))
+            if (!string.IsNullOrEmpty(enableOryxBuild) && (deploymentInfo.ShouldBuildArtifact || settings.DoBuildDuringDeployment()))
             {
                 if (StringUtils.IsTrueLike(enableOryxBuild))
                 {
diff --git a/Kudu.Core/Deployment/ISiteBuilderFactory.cs b/Kudu.Core/Deployment/ISiteBuilderFactory.cs
index 3c421819..609849c1 100644
--- a/Kudu.Core/Deployment/ISiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/ISiteBuilderFactory.cs
@@ -6,6 +6,6 @@ namespace Kudu.Core.Deployment
 {
     public interface ISiteBuilderFactory
     {
-        ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSettingsManager settings, IRepository fileFinder);
+        ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSettingsManager settings, IRepository fileFinder, DeploymentInfoBase deploymentInfo);
     }
 }
diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index e55ae34d..616b26cd 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -34,7 +34,6 @@ public AppServiceOryxArguments(IEnvironment environment)
 
             if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
-                Console.WriteLine("Oryx App Name : " + environment.K8SEAppName);
                 this.AppName = environment.K8SEAppName;
 
                 // K8SE TODO: Inject Environment
@@ -184,12 +183,13 @@ public string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment e
                     {
                         // 10-LTS, 12-LTS should use versions 10, 12 etc
                         // Oryx Builder uses lts for major versions
-                        Version = Version.Replace("LTS", "").Replace("-", "");
+                        Version = Version.Replace("LTS", "").Replace("lts", "").Replace("-", "");
                         if (string.IsNullOrEmpty(Version))
                         {
                             // Current LTS
                             Version = "10";
                         }
+                        OryxArgumentsHelper.AddLanguageVersion(args, Version);
                     }
                     break;
                 case Framework.Python:
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index 1e40d2ae..cc80f643 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -4,9 +4,11 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using Kudu.Contracts.Deployment;
 using Kudu.Core.Functions;
 using Kudu.Core.Helpers;
 using Kudu.Core.K8SE;
+using Newtonsoft.Json;
 
 namespace Kudu.Core.Infrastructure
 {
@@ -25,22 +27,28 @@ public static class DockerContainerRestartTrigger
             "The last modification Kudu made to this file was at {0}, for the following reason: {1}.",
             System.Environment.NewLine);
 
-        public static void RequestContainerRestart(IEnvironment environment, string reason, string repositoryUrl = null)
+        public static void RequestContainerRestart(IEnvironment environment, string reason, string repositoryUrl = null, string appSubPath = "")
         {
             if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
                 string buildNumber = environment.CurrId;
                 var functionTriggers = FunctionTriggerProvider.GetFunctionTriggers<IEnumerable<ScaleTrigger>>("keda", repositoryUrl);
+                var buildMetadata = new BuildMetadata()
+                {
+                    AppName = appName,
+                    BuildVersion = buildNumber,
+                    AppSubPath = appSubPath
+                };
 
                 //Only for function apps functionTriggers will be non-null/non-empty 
                 if (functionTriggers?.Any() == true)
                 {
-                    K8SEDeploymentHelper.UpdateFunctionAppTriggers(appName, functionTriggers, $"{buildNumber}|{appName}");
+                    K8SEDeploymentHelper.UpdateFunctionAppTriggers(appName, functionTriggers, buildMetadata);
                 }
                 else
                 {
-                    K8SEDeploymentHelper.UpdateBuildNumber(appName, buildNumber);
+                    K8SEDeploymentHelper.UpdateBuildNumber(appName, buildMetadata);
                 }
 
                 return;
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 6954c6f3..73a78c63 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -1,4 +1,5 @@
-using Kudu.Contracts.Tracing;
+using Kudu.Contracts.Deployment;
+using Kudu.Contracts.Tracing;
 using Kudu.Core.Deployment;
 using Kudu.Core.Functions;
 using Microsoft.AspNetCore.Http;
@@ -8,6 +9,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Web;
 
 namespace Kudu.Core.K8SE
 {
@@ -44,25 +46,43 @@ public static string GetLinuxFxVersion(string appName)
         /// </summary>
         /// <param name="appName"></param>
         /// <returns></returns>
-        public static void UpdateBuildNumber(string appName, string buildNumber)
+        public static void UpdateBuildNumber(string appName, BuildMetadata buildMetadata)
         {
+            var buildPatchJson = $"\"{HttpUtility.JavaScriptStringEncode(JsonConvert.SerializeObject(buildMetadata)).Replace("\\","\\\\")}\"";
+
             var cmd = new StringBuilder();
             BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "update");
             BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
-            BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "buildVersion");
-            BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, buildNumber);
+            BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "buildMetadata");
+            BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, buildPatchJson);
             RunBuildCtlCommand(cmd.ToString(), "Updating build version...");
         }
 
+        /// <summary>
+        /// Updates the Image Tag of the K8SE custom container app
+        /// </summary>
+        /// <param name="appName"></param>
+        /// <param name="imageTag">container image tag of the format registry/<image>:<tag></param>
+        /// <returns></returns>
+        public static void UpdateImageTag(string appName, string imageTag)
+        {
+            var cmd = new StringBuilder();
+            BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "update");
+            BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
+            BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "appImage");
+            BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, imageTag);
+            RunBuildCtlCommand(cmd.ToString(), "Updating image tag...");
+        }
+
         /// <summary>
         /// Updates the triggers for the function apps
         /// </summary>
         /// <param name="appName">The app name to update</param>
         /// <param name="functionTriggers">The IEnumerable<ScaleTrigger></param>
         /// <param name="buildNumber">Build number to update</param>
-        public static void UpdateFunctionAppTriggers(string appName, IEnumerable<ScaleTrigger> functionTriggers, string buildNumber)
+        public static void UpdateFunctionAppTriggers(string appName, IEnumerable<ScaleTrigger> functionTriggers, BuildMetadata buildMetadata)
         {
-            var functionAppPatchJson = GetFunctionAppPatchJson(functionTriggers, buildNumber);
+            var functionAppPatchJson = GetFunctionAppPatchJson(functionTriggers, buildMetadata);
             if (string.IsNullOrEmpty(functionAppPatchJson))
             {
                 return;
@@ -118,19 +138,24 @@ public static string GetAppName(HttpContext context)
                 // K8SE TODO: move this to resource map
                 throw new InvalidOperationException("Couldn't recognize AppName");
             }
-
-            Console.WriteLine("AppName :::::::: " + appName);
-
             return appName;
         }
 
-        private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> functionTriggers, string buildNumber)
+        private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> functionTriggers, BuildMetadata buildMetadata)
         {
             if (functionTriggers == null || !functionTriggers.Any())
             {
                 return null;
             }
 
+            if (buildMetadata == null )
+            {
+                return null;
+            }
+
+            var buildPatchJson = JsonConvert.SerializeObject(buildMetadata);
+            var buildmetaJsonString = JsonConvert.ToString(buildPatchJson);
+
             var patchAppJson = new PatchAppJson
             {
                 PatchSpec = new PatchSpec
@@ -143,7 +168,7 @@ private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> function
                     {
                         PackageRef = new PackageReference
                         {
-                            BuildVersion = buildNumber
+                            BuildVersion = buildmetaJsonString
                         }
                     }
                 }
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 413a6f0a..918839f5 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -84,8 +84,8 @@ public void ConfigureServices(IServiceCollection services)
             services.Configure<FormOptions>(options =>
             {
                 options.MultipartBodyLengthLimit = 52428800;
-                options.ValueCountLimit = 500000;
-                options.KeyLengthLimit = 500000;
+                options.ValueCountLimit = 1000000;
+                options.KeyLengthLimit = 1000000;
             });
 
             services.AddRouteAnalyzer();
@@ -518,6 +518,8 @@ public void Configure(IApplicationBuilder app,
                     new {controller = "Deployment", action = "GetLogEntry"});
                 routes.MapHttpRouteDual("one-deployment-log-details", "deployments/{id}/log/{logId}",
                     new {controller = "Deployment", action = "GetLogEntryDetails"});
+                routes.MapHttpRouteDual("update-container-tag", "app/update",
+                    new { controller = "Deployment", action = "UpdateContainerTag" });
 
                 // Deployment script
                 routes.MapRoute("get-deployment-script", "api/deploymentscript",
diff --git a/Kudu.Services/Deployment/DeploymentController.cs b/Kudu.Services/Deployment/DeploymentController.cs
index a55a957e..dacc3870 100644
--- a/Kudu.Services/Deployment/DeploymentController.cs
+++ b/Kudu.Services/Deployment/DeploymentController.cs
@@ -30,6 +30,7 @@
 using Kudu.Services.Zip;
 using System.IO.Compression;
 using Kudu.Core.K8SE;
+using Org.BouncyCastle.Ocsp;
 
 namespace Kudu.Services.Deployment
 {
@@ -139,6 +140,11 @@ public IActionResult IsDeploying()
         [HttpPut]
         public async Task<IActionResult> Deploy(string id = null)
         {
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                Request.Scheme = "https";
+            }
+
             JObject jsonContent = GetJsonContent();
 
             // Just block here to read the json payload from the body
@@ -402,6 +408,11 @@ public IActionResult GetDeployResults()
                 _tracer.Trace("Current Etag: {0}, Cached Etag: {1}", currentEtag, cachedDeployments.Etag);
             }
 
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                Request.Scheme = "https";
+            }
+
             // Avoid Caching when on K8
             if (EtagEquals(Request, currentEtag) && !K8SEDeploymentHelper.IsK8SEEnvironment())
             {
@@ -442,6 +453,11 @@ public IActionResult GetDeployResults()
         [HttpGet]
         public IActionResult GetLogEntry(string id)
         {
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                Request.Scheme = "https";
+            }
+
             using (_tracer.Step("DeploymentService.GetLogEntry"))
             {
                 try
@@ -472,6 +488,11 @@ public IActionResult GetLogEntry(string id)
         [HttpGet]
         public IActionResult GetLogEntryDetails(string id, string logId)
         {
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                Request.Scheme = "https";
+            }
+
             using (_tracer.Step("DeploymentService.GetLogEntryDetails"))
             {
                 try
@@ -499,6 +520,11 @@ public IActionResult GetLogEntryDetails(string id, string logId)
         [HttpGet]
         public IActionResult GetResult(string id)
         {
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                Request.Scheme = "https";
+            }
+
             using (_tracer.Step("DeploymentService.GetResult"))
             {
                 DeployResult pending;
@@ -558,6 +584,25 @@ private bool IsLatestPendingDeployment(ref string id, out DeployResult pending)
             return false;
         }
 
+
+        /// <summary>
+        /// Updates Image tag of a custom container app when running in the K8SE Environment
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult UpdateContainerTag()
+        {
+            if(!K8SEDeploymentHelper.IsK8SEEnvironment()
+                || !Request.Headers.ContainsKey("LINUXFXVERSION")
+                || !Request.Headers["LINUXFXVERSION"].First().StartsWith("DOCKER|"))
+            {
+                return StatusCode(Microsoft.AspNetCore.Http.StatusCodes.Status405MethodNotAllowed);
+            }
+            string linuxFxVersion = Request.Headers["LINUXFXVERSION"].First().Replace("DOCKER|", "");
+            K8SEDeploymentHelper.UpdateImageTag(K8SEDeploymentHelper.GetAppName(Request.HttpContext), linuxFxVersion);
+            return Ok();
+        }
+
         /// <summary>
         /// Gets a zip with containing deploy.cmd and .deployment
         /// </summary>
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index 9b3bf8e1..c461584c 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -79,8 +79,20 @@ public async Task<IActionResult> ZipPushDeploy(
             [FromQuery] string deployer = DefaultDeployer,
             [FromQuery] string message = DefaultMessage)
         {
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                Request.Scheme = "https";
+            }
             using (_tracer.Step("ZipPushDeploy"))
             {
+                var buildHeader = false;
+
+                if(HttpContext.Request.Headers.ContainsKey("SCM_DO_BUILD_DURING_DEPLOYMENT"))
+                {
+                    string header = HttpContext.Request.Headers["SCM_DO_BUILD_DURING_DEPLOYMENT"];
+                    buildHeader = !String.IsNullOrEmpty(header) && (header == "1" || header.Equals(Boolean.TrueString, StringComparison.OrdinalIgnoreCase));
+                }
+
                 var deploymentInfo = new ZipDeploymentInfo(_environment, _traceFactory)
                 {
                     AllowDeploymentWhileScmDisabled = true,
@@ -97,7 +109,8 @@ public async Task<IActionResult> ZipPushDeploy(
                     Author = author,
                     AuthorEmail = authorEmail,
                     Message = message,
-                    ZipURL = null
+                    ZipURL = null,
+                    ShouldBuildArtifact = buildHeader
                 };
 
                 if (_settings.RunFromLocalZip())
@@ -125,6 +138,11 @@ public async Task<IActionResult> ZipPushDeployViaUrl(
             [FromQuery] string deployer = DefaultDeployer,
             [FromQuery] string message = DefaultMessage)
         {
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                Request.Scheme = "https";
+            }
+
             using (_tracer.Step("ZipPushDeployViaUrl"))
             {
                 string zipUrl = GetZipURLFromJSON(requestJson);
@@ -162,6 +180,11 @@ public async Task<IActionResult> WarPushDeploy(
             [FromQuery] string deployer = DefaultDeployer,
             [FromQuery] string message = DefaultMessage)
         {
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                Request.Scheme = "https";
+            }
+
             using (_tracer.Step("WarPushDeploy"))
             {
                 var appName = HttpContext.Request.Query["name"].ToString();
@@ -235,6 +258,7 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
             }
 
             var zipFilePath = Path.Combine(_environment.ZipTempPath, Guid.NewGuid() + ".zip");
+
             if (_settings.RunFromLocalZip())
             {
                 await WriteSitePackageZip(deploymentInfo, _tracer);

From b08f508c2db584da5ee83370c70e88954d3312ba Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Thu, 5 Nov 2020 09:46:44 -0800
Subject: [PATCH 219/245] Fix Null Ref Exception + Base64 Encode Patch (#149)

* Fix null ref for git deployments

* out

* Fix package ref serialization for function apps

* Base64 Encode build metadata json

* Fix another nul ref

* Fix Functions triggers quote issue
---
 Kudu.Console/Program.cs                       |  3 ---
 Kudu.Contracts/Deployment/BuildMetadata.cs    |  3 ---
 Kudu.Core/Deployment/DeploymentManager.cs     | 13 ++++++++--
 .../Generator/SiteBuilderFactory.cs           |  4 ++--
 .../Functions/FunctionTriggerProvider.cs      |  2 +-
 Kudu.Core/Functions/PackageReference.cs       |  8 ++++---
 .../DockerContainerRestartTrigger.cs          |  2 +-
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        | 24 +++++++++----------
 8 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/Kudu.Console/Program.cs b/Kudu.Console/Program.cs
index bd3298ed..669edc2e 100644
--- a/Kudu.Console/Program.cs
+++ b/Kudu.Console/Program.cs
@@ -272,8 +272,6 @@ private static IEnvironment GetEnvironment(string siteRoot, string requestId)
         {
             string root = Path.GetFullPath(Path.Combine(siteRoot, ".."));
             string appName = root.Replace("/home/apps/","");
-            System.Console.WriteLine("!!!!!!!!!!!! ROOT ::: "+root);
-            System.Console.WriteLine("!!!!!!!!!!!! AppNAME ::: " + appName);
 
             // CORE TODO : test by setting SCM_REPOSITORY_PATH 
             // REVIEW: this looks wrong because it ignores SCM_REPOSITORY_PATH
@@ -298,7 +296,6 @@ private static IEnvironment GetEnvironment(string siteRoot, string requestId)
                 Path.Combine(AppContext.BaseDirectory, "KuduConsole", "kudu.dll"),
                 null,
                 appName);
-
             return env;
         }
     }
diff --git a/Kudu.Contracts/Deployment/BuildMetadata.cs b/Kudu.Contracts/Deployment/BuildMetadata.cs
index 32fedb0e..08f52351 100644
--- a/Kudu.Contracts/Deployment/BuildMetadata.cs
+++ b/Kudu.Contracts/Deployment/BuildMetadata.cs
@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Kudu.Contracts.Deployment
 {
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index d0046174..2c810e9c 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -284,8 +284,17 @@ public async Task DeployAsync(
                             logger.Log(Resources.Log_TriggeringContainerRestart);
                         }
 
-                        string appName = _environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
-                        DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason, deploymentInfo.RepositoryUrl, deploymentInfo.TargetPath);
+                        string appName = _environment.K8SEAppName;
+                        string repoUrl = deploymentInfo == null ? "empty" : deploymentInfo.RepositoryUrl;
+                        if(deploymentInfo == null)
+                        {
+                            DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason);
+                        }
+                        else
+                        {
+                            DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason, deploymentInfo == null ? null : deploymentInfo.RepositoryUrl, deploymentInfo.TargetPath);
+                        }
+                        logger.Log($"Deployment Pod Rollout Started! Use 'kubectl -n k8se-apps get pods {appName} --watch' to monitor the rollout status");
                         logger.Log($"Deployment Pod Rollout Started! Use kubectl watch deplotment {appName} to monitor the rollout status");
                     }
                 }
diff --git a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
index 1528655d..cdfb38e9 100644
--- a/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
+++ b/Kudu.Core/Deployment/Generator/SiteBuilderFactory.cs
@@ -80,14 +80,14 @@ public ISiteBuilder CreateBuilder(ITracer tracer, ILogger logger, IDeploymentSet
                 return new RunFromZipSiteBuilder();
             }
 
-            if (!deploymentInfo.ShouldBuildArtifact && !settings.DoBuildDuringDeployment() && repository.RepositoryType != RepositoryType.Git)
+            if (deploymentInfo != null && (!deploymentInfo.ShouldBuildArtifact && !settings.DoBuildDuringDeployment() && repository.RepositoryType != RepositoryType.Git))
             {
                 var projectPath = !String.IsNullOrEmpty(targetProjectPath) ? targetProjectPath : repositoryRoot;
                 return new BasicBuilder(_environment, settings, _propertyProvider, repositoryRoot, projectPath);
             }
 
             string enableOryxBuild = System.Environment.GetEnvironmentVariable("ENABLE_ORYX_BUILD");
-            if (!string.IsNullOrEmpty(enableOryxBuild) && (deploymentInfo.ShouldBuildArtifact || settings.DoBuildDuringDeployment()))
+            if (!string.IsNullOrEmpty(enableOryxBuild) && (deploymentInfo != null && deploymentInfo.ShouldBuildArtifact) || settings.DoBuildDuringDeployment())
             {
                 if (StringUtils.IsTrueLike(enableOryxBuild))
                 {
diff --git a/Kudu.Core/Functions/FunctionTriggerProvider.cs b/Kudu.Core/Functions/FunctionTriggerProvider.cs
index 85e21737..6f047559 100644
--- a/Kudu.Core/Functions/FunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/FunctionTriggerProvider.cs
@@ -11,7 +11,7 @@ public class FunctionTriggerProvider
         /// <returns>The josn string of triggers in function.json</returns>
         public static T GetFunctionTriggers<T>(string providerName, string functionzipFilePath)
         {
-            if (string.IsNullOrWhiteSpace(providerName))
+            if (string.IsNullOrWhiteSpace(providerName) || string.IsNullOrWhiteSpace(functionzipFilePath))
             {
                 return default;
             }
diff --git a/Kudu.Core/Functions/PackageReference.cs b/Kudu.Core/Functions/PackageReference.cs
index 667b9ac1..b13b835e 100644
--- a/Kudu.Core/Functions/PackageReference.cs
+++ b/Kudu.Core/Functions/PackageReference.cs
@@ -1,10 +1,12 @@
-namespace Kudu.Core.Functions
+using Kudu.Contracts.Deployment;
+
+namespace Kudu.Core.Functions
 {
     using Newtonsoft.Json;
 
     public class PackageReference
     {
-        [JsonProperty(PropertyName = "buildVersion")]
-        public string BuildVersion { get; set; }
+        [JsonProperty(PropertyName = "buildMetadata")]
+        public string BuildMetadata { get; set; }
     }
 }
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index cc80f643..021a4900 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -31,7 +31,7 @@ public static void RequestContainerRestart(IEnvironment environment, string reas
         {
             if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
-                string appName = environment.SiteRootPath.Replace("/home/apps/", "").Split("/")[0];
+                string appName = environment.K8SEAppName;
                 string buildNumber = environment.CurrId;
                 var functionTriggers = FunctionTriggerProvider.GetFunctionTriggers<IEnumerable<ScaleTrigger>>("keda", repositoryUrl);
                 var buildMetadata = new BuildMetadata()
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 73a78c63..7cca1999 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -9,7 +9,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using System.Web;
 
 namespace Kudu.Core.K8SE
 {
@@ -48,13 +47,11 @@ public static string GetLinuxFxVersion(string appName)
         /// <returns></returns>
         public static void UpdateBuildNumber(string appName, BuildMetadata buildMetadata)
         {
-            var buildPatchJson = $"\"{HttpUtility.JavaScriptStringEncode(JsonConvert.SerializeObject(buildMetadata)).Replace("\\","\\\\")}\"";
-
             var cmd = new StringBuilder();
             BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "update");
             BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
             BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "buildMetadata");
-            BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, buildPatchJson);
+            BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, $"\"{GetBuildMetadataStr(buildMetadata)}\"");
             RunBuildCtlCommand(cmd.ToString(), "Updating build version...");
         }
 
@@ -97,14 +94,13 @@ public static void UpdateFunctionAppTriggers(string appName, IEnumerable<ScaleTr
 
         private static string RunBuildCtlCommand(string args, string msg)
         {
-            var escapedArgs = args.Replace("\"", "\\\"");
             Console.WriteLine($"{msg} : {args}");
             var process = new Process()
             {
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = "/bin/bash",
-                    Arguments = $"-c \"{escapedArgs}\"",
+                    Arguments = $"-c \"{args}\"",
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     UseShellExecute = false,
@@ -153,9 +149,6 @@ private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> function
                 return null;
             }
 
-            var buildPatchJson = JsonConvert.SerializeObject(buildMetadata);
-            var buildmetaJsonString = JsonConvert.ToString(buildPatchJson);
-
             var patchAppJson = new PatchAppJson
             {
                 PatchSpec = new PatchSpec
@@ -168,15 +161,20 @@ private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> function
                     {
                         PackageRef = new PackageReference
                         {
-                            BuildVersion = buildmetaJsonString
+                            BuildMetadata = GetBuildMetadataStr(buildMetadata),
                         }
                     }
                 }
             };
 
-            var patchJson = JsonConvert.SerializeObject(patchAppJson, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-            var patchJsonString = JsonConvert.ToString(patchJson);
-            return patchJsonString;
+            var str= System.Convert.ToBase64String(ASCIIEncoding.ASCII.GetBytes(JsonConvert.SerializeObject(patchAppJson)));
+            Console.WriteLine("Test Str:     " + str);
+            return str;
+        }
+
+        private static string GetBuildMetadataStr(BuildMetadata buildMetadata)
+        {
+            return $"{buildMetadata.AppName}|{buildMetadata.BuildVersion}|{System.Convert.ToBase64String(ASCIIEncoding.ASCII.GetBytes(JsonConvert.SerializeObject(buildMetadata)))}";
         }
     }
 }

From c8a6e998d90d8c270891384a84f375700054e1df Mon Sep 17 00:00:00 2001
From: SatishRanjan <SatishRanjan@users.noreply.github.com>
Date: Mon, 30 Nov 2020 00:16:54 -0800
Subject: [PATCH 220/245] SyncTrigger API for the function app (#152)

* Function sync trigger API

* -Adding route for operation/settriggers
-Adding kube app namespace in the kube middleware and the enviornment

* -Adding route for operation/settriggers
-Adding kube app namespace in the kube middleware and the enviornment

* Authenticating sync trigger call from function host to the build service
---
 Kudu.Core/Environment.cs                      |  20 ++-
 .../Functions/FunctionTriggerProvider.cs      |   2 +-
 .../Functions/KedaFunctionTriggerProvider.cs  |   5 +-
 Kudu.Core/Functions/SyncTriggerHandler.cs     |  99 ++++++++++++
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        |   6 +
 Kudu.Core/Kube/SecretProvider.cs              |  49 ++++++
 Kudu.Core/Kube/SyncTriggerAuthenticator.cs    | 146 ++++++++++++++++++
 Kudu.Services.Web/KubeMiddleware.cs           |  15 +-
 .../Properties/launchSettings.json            |   2 +
 Kudu.Services.Web/Startup.cs                  |   4 +
 Kudu.Services/Function/FunctionController.cs  |  99 ++++++++++++
 .../Oryx/OryxArgumentsAppServiceTests.cs      |  48 +++---
 .../Oryx/OryxArgumentsFactoryTests.cs         |  26 ++--
 .../Oryx/OryxArgumentsFunctionAppTests.cs     |  14 +-
 ...gumentsLinuxConsumptionFunctionAppTests.cs |  10 +-
 .../Core/Function/SyncTriggerHandlerTests.cs  |  27 ++++
 16 files changed, 514 insertions(+), 58 deletions(-)
 create mode 100644 Kudu.Core/Functions/SyncTriggerHandler.cs
 create mode 100644 Kudu.Core/Kube/SecretProvider.cs
 create mode 100644 Kudu.Core/Kube/SyncTriggerAuthenticator.cs
 create mode 100644 Kudu.Services/Function/FunctionController.cs
 create mode 100644 Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs

diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 599fb7ec..3334f7d9 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -42,6 +42,7 @@ public class Environment : IEnvironment
         private readonly string _sitePackagesPath;
         private readonly string _secondaryJobsBinariesPath;
         private readonly string _k8seAppName;
+        private readonly string _k8seAppNamespace;
 
 
         // This ctor is used only in unit tests
@@ -63,7 +64,8 @@ public Environment(
                 string sitePackagesPath,
                 string requestId,
                 IHttpContextAccessor httpContextAccessor,
-                string k8seAppName = null)
+                string k8seAppName = null,
+                string k8seAppNamespace = null)
         {
             if (repositoryPath == null)
             {
@@ -103,6 +105,7 @@ public Environment(
             RequestId = !string.IsNullOrEmpty(requestId) ? requestId : Guid.Empty.ToString();
             _httpContextAccessor = httpContextAccessor;
             _k8seAppName = k8seAppName;
+            _k8seAppNamespace = k8seAppNamespace;
         }
 
         public Environment(
@@ -112,7 +115,8 @@ public Environment(
                 string requestId,
                 string kuduConsoleFullPath,
                 IHttpContextAccessor httpContextAccessor,
-                string k8seAppName = null)
+                string k8seAppName = null,
+                string k8seAppNamespace = null)
         {
             RootPath = rootPath;
 
@@ -128,6 +132,7 @@ public Environment(
             _diagnosticsPath = Path.Combine(SiteRootPath, Constants.DiagnosticsPath);
             _locksPath = Path.Combine(SiteRootPath, Constants.LocksPath);
             _k8seAppName = k8seAppName;
+            _k8seAppNamespace = k8seAppNamespace;
 
             if (OSDetector.IsOnWindows())
             {
@@ -468,7 +473,8 @@ public static string TenantId
             }
         }
 
-        public bool IsK8SEApp {
+        public bool IsK8SEApp
+        {
             get
             {
                 return K8SEDeploymentHelper.IsK8SEEnvironment();
@@ -485,6 +491,14 @@ public string K8SEAppName
             }
         }
 
+        public string K8SEAppNamespace
+        {
+            get
+            {
+                return _k8seAppNamespace;
+            }
+        }
+
         public static string GetFreeSpaceHtml(string path)
         {
             try
diff --git a/Kudu.Core/Functions/FunctionTriggerProvider.cs b/Kudu.Core/Functions/FunctionTriggerProvider.cs
index 6f047559..18d32af0 100644
--- a/Kudu.Core/Functions/FunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/FunctionTriggerProvider.cs
@@ -13,7 +13,7 @@ public static T GetFunctionTriggers<T>(string providerName, string functionzipFi
         {
             if (string.IsNullOrWhiteSpace(providerName) || string.IsNullOrWhiteSpace(functionzipFilePath))
             {
-                return default;
+                return default(T);
             }
 
             switch (providerName.ToLower())
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index c4934a2e..cfc2b7b8 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -114,7 +114,7 @@ private static string GetFunctionName(ZipArchiveEntry zipEnetry)
             return zipEnetry.FullName.Split('/').Length == 2 ? zipEnetry.FullName.Split('/')[0] : zipEnetry.FullName.Split('\\')[0];
         }
 
-        private static string GetKedaTriggerType(string triggerType)
+        public static string GetKedaTriggerType(string triggerType)
         {
             if (string.IsNullOrEmpty(triggerType))
             {
@@ -143,6 +143,9 @@ private static string GetKedaTriggerType(string triggerType)
                 case "rabbitmqtrigger":
                     return "rabbitmq";
 
+                case "httpTrigger":
+                    return "httpTrigger";
+
                 default:
                     return triggerType;
             }
diff --git a/Kudu.Core/Functions/SyncTriggerHandler.cs b/Kudu.Core/Functions/SyncTriggerHandler.cs
new file mode 100644
index 00000000..1ed10815
--- /dev/null
+++ b/Kudu.Core/Functions/SyncTriggerHandler.cs
@@ -0,0 +1,99 @@
+using Kudu.Contracts.Deployment;
+using Kudu.Contracts.Tracing;
+using Kudu.Core.K8SE;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Kudu.Core.Tracing;
+
+namespace Kudu.Core.Functions
+{
+    public class SyncTriggerHandler
+    {
+        private readonly IEnvironment _environment;
+        private readonly ITracer _tracer;
+
+        public SyncTriggerHandler(IEnvironment environment,
+            ITracer tracer)
+        {
+            _environment = environment;
+            _tracer = tracer;
+        }
+
+        public async Task<string> SyncTriggers(string functionTriggersPayload)
+        {
+            using (_tracer.Step("SyncTriggerHandler.SyncTrigger()"))
+            {
+                var scaleTriggersContent = GetScaleTriggers(functionTriggersPayload);
+                if (!string.IsNullOrEmpty(scaleTriggersContent.Item2))
+                {
+                    return scaleTriggersContent.Item2;
+                }
+
+                var scaleTriggers = scaleTriggersContent.Item1;
+                string appName = _environment.K8SEAppName;
+                string buildNumber = Guid.NewGuid().ToString();
+                var buildMetadata = new BuildMetadata()
+                {
+                    AppName = appName,
+                    BuildVersion = buildNumber,
+                    AppSubPath = string.Empty
+                };
+
+                await Task.Run(() => K8SEDeploymentHelper.UpdateFunctionAppTriggers(appName, scaleTriggers, buildMetadata));
+            }
+
+            return null;
+        }
+
+        public Tuple<IEnumerable<ScaleTrigger>, string> GetScaleTriggers(string functionTriggersPayload)
+        {
+            var scaleTriggers = new List<ScaleTrigger>();
+            try
+            {
+                if (string.IsNullOrEmpty(functionTriggersPayload))
+                {
+                    return new Tuple<IEnumerable<ScaleTrigger>, string>(null, "Function trigger payload is null or empty.");
+                }
+
+                var triggersJson = JArray.Parse(functionTriggersPayload);
+                foreach (JObject trigger in triggersJson)
+                {
+                    var type = (string)trigger["type"];
+                    if (type.EndsWith("Trigger", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var scaleTrigger = new ScaleTrigger
+                        {
+                            Type = KedaFunctionTriggerProvider.GetKedaTriggerType(type),
+                            Metadata = new Dictionary<string, string>()
+                        };
+
+                        foreach (var property in trigger)
+                        {
+                            if (property.Value.Type == JTokenType.String)
+                            {
+                                scaleTrigger.Metadata.Add(property.Key, property.Value.ToString());
+                            }
+                        }
+
+                        scaleTriggers.Add(scaleTrigger);
+                    }
+                }
+
+                if (!scaleTriggers.Any())
+                {
+                    return new Tuple<IEnumerable<ScaleTrigger>, string>(null, "No triggers in the payload");
+                }
+            }
+            catch (Exception e)
+            {
+                return new Tuple<IEnumerable<ScaleTrigger>, string>(null, e.Message);
+            }
+
+            return new Tuple<IEnumerable<ScaleTrigger>, string>(scaleTriggers, null); ;
+        }
+    }
+}
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 7cca1999..1595c7b2 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -137,6 +137,12 @@ public static string GetAppName(HttpContext context)
             return appName;
         }
 
+        public static string GetAppNamespace(HttpContext context)
+        {
+            var appNamepace = context.Request.Headers["K8SE_APP_NAMESPACE"].ToString();
+            return appNamepace;
+        }
+
         private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> functionTriggers, BuildMetadata buildMetadata)
         {
             if (functionTriggers == null || !functionTriggers.Any())
diff --git a/Kudu.Core/Kube/SecretProvider.cs b/Kudu.Core/Kube/SecretProvider.cs
new file mode 100644
index 00000000..b1b4ba00
--- /dev/null
+++ b/Kudu.Core/Kube/SecretProvider.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.IO;
+
+namespace Kudu.Core.Kube
+{
+
+    public class SecretProvider
+    {
+        private readonly HttpClient _httpClient = new HttpClient();
+        private readonly string _secretKubeApiUrlPlaceHolder = "https://kubernetes.default.svc.cluster.local/api/v1/namespaces/{0}/secrets/{1}";
+        private readonly string _rbacServiceActTokenFilePath = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+
+        public async Task<string> GetSecretContent(string secretName, string secretNamespace)
+        {
+            var responseBodyContent = "";
+            var secretKubeApiUrl = string.Format(_secretKubeApiUrlPlaceHolder, secretNamespace, secretName);
+            var accessToken = await GetAccessToken();
+            _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + accessToken);
+            var responseMessage = await _httpClient.GetAsync(secretKubeApiUrl);
+
+            if (responseMessage.StatusCode == System.Net.HttpStatusCode.NotFound)
+            {
+                return responseBodyContent;
+            }
+
+            using (var reader = new StreamReader(await responseMessage.Content.ReadAsStreamAsync()))
+            {
+                responseBodyContent = await reader.ReadToEndAsync();
+            }
+
+            return responseBodyContent;
+        }
+
+        private async Task<string> GetAccessToken()
+        {
+            var accessToken = "";
+            using (var sr = File.OpenText(_rbacServiceActTokenFilePath))
+            {
+                accessToken = await sr.ReadToEndAsync();
+            }
+
+            return accessToken;
+        }
+    }
+}
diff --git a/Kudu.Core/Kube/SyncTriggerAuthenticator.cs b/Kudu.Core/Kube/SyncTriggerAuthenticator.cs
new file mode 100644
index 00000000..a82e723f
--- /dev/null
+++ b/Kudu.Core/Kube/SyncTriggerAuthenticator.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using System.Security.Cryptography;
+using System.IO;
+
+namespace Kudu.Core.Kube
+{
+    public class SyncTriggerAuthenticator
+    {
+        private const string SiteTokenHeaderName = "x-ms-site-restricted-token";
+        private const string FuncAppEncryptionKeyName = "WEBSITE_AUTH_ENCRYPTION_KEY";
+        private const string FuncAppNameHeaderKey = "K8SE_APP_NAME";
+        private const string FuncAppNamespaceHeaderKey = "K8SE_APP_NAMESPACE";
+        public async static Task<bool> AuthenticateCaller(Dictionary<string, IEnumerable<string>> headers)
+        {
+            if (headers == null || !headers.Any())
+            {
+                return false;
+            }
+
+            //If there's no encryption key in the header return true
+            if (!headers.TryGetValue(SiteTokenHeaderName, out IEnumerable<string> siteTokenHeaderValue))
+            {
+                return false;
+            }
+
+            //Auth header value is null or empty return false
+            var funcAppAuthToken = siteTokenHeaderValue.FirstOrDefault();
+            if (string.IsNullOrEmpty(funcAppAuthToken))
+            {
+                return false;
+            }
+
+            //If there's no app name or app namespace in the header return false
+            if (!headers.TryGetValue(FuncAppNameHeaderKey, out IEnumerable<string> funcAppNameHeaderValue)
+                || !headers.TryGetValue(FuncAppNamespaceHeaderKey, out IEnumerable<string> funcAppNamespaceHeaderValue))
+            {
+                return false;
+            }
+
+            var funcAppName = funcAppNameHeaderValue.FirstOrDefault();
+            var funcAppNamespace = funcAppNamespaceHeaderValue.FirstOrDefault();
+            if (string.IsNullOrEmpty(funcAppName) || string.IsNullOrEmpty(funcAppNamespace))
+            {
+                return false;
+            }
+
+            //If the encryption key secret is null or empty in the Kubernetes - return false
+            var secretProvider = new SecretProvider();
+            var encryptionKeySecretContent = await secretProvider.GetSecretContent(funcAppName + "-encryptionkey".ToLower(), funcAppNamespace);
+            if (string.IsNullOrEmpty(encryptionKeySecretContent))
+            {
+                return false;
+            }
+
+            var encryptionSecretJObject = JObject.Parse(encryptionKeySecretContent);
+            var functionEncryptionKey = Base64Decode((string)encryptionSecretJObject["data"][FuncAppEncryptionKeyName]);
+            if (string.IsNullOrEmpty(functionEncryptionKey))
+            {
+                return false;
+            }
+
+            var decryptedToken = Decrypt(Encoding.UTF8.GetBytes(functionEncryptionKey), funcAppAuthToken);
+            return ValidateToken(decryptedToken);
+        }
+
+        private static bool ValidateToken(string token)
+        {
+            if (string.IsNullOrEmpty(token))
+            {
+                return false;
+            }
+
+            var tokenValues = token.Split('=');
+            if (tokenValues.Length < 2)
+            {
+                return false;
+            }
+
+            long ticksVal = 0;
+            if (!long.TryParse(tokenValues[1], out ticksVal))
+            {
+                return false;
+            }
+
+            //The token will be valid only for the next 5 more minutes after being generated
+            DateTime myDate = new DateTime(ticksVal);
+            if (myDate.AddMinutes(5) < DateTime.UtcNow)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private static string Base64Decode(string base64EncodedData)
+        {
+            var base64EncodedBytes = Convert.FromBase64String(base64EncodedData);
+            return Encoding.UTF8.GetString(base64EncodedBytes);
+        }
+
+        private static string Decrypt(byte[] encryptionKey, string value)
+        {
+            var parts = value.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
+            if (parts.Length != 2 && parts.Length != 3)
+            {
+                throw new InvalidOperationException("Malformed token.");
+            }
+
+            var iv = Convert.FromBase64String(parts[0]);
+            var data = Convert.FromBase64String(parts[1]);
+            var base64KeyHash = parts.Length == 3 ? parts[2] : null;
+
+            if (!string.IsNullOrEmpty(base64KeyHash) && !string.Equals(GetSHA256Base64String(encryptionKey), base64KeyHash))
+            {
+                throw new InvalidOperationException(string.Format("Key with hash {0} does not exist.", base64KeyHash));
+            }
+
+            using (var aes = new AesManaged { Key = encryptionKey })
+            {
+                using (var ms = new MemoryStream())
+                {
+                    using (var cs = new CryptoStream(ms, aes.CreateDecryptor(aes.Key, iv), CryptoStreamMode.Write))
+                    using (var binaryWriter = new BinaryWriter(cs))
+                    {
+                        binaryWriter.Write(data, 0, data.Length);
+                    }
+
+                    return Encoding.UTF8.GetString(ms.ToArray());
+                }
+            }
+        }
+
+        private static string GetSHA256Base64String(byte[] key)
+        {
+            using (var sha256 = new SHA256Managed())
+            {
+                return Convert.ToBase64String(sha256.ComputeHash(key));
+            }
+        }
+    }
+}
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index aa4b285d..dcd21ad3 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -40,13 +40,14 @@ public KubeMiddleware(RequestDelegate next)
         public async Task Invoke(HttpContext context, IEnvironment environment, IServerConfiguration serverConfig)
         {
             string appName = K8SEDeploymentHelper.GetAppName(context);
+            string appNamenamespace = K8SEDeploymentHelper.GetAppNamespace(context);
 
             string homeDir = "";
             string siteRepoDir = "";
             if (OSDetector.IsOnWindows())
             {
                 // K8SE TODO : Move to constants
-                homeDir = "F:\\repos\\apps\\";
+                homeDir = "C:\\repos\\apps\\";
                 siteRepoDir = "\\site\\repository";
             }
             else
@@ -57,11 +58,16 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             }
 
             // Cache the App Environment for this request
-            context.Items.Add("environment", GetEnvironment(homeDir, appName));
+            context.Items.Add("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace));
 
             // Cache the appName for this request
             context.Items.Add("appName", appName);
 
+            // Cache the appNamenamespace for this request if it's not empty or null
+            if (!string.IsNullOrEmpty(appNamenamespace))
+            {
+                context.Items.Add("appNamespace", appNamenamespace);
+            }
 
             string[] pathParts = context.Request.Path.ToString().Split("/");
 
@@ -101,7 +107,8 @@ private static IEnvironment GetEnvironment(
             string home,
             string appName,
             IDeploymentSettingsManager settings = null,
-            HttpContext httpContext = null)
+            HttpContext httpContext = null,
+            string appNamespace = null)
         {
             var root = KubeMiddleware.ResolveRootPath(home, appName);
             var siteRoot = Path.Combine(root, Constants.SiteFolder);
@@ -112,7 +119,7 @@ private static IEnvironment GetEnvironment(
             var kuduConsoleFullPath =
                 Path.Combine(AppContext.BaseDirectory, KuduConsoleRelativePath, KuduConsoleFilename);
             return new Core.Environment(root, EnvironmentHelper.NormalizeBinPath(binPath), repositoryPath, requestId,
-                kuduConsoleFullPath, null, appName);
+                kuduConsoleFullPath, null, appName, appNamespace);
         }
 
         /// <summary>
diff --git a/Kudu.Services.Web/Properties/launchSettings.json b/Kudu.Services.Web/Properties/launchSettings.json
index ec56f9c1..69f18189 100644
--- a/Kudu.Services.Web/Properties/launchSettings.json
+++ b/Kudu.Services.Web/Properties/launchSettings.json
@@ -12,6 +12,8 @@
       "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
+        "K8SE_BUILD_SERVICE": "yes",
+        "HOME": "C:\\work\\function-apps\\HttpFunApp1\\bin\\Debug\\netcoreapp2.2",
         "ASPNETCORE_ENVIRONMENT": "Production"
       },
       "applicationUrl": "http://0.0.0.0:16018/"
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 918839f5..dbdb89cb 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -676,6 +676,10 @@ public void Configure(IApplicationBuilder app,
                         new {verb = new HttpMethodRouteConstraint("POST")});
                 }
 
+                routes.MapHttpRouteDual("sync-function-triggers-put", "operations/settriggers",
+                   new { controller = "Function", action = "SyncTrigger" },
+                   new { verb = new HttpMethodRouteConstraint("PUT") });
+
                 // catch all unregistered url to properly handle not found
                 // routes.MapRoute("error-404", "{*path}", new {controller = "Error404", action = "Handle"});
             });
diff --git a/Kudu.Services/Function/FunctionController.cs b/Kudu.Services/Function/FunctionController.cs
new file mode 100644
index 00000000..eb87c8d5
--- /dev/null
+++ b/Kudu.Services/Function/FunctionController.cs
@@ -0,0 +1,99 @@
+using Kudu.Contracts.Tracing;
+using Kudu.Core;
+using Kudu.Core.Functions;
+using Kudu.Core.K8SE;
+using Kudu.Core.Kube;
+using Kudu.Core.Tracing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Remotion.Linq.Parsing.Structure.IntermediateModel;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Kudu.Services.Function
+{
+    public class FunctionController : Controller
+    {
+        private IEnvironment _environment;
+        private readonly IAnalytics _analytics;
+        private readonly ITracer _tracer;
+
+        public FunctionController(ITracer tracer,
+            IAnalytics analytics,
+            IHttpContextAccessor accessor)
+        {
+            _tracer = tracer;
+            _environment = (IEnvironment)accessor.HttpContext.Items["environment"];
+            _analytics = analytics;
+        }
+
+        /// <summary>
+        /// Sync triggers to the k8se function apps
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<IActionResult> SyncTrigger()
+        {
+            try
+            {
+                var headers = Request.Headers.ToDictionary(a => a.Key, a => a.Value.AsEnumerable());
+                var authResult = await SyncTriggerAuthenticator.AuthenticateCaller(headers);
+                if (!authResult)
+                {
+                    return StatusCode(StatusCodes.Status401Unauthorized, "Invalid authetication token in the header");
+                }
+            }
+            catch (Exception e)
+            {
+                return StatusCode(StatusCodes.Status401Unauthorized, e.Message);
+            }
+
+
+            IActionResult result = Ok();
+            using (_tracer.Step("FunctionController.SyncTrigger()"))
+            {
+                var triggerPayload = default(string);
+                try
+                {
+                    triggerPayload = await GetRequestBodyPayload();
+                }
+                catch (Exception e)
+                {
+                    result = BadRequest(e.ToString());
+                    return result;
+                }
+
+                try
+                {
+                    var syncTriggerHandler = new SyncTriggerHandler(_environment, _tracer);
+                    var errorMessage = await syncTriggerHandler.SyncTriggers(triggerPayload);
+                    if (!string.IsNullOrEmpty(errorMessage))
+                    {
+                        result = BadRequest(errorMessage);
+                        return result;
+                    }
+                }
+                catch (Exception e)
+                {
+                    return StatusCode(StatusCodes.Status500InternalServerError, e.ToString());
+                }
+            }
+
+            return result;
+        }
+
+        private async Task<string> GetRequestBodyPayload()
+        {
+            using (StreamReader reader = new StreamReader(Request.Body))
+            {
+                return await reader.ReadToEndAsync();
+            }
+        }
+    }
+}
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
index bef6d177..a0ed14f2 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
@@ -11,7 +11,7 @@ public class OryxArgumentsAppServiceTests
         [Fact]
         public void DefaultTest()
         {
-            IOryxArguments args = new AppServiceOryxArguments();
+            IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
             Assert.False(args.RunOryxBuild);
             Assert.False(args.SkipKuduSync);
             Assert.Equal(BuildOptimizationsFlags.Off, args.Flags);
@@ -22,7 +22,7 @@ public void DefaultTest()
                 BuildTempPath = "BuildTempPath",
                 OutputPath = "OutputPath"
             };
-            string command = args.GenerateOryxBuildCommand(mockedContext);
+            string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
             Assert.Equal("oryx build OutputPath -o OutputPath", command);
         }
 
@@ -42,7 +42,7 @@ public void ArgumentPropertyTest(string language, string version,
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new AppServiceOryxArguments();
+                IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(expectedRunOryxBuild, args.RunOryxBuild);
                 Assert.Equal(expectedSkipKuduSync, args.SkipKuduSync);
                 Assert.Equal(expectedFlags, args.Flags);
@@ -75,9 +75,9 @@ public void CommandGenerationTest(string language, string version, string expect
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new AppServiceOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
-                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext));
+                IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
+                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
 
@@ -101,9 +101,9 @@ public void DotnetcoreVersionPromotionTest(string version, string expectedComman
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new AppServiceOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
-                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext));
+                IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
+                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
 
@@ -126,10 +126,10 @@ public void NodejsUseExpressBuildTest()
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new AppServiceOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
+                IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal("oryx build OutputPath -o OutputPath --platform nodejs --platform-version 8.12 -i BuildTempPath -p compress_node_modules=zip",
-                    args.GenerateOryxBuildCommand(mockedContext));
+                    args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
 
@@ -154,9 +154,9 @@ public void PythonVirtualEnvironmentNamingTest(string version, string expectedCo
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new AppServiceOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
-                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext));
+                IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
+                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
 
@@ -182,9 +182,9 @@ public void MissingFrameworkVersionEnvironmentTest(string language, string expec
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new AppServiceOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
-                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext));
+                IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
+                Assert.Equal(expectedCommand, args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
 
@@ -206,9 +206,9 @@ public void MissingFrameworkEnvironmentTest()
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new AppServiceOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
-                Assert.Equal("oryx build OutputPath -o OutputPath", args.GenerateOryxBuildCommand(mockedContext));
+                IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
+                Assert.Equal("oryx build OutputPath -o OutputPath", args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
 
@@ -229,10 +229,10 @@ public void MissingOutputPathTest()
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new AppServiceOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
+                IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal("oryx build  -o  --platform python --platform-version 3.6 -p virtualenv_name=antenv3.6",
-                    args.GenerateOryxBuildCommand(mockedContext));
+                    args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
     }
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
index 5eaac526..792c4406 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
@@ -12,7 +12,7 @@ public class OryxArgumentsFactoryTests
         [Fact]
         public void OryxArgumentShouldBeAppService()
         {
-            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
             Assert.IsType<AppServiceOryxArguments>(args);
         }
 
@@ -22,7 +22,7 @@ public void OryxArgumentShouldBeFunctionApp()
             using (new TestScopedEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME", "PYTHON"))
             using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
             {
-                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 Assert.IsType<FunctionAppOryxArguments>(args);
             }
         }
@@ -34,7 +34,7 @@ public void OryxArgumentShouldBeLinuxConsumption()
             using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
             using (new TestScopedEnvironmentVariable("SCM_RUN_FROM_PACKAGE", "http://microsoft.com"))
             {
-                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 Assert.IsType<LinuxConsumptionFunctionAppOryxArguments>(args);
             }
         }
@@ -55,7 +55,7 @@ public void OryxArgumentRunOryxBuild(bool expectedRunOryxBuild, params string[]
 
             using (new TestScopedEnvironmentVariable(env))
             {
-                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(expectedRunOryxBuild, args.RunOryxBuild);
             }
         }
@@ -76,7 +76,7 @@ public void OryxArgumentSkipKuduSync(bool expectedSkipKuduSync, params string[]
 
             using (new TestScopedEnvironmentVariable(env))
             {
-                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(expectedSkipKuduSync, args.SkipKuduSync);
             }
         }
@@ -88,8 +88,8 @@ public void BuildCommandForAppService()
             {
                 OutputPath = "outputpath"
             };
-            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
-            string command = args.GenerateOryxBuildCommand(deploymentContext);
+            IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+            string command = args.GenerateOryxBuildCommand(deploymentContext, TestMockedEnvironment.GetMockedEnvironment());
             Assert.Equal(@"oryx build outputpath -o outputpath", command);
         }
 
@@ -104,8 +104,8 @@ public void BuildCommandForFunctionApp()
 
             using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
             {
-                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
-                string command = args.GenerateOryxBuildCommand(deploymentContext);
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(deploymentContext, TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(@"oryx build outputpath -o outputpath -i buildtemppath", command);
             }
         }
@@ -121,8 +121,8 @@ public void BuildCommandForLinuxConsumptionFunctionApp()
             using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
             using (new TestScopedEnvironmentVariable("SCM_RUN_FROM_PACKAGE", "http://microsoft.com"))
             {
-                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
-                string command = args.GenerateOryxBuildCommand(deploymentContext);
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(deploymentContext, TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(@"oryx build repositorypath -o repositorypath", command);
             }
         }
@@ -139,8 +139,8 @@ public void BuildCommandForPythonFunctionApp()
             using (new TestScopedEnvironmentVariable("FUNCTIONS_EXTENSION_VERSION", "~2"))
             using (new TestScopedEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME", "python"))
             {
-                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments();
-                string command = args.GenerateOryxBuildCommand(deploymentContext);
+                IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(deploymentContext, TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(@"oryx build outputpath -o outputpath --platform python --platform-version 3.6 -i buildtemppath -p packagedir=.python_packages\lib\python3.6\site-packages", command);
             }
         }
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
index 53944235..10caaf5b 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
@@ -11,7 +11,7 @@ public class OryxArgumentsFunctionAppTests
         [Fact]
         public void DefaultTest()
         {
-            IOryxArguments args = new FunctionAppOryxArguments();
+            IOryxArguments args = new FunctionAppOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
             Assert.False(args.RunOryxBuild);
             Assert.False(args.SkipKuduSync);
             Assert.Equal(BuildOptimizationsFlags.None, args.Flags);
@@ -22,7 +22,7 @@ public void DefaultTest()
                 BuildTempPath = "BuildTempPath",
                 OutputPath = "OutputPath"
             };
-            string command = args.GenerateOryxBuildCommand(mockedContext);
+            string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
             Assert.Equal("oryx build OutputPath -o OutputPath -i BuildTempPath", command);
         }
 
@@ -41,7 +41,7 @@ public void ArgumentPropertyTest(string functions_worker_runtime,
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new FunctionAppOryxArguments();
+                IOryxArguments args = new FunctionAppOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(expectedRunOryxBuild, args.RunOryxBuild);
                 Assert.Equal(expectedSkipKuduSync, args.SkipKuduSync);
                 Assert.Equal(expectedFlags, args.Flags);
@@ -74,8 +74,8 @@ public void CommandGenerationTest(string functions_worker_runtime, string expect
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new FunctionAppOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
+                IOryxArguments args = new FunctionAppOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(expected_command, command);
             }
         }
@@ -98,8 +98,8 @@ public void SkipKuduSyncOnExpressBuildTest()
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new FunctionAppOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
+                IOryxArguments args = new FunctionAppOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
                 Assert.True(args.RunOryxBuild);
                 Assert.True(args.SkipKuduSync);
                 Assert.Equal("oryx build RepositoryPath -o /tmp/build/expressbuild --platform nodejs --platform-version 8.15 -i BuildTempPath",
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs
index 7b5cba52..cb3f01ef 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs
@@ -11,7 +11,7 @@ public class OryxArgumentsLinuxConsumptionFunctionAppTests
         [Fact]
         public void DefaultTest()
         {
-            IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments();
+            IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
             Assert.False(args.RunOryxBuild);
             Assert.True(args.SkipKuduSync);
             Assert.Equal(BuildOptimizationsFlags.Off, args.Flags);
@@ -22,7 +22,7 @@ public void DefaultTest()
                 BuildTempPath = "BuildTempPath", // Should be ignored
                 OutputPath = "OutputPath"
             };
-            string command = args.GenerateOryxBuildCommand(mockedContext);
+            string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
             Assert.Equal("oryx build RepositoryPath -o RepositoryPath", command);
         }
 
@@ -41,7 +41,7 @@ public void ArgumentPropertyTest(string functions_worker_runtime,
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments();
+                IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(expectedRunOryxBuild, args.RunOryxBuild);
                 Assert.Equal(expectedSkipKuduSync, args.SkipKuduSync);
                 Assert.Equal(expectedFlags, args.Flags);
@@ -74,8 +74,8 @@ public void CommandGenerationTest(string functions_worker_runtime, string expect
 
             using (new TestScopedEnvironmentVariable(mockedEnvironment))
             {
-                IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments();
-                string command = args.GenerateOryxBuildCommand(mockedContext);
+                IOryxArguments args = new LinuxConsumptionFunctionAppOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
+                string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
                 Assert.Equal(expected_command, command);
             }
         }
diff --git a/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs b/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
new file mode 100644
index 00000000..e1723e8d
--- /dev/null
+++ b/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
@@ -0,0 +1,27 @@
+using Kudu.Core.Functions;
+using System.Linq;
+using Xunit;
+
+namespace Kudu.Tests.Core.Function
+{
+    public class SyncTriggerHandlerTests
+    {
+        [Theory]
+        [InlineData("[{\"type\":\"httpTrigger\",\"methods\":[\"get\",\"post\"],\"authLevel\":\"function\",\"name\":\"req\",\"functionName\":\"Function1 - Oct152020 - 1\"},{\"type\":\"queueTrigger\",\"connection\":\"AzureWebJobsStorage\",\"queueName\":\"myqueue - 1\",\"name\":\"myQueueItem\",\"functionName\":\"Function2\"}]")]
+        [InlineData("Invalid json")]
+        [InlineData(null)]
+        public void GetScaleTriggersTest(string functionTriggerPayload)
+        {
+            var syncTriggerHandler = new SyncTriggerHandler(null, null);
+            var scaleTriggers = syncTriggerHandler.GetScaleTriggers(functionTriggerPayload);
+            if (string.Equals(functionTriggerPayload, "Invalid json") || string.IsNullOrEmpty(functionTriggerPayload))
+            {
+                Assert.True(!string.IsNullOrEmpty(scaleTriggers.Item2));
+            }
+            else
+            {
+                Assert.True(scaleTriggers != null && scaleTriggers.Item1 != null && scaleTriggers.Item1.ToList<ScaleTrigger>().Count > 0);
+            }
+        }
+    }
+}

From f328c6d1396e8d26aad4b8ed7a3f3498ac4d955d Mon Sep 17 00:00:00 2001
From: Chris Gillum <cgillum@microsoft.com>
Date: Wed, 17 Mar 2021 17:18:39 -0700
Subject: [PATCH 221/245] Added support for KEDA Durable triggers

---
 .../Functions/KedaFunctionTriggerProvider.cs  | 138 ++++++++++++++----
 .../KedaFunctionTriggersProviderTests.cs      |  57 ++++++++
 2 files changed, 167 insertions(+), 28 deletions(-)
 create mode 100644 Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index cfc2b7b8..6bb345b2 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -21,9 +21,19 @@ public IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath)
                 return null;
             }
 
-            List<ScaleTrigger> kedaScaleTriggers = new List<ScaleTrigger>();
+            string hostJsonText = null;
+            var triggerBindings = new List<FunctionTrigger>();
             using (var zip = ZipFile.OpenRead(zipFilePath))
             {
+                var hostJsonEntry = zip.Entries.FirstOrDefault(e => IsHostJson(e.FullName));
+                if (hostJsonEntry != null)
+                {
+                    using (var reader = new StreamReader(hostJsonEntry.Open()))
+                    {
+                        hostJsonText = reader.ReadToEnd();
+                    }
+                }
+
                 var entries = zip.Entries
                     .Where(e => IsFunctionJson(e.FullName));
 
@@ -33,26 +43,39 @@ public IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath)
                     {
                         using (var reader = new StreamReader(stream))
                         {
-                            var functionTriggers = ParseFunctionJson(GetFunctionName(entry), reader.ReadToEnd());
-                            if (functionTriggers?.Any() == true)
-                            {
-                                kedaScaleTriggers.AddRange(functionTriggers);
-                            }
+                            triggerBindings.AddRange(ParseFunctionJson(GetFunctionName(entry), reader.ReadToEnd()));
                         }
                     }
                 }
             }
 
+            var durableTriggers = triggerBindings.Where(b => IsDurable(b));
+            var standardTriggers = triggerBindings.Where(b => !IsDurable(b));
+
+            var kedaScaleTriggers = new List<ScaleTrigger>();
+            kedaScaleTriggers.AddRange(GetStandardScaleTriggers(standardTriggers));
+
+            // Durable Functions triggers are treated as a group and get configuration from host.json
+            if (durableTriggers.Any() && TryGetDurableKedaTrigger(hostJsonText, out ScaleTrigger durableScaleTrigger))
+            {
+                kedaScaleTriggers.Add(durableScaleTrigger);
+            }
+
             bool IsFunctionJson(string fullName)
             {
                 return fullName.EndsWith(Constants.FunctionsConfigFile) &&
                        fullName.Count(c => c == '/' || c == '\\') == 1;
             }
 
+            bool IsHostJson(string fullName)
+            {
+                return fullName.Equals("host.json", StringComparison.OrdinalIgnoreCase);
+            }
+
             return kedaScaleTriggers;
         }
 
-        public IEnumerable<ScaleTrigger> ParseFunctionJson(string functionName, string functionJson)
+        public IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, string functionJson)
         {
             var json = JObject.Parse(functionJson);
             if (json.TryGetValue("disabled", out JToken value))
@@ -67,51 +90,56 @@ public IEnumerable<ScaleTrigger> ParseFunctionJson(string functionName, string f
 
                 if (disabled)
                 {
-                    return null;
+                    yield break;
                 }
             }
 
             var excluded = json.TryGetValue("excluded", out value) && (bool)value;
             if (excluded)
             {
-                return null;
+                yield break;
             }
 
-            var triggers = new List<ScaleTrigger>();
             foreach (JObject binding in (JArray)json["bindings"])
             {
                 var type = (string)binding["type"];
                 if (type.EndsWith("Trigger", StringComparison.OrdinalIgnoreCase))
                 {
-                    var scaleTrigger = new ScaleTrigger
-                    {
-                        Type = GetKedaTriggerType(type),
-                        Metadata = new Dictionary<string, string>()
-                    };
-                    foreach (var property in binding)
+                    yield return new FunctionTrigger(functionName, binding, type);
+                }
+            }
+        }
+
+        private static IEnumerable<ScaleTrigger> GetStandardScaleTriggers(IEnumerable<FunctionTrigger> standardTriggers)
+        {
+            foreach (FunctionTrigger function in standardTriggers)
+            {
+                var scaleTrigger = new ScaleTrigger
+                {
+                    Type = GetKedaTriggerType(function.Type),
+                    Metadata = new Dictionary<string, string>()
+                };
+                foreach (var property in function.Binding)
+                {
+                    if (property.Value.Type == JTokenType.String)
                     {
-                        if (property.Value.Type == JTokenType.String)
-                        {
-                            scaleTrigger.Metadata.Add(property.Key, property.Value.ToString());
-                        }
+                        scaleTrigger.Metadata.Add(property.Key, property.Value.ToString());
                     }
-
-                    scaleTrigger.Metadata.Add("functionName", functionName);
-                    triggers.Add(scaleTrigger);
                 }
-            }
 
-            return triggers;
+                scaleTrigger.Metadata.Add("functionName", function.FunctionName);
+                yield return scaleTrigger;
+            }
         }
 
-        private static string GetFunctionName(ZipArchiveEntry zipEnetry)
+        private static string GetFunctionName(ZipArchiveEntry zipEntry)
         {
-            if (string.IsNullOrWhiteSpace(zipEnetry?.FullName))
+            if (string.IsNullOrWhiteSpace(zipEntry?.FullName))
             {
                 return string.Empty;
             }
 
-            return zipEnetry.FullName.Split('/').Length == 2 ? zipEnetry.FullName.Split('/')[0] : zipEnetry.FullName.Split('\\')[0];
+            return zipEntry.FullName.Split('/').Length == 2 ? zipEntry.FullName.Split('/')[0] : zipEntry.FullName.Split('\\')[0];
         }
 
         public static string GetKedaTriggerType(string triggerType)
@@ -150,5 +178,59 @@ public static string GetKedaTriggerType(string triggerType)
                     return triggerType;
             }
         }
+        
+        private static bool IsDurable(FunctionTrigger function) => 
+            function.Type.Equals("orchestrationTrigger", StringComparison.OrdinalIgnoreCase) ||
+            function.Type.Equals("activityTrigger", StringComparison.OrdinalIgnoreCase) ||
+            function.Type.Equals("entityTrigger", StringComparison.OrdinalIgnoreCase);
+
+        private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigger scaleTrigger)
+        {
+            scaleTrigger = null;
+            if (string.IsNullOrEmpty(hostJsonText))
+            {
+                return false;
+            }
+
+            JObject hostJson = JObject.Parse(hostJsonText);
+
+            // Reference: https://docs.microsoft.com/azure/azure-functions/durable/durable-functions-bindings#durable-functions-2-0-host-json
+            JObject storageProviderConfig = hostJson.SelectToken("extensions.durableTask.storageProvider") as JObject;
+            string storageType = storageProviderConfig?["type"]?.ToString();
+
+            // Custom storage types are supported starting in Durable Functions v2.4.2
+            if (string.Equals(storageType, "MicrosoftSQL", StringComparison.OrdinalIgnoreCase))
+            {
+                scaleTrigger = new ScaleTrigger
+                {
+                    // MSSQL scaler reference: https://keda.sh/docs/2.2/scalers/mssql/
+                    Type = "mssql",
+                    Metadata = new Dictionary<string, string>
+                    {
+                        ["connectionStringFromEnv"] = storageProviderConfig?["connectionStringName"]?.ToString(),
+                    }
+                };
+            }
+            else
+            {
+                // TODO: Support for the Azure Storage and Netherite backends
+            }
+
+            return scaleTrigger != null;
+        }
+
+        public class FunctionTrigger
+        {
+            public FunctionTrigger(string functionName, JObject binding, string type)
+            {
+                this.FunctionName = functionName;
+                this.Binding = binding;
+                this.Type = type;
+            }
+
+            public string FunctionName { get; }
+            public JObject Binding { get; }
+            public string Type { get; }
+        }
     }
 }
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
new file mode 100644
index 00000000..afe15655
--- /dev/null
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -0,0 +1,57 @@
+using Kudu.Core.Functions;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using Xunit;
+
+namespace Kudu.Tests.Core.Function
+{
+    public class KedaFunctionTriggersProviderTests
+    {
+        [Fact]
+        public void DurableFunctionApp()
+        {
+            // Generate a zip archive with a host.json and the contents of a Durable Function app
+            string zipFilePath = Path.GetTempFileName();
+            using (var fileStream = File.OpenWrite(zipFilePath))
+            using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
+            {
+                CreateJsonFileEntry(archive, "host.json", @"{""version"":""2.0"",""extensions"":{""durableTask"":{""hubName"":""DFTest"",""storageProvider"":{""type"":""MicrosoftSQL"",""connectionStringName"":""SQLDB_Connection""}}}}");
+                CreateJsonFileEntry(archive, "f1/function.json", @"{""bindings"":[{""type"":""orchestrationTrigger"",""name"":""context""}],""disabled"":false}");
+                CreateJsonFileEntry(archive, "f2/function.json", @"{""bindings"":[{""type"":""entityTrigger"",""name"":""ctx""}],""disabled"":false}");
+                CreateJsonFileEntry(archive, "f3/function.json", @"{""bindings"":[{""type"":""activityTrigger"",""name"":""input""}],""disabled"":false}");
+                CreateJsonFileEntry(archive, "f4/function.json", @"{""bindings"":[{""type"":""httpTrigger"",""methods"":[""post""],""authLevel"":""anonymous"",""name"":""req""}],""disabled"":false}");
+            }
+
+            try
+            {
+                var provider = new KedaFunctionTriggerProvider();
+                IEnumerable<ScaleTrigger> result = provider.GetFunctionTriggers(zipFilePath);
+                Assert.Equal(2, result.Count());
+
+                ScaleTrigger mssqlTrigger = Assert.Single(result, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
+                string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
+                Assert.Equal("SQLDB_Connection", connectionStringName);
+
+                ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
+                string functionName = Assert.Contains("functionName", httpTrigger.Metadata);
+                Assert.Equal("f4", functionName);
+            }
+            finally
+            {
+                File.Delete(zipFilePath);
+            }
+        }
+
+        private static void CreateJsonFileEntry(ZipArchive archive, string path, string content)
+        {
+            using (Stream entryStream = archive.CreateEntry(path).Open())
+            using (var streamWriter = new StreamWriter(entryStream))
+            {
+                streamWriter.Write(content);
+            }
+        }
+    }
+}

From 29966b905889ceb2c55bbfbe69153aa2485f0a39 Mon Sep 17 00:00:00 2001
From: Chris Gillum <cgillum@microsoft.com>
Date: Wed, 17 Mar 2021 18:58:34 -0700
Subject: [PATCH 222/245] Add query and targetValue

---
 Kudu.Core/Functions/KedaFunctionTriggerProvider.cs       | 2 ++
 .../Core/Function/KedaFunctionTriggersProviderTests.cs   | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 6bb345b2..1eb195c1 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -207,6 +207,8 @@ private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigg
                     Type = "mssql",
                     Metadata = new Dictionary<string, string>
                     {
+                        ["query"] = "SELECT dt.GetScaleMetric()",
+                        ["targetValue"] = "1", // super-conservative default
                         ["connectionStringFromEnv"] = storageProviderConfig?["connectionStringName"]?.ToString(),
                     }
                 };
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index afe15655..b55de524 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -32,8 +32,15 @@ public void DurableFunctionApp()
                 Assert.Equal(2, result.Count());
 
                 ScaleTrigger mssqlTrigger = Assert.Single(result, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
+                string query = Assert.Contains("query", mssqlTrigger.Metadata);
+                Assert.False(string.IsNullOrEmpty(query));
+
+                string targetValue = Assert.Contains("targetValue", mssqlTrigger.Metadata);
+                Assert.False(string.IsNullOrEmpty(targetValue));
+                Assert.True(double.TryParse(targetValue, out _));
+
                 string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
-                Assert.Equal("SQLDB_Connection", connectionStringName);
+                Assert.Equal("SQLDB_Connection", connectionStringName);                
 
                 ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
                 string functionName = Assert.Contains("functionName", httpTrigger.Metadata);

From a1c16b002453f86c99960b1e2d1f9eecd471e603 Mon Sep 17 00:00:00 2001
From: Chris Gillum <cgillum@microsoft.com>
Date: Thu, 18 Mar 2021 13:19:23 -0700
Subject: [PATCH 223/245] PR feedback

---
 Common/Constants.cs                           |  3 +++
 .../Functions/KedaFunctionTriggerProvider.cs  | 23 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 50cf19d9..3185f102 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -141,6 +141,9 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string HubName = "HubName";
         public const string DurableTaskStorageConnection = "connection";
         public const string DurableTaskStorageConnectionName = "azureStorageConnectionStringName";
+        public const string DurableTaskSqlConnectionName = "connectionStringName";
+        public const string DurableTaskStorageProvider = "storageProvider";
+        public const string DurableTaskMicrosoftSqlProviderType = "MicrosoftSQL";
         public const string DurableTask = "durableTask";
         public const string Extensions = "extensions";
         public const string SitePackages = "SitePackages";
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 1eb195c1..26ce4d60 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -69,13 +69,18 @@ bool IsFunctionJson(string fullName)
 
             bool IsHostJson(string fullName)
             {
-                return fullName.Equals("host.json", StringComparison.OrdinalIgnoreCase);
+                return fullName.Equals(Constants.FunctionsHostConfigFile, StringComparison.OrdinalIgnoreCase);
             }
 
+            bool IsDurable(FunctionTrigger function) => 
+                function.Type.Equals("orchestrationTrigger", StringComparison.OrdinalIgnoreCase) ||
+                function.Type.Equals("activityTrigger", StringComparison.OrdinalIgnoreCase) ||
+                function.Type.Equals("entityTrigger", StringComparison.OrdinalIgnoreCase);
+
             return kedaScaleTriggers;
         }
 
-        public IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, string functionJson)
+        private IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, string functionJson)
         {
             var json = JObject.Parse(functionJson);
             if (json.TryGetValue("disabled", out JToken value))
@@ -179,11 +184,6 @@ public static string GetKedaTriggerType(string triggerType)
             }
         }
         
-        private static bool IsDurable(FunctionTrigger function) => 
-            function.Type.Equals("orchestrationTrigger", StringComparison.OrdinalIgnoreCase) ||
-            function.Type.Equals("activityTrigger", StringComparison.OrdinalIgnoreCase) ||
-            function.Type.Equals("entityTrigger", StringComparison.OrdinalIgnoreCase);
-
         private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigger scaleTrigger)
         {
             scaleTrigger = null;
@@ -195,11 +195,12 @@ private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigg
             JObject hostJson = JObject.Parse(hostJsonText);
 
             // Reference: https://docs.microsoft.com/azure/azure-functions/durable/durable-functions-bindings#durable-functions-2-0-host-json
-            JObject storageProviderConfig = hostJson.SelectToken("extensions.durableTask.storageProvider") as JObject;
+            string durableStorageProviderPath = $"{Constants.Extensions}.{Constants.DurableTask}.{Constants.DurableTaskStorageProvider}";
+            JObject storageProviderConfig = hostJson.SelectToken(durableStorageProviderPath) as JObject;
             string storageType = storageProviderConfig?["type"]?.ToString();
 
             // Custom storage types are supported starting in Durable Functions v2.4.2
-            if (string.Equals(storageType, "MicrosoftSQL", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(storageType, Constants.DurableTaskMicrosoftSqlProviderType, StringComparison.OrdinalIgnoreCase))
             {
                 scaleTrigger = new ScaleTrigger
                 {
@@ -209,7 +210,7 @@ private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigg
                     {
                         ["query"] = "SELECT dt.GetScaleMetric()",
                         ["targetValue"] = "1", // super-conservative default
-                        ["connectionStringFromEnv"] = storageProviderConfig?["connectionStringName"]?.ToString(),
+                        ["connectionStringFromEnv"] = storageProviderConfig?[Constants.DurableTaskSqlConnectionName]?.ToString(),
                     }
                 };
             }
@@ -221,7 +222,7 @@ private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigg
             return scaleTrigger != null;
         }
 
-        public class FunctionTrigger
+        private class FunctionTrigger
         {
             public FunctionTrigger(string functionName, JObject binding, string type)
             {

From 53222ff1be91f737615b6a2e777f82e668a10819 Mon Sep 17 00:00:00 2001
From: Chris Gillum <cgillum@microsoft.com>
Date: Thu, 18 Mar 2021 13:30:28 -0700
Subject: [PATCH 224/245] PR feedback

---
 Common/Constants.cs                                | 1 +
 Kudu.Core/Functions/KedaFunctionTriggerProvider.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 3185f102..ac299384 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -144,6 +144,7 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string DurableTaskSqlConnectionName = "connectionStringName";
         public const string DurableTaskStorageProvider = "storageProvider";
         public const string DurableTaskMicrosoftSqlProviderType = "MicrosoftSQL";
+        public const string MicrosoftSqlScaler = "mssql";
         public const string DurableTask = "durableTask";
         public const string Extensions = "extensions";
         public const string SitePackages = "SitePackages";
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 26ce4d60..d2fa1e70 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -205,7 +205,7 @@ private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigg
                 scaleTrigger = new ScaleTrigger
                 {
                     // MSSQL scaler reference: https://keda.sh/docs/2.2/scalers/mssql/
-                    Type = "mssql",
+                    Type = Constants.MicrosoftSqlScaler,
                     Metadata = new Dictionary<string, string>
                     {
                         ["query"] = "SELECT dt.GetScaleMetric()",

From cae963b7bfdd55e9ff85cdb12b9ab7bf40b0cdde Mon Sep 17 00:00:00 2001
From: xwang971 <79332479+xwang971@users.noreply.github.com>
Date: Tue, 23 Mar 2021 13:15:53 -0400
Subject: [PATCH 225/245] fix bldctl issue (#187)

Co-authored-by: Xingjian Wang <xingjianwang@microsoft.com>
---
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 1595c7b2..a589c6c6 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -51,7 +51,7 @@ public static void UpdateBuildNumber(string appName, BuildMetadata buildMetadata
             BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "update");
             BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
             BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "buildMetadata");
-            BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, $"\"{GetBuildMetadataStr(buildMetadata)}\"");
+            BuildCtlArgumentsHelper.AddAppPropertyValueArgument(cmd, $"\\\"{GetBuildMetadataStr(buildMetadata)}\\\"");
             RunBuildCtlCommand(cmd.ToString(), "Updating build version...");
         }
 

From 64d80a7a99b9d76d73d7e3f16ce954ee6b84f1cb Mon Sep 17 00:00:00 2001
From: Ahmed ElSayed <ahmels@microsoft.com>
Date: Tue, 30 Mar 2021 18:51:57 -0700
Subject: [PATCH 226/245] Update KEDA transformation to match core-tools (#192)

---
 .../Functions/KedaFunctionTriggerProvider.cs  | 76 +++++++++++++++----
 .../KedaFunctionTriggersProviderTests.cs      | 50 +++++++++++-
 2 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index d2fa1e70..ae590b0a 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -10,7 +10,7 @@
 namespace Kudu.Core.Functions
 {
     /// <summary>
-    /// Returns "<see cref="IEnumerable<ScaleTrigger>"/> for KEDA scalers" 
+    /// Returns "<see cref="IEnumerable<ScaleTrigger>"/> for KEDA scalers"
     /// </summary>
     public class KedaFunctionTriggerProvider
     {
@@ -72,7 +72,7 @@ bool IsHostJson(string fullName)
                 return fullName.Equals(Constants.FunctionsHostConfigFile, StringComparison.OrdinalIgnoreCase);
             }
 
-            bool IsDurable(FunctionTrigger function) => 
+            bool IsDurable(FunctionTrigger function) =>
                 function.Type.Equals("orchestrationTrigger", StringComparison.OrdinalIgnoreCase) ||
                 function.Type.Equals("activityTrigger", StringComparison.OrdinalIgnoreCase) ||
                 function.Type.Equals("entityTrigger", StringComparison.OrdinalIgnoreCase);
@@ -122,17 +122,8 @@ private static IEnumerable<ScaleTrigger> GetStandardScaleTriggers(IEnumerable<Fu
                 var scaleTrigger = new ScaleTrigger
                 {
                     Type = GetKedaTriggerType(function.Type),
-                    Metadata = new Dictionary<string, string>()
+                    Metadata = PopulateMetadataDictionary(function.Binding)
                 };
-                foreach (var property in function.Binding)
-                {
-                    if (property.Value.Type == JTokenType.String)
-                    {
-                        scaleTrigger.Metadata.Add(property.Key, property.Value.ToString());
-                    }
-                }
-
-                scaleTrigger.Metadata.Add("functionName", function.FunctionName);
                 yield return scaleTrigger;
             }
         }
@@ -183,7 +174,7 @@ public static string GetKedaTriggerType(string triggerType)
                     return triggerType;
             }
         }
-        
+
         private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigger scaleTrigger)
         {
             scaleTrigger = null;
@@ -222,6 +213,55 @@ private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigg
             return scaleTrigger != null;
         }
 
+        // match https://github.com/Azure/azure-functions-core-tools/blob/6bfab24b2743f8421475d996402c398d2fe4a9e0/src/Azure.Functions.Cli/Kubernetes/KEDA/V2/KedaV2Resource.cs#L91
+        public static IDictionary<string, string> PopulateMetadataDictionary(JToken t)
+        {
+            const string ConnectionField = "connection";
+            const string ConnectionFromEnvField = "connectionFromEnv";
+
+            IDictionary<string, string> metadata = t.ToObject<Dictionary<string, JToken>>()
+                .Where(i => i.Value.Type == JTokenType.String)
+                .ToDictionary(k => k.Key, v => v.Value.ToString());
+
+            var triggerType = t["type"].ToString().ToLower();
+
+            switch (triggerType)
+            {
+                case TriggerTypes.AzureBlobStorage:
+                case TriggerTypes.AzureStorageQueue:
+                    metadata[ConnectionFromEnvField] = metadata[ConnectionField] ?? "AzureWebJobsStorage";
+                    metadata.Remove(ConnectionField);
+                    break;
+                case TriggerTypes.AzureServiceBus:
+                    metadata[ConnectionFromEnvField] = metadata[ConnectionField] ?? "AzureWebJobsServiceBus";
+                    metadata.Remove(ConnectionField);
+                    break;
+                case TriggerTypes.AzureEventHubs:
+                    metadata[ConnectionFromEnvField] = metadata[ConnectionField];
+                    metadata.Remove(ConnectionField);
+                    break;
+
+                case TriggerTypes.Kafka:
+                    metadata["bootstrapServers"] = metadata["brokerList"];
+                    metadata.Remove("brokerList");
+                    metadata.Remove("protocol");
+                    metadata.Remove("authenticationMode");
+                    break;
+
+                case TriggerTypes.RabbitMq:
+                    metadata["hostFromEnv"] = metadata["connectionStringSetting"];
+                    metadata.Remove("connectionStringSetting");
+                    break;
+            }
+
+            // Clean-up for all triggers
+
+            metadata.Remove("type");
+            metadata.Remove("name");
+
+            return metadata;
+        }
+
         private class FunctionTrigger
         {
             public FunctionTrigger(string functionName, JObject binding, string type)
@@ -235,5 +275,15 @@ public FunctionTrigger(string functionName, JObject binding, string type)
             public JObject Binding { get; }
             public string Type { get; }
         }
+
+        public class TriggerTypes
+        {
+            public const string AzureBlobStorage = "blobtrigger";
+            public const string AzureEventHubs = "eventhubtrigger";
+            public const string AzureServiceBus = "servicebustrigger";
+            public const string AzureStorageQueue = "queuetrigger";
+            public const string Kafka = "kafkatrigger";
+            public const string RabbitMq = "rabbitmqtrigger";
+        }
     }
 }
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index b55de524..ea744857 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -1,4 +1,5 @@
 using Kudu.Core.Functions;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -40,7 +41,7 @@ public void DurableFunctionApp()
                 Assert.True(double.TryParse(targetValue, out _));
 
                 string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
-                Assert.Equal("SQLDB_Connection", connectionStringName);                
+                Assert.Equal("SQLDB_Connection", connectionStringName);
 
                 ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
                 string functionName = Assert.Contains("functionName", httpTrigger.Metadata);
@@ -60,5 +61,52 @@ private static void CreateJsonFileEntry(ZipArchive archive, string path, string
                 streamWriter.Write(content);
             }
         }
+
+         public void PopulateMetadataDictionary_KedaV1_CorrectlyPopulatesRabbitMQMetadata()
+        {
+            string jsonText = @"
+            {
+                ""type"": ""rabbitMQTrigger"",
+                ""connectionStringSetting"": ""RabbitMQConnection"",
+                ""queueName"": ""myQueue"",
+                ""name"": ""message""
+            }";
+
+            JToken jsonObj = JToken.Parse(jsonText);
+
+            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj);
+
+            Assert.Equal(4, metadata.Count);
+            Assert.True(metadata.ContainsKey("type"));
+            Assert.True(metadata.ContainsKey("host"));
+            Assert.True(metadata.ContainsKey("name"));
+            Assert.True(metadata.ContainsKey("queueName"));
+            Assert.Equal("rabbitMQTrigger", metadata["type"]);
+            Assert.Equal("RabbitMQConnection", metadata["host"]);
+            Assert.Equal("message", metadata["name"]);
+            Assert.Equal("myQueue", metadata["queueName"]);
+        }
+
+        [Fact]
+        public void PopulateMetadataDictionary_KedaV2_CorrectlyPopulatesRabbitMQMetadata()
+        {
+            string jsonText = @"
+            {
+                ""type"": ""rabbitMQTrigger"",
+                ""connectionStringSetting"": ""RabbitMQConnection"",
+                ""queueName"": ""myQueue"",
+                ""name"": ""message""
+            }";
+
+            JToken jsonObj = JToken.Parse(jsonText);
+
+            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj);
+
+            Assert.Equal(2, metadata.Count);
+            Assert.True(metadata.ContainsKey("queueName"));
+            Assert.True(metadata.ContainsKey("hostFromEnv"));
+            Assert.Equal("myQueue", metadata["queueName"]);
+            Assert.Equal("RabbitMQConnection", metadata["hostFromEnv"]);
+        }
     }
 }

From f14b10b07d7d1d7f687bd03a173cb12f13aee048 Mon Sep 17 00:00:00 2001
From: Ahmed ElSayed <ahmels@microsoft.com>
Date: Tue, 13 Apr 2021 14:29:50 -0700
Subject: [PATCH 227/245] only return valid keda triggers (#194)

---
 .../Functions/FunctionTriggerProvider.cs      | 30 ------
 .../Functions/KedaFunctionTriggerProvider.cs  | 92 ++++++++++---------
 Kudu.Core/Functions/SyncTriggerHandler.cs     | 28 +-----
 .../DockerContainerRestartTrigger.cs          |  4 +-
 Kudu.Core/Properties/AssemblyInfo.cs          |  4 +
 .../KedaFunctionTriggersProviderTests.cs      | 35 +++++--
 6 files changed, 88 insertions(+), 105 deletions(-)
 delete mode 100644 Kudu.Core/Functions/FunctionTriggerProvider.cs
 create mode 100644 Kudu.Core/Properties/AssemblyInfo.cs

diff --git a/Kudu.Core/Functions/FunctionTriggerProvider.cs b/Kudu.Core/Functions/FunctionTriggerProvider.cs
deleted file mode 100644
index 18d32af0..00000000
--- a/Kudu.Core/Functions/FunctionTriggerProvider.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Kudu.Core.Functions
-{
-    public class FunctionTriggerProvider
-    {
-        /// <summary>
-        /// Returns the function triggers from function.json files
-        /// </summary>
-        /// <param name="providerName">The the returns json string differs as per the format expected based upon providers.
-        /// e.g. for "KEDA" the json string is the serialzed string of IEnumerable<ScaleTrigger>object</param>
-        /// <param name="functionzipFilePath">The functions file path</param>
-        /// <returns>The josn string of triggers in function.json</returns>
-        public static T GetFunctionTriggers<T>(string providerName, string functionzipFilePath)
-        {
-            if (string.IsNullOrWhiteSpace(providerName) || string.IsNullOrWhiteSpace(functionzipFilePath))
-            {
-                return default(T);
-            }
-
-            switch (providerName.ToLower())
-            {
-                case "keda":
-                    var functionTriggerProvider = new KedaFunctionTriggerProvider();
-                    return (T)functionTriggerProvider.GetFunctionTriggers(functionzipFilePath);
-                default:
-                    functionTriggerProvider = new KedaFunctionTriggerProvider();
-                    return (T)functionTriggerProvider.GetFunctionTriggers(functionzipFilePath);
-            }
-        }
-    }
-}
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index ae590b0a..76de8067 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -1,20 +1,15 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Text;
 
 namespace Kudu.Core.Functions
 {
-    /// <summary>
-    /// Returns "<see cref="IEnumerable<ScaleTrigger>"/> for KEDA scalers"
-    /// </summary>
-    public class KedaFunctionTriggerProvider
+    public static class KedaFunctionTriggerProvider
     {
-        public IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath)
+        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath)
         {
             if (!File.Exists(zipFilePath))
             {
@@ -43,12 +38,37 @@ public IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath)
                     {
                         using (var reader = new StreamReader(stream))
                         {
-                            triggerBindings.AddRange(ParseFunctionJson(GetFunctionName(entry), reader.ReadToEnd()));
+                            triggerBindings.AddRange(ParseFunctionJson(GetFunctionName(entry), JObject.Parse(reader.ReadToEnd())));
                         }
                     }
                 }
             }
 
+            bool IsFunctionJson(string fullName)
+            {
+                return fullName.EndsWith(Constants.FunctionsConfigFile) &&
+                       fullName.Count(c => c == '/' || c == '\\') == 1;
+            }
+
+            bool IsHostJson(string fullName)
+            {
+                return fullName.Equals(Constants.FunctionsHostConfigFile, StringComparison.OrdinalIgnoreCase);
+            }
+
+            return CreateScaleTriggers(triggerBindings, hostJsonText);
+        }
+
+        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(IEnumerable<JObject> functionsJson, string hostJsonText)
+        {
+            var triggerBindings = functionsJson
+            .Select(o => ParseFunctionJson(o["functionName"]?.ToString(), o))
+            .SelectMany(i => i);
+
+            return CreateScaleTriggers(triggerBindings, hostJsonText);
+        }
+
+        internal static IEnumerable<ScaleTrigger> CreateScaleTriggers(IEnumerable<FunctionTrigger> triggerBindings, string hostJsonText)
+        {
             var durableTriggers = triggerBindings.Where(b => IsDurable(b));
             var standardTriggers = triggerBindings.Where(b => !IsDurable(b));
 
@@ -61,17 +81,6 @@ public IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath)
                 kedaScaleTriggers.Add(durableScaleTrigger);
             }
 
-            bool IsFunctionJson(string fullName)
-            {
-                return fullName.EndsWith(Constants.FunctionsConfigFile) &&
-                       fullName.Count(c => c == '/' || c == '\\') == 1;
-            }
-
-            bool IsHostJson(string fullName)
-            {
-                return fullName.Equals(Constants.FunctionsHostConfigFile, StringComparison.OrdinalIgnoreCase);
-            }
-
             bool IsDurable(FunctionTrigger function) =>
                 function.Type.Equals("orchestrationTrigger", StringComparison.OrdinalIgnoreCase) ||
                 function.Type.Equals("activityTrigger", StringComparison.OrdinalIgnoreCase) ||
@@ -80,10 +89,9 @@ bool IsDurable(FunctionTrigger function) =>
             return kedaScaleTriggers;
         }
 
-        private IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, string functionJson)
+        internal static IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, JObject functionJson)
         {
-            var json = JObject.Parse(functionJson);
-            if (json.TryGetValue("disabled", out JToken value))
+            if (functionJson.TryGetValue("disabled", out JToken value))
             {
                 string stringValue = value.ToString();
                 if (!bool.TryParse(stringValue, out bool disabled))
@@ -99,13 +107,13 @@ private IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, stri
                 }
             }
 
-            var excluded = json.TryGetValue("excluded", out value) && (bool)value;
+            var excluded = functionJson.TryGetValue("excluded", out value) && (bool)value;
             if (excluded)
             {
                 yield break;
             }
 
-            foreach (JObject binding in (JArray)json["bindings"])
+            foreach (JObject binding in (JArray)functionJson["bindings"])
             {
                 var type = (string)binding["type"];
                 if (type.EndsWith("Trigger", StringComparison.OrdinalIgnoreCase))
@@ -115,20 +123,24 @@ private IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, stri
             }
         }
 
-        private static IEnumerable<ScaleTrigger> GetStandardScaleTriggers(IEnumerable<FunctionTrigger> standardTriggers)
+        internal static IEnumerable<ScaleTrigger> GetStandardScaleTriggers(IEnumerable<FunctionTrigger> standardTriggers)
         {
             foreach (FunctionTrigger function in standardTriggers)
             {
-                var scaleTrigger = new ScaleTrigger
+                var triggerType = GetKedaTriggerType(function.Type);
+                if (!string.IsNullOrEmpty(triggerType))
                 {
-                    Type = GetKedaTriggerType(function.Type),
-                    Metadata = PopulateMetadataDictionary(function.Binding)
-                };
-                yield return scaleTrigger;
+                    var scaleTrigger = new ScaleTrigger
+                    {
+                        Type = triggerType,
+                        Metadata = PopulateMetadataDictionary(function.Binding, function.FunctionName)
+                    };
+                    yield return scaleTrigger;
+                }
             }
         }
 
-        private static string GetFunctionName(ZipArchiveEntry zipEntry)
+        internal static string GetFunctionName(ZipArchiveEntry zipEntry)
         {
             if (string.IsNullOrWhiteSpace(zipEntry?.FullName))
             {
@@ -138,7 +150,7 @@ private static string GetFunctionName(ZipArchiveEntry zipEntry)
             return zipEntry.FullName.Split('/').Length == 2 ? zipEntry.FullName.Split('/')[0] : zipEntry.FullName.Split('\\')[0];
         }
 
-        public static string GetKedaTriggerType(string triggerType)
+        internal static string GetKedaTriggerType(string triggerType)
         {
             if (string.IsNullOrEmpty(triggerType))
             {
@@ -167,15 +179,12 @@ public static string GetKedaTriggerType(string triggerType)
                 case "rabbitmqtrigger":
                     return "rabbitmq";
 
-                case "httpTrigger":
-                    return "httpTrigger";
-
                 default:
-                    return triggerType;
+                    return string.Empty;
             }
         }
 
-        private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigger scaleTrigger)
+        internal static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigger scaleTrigger)
         {
             scaleTrigger = null;
             if (string.IsNullOrEmpty(hostJsonText))
@@ -214,7 +223,7 @@ private static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrigg
         }
 
         // match https://github.com/Azure/azure-functions-core-tools/blob/6bfab24b2743f8421475d996402c398d2fe4a9e0/src/Azure.Functions.Cli/Kubernetes/KEDA/V2/KedaV2Resource.cs#L91
-        public static IDictionary<string, string> PopulateMetadataDictionary(JToken t)
+        internal static IDictionary<string, string> PopulateMetadataDictionary(JToken t, string functionName)
         {
             const string ConnectionField = "connection";
             const string ConnectionFromEnvField = "connectionFromEnv";
@@ -259,10 +268,11 @@ public static IDictionary<string, string> PopulateMetadataDictionary(JToken t)
             metadata.Remove("type");
             metadata.Remove("name");
 
+            metadata["functionName"] = functionName;
             return metadata;
         }
 
-        private class FunctionTrigger
+        internal class FunctionTrigger
         {
             public FunctionTrigger(string functionName, JObject binding, string type)
             {
@@ -276,7 +286,7 @@ public FunctionTrigger(string functionName, JObject binding, string type)
             public string Type { get; }
         }
 
-        public class TriggerTypes
+        static class TriggerTypes
         {
             public const string AzureBlobStorage = "blobtrigger";
             public const string AzureEventHubs = "eventhubtrigger";
diff --git a/Kudu.Core/Functions/SyncTriggerHandler.cs b/Kudu.Core/Functions/SyncTriggerHandler.cs
index 1ed10815..b384a275 100644
--- a/Kudu.Core/Functions/SyncTriggerHandler.cs
+++ b/Kudu.Core/Functions/SyncTriggerHandler.cs
@@ -51,7 +51,7 @@ public async Task<string> SyncTriggers(string functionTriggersPayload)
 
         public Tuple<IEnumerable<ScaleTrigger>, string> GetScaleTriggers(string functionTriggersPayload)
         {
-            var scaleTriggers = new List<ScaleTrigger>();
+            IEnumerable<ScaleTrigger> scaleTriggers = new List<ScaleTrigger>();
             try
             {
                 if (string.IsNullOrEmpty(functionTriggersPayload))
@@ -59,30 +59,10 @@ public Tuple<IEnumerable<ScaleTrigger>, string> GetScaleTriggers(string function
                     return new Tuple<IEnumerable<ScaleTrigger>, string>(null, "Function trigger payload is null or empty.");
                 }
 
-                var triggersJson = JArray.Parse(functionTriggersPayload);
-                foreach (JObject trigger in triggersJson)
-                {
-                    var type = (string)trigger["type"];
-                    if (type.EndsWith("Trigger", StringComparison.OrdinalIgnoreCase))
-                    {
-                        var scaleTrigger = new ScaleTrigger
-                        {
-                            Type = KedaFunctionTriggerProvider.GetKedaTriggerType(type),
-                            Metadata = new Dictionary<string, string>()
-                        };
-
-                        foreach (var property in trigger)
-                        {
-                            if (property.Value.Type == JTokenType.String)
-                            {
-                                scaleTrigger.Metadata.Add(property.Key, property.Value.ToString());
-                            }
-                        }
-
-                        scaleTriggers.Add(scaleTrigger);
-                    }
-                }
+                var triggersJson = JArray.Parse(functionTriggersPayload).Select(o => o.ToObject<JObject>());
 
+                // TODO: https://github.com/Azure/azure-functions-host/issues/7288 should change how we parse hostJsonText here.
+                scaleTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(triggersJson, string.Empty);
                 if (!scaleTriggers.Any())
                 {
                     return new Tuple<IEnumerable<ScaleTrigger>, string>(null, "No triggers in the payload");
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index 021a4900..a7571808 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -33,7 +33,7 @@ public static void RequestContainerRestart(IEnvironment environment, string reas
             {
                 string appName = environment.K8SEAppName;
                 string buildNumber = environment.CurrId;
-                var functionTriggers = FunctionTriggerProvider.GetFunctionTriggers<IEnumerable<ScaleTrigger>>("keda", repositoryUrl);
+                var functionTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(repositoryUrl);
                 var buildMetadata = new BuildMetadata()
                 {
                     AppName = appName,
@@ -41,7 +41,7 @@ public static void RequestContainerRestart(IEnvironment environment, string reas
                     AppSubPath = appSubPath
                 };
 
-                //Only for function apps functionTriggers will be non-null/non-empty 
+                //Only for function apps functionTriggers will be non-null/non-empty
                 if (functionTriggers?.Any() == true)
                 {
                     K8SEDeploymentHelper.UpdateFunctionAppTriggers(appName, functionTriggers, buildMetadata);
diff --git a/Kudu.Core/Properties/AssemblyInfo.cs b/Kudu.Core/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..9e48b835
--- /dev/null
+++ b/Kudu.Core/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Kudu.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
\ No newline at end of file
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index ea744857..d9482ec2 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -23,13 +23,12 @@ public void DurableFunctionApp()
                 CreateJsonFileEntry(archive, "f1/function.json", @"{""bindings"":[{""type"":""orchestrationTrigger"",""name"":""context""}],""disabled"":false}");
                 CreateJsonFileEntry(archive, "f2/function.json", @"{""bindings"":[{""type"":""entityTrigger"",""name"":""ctx""}],""disabled"":false}");
                 CreateJsonFileEntry(archive, "f3/function.json", @"{""bindings"":[{""type"":""activityTrigger"",""name"":""input""}],""disabled"":false}");
-                CreateJsonFileEntry(archive, "f4/function.json", @"{""bindings"":[{""type"":""httpTrigger"",""methods"":[""post""],""authLevel"":""anonymous"",""name"":""req""}],""disabled"":false}");
+                CreateJsonFileEntry(archive, "f4/function.json", @"{""bindings"":[{""type"":""queueTrigger"",""connection"":""AzureWebjobsStorage"",""queueName"":""queue"",""name"":""queueItem""}],""disabled"":false}");
             }
 
             try
             {
-                var provider = new KedaFunctionTriggerProvider();
-                IEnumerable<ScaleTrigger> result = provider.GetFunctionTriggers(zipFilePath);
+                IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath);
                 Assert.Equal(2, result.Count());
 
                 ScaleTrigger mssqlTrigger = Assert.Single(result, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
@@ -43,8 +42,8 @@ public void DurableFunctionApp()
                 string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
                 Assert.Equal("SQLDB_Connection", connectionStringName);
 
-                ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
-                string functionName = Assert.Contains("functionName", httpTrigger.Metadata);
+                ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
+                string functionName = Assert.Contains("functionName", queueTrigger.Metadata);
                 Assert.Equal("f4", functionName);
             }
             finally
@@ -74,7 +73,7 @@ public void PopulateMetadataDictionary_KedaV1_CorrectlyPopulatesRabbitMQMetadata
 
             JToken jsonObj = JToken.Parse(jsonText);
 
-            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj);
+            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj, "f1");
 
             Assert.Equal(4, metadata.Count);
             Assert.True(metadata.ContainsKey("type"));
@@ -100,13 +99,33 @@ public void PopulateMetadataDictionary_KedaV2_CorrectlyPopulatesRabbitMQMetadata
 
             JToken jsonObj = JToken.Parse(jsonText);
 
-            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj);
+            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj, "f1");
 
-            Assert.Equal(2, metadata.Count);
+            Assert.Equal(3, metadata.Count);
             Assert.True(metadata.ContainsKey("queueName"));
             Assert.True(metadata.ContainsKey("hostFromEnv"));
             Assert.Equal("myQueue", metadata["queueName"]);
             Assert.Equal("RabbitMQConnection", metadata["hostFromEnv"]);
         }
+
+        [Fact]
+        public void PopulateMetadataDictionary_KedaV2_OnlyKedaSupportedTriggers()
+        {
+            string jsonText = @"
+            {
+                ""functionName"": ""f1"",
+                ""bindings"": [{
+                    ""type"": ""httpTrigger"",
+                    ""methods"": [""GET""],
+                    ""authLevel"": ""anonymous""
+                }]
+            }";
+
+            var jsonObj = JObject.Parse(jsonText);
+
+            var triggers = KedaFunctionTriggerProvider.GetFunctionTriggers(new[] { jsonObj }, string.Empty);
+
+            Assert.Equal(0, triggers.Count());
+        }
     }
 }

From 3950b218062347d464c44e3d49a32ed66b861d1e Mon Sep 17 00:00:00 2001
From: Chris Gillum <cgillum@gmail.com>
Date: Mon, 19 Apr 2021 10:00:18 -0700
Subject: [PATCH 228/245] Updates for Durable SQL v0.7.0-alpha changes (#197)

---
 Common/Constants.cs                                         | 2 +-
 Kudu.Core/Functions/KedaFunctionTriggerProvider.cs          | 6 ++++--
 .../Core/Function/KedaFunctionTriggersProviderTests.cs      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Common/Constants.cs b/Common/Constants.cs
index ac299384..1974d200 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -143,7 +143,7 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string DurableTaskStorageConnectionName = "azureStorageConnectionStringName";
         public const string DurableTaskSqlConnectionName = "connectionStringName";
         public const string DurableTaskStorageProvider = "storageProvider";
-        public const string DurableTaskMicrosoftSqlProviderType = "MicrosoftSQL";
+        public const string DurableTaskMicrosoftSqlProviderType = "mssql";
         public const string MicrosoftSqlScaler = "mssql";
         public const string DurableTask = "durableTask";
         public const string Extensions = "extensions";
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 76de8067..776f54f5 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -200,6 +200,7 @@ internal static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrig
             string storageType = storageProviderConfig?["type"]?.ToString();
 
             // Custom storage types are supported starting in Durable Functions v2.4.2
+            // Minimum required version of Microsoft.DurableTask.SqlServer.AzureFunctions is v0.7.0-alpha
             if (string.Equals(storageType, Constants.DurableTaskMicrosoftSqlProviderType, StringComparison.OrdinalIgnoreCase))
             {
                 scaleTrigger = new ScaleTrigger
@@ -208,8 +209,9 @@ internal static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrig
                     Type = Constants.MicrosoftSqlScaler,
                     Metadata = new Dictionary<string, string>
                     {
-                        ["query"] = "SELECT dt.GetScaleMetric()",
-                        ["targetValue"] = "1", // super-conservative default
+                        // Durable SQL scaling: https://microsoft.github.io/durabletask-mssql/#/scaling?id=worker-auto-scale
+                        ["query"] = "SELECT dt.GetScaleRecommendation(10, 1)", // max 10 orchestrations and 1 activity per replica
+                        ["targetValue"] = "1",
                         ["connectionStringFromEnv"] = storageProviderConfig?[Constants.DurableTaskSqlConnectionName]?.ToString(),
                     }
                 };
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index d9482ec2..16ce8021 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -19,7 +19,7 @@ public void DurableFunctionApp()
             using (var fileStream = File.OpenWrite(zipFilePath))
             using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
             {
-                CreateJsonFileEntry(archive, "host.json", @"{""version"":""2.0"",""extensions"":{""durableTask"":{""hubName"":""DFTest"",""storageProvider"":{""type"":""MicrosoftSQL"",""connectionStringName"":""SQLDB_Connection""}}}}");
+                CreateJsonFileEntry(archive, "host.json", @"{""version"":""2.0"",""extensions"":{""durableTask"":{""hubName"":""DFTest"",""storageProvider"":{""type"":""mssql"",""connectionStringName"":""SQLDB_Connection""}}}}");
                 CreateJsonFileEntry(archive, "f1/function.json", @"{""bindings"":[{""type"":""orchestrationTrigger"",""name"":""context""}],""disabled"":false}");
                 CreateJsonFileEntry(archive, "f2/function.json", @"{""bindings"":[{""type"":""entityTrigger"",""name"":""ctx""}],""disabled"":false}");
                 CreateJsonFileEntry(archive, "f3/function.json", @"{""bindings"":[{""type"":""activityTrigger"",""name"":""input""}],""disabled"":false}");

From 6facc9fc99c6217aa8f34dca95ca630593c3ccce Mon Sep 17 00:00:00 2001
From: Hamza Assyad <assyad@outlook.com>
Date: Mon, 19 Apr 2021 14:08:28 -0700
Subject: [PATCH 229/245] Support KEDA queue scale trigger for Logic App
 workflow app (#196)

* Support KEDA queue scale trigger for Logic App workflow app

* Reverting a small useless change

* Removing unused using statements

* Use workflow kind app from headers to check if workflow app rather than bundle in host.json

* No need to cache the appkind since we retrieve it from the environment directly

* Remove useless comment

* Refactoring

Co-authored-by: Hamza Assyad <haassyad@microsoft.com>
---
 Common/Constants.cs                           |   4 +
 Kudu.Contracts/IEnvironment.cs                |   1 +
 Kudu.Core/Environment.cs                      |  17 ++-
 .../Functions/KedaFunctionTriggerProvider.cs  |  64 +++++++-
 Kudu.Core/Helpers/HashHelper.cs               | 138 ++++++++++++++++++
 Kudu.Core/Helpers/StringHelper.cs             |  99 +++++++++++++
 .../DockerContainerRestartTrigger.cs          |   3 +-
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        |  13 ++
 Kudu.Services.Web/KubeMiddleware.cs           |   8 +-
 .../KedaFunctionTriggersProviderTests.cs      |  34 +++++
 10 files changed, 372 insertions(+), 9 deletions(-)
 create mode 100644 Kudu.Core/Helpers/HashHelper.cs
 create mode 100644 Kudu.Core/Helpers/StringHelper.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 1974d200..fdcc8fbc 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -145,7 +145,11 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string DurableTaskStorageProvider = "storageProvider";
         public const string DurableTaskMicrosoftSqlProviderType = "mssql";
         public const string MicrosoftSqlScaler = "mssql";
+        public const string AzureQueueScaler = "azure-queue";
         public const string DurableTask = "durableTask";
+        public const string WorkflowAppKind = "workflowApp";
+        public const string WorkflowExtensionName = "workflow";
+        public const string WorkflowSettingsName = "Settings";
         public const string Extensions = "extensions";
         public const string SitePackages = "SitePackages";
         public const string PackageNameTxt = "packagename.txt";
diff --git a/Kudu.Contracts/IEnvironment.cs b/Kudu.Contracts/IEnvironment.cs
index 0d452468..e0f1d487 100644
--- a/Kudu.Contracts/IEnvironment.cs
+++ b/Kudu.Contracts/IEnvironment.cs
@@ -34,5 +34,6 @@ public interface IEnvironment
         bool IsOnLinuxConsumption { get; }      // e.g. True on Linux Consumption. False on App Service.
         bool IsK8SEApp { get; }
         string K8SEAppName { get;  }
+        string K8SEAppKind { get; }
     }
 }
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 3334f7d9..49ce6ef6 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -43,6 +43,7 @@ public class Environment : IEnvironment
         private readonly string _secondaryJobsBinariesPath;
         private readonly string _k8seAppName;
         private readonly string _k8seAppNamespace;
+        private readonly string _k8seAppKind;
 
 
         // This ctor is used only in unit tests
@@ -65,7 +66,8 @@ public Environment(
                 string requestId,
                 IHttpContextAccessor httpContextAccessor,
                 string k8seAppName = null,
-                string k8seAppNamespace = null)
+                string k8seAppNamespace = null,
+                string k8seAppKind = null)
         {
             if (repositoryPath == null)
             {
@@ -106,6 +108,7 @@ public Environment(
             _httpContextAccessor = httpContextAccessor;
             _k8seAppName = k8seAppName;
             _k8seAppNamespace = k8seAppNamespace;
+            _k8seAppKind = k8seAppKind;
         }
 
         public Environment(
@@ -116,7 +119,8 @@ public Environment(
                 string kuduConsoleFullPath,
                 IHttpContextAccessor httpContextAccessor,
                 string k8seAppName = null,
-                string k8seAppNamespace = null)
+                string k8seAppNamespace = null,
+                string k8seAppKind = null)
         {
             RootPath = rootPath;
 
@@ -133,6 +137,7 @@ public Environment(
             _locksPath = Path.Combine(SiteRootPath, Constants.LocksPath);
             _k8seAppName = k8seAppName;
             _k8seAppNamespace = k8seAppNamespace;
+            _k8seAppKind = k8seAppKind;
 
             if (OSDetector.IsOnWindows())
             {
@@ -499,6 +504,14 @@ public string K8SEAppNamespace
             }
         }
 
+        public string K8SEAppKind
+        {
+            get
+            {
+                return _k8seAppKind;
+            }
+        }
+
         public static string GetFreeSpaceHtml(string path)
         {
             try
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 776f54f5..9f6e49b7 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Kudu.Core.Helpers;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,7 +10,7 @@ namespace Kudu.Core.Functions
 {
     public static class KedaFunctionTriggerProvider
     {
-        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath)
+        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath, string appName = null, string appKind = null)
         {
             if (!File.Exists(zipFilePath))
             {
@@ -55,7 +56,18 @@ bool IsHostJson(string fullName)
                 return fullName.Equals(Constants.FunctionsHostConfigFile, StringComparison.OrdinalIgnoreCase);
             }
 
-            return CreateScaleTriggers(triggerBindings, hostJsonText);
+            var triggers = CreateScaleTriggers(triggerBindings, hostJsonText).ToList();
+
+            if (appKind?.ToLowerInvariant() == Constants.WorkflowAppKind.ToLowerInvariant())
+            {
+                // NOTE(haassyad) Check if the host json has the workflow extension loaded. If so we will add a queue scale trigger for the job dispatcher queue.
+                if (TryGetWorkflowKedaTrigger(hostJsonText, appName, out ScaleTrigger workflowScaleTrigger))
+                {
+                    triggers.Add(workflowScaleTrigger);
+                }
+            }
+
+            return triggers;
         }
 
         public static IEnumerable<ScaleTrigger> GetFunctionTriggers(IEnumerable<JObject> functionsJson, string hostJsonText)
@@ -224,6 +236,52 @@ internal static bool TryGetDurableKedaTrigger(string hostJsonText, out ScaleTrig
             return scaleTrigger != null;
         }
 
+        /// <summary>
+        /// Tries to add a scale trigger if the app is a workflow app.
+        /// </summary>
+        /// <param name="hostJsonText">The host.json text.</param>
+        /// <param name="appName">The app name.</param>
+        /// <param name="scaleTrigger">The scale trigger.</param>
+        /// <returns>true if a scale trigger was found</returns>
+        internal static bool TryGetWorkflowKedaTrigger(string hostJsonText, string appName, out ScaleTrigger scaleTrigger)
+        {
+            JObject hostJson = JObject.Parse(hostJsonText);
+
+            // Check the host.json file for workflow settings.
+            JObject workflowSettings = hostJson
+                .SelectToken(path: $"{Constants.Extensions}.{Constants.WorkflowExtensionName}.{Constants.WorkflowSettingsName}") as JObject;
+
+            // Get the queue length if specified, otherwise default to arbitrary value.
+            var queueLengthObject = workflowSettings?["Runtime.ScaleMonitor.KEDA.TargetQueueLength"];
+            var queueLength = queueLengthObject != null ? queueLengthObject.ToString() : "20";
+
+            // Get the host id if specified, otherwise default to app name.
+            var hostIdObject = workflowSettings?["Runtime.HostId"];
+            var hostId = hostIdObject != null ? hostIdObject.ToString() : appName;
+
+            // Hash the host id.
+            var hostSpecificStorageId = StringHelper
+                .EscapeAndTrimStorageKeyPrefix(HashHelper.MurmurHash64(hostId).ToString("X"), 32)
+                .ToLowerInvariant();
+
+            var queuePrefix = $"flow{hostSpecificStorageId}jobtriggers";
+
+            scaleTrigger = new ScaleTrigger
+            {
+                // Azure queue scaler reference: https://keda.sh/docs/2.2/scalers/azure-storage-queue/
+                Type = Constants.AzureQueueScaler,
+                Metadata = new Dictionary<string, string>
+                {
+                    // NOTE(haassyad): We only have one queue partition in single tenant.
+                    ["queueName"] = StringHelper.GetWorkflowQueueNameInternal(queuePrefix, 1),
+                    ["queueLength"] = queueLength,
+                    ["connectionStringFromEnv"] = "AzureWebJobsStorage",
+                }
+            };
+
+            return true;
+        }
+
         // match https://github.com/Azure/azure-functions-core-tools/blob/6bfab24b2743f8421475d996402c398d2fe4a9e0/src/Azure.Functions.Cli/Kubernetes/KEDA/V2/KedaV2Resource.cs#L91
         internal static IDictionary<string, string> PopulateMetadataDictionary(JToken t, string functionName)
         {
diff --git a/Kudu.Core/Helpers/HashHelper.cs b/Kudu.Core/Helpers/HashHelper.cs
new file mode 100644
index 00000000..5fa35d3a
--- /dev/null
+++ b/Kudu.Core/Helpers/HashHelper.cs
@@ -0,0 +1,138 @@
+using System.Text;
+
+namespace Kudu.Core.Helpers
+{
+    public static class HashHelper
+    {
+        /// <summary>
+        /// Computes 64-bit Murmur hash.
+        /// </summary>
+        /// <param name="str">The input string.</param>
+        /// <param name="seed">The input seed.</param>
+        public static ulong MurmurHash64(string str, uint seed = 0)
+        {
+            return HashHelper.MurmurHash64(Encoding.UTF8.GetBytes(str), seed);
+        }
+
+        /// <summary>
+        /// Computes 64-bit Murmur hash.
+        /// </summary>
+        /// <param name="data">The input data.</param>
+        /// <param name="seed">The input seed.</param>
+        public static ulong MurmurHash64(byte[] data, uint seed = 0)
+        {
+            const uint C1 = 0x239b961b;
+            const uint C2 = 0xab0e9789;
+            const uint C3 = 0x561ccd1b;
+            const uint C4 = 0x0bcaa747;
+            const uint C5 = 0x85ebca6b;
+            const uint C6 = 0xc2b2ae35;
+
+            int length = data.Length;
+
+            unchecked
+            {
+                uint h1 = seed;
+                uint h2 = seed;
+
+                int index = 0;
+                while (index + 7 < length)
+                {
+                    uint k1 = (uint)(data[index + 0] | data[index + 1] << 8 | data[index + 2] << 16 | data[index + 3] << 24);
+                    uint k2 = (uint)(data[index + 4] | data[index + 5] << 8 | data[index + 6] << 16 | data[index + 7] << 24);
+
+                    k1 *= C1;
+                    k1 = k1.RotateLeft32(15);
+                    k1 *= C2;
+                    h1 ^= k1;
+                    h1 = h1.RotateLeft32(19);
+                    h1 += h2;
+                    h1 = (h1 * 5) + C3;
+
+                    k2 *= C2;
+                    k2 = k2.RotateLeft32(17);
+                    k2 *= C1;
+                    h2 ^= k2;
+                    h2 = h2.RotateLeft32(13);
+                    h2 += h1;
+                    h2 = (h2 * 5) + C4;
+
+                    index += 8;
+                }
+
+                int tail = length - index;
+                if (tail > 0)
+                {
+                    uint k1 = (tail >= 4) ? (uint)(data[index + 0] | data[index + 1] << 8 | data[index + 2] << 16 | data[index + 3] << 24) :
+                              (tail == 3) ? (uint)(data[index + 0] | data[index + 1] << 8 | data[index + 2] << 16) :
+                              (tail == 2) ? (uint)(data[index + 0] | data[index + 1] << 8) :
+                                            (uint)data[index + 0];
+
+                    k1 *= C1;
+                    k1 = k1.RotateLeft32(15);
+                    k1 *= C2;
+                    h1 ^= k1;
+
+                    if (tail > 4)
+                    {
+                        uint k2 = (tail == 7) ? (uint)(data[index + 4] | data[index + 5] << 8 | data[index + 6] << 16) :
+                                  (tail == 6) ? (uint)(data[index + 4] | data[index + 5] << 8) :
+                                                (uint)data[index + 4];
+
+                        k2 *= C2;
+                        k2 = k2.RotateLeft32(17);
+                        k2 *= C1;
+                        h2 ^= k2;
+                    }
+                }
+
+                h1 ^= (uint)length;
+                h2 ^= (uint)length;
+
+                h1 += h2;
+                h2 += h1;
+
+                h1 ^= h1 >> 16;
+                h1 *= C5;
+                h1 ^= h1 >> 13;
+                h1 *= C6;
+                h1 ^= h1 >> 16;
+
+                h2 ^= h2 >> 16;
+                h2 *= C5;
+                h2 ^= h2 >> 13;
+                h2 *= C6;
+                h2 ^= h2 >> 16;
+
+                h1 += h2;
+                h2 += h1;
+
+                return ((ulong)h2 << 32) | (ulong)h1;
+            }
+        }
+
+        #region RotateLeft
+
+        /// <summary>
+        /// Rotates the bits in the provided value to the left (where the number of bits is specified).
+        /// </summary>
+        /// <param name="value">The value to be rotated.</param>
+        /// <param name="count">The number of bits to rotate.</param>
+        private static uint RotateLeft32(this uint value, int count)
+        {
+            return (value << count) | (value >> (32 - count));
+        }
+
+        /// <summary>
+        /// Rotates the bits in the provided value to the right (where the number of bits is specified).
+        /// </summary>
+        /// <param name="value">The value to be rotated.</param>
+        /// <param name="count">The number of bits to rotate.</param>
+        private static ulong RotateLeft64(this ulong value, int count)
+        {
+            return (value << count) | (value >> (64 - count));
+        }
+
+        #endregion
+    }
+}
diff --git a/Kudu.Core/Helpers/StringHelper.cs b/Kudu.Core/Helpers/StringHelper.cs
new file mode 100644
index 00000000..3c4084a1
--- /dev/null
+++ b/Kudu.Core/Helpers/StringHelper.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Kudu.Core.Helpers
+{
+    public static class StringHelper
+    {
+        /// <summary>
+        /// The storage key trim padding.
+        /// </summary>
+        public const int StorageKeyTrimPadding = 17;
+
+        /// <summary>
+        /// The escaped storage keys.
+        /// </summary>
+        private static readonly string[] EscapedStorageKeys = new string[128]
+        {
+            ":00", ":01", ":02", ":03", ":04", ":05", ":06", ":07", ":08", ":09", ":0A", ":0B", ":0C", ":0D", ":0E", ":0F",
+            ":10", ":11", ":12", ":13", ":14", ":15", ":16", ":17", ":18", ":19", ":1A", ":1B", ":1C", ":1D", ":1E", ":1F",
+            ":20", ":21", ":22", ":23", ":24", ":25", ":26", ":27", ":28", ":29", ":2A", ":2B", ":2C", ":2D", ":2E", ":2F",
+            "0",   "1",   "2",   "3",   "4",   "5",   "6",   "7",   "8",   "9", ":3A", ":3B", ":3C", ":3D", ":3E", ":3F",
+            ":40",   "A",   "B",   "C",   "D",   "E",   "F",   "G",   "H",   "I",   "J",   "K",   "L",   "M",   "N",   "O",
+            "P",   "Q",   "R",   "S",   "T",   "U",   "V",   "W",   "X",   "Y",   "Z", ":5B", ":5C", ":5D", ":5E", ":5F",
+            ":60",   "a",   "b",   "c",   "d",   "e",   "f",   "g",   "h",   "i",   "j",   "k",   "l",   "m",   "n",   "o",
+            "p",   "q",   "r",   "s",   "t",   "u",   "v",   "w",   "x",   "y",   "z", ":7B", ":7C", ":7D", ":7E", ":7F",
+        };
+
+        /// <summary>
+        /// Escapes the and trim storage key prefix.
+        /// </summary>
+        /// <param name="storageKeyPrefix">The storage key prefix.</param>
+        /// <param name="limit">The storage key limit.</param>
+        public static string EscapeAndTrimStorageKeyPrefix(string storageKeyPrefix, int limit)
+        {
+            return StringHelper.TrimStorageKeyPrefix(StringHelper.EscapeStorageKey(storageKeyPrefix), limit);
+        }
+
+        /// <summary>
+        /// Trims the storage key prefix.
+        /// </summary>
+        /// <param name="storageKeyPrefix">The storage key prefix.</param>
+        /// <param name="limit">The storage key limit.</param>
+        private static string TrimStorageKeyPrefix(string storageKeyPrefix, int limit)
+        {
+            if (limit < StringHelper.StorageKeyTrimPadding)
+            {
+                throw new ArgumentException(message: $"The storage key limit should be at least {StringHelper.StorageKeyTrimPadding} characters.", paramName: nameof(limit));
+            }
+
+            return storageKeyPrefix.Length > limit - StringHelper.StorageKeyTrimPadding
+                ? storageKeyPrefix.Substring(0, limit - StringHelper.StorageKeyTrimPadding)
+                : storageKeyPrefix;
+        }
+
+        /// <summary>
+        /// Escapes the storage key.
+        /// </summary>
+        /// <param name="storageKey">The storage key.</param>
+        public static string EscapeStorageKey(string storageKey)
+        {
+            var sb = new StringBuilder(storageKey.Length);
+            for (var index = 0; index < storageKey.Length; ++index)
+            {
+                var c = storageKey[index];
+                if (c < 128)
+                {
+                    sb.Append(StringHelper.EscapedStorageKeys[c]);
+                }
+                else if (char.IsLetterOrDigit(c))
+                {
+                    sb.Append(c);
+                }
+                else if (c < 0x100)
+                {
+                    sb.Append(':');
+                    sb.Append(((int)c).ToString("X2", CultureInfo.InvariantCulture));
+                }
+                else
+                {
+                    sb.Append(':');
+                    sb.Append(':');
+                    sb.Append(((int)c).ToString("X4", CultureInfo.InvariantCulture));
+                }
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Gets the name of the workflow job trigger queue.
+        /// </summary>
+        /// <param name="queueIndex">Index of the queue.</param>
+        internal static string GetWorkflowQueueNameInternal(string prefix, int numPartitionsInJobTriggersQueue)
+        {
+            return string.Concat(prefix, (1 % numPartitionsInJobTriggersQueue).ToString("d2", CultureInfo.InvariantCulture));
+        }
+    }
+}
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index a7571808..1edb1c98 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -32,8 +32,9 @@ public static void RequestContainerRestart(IEnvironment environment, string reas
             if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 string appName = environment.K8SEAppName;
+                string appKind = environment.K8SEAppKind;
                 string buildNumber = environment.CurrId;
-                var functionTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(repositoryUrl);
+                var functionTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(repositoryUrl, appName, appKind);
                 var buildMetadata = new BuildMetadata()
                 {
                     AppName = appName,
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index a589c6c6..e9f5b75f 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -137,6 +137,19 @@ public static string GetAppName(HttpContext context)
             return appName;
         }
 
+        public static string GetAppKind(HttpContext context)
+        {
+            var appKind = context.Request.Headers["K8SE_APP_KIND"].ToString();
+
+            if (string.IsNullOrEmpty(appKind))
+            {
+                context.Response.StatusCode = 401;
+                // K8SE TODO: move this to resource map
+                throw new InvalidOperationException("Couldn't recognize AppKind");
+            }
+            return appKind;
+        }
+
         public static string GetAppNamespace(HttpContext context)
         {
             var appNamepace = context.Request.Headers["K8SE_APP_NAMESPACE"].ToString();
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index dcd21ad3..bd6855ca 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -41,6 +41,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
         {
             string appName = K8SEDeploymentHelper.GetAppName(context);
             string appNamenamespace = K8SEDeploymentHelper.GetAppNamespace(context);
+            string appKind = K8SEDeploymentHelper.GetAppKind(context);
 
             string homeDir = "";
             string siteRepoDir = "";
@@ -58,7 +59,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             }
 
             // Cache the App Environment for this request
-            context.Items.Add("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace));
+            context.Items.Add("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace, appKind));
 
             // Cache the appName for this request
             context.Items.Add("appName", appName);
@@ -108,7 +109,8 @@ private static IEnvironment GetEnvironment(
             string appName,
             IDeploymentSettingsManager settings = null,
             HttpContext httpContext = null,
-            string appNamespace = null)
+            string appNamespace = null,
+            string appKind = null)
         {
             var root = KubeMiddleware.ResolveRootPath(home, appName);
             var siteRoot = Path.Combine(root, Constants.SiteFolder);
@@ -119,7 +121,7 @@ private static IEnvironment GetEnvironment(
             var kuduConsoleFullPath =
                 Path.Combine(AppContext.BaseDirectory, KuduConsoleRelativePath, KuduConsoleFilename);
             return new Core.Environment(root, EnvironmentHelper.NormalizeBinPath(binPath), repositoryPath, requestId,
-                kuduConsoleFullPath, null, appName, appNamespace);
+                kuduConsoleFullPath, null, appName, appNamespace, appKind);
         }
 
         /// <summary>
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index 16ce8021..bed76d9f 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -52,6 +52,40 @@ public void DurableFunctionApp()
             }
         }
 
+        [Theory]
+        [InlineData("flowc1712a574433c1djobtriggers00", "10", "haassyad-scaling-lima", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.ScaleMonitor.KEDA.TargetQueueLength"":10}}}}")]
+        [InlineData("flowdc234f1fbd9ff3fjobtriggers00", "20", "n/a", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.HostId"":""haassyad-applicationinsights""}}}}")]
+        public void WorkflowApp( string expectedQueueName, string expectedQueueLength, string appName, string appKind, string hostJsonText)
+        {
+            // Generate a zip archive with a host.json with workflow extension enabled
+            string zipFilePath = Path.GetTempFileName();
+            using (var fileStream = File.OpenWrite(zipFilePath))
+            using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
+            {
+                CreateJsonFileEntry(archive, "host.json", hostJsonText);
+            }
+
+            try
+            {
+                IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath, appName, appKind);
+                Assert.Single(result);
+
+                ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
+                var actualQueueName = Assert.Contains("queueName", queueTrigger.Metadata);
+                Assert.Equal(actualQueueName, expectedQueueName);
+
+                var actualQueueLength = Assert.Contains("queueLength", queueTrigger.Metadata);
+                Assert.Equal(actualQueueLength, expectedQueueLength);
+
+                string connectionStringFromEnv = Assert.Contains("connectionStringFromEnv", queueTrigger.Metadata);
+                Assert.Equal("AzureWebJobsStorage", connectionStringFromEnv);
+            }
+            finally
+            {
+                File.Delete(zipFilePath);
+            }
+        }
+
         private static void CreateJsonFileEntry(ZipArchive archive, string path, string content)
         {
             using (Stream entryStream = archive.CreateEntry(path).Open())

From 6ba128fa4143af86268b932bebd959cc7438aecd Mon Sep 17 00:00:00 2001
From: Divya Gandhi <digandhi@microsoft.com>
Date: Wed, 21 Apr 2021 04:49:25 -0700
Subject: [PATCH 230/245] add http trigger as valid keda trigger type

---
 Kudu.Core/Functions/KedaFunctionTriggerProvider.cs    |  3 +++
 .../Function/KedaFunctionTriggersProviderTests.cs     | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 9f6e49b7..135f7fcc 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -191,6 +191,9 @@ internal static string GetKedaTriggerType(string triggerType)
                 case "rabbitmqtrigger":
                     return "rabbitmq";
 
+                case "httptrigger":
+                    return "httpTrigger";
+
                 default:
                     return string.Empty;
             }
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index bed76d9f..5d8a0d3f 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -23,7 +23,8 @@ public void DurableFunctionApp()
                 CreateJsonFileEntry(archive, "f1/function.json", @"{""bindings"":[{""type"":""orchestrationTrigger"",""name"":""context""}],""disabled"":false}");
                 CreateJsonFileEntry(archive, "f2/function.json", @"{""bindings"":[{""type"":""entityTrigger"",""name"":""ctx""}],""disabled"":false}");
                 CreateJsonFileEntry(archive, "f3/function.json", @"{""bindings"":[{""type"":""activityTrigger"",""name"":""input""}],""disabled"":false}");
-                CreateJsonFileEntry(archive, "f4/function.json", @"{""bindings"":[{""type"":""queueTrigger"",""connection"":""AzureWebjobsStorage"",""queueName"":""queue"",""name"":""queueItem""}],""disabled"":false}");
+                CreateJsonFileEntry(archive, "f4/function.json", @"{""bindings"":[{""type"":""queueTrigger"",""connection"":""AzureWebjobsStorage"",""queueName"":""queue"",""name"":""queueItem""}],""disabled"":false}");
+                CreateJsonFileEntry(archive, "f5/function.json", @"{""bindings"":[{""type"":""httpTrigger"",""methods"":[""post""],""authLevel"":""anonymous"",""name"":""req""}],""disabled"":false}");
             }
 
             try
@@ -44,7 +45,11 @@ public void DurableFunctionApp()
 
                 ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
                 string functionName = Assert.Contains("functionName", queueTrigger.Metadata);
-                Assert.Equal("f4", functionName);
+                Assert.Equal("f4", functionName);
+
+                ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
+                functionName = Assert.Contains("functionName", httpTrigger.Metadata);
+                Assert.Equal("f5", functionName);
             }
             finally
             {
@@ -149,7 +154,7 @@ public void PopulateMetadataDictionary_KedaV2_OnlyKedaSupportedTriggers()
             {
                 ""functionName"": ""f1"",
                 ""bindings"": [{
-                    ""type"": ""httpTrigger"",
+                    ""type"": ""eventGridTrigger"",
                     ""methods"": [""GET""],
                     ""authLevel"": ""anonymous""
                 }]

From 97b2a5b8b4ee9021f45900a1077e98e1877d95ba Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 26 Apr 2021 09:02:02 -0700
Subject: [PATCH 231/245] Refactor AppType header (#201)

---
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs | 10 +++++-----
 Kudu.Services.Web/KubeMiddleware.cs    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index e9f5b75f..298910cd 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -137,17 +137,17 @@ public static string GetAppName(HttpContext context)
             return appName;
         }
 
-        public static string GetAppKind(HttpContext context)
+        public static string GetAppType(HttpContext context)
         {
-            var appKind = context.Request.Headers["K8SE_APP_KIND"].ToString();
+            var appType = context.Request.Headers["K8SE_APP_TYPE"].ToString();
 
-            if (string.IsNullOrEmpty(appKind))
+            if (string.IsNullOrEmpty(appType))
             {
                 context.Response.StatusCode = 401;
                 // K8SE TODO: move this to resource map
-                throw new InvalidOperationException("Couldn't recognize AppKind");
+                throw new InvalidOperationException("Couldn't recognize AppType");
             }
-            return appKind;
+            return appType;
         }
 
         public static string GetAppNamespace(HttpContext context)
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index bd6855ca..28a1e340 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -41,7 +41,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
         {
             string appName = K8SEDeploymentHelper.GetAppName(context);
             string appNamenamespace = K8SEDeploymentHelper.GetAppNamespace(context);
-            string appKind = K8SEDeploymentHelper.GetAppKind(context);
+            string appType = K8SEDeploymentHelper.GetAppType(context);
 
             string homeDir = "";
             string siteRepoDir = "";
@@ -59,7 +59,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             }
 
             // Cache the App Environment for this request
-            context.Items.Add("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace, appKind));
+            context.Items.Add("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace, appType));
 
             // Cache the appName for this request
             context.Items.Add("appName", appName);

From 8ce8727805e8d3b6547a24aa9ae3399d57bd8ebd Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ushio <ushio@simplearchitect.com>
Date: Fri, 7 May 2021 13:29:51 -0700
Subject: [PATCH 232/245] [Functions]Binding Expression Transformation for
 AppSettings (#199)

---
 Common/Constants.cs                           |   4 +
 Kudu.Core/Deployment/DeploymentManager.cs     |  20 +-
 .../Functions/KedaFunctionTriggerProvider.cs  |  47 ++-
 Kudu.Core/Functions/SyncTriggerHandler.cs     |   7 +-
 .../DockerContainerRestartTrigger.cs          |   9 +-
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        |  20 +-
 Kudu.Services.Web/KubeMiddleware.cs           |   8 +
 Kudu.Services/Function/FunctionController.cs  |   4 +-
 .../Core/Deployment/DeploymentManagerTests.cs |  35 ++
 .../KedaFunctionTriggersProviderTests.cs      | 367 ++++++++++--------
 .../Core/Function/SyncTriggerHandlerTests.cs  |   2 +-
 .../Core/K8SE/K8SEDeploymentHelperTest.cs     |  31 ++
 12 files changed, 370 insertions(+), 184 deletions(-)
 create mode 100644 Kudu.Tests/Core/Deployment/DeploymentManagerTests.cs
 create mode 100644 Kudu.Tests/Core/K8SE/K8SEDeploymentHelperTest.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index fdcc8fbc..2da9c5e6 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -98,6 +98,8 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string LogicAppJson = "logicapp.json";
         public const string LogicAppUrlKey = "LOGICAPP_URL";
 
+        public const string AppSettingsRegex = "%.*?%";
+
         public const string SiteExtensionProvisioningStateCreated = "Created";
         public const string SiteExtensionProvisioningStateAccepted = "Accepted";
         public const string SiteExtensionProvisioningStateSucceeded = "Succeeded";
@@ -162,5 +164,7 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string WebSiteHomeStampName = "WEBSITE_HOME_STAMPNAME";
         public const string WebSiteStampDeploymentId = "WEBSITE_STAMP_DEPLOYMENT_ID";
         public const string IsK8SEEnvironment = "K8SE_BUILD_SERVICE";
+
+        public const string K8SEAppTypeDefault = "functionapp,kubernetes,linux";
     }
 }
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index 2c810e9c..f79f7d65 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -35,6 +35,7 @@ public class DeploymentManager : IDeploymentManager
         private readonly IDeploymentSettingsManager _settings;
         private readonly IDeploymentStatusManager _status;
         private readonly IWebHooksManager _hooksManager;
+        private readonly IDictionary<string, string> _appSettings;
 
         private const string RestartTriggerReason = "App deployment";
         private const string XmlLogFile = "log.xml";
@@ -68,6 +69,7 @@ public DeploymentManager(ISiteBuilderFactory builderFactory,
         {
             _builderFactory = builderFactory;
             _environment = GetEnvironment(httpContextAccessor, environment);
+            _appSettings = GetAppSettings(httpContextAccessor);
             _traceFactory = traceFactory;
             _analytics = analytics;
             _deploymentLock = deploymentLock;
@@ -92,6 +94,20 @@ private IEnvironment GetEnvironment(IHttpContextAccessor accessor, IEnvironment
             return _environment;
         }
 
+        internal static IDictionary<string, string> GetAppSettings(IHttpContextAccessor accessor, Func<bool> isK8SeEnvironment = null)
+        {
+            isK8SeEnvironment = isK8SeEnvironment ?? K8SEDeploymentHelper.IsK8SEEnvironment;
+
+            IDictionary<string, string> appSettings = new Dictionary<string, string>();
+            if (isK8SeEnvironment() && accessor != null)
+            {
+                var context = accessor.HttpContext;
+                appSettings = (IDictionary<string, string>) context.Items["appSettings"];
+            }
+
+            return appSettings;
+        }
+
         private bool IsDeploying
         {
             get
@@ -288,11 +304,11 @@ public async Task DeployAsync(
                         string repoUrl = deploymentInfo == null ? "empty" : deploymentInfo.RepositoryUrl;
                         if(deploymentInfo == null)
                         {
-                            DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason);
+                            DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason, appSettings: _appSettings);
                         }
                         else
                         {
-                            DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason, deploymentInfo == null ? null : deploymentInfo.RepositoryUrl, deploymentInfo.TargetPath);
+                            DockerContainerRestartTrigger.RequestContainerRestart(_environment, RestartTriggerReason, deploymentInfo == null ? null : deploymentInfo.RepositoryUrl, deploymentInfo.TargetPath, appSettings:_appSettings);
                         }
                         logger.Log($"Deployment Pod Rollout Started! Use 'kubectl -n k8se-apps get pods {appName} --watch' to monitor the rollout status");
                         logger.Log($"Deployment Pod Rollout Started! Use kubectl watch deplotment {appName} to monitor the rollout status");
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 135f7fcc..ea3d0ea9 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -5,13 +5,16 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Kudu.Core.Functions
 {
     public static class KedaFunctionTriggerProvider
     {
-        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath, string appName = null, string appKind = null)
+        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath, string appName = null, string appKind = null, IDictionary<string, string> appSettings = null)
         {
+            appSettings = appSettings ?? new Dictionary<string, string>();
+            
             if (!File.Exists(zipFilePath))
             {
                 return null;
@@ -56,7 +59,7 @@ bool IsHostJson(string fullName)
                 return fullName.Equals(Constants.FunctionsHostConfigFile, StringComparison.OrdinalIgnoreCase);
             }
 
-            var triggers = CreateScaleTriggers(triggerBindings, hostJsonText).ToList();
+            var triggers = CreateScaleTriggers(triggerBindings, hostJsonText, appSettings).ToList();
 
             if (appKind?.ToLowerInvariant() == Constants.WorkflowAppKind.ToLowerInvariant())
             {
@@ -70,23 +73,56 @@ bool IsHostJson(string fullName)
             return triggers;
         }
 
-        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(IEnumerable<JObject> functionsJson, string hostJsonText)
+        internal static void UpdateFunctionTriggerBindingExpression(
+            IEnumerable<ScaleTrigger> scaleTriggers, IDictionary<string, string> appSettings)
+        {
+            string ReplaceMatchedBindingExpression(Match match)
+            {
+                var bindingExpressionTarget = match.Value.Replace("%", "");
+                if (appSettings.ContainsKey(bindingExpressionTarget))
+                {
+                    return appSettings[bindingExpressionTarget];
+                }
+
+                return bindingExpressionTarget;
+            }
+
+            var matchEvaluator = new MatchEvaluator((Func<Match, string>) ReplaceMatchedBindingExpression);
+
+            foreach (var scaleTrigger in scaleTriggers)
+            {
+                IDictionary<string, string> newMetadata = new Dictionary<string, string>();
+                foreach (var metadata in scaleTrigger.Metadata)
+                {
+                    var replacedValue = Regex.Replace(metadata.Value, Constants.AppSettingsRegex, matchEvaluator);
+                    newMetadata[metadata.Key] = replacedValue;
+                }
+
+                scaleTrigger.Metadata = newMetadata;
+            }
+        }
+
+        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(IEnumerable<JObject> functionsJson, string hostJsonText, IDictionary<string, string> appSettings)
         {
             var triggerBindings = functionsJson
             .Select(o => ParseFunctionJson(o["functionName"]?.ToString(), o))
             .SelectMany(i => i);
 
-            return CreateScaleTriggers(triggerBindings, hostJsonText);
+            return CreateScaleTriggers(triggerBindings, hostJsonText, appSettings);
         }
 
-        internal static IEnumerable<ScaleTrigger> CreateScaleTriggers(IEnumerable<FunctionTrigger> triggerBindings, string hostJsonText)
+        internal static IEnumerable<ScaleTrigger> CreateScaleTriggers(IEnumerable<FunctionTrigger> triggerBindings, string hostJsonText, IDictionary<string, string> appSettings)
         {
+
             var durableTriggers = triggerBindings.Where(b => IsDurable(b));
             var standardTriggers = triggerBindings.Where(b => !IsDurable(b));
 
             var kedaScaleTriggers = new List<ScaleTrigger>();
             kedaScaleTriggers.AddRange(GetStandardScaleTriggers(standardTriggers));
 
+            // Update Binding Expression for %..% notation
+            UpdateFunctionTriggerBindingExpression(kedaScaleTriggers, appSettings);
+
             // Durable Functions triggers are treated as a group and get configuration from host.json
             if (durableTriggers.Any() && TryGetDurableKedaTrigger(hostJsonText, out ScaleTrigger durableScaleTrigger))
             {
@@ -101,6 +137,7 @@ bool IsDurable(FunctionTrigger function) =>
             return kedaScaleTriggers;
         }
 
+
         internal static IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, JObject functionJson)
         {
             if (functionJson.TryGetValue("disabled", out JToken value))
diff --git a/Kudu.Core/Functions/SyncTriggerHandler.cs b/Kudu.Core/Functions/SyncTriggerHandler.cs
index b384a275..ede8ea1c 100644
--- a/Kudu.Core/Functions/SyncTriggerHandler.cs
+++ b/Kudu.Core/Functions/SyncTriggerHandler.cs
@@ -15,12 +15,15 @@ public class SyncTriggerHandler
     {
         private readonly IEnvironment _environment;
         private readonly ITracer _tracer;
+        private readonly IDictionary<string, string> _appSettings;
 
         public SyncTriggerHandler(IEnvironment environment,
-            ITracer tracer)
+            ITracer tracer,
+            IDictionary<string, string> appSettings)
         {
             _environment = environment;
             _tracer = tracer;
+            _appSettings = appSettings ?? new Dictionary<string, string>();
         }
 
         public async Task<string> SyncTriggers(string functionTriggersPayload)
@@ -62,7 +65,7 @@ public Tuple<IEnumerable<ScaleTrigger>, string> GetScaleTriggers(string function
                 var triggersJson = JArray.Parse(functionTriggersPayload).Select(o => o.ToObject<JObject>());
 
                 // TODO: https://github.com/Azure/azure-functions-host/issues/7288 should change how we parse hostJsonText here.
-                scaleTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(triggersJson, string.Empty);
+                scaleTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(triggersJson, string.Empty, _appSettings);
                 if (!scaleTriggers.Any())
                 {
                     return new Tuple<IEnumerable<ScaleTrigger>, string>(null, "No triggers in the payload");
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index 1edb1c98..c536c0cf 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -27,14 +27,19 @@ public static class DockerContainerRestartTrigger
             "The last modification Kudu made to this file was at {0}, for the following reason: {1}.",
             System.Environment.NewLine);
 
-        public static void RequestContainerRestart(IEnvironment environment, string reason, string repositoryUrl = null, string appSubPath = "")
+        public static void RequestContainerRestart(IEnvironment environment, string reason, string repositoryUrl = null, string appSubPath = "", IDictionary<string,string> appSettings = null)
         {
+            if (appSettings is null)
+            {
+                appSettings = new Dictionary<string, string>();
+            }
+
             if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 string appName = environment.K8SEAppName;
                 string appKind = environment.K8SEAppKind;
                 string buildNumber = environment.CurrId;
-                var functionTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(repositoryUrl, appName, appKind);
+                var functionTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(repositoryUrl, appName, appKind, appSettings);
                 var buildMetadata = new BuildMetadata()
                 {
                     AppName = appName,
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 298910cd..ce937d2e 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using Microsoft.Extensions.Primitives;
 
 namespace Kudu.Core.K8SE
 {
@@ -143,9 +144,7 @@ public static string GetAppType(HttpContext context)
 
             if (string.IsNullOrEmpty(appType))
             {
-                context.Response.StatusCode = 401;
-                // K8SE TODO: move this to resource map
-                throw new InvalidOperationException("Couldn't recognize AppType");
+                appType = Constants.K8SEAppTypeDefault;
             }
             return appType;
         }
@@ -156,6 +155,21 @@ public static string GetAppNamespace(HttpContext context)
             return appNamepace;
         }
 
+        public static void UpdateContextWithAppSettings(HttpContext context)
+        {
+            Dictionary<string, string> appSettings = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
+            var appSettingsPrefix = "appsetting_";
+            var appSettingsWithHeader = context.Request.Headers
+                .Where(p => p.Key.StartsWith(appSettingsPrefix, StringComparison.OrdinalIgnoreCase));
+
+            foreach (var setting in appSettingsWithHeader)
+            {
+                var key = setting.Key.Substring(appSettingsPrefix.Length);
+                appSettings[key] = setting.Value;
+            }
+            context.Items.Add("appSettings", appSettings);
+        }
+
         private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> functionTriggers, BuildMetadata buildMetadata)
         {
             if (functionTriggers == null || !functionTriggers.Any())
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 28a1e340..c781c132 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using System;
+using System.Collections.Generic;
 using Kudu.Core.Infrastructure;
 using Kudu.Contracts.Settings;
 using Kudu.Services.Infrastructure;
@@ -9,7 +10,11 @@
 using System.Text;
 using Kudu.Core.Helpers;
 using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
 using Kudu.Core.K8SE;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Primitives;
 
 namespace Kudu.Services.Web
 {
@@ -64,6 +69,9 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             // Cache the appName for this request
             context.Items.Add("appName", appName);
 
+            // Add All AppSettings to the context.
+            K8SEDeploymentHelper.UpdateContextWithAppSettings(context);
+
             // Cache the appNamenamespace for this request if it's not empty or null
             if (!string.IsNullOrEmpty(appNamenamespace))
             {
diff --git a/Kudu.Services/Function/FunctionController.cs b/Kudu.Services/Function/FunctionController.cs
index eb87c8d5..b101a7f8 100644
--- a/Kudu.Services/Function/FunctionController.cs
+++ b/Kudu.Services/Function/FunctionController.cs
@@ -23,6 +23,7 @@ public class FunctionController : Controller
         private IEnvironment _environment;
         private readonly IAnalytics _analytics;
         private readonly ITracer _tracer;
+        private readonly IDictionary<string, string> _appSettings;
 
         public FunctionController(ITracer tracer,
             IAnalytics analytics,
@@ -30,6 +31,7 @@ public FunctionController(ITracer tracer,
         {
             _tracer = tracer;
             _environment = (IEnvironment)accessor.HttpContext.Items["environment"];
+            _appSettings = (IDictionary<string, string>) accessor.HttpContext.Items["appSettings"];
             _analytics = analytics;
         }
 
@@ -71,7 +73,7 @@ public async Task<IActionResult> SyncTrigger()
 
                 try
                 {
-                    var syncTriggerHandler = new SyncTriggerHandler(_environment, _tracer);
+                    var syncTriggerHandler = new SyncTriggerHandler(_environment, _tracer, _appSettings);
                     var errorMessage = await syncTriggerHandler.SyncTriggers(triggerPayload);
                     if (!string.IsNullOrEmpty(errorMessage))
                     {
diff --git a/Kudu.Tests/Core/Deployment/DeploymentManagerTests.cs b/Kudu.Tests/Core/Deployment/DeploymentManagerTests.cs
new file mode 100644
index 00000000..817128b0
--- /dev/null
+++ b/Kudu.Tests/Core/Deployment/DeploymentManagerTests.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection.Metadata.Ecma335;
+using System.Text;
+using Kudu.Core.Deployment;
+using Microsoft.AspNetCore.Http;
+using Xunit;
+
+namespace Kudu.Tests.Core.Deployment
+{
+    public class DeploymentManagerTests
+    {
+        [Fact]
+        public void GetAppSettingsTest()
+        {
+            var appSettings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            var functionsWorkerRuntimeKey = "APPSETTING_FUNCTIONS_WORKER_RUNTIME";
+            var functionsWorkerRuntimeValue = "java";
+            appSettings[functionsWorkerRuntimeKey] = functionsWorkerRuntimeValue;
+            var functionsExtensionVersionKey = "appsetting_functions_extension_version";
+            var functionsExtensionVersionValue = "~3";
+            appSettings[functionsExtensionVersionKey] = functionsExtensionVersionValue;
+        
+            IHttpContextAccessor accessor = new HttpContextAccessor();
+            accessor.HttpContext = new DefaultHttpContext();
+            accessor.HttpContext.Items.Add("appSettings", appSettings);
+
+            Assert.Equal(2, DeploymentManager.GetAppSettings(accessor, () => true).Count);
+            Assert.Equal(functionsWorkerRuntimeValue, DeploymentManager.GetAppSettings(accessor, () => true)[functionsWorkerRuntimeKey]);
+            Assert.Equal(functionsExtensionVersionValue, DeploymentManager.GetAppSettings(accessor, () => true)[functionsExtensionVersionKey]);
+            Assert.Equal(0, DeploymentManager.GetAppSettings(accessor, () => false).Count);
+            Assert.Equal(0, DeploymentManager.GetAppSettings(null, () => true).Count);
+        }
+    }
+}
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index 5d8a0d3f..8b28d4a9 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -1,170 +1,201 @@
-using Kudu.Core.Functions;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using Xunit;
-
-namespace Kudu.Tests.Core.Function
-{
-    public class KedaFunctionTriggersProviderTests
-    {
-        [Fact]
-        public void DurableFunctionApp()
-        {
-            // Generate a zip archive with a host.json and the contents of a Durable Function app
-            string zipFilePath = Path.GetTempFileName();
-            using (var fileStream = File.OpenWrite(zipFilePath))
-            using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
-            {
-                CreateJsonFileEntry(archive, "host.json", @"{""version"":""2.0"",""extensions"":{""durableTask"":{""hubName"":""DFTest"",""storageProvider"":{""type"":""mssql"",""connectionStringName"":""SQLDB_Connection""}}}}");
-                CreateJsonFileEntry(archive, "f1/function.json", @"{""bindings"":[{""type"":""orchestrationTrigger"",""name"":""context""}],""disabled"":false}");
-                CreateJsonFileEntry(archive, "f2/function.json", @"{""bindings"":[{""type"":""entityTrigger"",""name"":""ctx""}],""disabled"":false}");
-                CreateJsonFileEntry(archive, "f3/function.json", @"{""bindings"":[{""type"":""activityTrigger"",""name"":""input""}],""disabled"":false}");
+using Kudu.Core.Functions;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using Xunit;
+
+namespace Kudu.Tests.Core.Function
+{
+    public class KedaFunctionTriggersProviderTests
+    {
+        [Fact]
+        public void DurableFunctionApp()
+        {
+            // Generate a zip archive with a host.json and the contents of a Durable Function app
+            string zipFilePath = Path.GetTempFileName();
+            using (var fileStream = File.OpenWrite(zipFilePath))
+            using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
+            {
+                CreateJsonFileEntry(archive, "host.json", @"{""version"":""2.0"",""extensions"":{""durableTask"":{""hubName"":""DFTest"",""storageProvider"":{""type"":""mssql"",""connectionStringName"":""SQLDB_Connection""}}}}");
+                CreateJsonFileEntry(archive, "f1/function.json", @"{""bindings"":[{""type"":""orchestrationTrigger"",""name"":""context""}],""disabled"":false}");
+                CreateJsonFileEntry(archive, "f2/function.json", @"{""bindings"":[{""type"":""entityTrigger"",""name"":""ctx""}],""disabled"":false}");
+                CreateJsonFileEntry(archive, "f3/function.json", @"{""bindings"":[{""type"":""activityTrigger"",""name"":""input""}],""disabled"":false}");
                 CreateJsonFileEntry(archive, "f4/function.json", @"{""bindings"":[{""type"":""queueTrigger"",""connection"":""AzureWebjobsStorage"",""queueName"":""queue"",""name"":""queueItem""}],""disabled"":false}");
-                CreateJsonFileEntry(archive, "f5/function.json", @"{""bindings"":[{""type"":""httpTrigger"",""methods"":[""post""],""authLevel"":""anonymous"",""name"":""req""}],""disabled"":false}");
-            }
-
-            try
-            {
-                IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath);
-                Assert.Equal(2, result.Count());
-
-                ScaleTrigger mssqlTrigger = Assert.Single(result, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
-                string query = Assert.Contains("query", mssqlTrigger.Metadata);
-                Assert.False(string.IsNullOrEmpty(query));
-
-                string targetValue = Assert.Contains("targetValue", mssqlTrigger.Metadata);
-                Assert.False(string.IsNullOrEmpty(targetValue));
-                Assert.True(double.TryParse(targetValue, out _));
-
-                string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
-                Assert.Equal("SQLDB_Connection", connectionStringName);
-
-                ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
-                string functionName = Assert.Contains("functionName", queueTrigger.Metadata);
+                CreateJsonFileEntry(archive, "f5/function.json", @"{""bindings"":[{""type"":""httpTrigger"",""methods"":[""post""],""authLevel"":""anonymous"",""name"":""req""}],""disabled"":false}");
+            }
+
+            try
+            {
+                IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath);
+                Assert.Equal(3, result.Count());
+
+                ScaleTrigger mssqlTrigger = Assert.Single(result, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
+                string query = Assert.Contains("query", mssqlTrigger.Metadata);
+                Assert.False(string.IsNullOrEmpty(query));
+
+                string targetValue = Assert.Contains("targetValue", mssqlTrigger.Metadata);
+                Assert.False(string.IsNullOrEmpty(targetValue));
+                Assert.True(double.TryParse(targetValue, out _));
+
+                string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
+                Assert.Equal("SQLDB_Connection", connectionStringName);
+
+                ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
+                string functionName = Assert.Contains("functionName", queueTrigger.Metadata);
                 Assert.Equal("f4", functionName);
-
-                ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
-                functionName = Assert.Contains("functionName", httpTrigger.Metadata);
-                Assert.Equal("f5", functionName);
-            }
-            finally
-            {
-                File.Delete(zipFilePath);
-            }
-        }
-
-        [Theory]
-        [InlineData("flowc1712a574433c1djobtriggers00", "10", "haassyad-scaling-lima", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.ScaleMonitor.KEDA.TargetQueueLength"":10}}}}")]
-        [InlineData("flowdc234f1fbd9ff3fjobtriggers00", "20", "n/a", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.HostId"":""haassyad-applicationinsights""}}}}")]
-        public void WorkflowApp( string expectedQueueName, string expectedQueueLength, string appName, string appKind, string hostJsonText)
-        {
-            // Generate a zip archive with a host.json with workflow extension enabled
-            string zipFilePath = Path.GetTempFileName();
-            using (var fileStream = File.OpenWrite(zipFilePath))
-            using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
-            {
-                CreateJsonFileEntry(archive, "host.json", hostJsonText);
-            }
-
-            try
-            {
-                IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath, appName, appKind);
-                Assert.Single(result);
-
-                ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
-                var actualQueueName = Assert.Contains("queueName", queueTrigger.Metadata);
-                Assert.Equal(actualQueueName, expectedQueueName);
-
-                var actualQueueLength = Assert.Contains("queueLength", queueTrigger.Metadata);
-                Assert.Equal(actualQueueLength, expectedQueueLength);
-
-                string connectionStringFromEnv = Assert.Contains("connectionStringFromEnv", queueTrigger.Metadata);
-                Assert.Equal("AzureWebJobsStorage", connectionStringFromEnv);
-            }
-            finally
-            {
-                File.Delete(zipFilePath);
-            }
-        }
-
-        private static void CreateJsonFileEntry(ZipArchive archive, string path, string content)
-        {
-            using (Stream entryStream = archive.CreateEntry(path).Open())
-            using (var streamWriter = new StreamWriter(entryStream))
-            {
-                streamWriter.Write(content);
-            }
-        }
-
-         public void PopulateMetadataDictionary_KedaV1_CorrectlyPopulatesRabbitMQMetadata()
-        {
-            string jsonText = @"
-            {
-                ""type"": ""rabbitMQTrigger"",
-                ""connectionStringSetting"": ""RabbitMQConnection"",
-                ""queueName"": ""myQueue"",
-                ""name"": ""message""
-            }";
-
-            JToken jsonObj = JToken.Parse(jsonText);
-
-            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj, "f1");
-
-            Assert.Equal(4, metadata.Count);
-            Assert.True(metadata.ContainsKey("type"));
-            Assert.True(metadata.ContainsKey("host"));
-            Assert.True(metadata.ContainsKey("name"));
-            Assert.True(metadata.ContainsKey("queueName"));
-            Assert.Equal("rabbitMQTrigger", metadata["type"]);
-            Assert.Equal("RabbitMQConnection", metadata["host"]);
-            Assert.Equal("message", metadata["name"]);
-            Assert.Equal("myQueue", metadata["queueName"]);
-        }
-
-        [Fact]
-        public void PopulateMetadataDictionary_KedaV2_CorrectlyPopulatesRabbitMQMetadata()
-        {
-            string jsonText = @"
-            {
-                ""type"": ""rabbitMQTrigger"",
-                ""connectionStringSetting"": ""RabbitMQConnection"",
-                ""queueName"": ""myQueue"",
-                ""name"": ""message""
-            }";
-
-            JToken jsonObj = JToken.Parse(jsonText);
-
-            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj, "f1");
-
-            Assert.Equal(3, metadata.Count);
-            Assert.True(metadata.ContainsKey("queueName"));
-            Assert.True(metadata.ContainsKey("hostFromEnv"));
-            Assert.Equal("myQueue", metadata["queueName"]);
-            Assert.Equal("RabbitMQConnection", metadata["hostFromEnv"]);
-        }
-
-        [Fact]
-        public void PopulateMetadataDictionary_KedaV2_OnlyKedaSupportedTriggers()
-        {
-            string jsonText = @"
-            {
-                ""functionName"": ""f1"",
-                ""bindings"": [{
-                    ""type"": ""eventGridTrigger"",
-                    ""methods"": [""GET""],
-                    ""authLevel"": ""anonymous""
-                }]
-            }";
-
-            var jsonObj = JObject.Parse(jsonText);
-
-            var triggers = KedaFunctionTriggerProvider.GetFunctionTriggers(new[] { jsonObj }, string.Empty);
-
-            Assert.Equal(0, triggers.Count());
-        }
-    }
-}
+
+                ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
+                functionName = Assert.Contains("functionName", httpTrigger.Metadata);
+                Assert.Equal("f5", functionName);
+            }
+            finally
+            {
+                File.Delete(zipFilePath);
+            }
+        }
+
+        [Theory]
+        [InlineData("flowc1712a574433c1djobtriggers00", "10", "haassyad-scaling-lima", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.ScaleMonitor.KEDA.TargetQueueLength"":10}}}}")]
+        [InlineData("flowdc234f1fbd9ff3fjobtriggers00", "20", "n/a", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.HostId"":""haassyad-applicationinsights""}}}}")]
+        public void WorkflowApp( string expectedQueueName, string expectedQueueLength, string appName, string appKind, string hostJsonText)
+        {
+            // Generate a zip archive with a host.json with workflow extension enabled
+            string zipFilePath = Path.GetTempFileName();
+            using (var fileStream = File.OpenWrite(zipFilePath))
+            using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, leaveOpen: true))
+            {
+                CreateJsonFileEntry(archive, "host.json", hostJsonText);
+            }
+
+            try
+            {
+                IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath, appName, appKind);
+                Assert.Single(result);
+
+                ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
+                var actualQueueName = Assert.Contains("queueName", queueTrigger.Metadata);
+                Assert.Equal(actualQueueName, expectedQueueName);
+
+                var actualQueueLength = Assert.Contains("queueLength", queueTrigger.Metadata);
+                Assert.Equal(actualQueueLength, expectedQueueLength);
+
+                string connectionStringFromEnv = Assert.Contains("connectionStringFromEnv", queueTrigger.Metadata);
+                Assert.Equal("AzureWebJobsStorage", connectionStringFromEnv);
+            }
+            finally
+            {
+                File.Delete(zipFilePath);
+            }
+        }
+
+        private static void CreateJsonFileEntry(ZipArchive archive, string path, string content)
+        {
+            using (Stream entryStream = archive.CreateEntry(path).Open())
+            using (var streamWriter = new StreamWriter(entryStream))
+            {
+                streamWriter.Write(content);
+            }
+        }
+
+         public void PopulateMetadataDictionary_KedaV1_CorrectlyPopulatesRabbitMQMetadata()
+        {
+            string jsonText = @"
+            {
+                ""type"": ""rabbitMQTrigger"",
+                ""connectionStringSetting"": ""RabbitMQConnection"",
+                ""queueName"": ""myQueue"",
+                ""name"": ""message""
+            }";
+
+            JToken jsonObj = JToken.Parse(jsonText);
+
+            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj, "f1");
+
+            Assert.Equal(4, metadata.Count);
+            Assert.True(metadata.ContainsKey("type"));
+            Assert.True(metadata.ContainsKey("host"));
+            Assert.True(metadata.ContainsKey("name"));
+            Assert.True(metadata.ContainsKey("queueName"));
+            Assert.Equal("rabbitMQTrigger", metadata["type"]);
+            Assert.Equal("RabbitMQConnection", metadata["host"]);
+            Assert.Equal("message", metadata["name"]);
+            Assert.Equal("myQueue", metadata["queueName"]);
+        }
+
+        [Fact]
+        public void PopulateMetadataDictionary_KedaV2_CorrectlyPopulatesRabbitMQMetadata()
+        {
+            string jsonText = @"
+            {
+                ""type"": ""rabbitMQTrigger"",
+                ""connectionStringSetting"": ""RabbitMQConnection"",
+                ""queueName"": ""myQueue"",
+                ""name"": ""message""
+            }";
+
+            JToken jsonObj = JToken.Parse(jsonText);
+
+            IDictionary<string, string> metadata = KedaFunctionTriggerProvider.PopulateMetadataDictionary(jsonObj, "f1");
+
+            Assert.Equal(3, metadata.Count);
+            Assert.True(metadata.ContainsKey("queueName"));
+            Assert.True(metadata.ContainsKey("hostFromEnv"));
+            Assert.Equal("myQueue", metadata["queueName"]);
+            Assert.Equal("RabbitMQConnection", metadata["hostFromEnv"]);
+        }
+
+        [Fact]
+        public void PopulateMetadataDictionary_KedaV2_OnlyKedaSupportedTriggers()
+        {
+            string jsonText = @"
+            {
+                ""functionName"": ""f1"",
+                ""bindings"": [{
+                    ""type"": ""eventGridTrigger"",
+                    ""methods"": [""GET""],
+                    ""authLevel"": ""anonymous""
+                }]
+            }";
+
+            var jsonObj = JObject.Parse(jsonText);
+
+            var triggers = KedaFunctionTriggerProvider.GetFunctionTriggers(new[] { jsonObj }, string.Empty, new Dictionary<string, string>());
+
+            Assert.Equal(0, triggers.Count());
+        }
+
+        [Fact]
+        public void UpdateFunctionTriggerBindingExpression_Replace_Expression()
+        {
+            IEnumerable<ScaleTrigger> triggers = new ScaleTrigger[]
+            {
+                new ScaleTrigger
+                {
+                    Type = "kafkaTrigger",
+                    Metadata = new Dictionary<string, string>()
+                    {
+                        {"brokerList", "BrokerList" },
+                        {"topic", "%topic%" },
+                        {"ConsumerGroup", "%ConsumerGroup%" }
+                    }
+                }
+            };
+
+
+            var appSettings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                {"topic", "myTopic"},
+                {"consumergroup", "$Default"} // should be case insensitive
+            };
+
+            KedaFunctionTriggerProvider.UpdateFunctionTriggerBindingExpression(triggers, appSettings);
+            var metadata = triggers?.FirstOrDefault().Metadata;
+            Assert.Equal("myTopic", metadata["topic"]);
+            Assert.Equal("$Default", metadata["ConsumerGroup"] );
+            Assert.Equal("BrokerList", metadata["brokerList"]);
+        }
+    }
+}
diff --git a/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs b/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
index e1723e8d..f33bca89 100644
--- a/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
+++ b/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
@@ -12,7 +12,7 @@ public class SyncTriggerHandlerTests
         [InlineData(null)]
         public void GetScaleTriggersTest(string functionTriggerPayload)
         {
-            var syncTriggerHandler = new SyncTriggerHandler(null, null);
+            var syncTriggerHandler = new SyncTriggerHandler(null, null, null);
             var scaleTriggers = syncTriggerHandler.GetScaleTriggers(functionTriggerPayload);
             if (string.Equals(functionTriggerPayload, "Invalid json") || string.IsNullOrEmpty(functionTriggerPayload))
             {
diff --git a/Kudu.Tests/Core/K8SE/K8SEDeploymentHelperTest.cs b/Kudu.Tests/Core/K8SE/K8SEDeploymentHelperTest.cs
new file mode 100644
index 00000000..2ebb3369
--- /dev/null
+++ b/Kudu.Tests/Core/K8SE/K8SEDeploymentHelperTest.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Kudu.Core.K8SE;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Xunit;
+
+namespace Kudu.Tests.Core.K8SE
+{
+
+    public class K8SEDeploymentHelperTest
+    {
+        [Fact]
+        public void UpdateHttpContextWithAppSettings()
+        {
+            HttpContext context = new DefaultHttpContext();
+            // AppSettings are case insensitive
+            // Current header casing inject header as lowercase.
+            context.Request.Headers.Add("appsetting_azurewebjobsstorage", new StringValues("AccountKey=verySecure"));
+            context.Request.Headers.Add("APPSETTING_FUNCTIONS_WORKER_RUNTIME", new StringValues("java"));
+            context.Request.Headers.Add("FUNCTIONS_EXTENSION_VERSION", new StringValues("~3"));
+            context.Request.Headers.Add("SOME_FUNCTIONS_WORKER_RUNTIME", new StringValues("Should not match"));
+            K8SEDeploymentHelper.UpdateContextWithAppSettings(context);
+            IDictionary<string, string> appSettings = (IDictionary<string, string>)context.Items["appSettings"];
+            Assert.Equal("AccountKey=verySecure", appSettings["AzureWebJobsStorage"]);
+            Assert.Equal("java", appSettings["FUNCTIONS_WORKER_RUNTIME"]);
+            Assert.Equal(2, appSettings.Count);
+        }
+    }
+}

From 545dc5d353fa4650d6cb291acd93599eeffd142a Mon Sep 17 00:00:00 2001
From: Hamza Assyad <assyad@outlook.com>
Date: Fri, 7 May 2021 14:20:51 -0700
Subject: [PATCH 233/245] Merge from master (#204)

Co-authored-by: Hamza Assyad <haassyad@microsoft.com>
---
 Kudu.Contracts/IEnvironment.cs                     |  2 +-
 Kudu.Core/Environment.cs                           | 14 +++++++-------
 Kudu.Core/Functions/KedaFunctionTriggerProvider.cs |  5 +++--
 .../DockerContainerRestartTrigger.cs               |  4 ++--
 Kudu.Services.Web/KubeMiddleware.cs                |  4 ++--
 .../Function/KedaFunctionTriggersProviderTests.cs  |  6 +++---
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Kudu.Contracts/IEnvironment.cs b/Kudu.Contracts/IEnvironment.cs
index e0f1d487..cc546b3a 100644
--- a/Kudu.Contracts/IEnvironment.cs
+++ b/Kudu.Contracts/IEnvironment.cs
@@ -34,6 +34,6 @@ public interface IEnvironment
         bool IsOnLinuxConsumption { get; }      // e.g. True on Linux Consumption. False on App Service.
         bool IsK8SEApp { get; }
         string K8SEAppName { get;  }
-        string K8SEAppKind { get; }
+        string K8SEAppType { get; }
     }
 }
diff --git a/Kudu.Core/Environment.cs b/Kudu.Core/Environment.cs
index 49ce6ef6..89ed2d0a 100644
--- a/Kudu.Core/Environment.cs
+++ b/Kudu.Core/Environment.cs
@@ -43,7 +43,7 @@ public class Environment : IEnvironment
         private readonly string _secondaryJobsBinariesPath;
         private readonly string _k8seAppName;
         private readonly string _k8seAppNamespace;
-        private readonly string _k8seAppKind;
+        private readonly string _k8seAppType;
 
 
         // This ctor is used only in unit tests
@@ -67,7 +67,7 @@ public Environment(
                 IHttpContextAccessor httpContextAccessor,
                 string k8seAppName = null,
                 string k8seAppNamespace = null,
-                string k8seAppKind = null)
+                string k8seAppType = null)
         {
             if (repositoryPath == null)
             {
@@ -108,7 +108,7 @@ public Environment(
             _httpContextAccessor = httpContextAccessor;
             _k8seAppName = k8seAppName;
             _k8seAppNamespace = k8seAppNamespace;
-            _k8seAppKind = k8seAppKind;
+            _k8seAppType = k8seAppType;
         }
 
         public Environment(
@@ -120,7 +120,7 @@ public Environment(
                 IHttpContextAccessor httpContextAccessor,
                 string k8seAppName = null,
                 string k8seAppNamespace = null,
-                string k8seAppKind = null)
+                string k8seAppType = null)
         {
             RootPath = rootPath;
 
@@ -137,7 +137,7 @@ public Environment(
             _locksPath = Path.Combine(SiteRootPath, Constants.LocksPath);
             _k8seAppName = k8seAppName;
             _k8seAppNamespace = k8seAppNamespace;
-            _k8seAppKind = k8seAppKind;
+            _k8seAppType = k8seAppType;
 
             if (OSDetector.IsOnWindows())
             {
@@ -504,11 +504,11 @@ public string K8SEAppNamespace
             }
         }
 
-        public string K8SEAppKind
+        public string K8SEAppType
         {
             get
             {
-                return _k8seAppKind;
+                return _k8seAppType;
             }
         }
 
diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index ea3d0ea9..9c8a24c2 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -11,7 +11,7 @@ namespace Kudu.Core.Functions
 {
     public static class KedaFunctionTriggerProvider
     {
-        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath, string appName = null, string appKind = null, IDictionary<string, string> appSettings = null)
+        public static IEnumerable<ScaleTrigger> GetFunctionTriggers(string zipFilePath, string appName = null, string appType = null, IDictionary<string, string> appSettings = null)
         {
             appSettings = appSettings ?? new Dictionary<string, string>();
             
@@ -61,7 +61,8 @@ bool IsHostJson(string fullName)
 
             var triggers = CreateScaleTriggers(triggerBindings, hostJsonText, appSettings).ToList();
 
-            if (appKind?.ToLowerInvariant() == Constants.WorkflowAppKind.ToLowerInvariant())
+            var isWorkflowApp = appType?.ToLowerInvariant()?.Contains(Constants.WorkflowAppKind.ToLowerInvariant());
+            if (isWorkflowApp.GetValueOrDefault(defaultValue: false))
             {
                 // NOTE(haassyad) Check if the host json has the workflow extension loaded. If so we will add a queue scale trigger for the job dispatcher queue.
                 if (TryGetWorkflowKedaTrigger(hostJsonText, appName, out ScaleTrigger workflowScaleTrigger))
diff --git a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
index c536c0cf..f082acac 100644
--- a/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
+++ b/Kudu.Core/Infrastructure/DockerContainerRestartTrigger.cs
@@ -37,9 +37,9 @@ public static void RequestContainerRestart(IEnvironment environment, string reas
             if (K8SEDeploymentHelper.IsK8SEEnvironment())
             {
                 string appName = environment.K8SEAppName;
-                string appKind = environment.K8SEAppKind;
+                string appType = environment.K8SEAppType;
                 string buildNumber = environment.CurrId;
-                var functionTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(repositoryUrl, appName, appKind, appSettings);
+                var functionTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(repositoryUrl, appName, appType, appSettings);
                 var buildMetadata = new BuildMetadata()
                 {
                     AppName = appName,
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index c781c132..dc036ce4 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -118,7 +118,7 @@ private static IEnvironment GetEnvironment(
             IDeploymentSettingsManager settings = null,
             HttpContext httpContext = null,
             string appNamespace = null,
-            string appKind = null)
+            string appType = null)
         {
             var root = KubeMiddleware.ResolveRootPath(home, appName);
             var siteRoot = Path.Combine(root, Constants.SiteFolder);
@@ -129,7 +129,7 @@ private static IEnvironment GetEnvironment(
             var kuduConsoleFullPath =
                 Path.Combine(AppContext.BaseDirectory, KuduConsoleRelativePath, KuduConsoleFilename);
             return new Core.Environment(root, EnvironmentHelper.NormalizeBinPath(binPath), repositoryPath, requestId,
-                kuduConsoleFullPath, null, appName, appNamespace, appKind);
+                kuduConsoleFullPath, null, appName, appNamespace, appType);
         }
 
         /// <summary>
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index 8b28d4a9..b932263a 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -59,8 +59,8 @@ public void DurableFunctionApp()
 
         [Theory]
         [InlineData("flowc1712a574433c1djobtriggers00", "10", "haassyad-scaling-lima", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.ScaleMonitor.KEDA.TargetQueueLength"":10}}}}")]
-        [InlineData("flowdc234f1fbd9ff3fjobtriggers00", "20", "n/a", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.HostId"":""haassyad-applicationinsights""}}}}")]
-        public void WorkflowApp( string expectedQueueName, string expectedQueueLength, string appName, string appKind, string hostJsonText)
+        [InlineData("flowdc234f1fbd9ff3fjobtriggers00", "20", "n/a", "workflowApp,functionapp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.HostId"":""haassyad-applicationinsights""}}}}")]
+        public void WorkflowApp( string expectedQueueName, string expectedQueueLength, string appName, string appType, string hostJsonText)
         {
             // Generate a zip archive with a host.json with workflow extension enabled
             string zipFilePath = Path.GetTempFileName();
@@ -72,7 +72,7 @@ public void WorkflowApp( string expectedQueueName, string expectedQueueLength, s
 
             try
             {
-                IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath, appName, appKind);
+                IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath, appName, appType);
                 Assert.Single(result);
 
                 ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));

From 17ce521603cd94b52afc5cf609940e67a901e644 Mon Sep 17 00:00:00 2001
From: SatishRanjan <SatishRanjan@users.noreply.github.com>
Date: Fri, 7 May 2021 14:23:14 -0700
Subject: [PATCH 234/245] OneDeployment API code (#200)

* OneDeployment API code

* using artifactTempPath as a general path

* Output path for the OneDeploy scenario

* Fixing the absense of "K8SE_APP_KIND" in the header for the failing az web app create and az web app deploy

* Suppressing K8SE_APP_NAME and K8SE_APP_KIND validation

* Making ignoreStack default to true

* Fixing the code comment from Sanchit

* For non logic app fall back app kind to "kubeapp"

* Fixing GetAppKind method name
---
 Common/Constants.cs                           |   3 +
 Kudu.Contracts/Deployment/ArtifactType.cs     |  19 +
 .../Deployment/DeploymentInfoBase.cs          |  30 ++
 .../Deployment/ArtifactDeploymentInfo.cs      |  41 ++
 Kudu.Core/Deployment/DeploymentManager.cs     |  17 +-
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        |  16 +-
 Kudu.Core/SourceControl/NullRepository.cs     |   2 +-
 Kudu.Services.Web/KubeMiddleware.cs           |   2 +-
 Kudu.Services.Web/Startup.cs                  |   3 +
 Kudu.Services/Deployment/OneDeployHelper.cs   | 127 ++++++
 .../Deployment/PushDeploymentController.cs    | 391 ++++++++++++++++--
 Kudu.Services/Util/RequestHelper.cs           |  24 ++
 12 files changed, 631 insertions(+), 44 deletions(-)
 create mode 100644 Kudu.Contracts/Deployment/ArtifactType.cs
 create mode 100644 Kudu.Core/Deployment/ArtifactDeploymentInfo.cs
 create mode 100644 Kudu.Services/Deployment/OneDeployHelper.cs
 create mode 100644 Kudu.Services/Util/RequestHelper.cs

diff --git a/Common/Constants.cs b/Common/Constants.cs
index 2da9c5e6..67ccabe6 100644
--- a/Common/Constants.cs
+++ b/Common/Constants.cs
@@ -165,6 +165,9 @@ public static TimeSpan MaxAllowedExecutionTime
         public const string WebSiteStampDeploymentId = "WEBSITE_STAMP_DEPLOYMENT_ID";
         public const string IsK8SEEnvironment = "K8SE_BUILD_SERVICE";
 
+        public const string OneDeploy = "OneDeploy";
+        public const string ArtifactStagingDirectoryName = "extracted";
+
         public const string K8SEAppTypeDefault = "functionapp,kubernetes,linux";
     }
 }
diff --git a/Kudu.Contracts/Deployment/ArtifactType.cs b/Kudu.Contracts/Deployment/ArtifactType.cs
new file mode 100644
index 00000000..a4050c5a
--- /dev/null
+++ b/Kudu.Contracts/Deployment/ArtifactType.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Kudu.Contracts.Deployment
+{
+    public enum ArtifactType
+    {
+        Unknown,
+        War,
+        Jar,
+        Ear,
+        Lib,
+        Static,
+        Startup,
+        Script,
+        Zip,
+    }
+}
diff --git a/Kudu.Contracts/Deployment/DeploymentInfoBase.cs b/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
index f64c02ec..94ff1110 100644
--- a/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
+++ b/Kudu.Contracts/Deployment/DeploymentInfoBase.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using System.Collections;
 using System.Collections.Generic;
+using Kudu.Contracts.Deployment;
 
 namespace Kudu.Core.Deployment
 {
@@ -75,5 +76,34 @@ public bool IsValid()
 
         // Used to set Publish Endpoint context
         public bool ShouldBuildArtifact { get; set; }
+
+        // Optional.
+        // Type of artifact being deployed.
+        public ArtifactType ArtifactType { get; set; }
+
+        // Optional.
+        // By default, TargetSubDirectoryRelativePath specifies the directory to deploy to relative to /home/site/wwwroot.
+        // This property can be used to change the root from wwwroot to something else.
+        public string TargetRootPath { get; set; }
+
+        // Allows the use of a deployment Id, to be tracked
+        public string DeploymentTrackingId { get; set; } = null;
+
+        // Optional.
+        // Path of the directory to be deployed to. The path should be relative to the wwwroot directory.
+        // Example: "webapps/ROOT"
+        public string TargetSubDirectoryRelativePath { get; set; }
+
+        // Optional.
+        // Specifies the name of the deployed artifact.
+        // Example: When deploying startup files, OneDeploy will set this to startup.cmd (or startup.sh)
+        public string TargetFileName { get; set; }
+
+        // Specifies whether to touch the watched file (example web.config, web.xml, etc) after the deployment
+        public bool WatchedFileEnabled { get; set; }
+
+        // Used to allow / disallow 'restart' on a per deployment basis, if needed.
+        // For example: OneDeploy allows clients to enable / disable 'restart'.
+        public bool RestartAllowed { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Kudu.Core/Deployment/ArtifactDeploymentInfo.cs b/Kudu.Core/Deployment/ArtifactDeploymentInfo.cs
new file mode 100644
index 00000000..f560cd23
--- /dev/null
+++ b/Kudu.Core/Deployment/ArtifactDeploymentInfo.cs
@@ -0,0 +1,41 @@
+using Kudu.Core.SourceControl;
+using Kudu.Core.Tracing;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Kudu.Core.Deployment
+{
+    public class ArtifactDeploymentInfo : DeploymentInfoBase
+    {
+        private readonly IEnvironment _environment;
+        private readonly ITraceFactory _traceFactory;
+
+        public ArtifactDeploymentInfo(IEnvironment environment, ITraceFactory traceFactory)
+        {
+            _environment = environment;
+            _traceFactory = traceFactory;
+        }
+
+        public override IRepository GetRepository()
+        {
+            // Artifact "repository" does not conflict with other types, including NoRepository,
+            // so there's no call to EnsureRepository
+            var path = Path.Combine(_environment.ZipTempPath, Constants.ArtifactStagingDirectoryName);
+            return new NullRepository(path, _traceFactory, DeploymentTrackingId);
+        }
+
+        public string Author { get; set; }
+
+        public string AuthorEmail { get; set; }
+
+        public string Message { get; set; }
+
+        // Optional file name. Used by certain features like run-from-zip.
+        public string ArtifactFileName { get; set; }
+
+        // This is used when getting the artifact file from the remote URL
+        public string RemoteURL { get; set; }
+    }
+}
diff --git a/Kudu.Core/Deployment/DeploymentManager.cs b/Kudu.Core/Deployment/DeploymentManager.cs
index f79f7d65..3ceffd52 100644
--- a/Kudu.Core/Deployment/DeploymentManager.cs
+++ b/Kudu.Core/Deployment/DeploymentManager.cs
@@ -844,17 +844,22 @@ private static void FailDeployment(ITracer tracer, IDisposable deployStep, Deplo
 
         private static string GetOutputPath(DeploymentInfoBase deploymentInfo, IEnvironment environment, IDeploymentSettingsManager perDeploymentSettings)
         {
-            string targetPath = perDeploymentSettings.GetTargetPath();
+            string targetSubDirectoryRelativePath = perDeploymentSettings.GetTargetPath();
 
-            if (string.IsNullOrWhiteSpace(targetPath))
+            if (string.IsNullOrWhiteSpace(targetSubDirectoryRelativePath))
             {
-                targetPath = deploymentInfo?.TargetPath;
+                targetSubDirectoryRelativePath = deploymentInfo?.TargetSubDirectoryRelativePath;
             }
 
-            if (!string.IsNullOrWhiteSpace(targetPath))
+            if (deploymentInfo?.Deployer == Constants.OneDeploy)
             {
-                targetPath = targetPath.Trim('\\', '/');
-                return Path.GetFullPath(Path.Combine(environment.WebRootPath, targetPath));
+                return string.IsNullOrWhiteSpace(deploymentInfo?.TargetRootPath) ? environment.WebRootPath : deploymentInfo.TargetRootPath;
+            }
+
+            if (!string.IsNullOrWhiteSpace(targetSubDirectoryRelativePath))
+            {
+                targetSubDirectoryRelativePath = targetSubDirectoryRelativePath.Trim('\\', '/');
+                return Path.GetFullPath(Path.Combine(environment.WebRootPath, targetSubDirectoryRelativePath));
             }
 
             return environment.WebRootPath;
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index ce937d2e..81434611 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -138,15 +138,19 @@ public static string GetAppName(HttpContext context)
             return appName;
         }
 
-        public static string GetAppType(HttpContext context)
+        public static string GetAppKind(HttpContext context)
         {
-            var appType = context.Request.Headers["K8SE_APP_TYPE"].ToString();
-
-            if (string.IsNullOrEmpty(appType))
+            var appKind = context.Request.Headers["K8SE_APP_KIND"].ToString();
+            //K8SE_APP_KIND is only needed for the logic apps, for web apps and function apps, fallback to "kubeapp"
+            appKind = string.IsNullOrEmpty(appKind) ? "kubeapp" : appKind;
+            if (string.IsNullOrEmpty(appKind))
             {
-                appType = Constants.K8SEAppTypeDefault;
+                context.Response.StatusCode = 401;
+                // K8SE TODO: move this to resource map
+                throw new InvalidOperationException("Couldn't recognize AppKind");
             }
-            return appType;
+
+            return appKind;           
         }
 
         public static string GetAppNamespace(HttpContext context)
diff --git a/Kudu.Core/SourceControl/NullRepository.cs b/Kudu.Core/SourceControl/NullRepository.cs
index e21a1fe8..d7600f9e 100644
--- a/Kudu.Core/SourceControl/NullRepository.cs
+++ b/Kudu.Core/SourceControl/NullRepository.cs
@@ -21,7 +21,7 @@ public class NullRepository : IRepository
         private readonly string _path;
         private readonly ITraceFactory _traceFactory;
 
-        public NullRepository(string path, ITraceFactory traceFactory)
+        public NullRepository(string path, ITraceFactory traceFactory, string commitId = null)
         {
             _path = path;
             _traceFactory = traceFactory;
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index dc036ce4..3a1fc537 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -46,7 +46,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
         {
             string appName = K8SEDeploymentHelper.GetAppName(context);
             string appNamenamespace = K8SEDeploymentHelper.GetAppNamespace(context);
-            string appType = K8SEDeploymentHelper.GetAppType(context);
+            string appType = K8SEDeploymentHelper.GetAppKind(context);
 
             string homeDir = "";
             string siteRepoDir = "";
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index dbdb89cb..cfd34246 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -488,6 +488,9 @@ public void Configure(IApplicationBuilder app,
                     new {controller = "PushDeployment", action = "WarPushDeploy"},
                     new {verb = new HttpMethodRouteConstraint("POST")});
 
+                routes.MapHttpRouteDual("onedeploy", "publish",
+                    new { controller = "PushDeployment", action = "OneDeploy" });
+
                 // Support Linux Consumption Function app on Service Fabric Mesh
                 routes.MapRoute("admin-instance-info", "admin/instance/info",
                     new {controller = "LinuxConsumptionInstanceAdmin", action = "Info"},
diff --git a/Kudu.Services/Deployment/OneDeployHelper.cs b/Kudu.Services/Deployment/OneDeployHelper.cs
new file mode 100644
index 00000000..f4a64570
--- /dev/null
+++ b/Kudu.Services/Deployment/OneDeployHelper.cs
@@ -0,0 +1,127 @@
+using Kudu.Contracts.Deployment;
+using Kudu.Core;
+using Kudu.Core.Deployment;
+using Kudu.Core.Helpers;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Kudu.Services.Deployment
+{
+    static class OneDeployHelper
+    {
+        // Stacks supported by OneDeploy 
+        public const string Tomcat = "TOMCAT";
+        public const string JavaSE = "JAVA";
+        public const string JBossEap = "JBOSSEAP";
+
+        private const string StackEnvVarName = "WEBSITE_STACK";
+
+        // All paths are relative to HOME directory
+        public const string WwwrootDirectoryRelativePath = "site/wwwroot";
+        public const string ScriptsDirectoryRelativePath = "site/scripts";
+        public const string LibsDirectoryRelativePath = "site/libs";
+
+        public static bool IsLegacyWarPathValid(string path)
+        {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                return false;
+            }
+
+            var segments = path.Split('/');
+
+            return segments.Length == 2 && path.StartsWith("webapps/", StringComparison.Ordinal) && !string.IsNullOrWhiteSpace(segments[1]);
+        }
+
+        public static bool EnsureValidStack(ArtifactType artifactType, List<string> expectedStacks, bool ignoreStack, out string error)
+        {
+            var websiteStack = GetWebsiteStack();
+
+            bool isStackValid = expectedStacks != null && expectedStacks.Any(stack => string.Equals(websiteStack, stack, StringComparison.OrdinalIgnoreCase));
+
+            if (ignoreStack || isStackValid)
+            {
+                error = null;
+                return true;
+            }
+
+            error = $"Artifact type = '{artifactType}' cannot be deployed to stack = '{websiteStack}'. " +
+                    $"Site should be configured to run with stack = {string.Join(" or ", expectedStacks)}";
+            return false;
+        }
+
+        public static bool EnsureValidPath(ArtifactType artifactType, string designatedDirectoryRelativePath, ref string path, out string error)
+        {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                error = $"Path must be defined for type='{artifactType}'";
+                return false;
+            }
+
+            // Keep things simple by disallowing trailing slash
+            if (path.EndsWith("/", StringComparison.Ordinal))
+            {
+                error = $"Path cannot end with a '/'";
+                return false;
+            }
+
+            // If specified path is absolute, make sure it points to the designated directory for the artifact type
+            if (path.StartsWith("/", StringComparison.Ordinal))
+            {
+                string designatedRootAbsolutePath = $"/home/{designatedDirectoryRelativePath}/";
+
+                if (!path.StartsWith($"{designatedRootAbsolutePath}", StringComparison.Ordinal))
+                {
+                    error = $"Absolute path = '{path}' for artifact type = '{artifactType}' is invalid. " +
+                            $"Either use a relative path or use an absolute path that start with prefix '{designatedRootAbsolutePath}'";
+                    return false;
+                }
+
+                path = path.Substring(designatedRootAbsolutePath.Length);
+
+                if (string.IsNullOrWhiteSpace(path))
+                {
+                    error = $"Absolute path for artifact type = '{artifactType}' should be of the form {designatedRootAbsolutePath}[directoryname/]<filename>";
+                    return false;
+                }
+            }
+
+            error = null;
+            return true;
+        }
+
+        public static string GetWebsiteStack()
+        {
+            return System.Environment.GetEnvironmentVariable(StackEnvVarName);
+        }
+
+        public static string GetAbsolutePath(IEnvironment environment, string relativePath)
+        {
+            return Path.Combine(environment.RootPath, relativePath);
+        }
+
+        public static string GetStartupFileName()
+        {
+            return OSDetector.IsOnWindows() ? "startup.cmd" : "startup.sh";
+        }
+
+        // Extract directory path and file name from relativeFilePath
+        // Example: path=a/b/c.jar => TargetSubDirectoryRelativePath=a/b and TargetFileName=c.jar
+        // Example: path=c.jar => TargetSubDirectoryRelativePath=null and TargetFileName=c.jar
+        // Example: path=/c.jar => TargetSubDirectoryRelativePath="" and TargetFileName=c.jar
+        // Example: path=null => TargetSubDirectoryRelativePath=null and TargetFileName=null
+        public static void SetTargetSubDirectoyAndFileNameFromRelativePath(DeploymentInfoBase deploymentInfo, string relativeFilePath)
+        {
+            if (relativeFilePath != null)
+            {
+                relativeFilePath = relativeFilePath.TrimStart('/');
+            }
+
+            deploymentInfo.TargetFileName = Path.GetFileName(relativeFilePath);
+            deploymentInfo.TargetSubDirectoryRelativePath = Path.GetDirectoryName(relativeFilePath);
+        }
+    }
+}
diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index c461584c..b15e5ee4 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -23,6 +23,10 @@
 using System.Threading;
 using System.Collections;
 using Kudu.Core.K8SE;
+using Kudu.Contracts.Deployment;
+using Kudu.Services.Util;
+using System.Text;
+using Kudu.Services.Arm;
 
 namespace Kudu.Services.Deployment
 {
@@ -87,13 +91,13 @@ public async Task<IActionResult> ZipPushDeploy(
             {
                 var buildHeader = false;
 
-                if(HttpContext.Request.Headers.ContainsKey("SCM_DO_BUILD_DURING_DEPLOYMENT"))
+                if (HttpContext.Request.Headers.ContainsKey("SCM_DO_BUILD_DURING_DEPLOYMENT"))
                 {
                     string header = HttpContext.Request.Headers["SCM_DO_BUILD_DURING_DEPLOYMENT"];
                     buildHeader = !String.IsNullOrEmpty(header) && (header == "1" || header.Equals(Boolean.TrueString, StringComparison.OrdinalIgnoreCase));
                 }
 
-                var deploymentInfo = new ZipDeploymentInfo(_environment, _traceFactory)
+                var deploymentInfo = new ArtifactDeploymentInfo(_environment, _traceFactory)
                 {
                     AllowDeploymentWhileScmDisabled = true,
                     Deployer = deployer,
@@ -109,7 +113,7 @@ public async Task<IActionResult> ZipPushDeploy(
                     Author = author,
                     AuthorEmail = authorEmail,
                     Message = message,
-                    ZipURL = null,
+                    RemoteURL = null,
                     ShouldBuildArtifact = buildHeader
                 };
 
@@ -118,7 +122,7 @@ public async Task<IActionResult> ZipPushDeploy(
                     // This is used if the deployment is Run-From-Zip
                     // the name of the deployed file in D:\home\data\SitePackages\{name}.zip is the 
                     // timestamp in the format yyyMMddHHmmss. 
-                    deploymentInfo.ZipName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
+                    deploymentInfo.ArtifactFileName = $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.zip";
                     // This is also for Run-From-Zip where we need to extract the triggers
                     // for post deployment sync triggers.
                     deploymentInfo.SyncFunctionsTriggersPath =
@@ -147,7 +151,7 @@ public async Task<IActionResult> ZipPushDeployViaUrl(
             {
                 string zipUrl = GetZipURLFromJSON(requestJson);
 
-                var deploymentInfo = new ZipDeploymentInfo(_environment, _traceFactory)
+                var deploymentInfo = new ArtifactDeploymentInfo(_environment, _traceFactory)
                 {
                     AllowDeploymentWhileScmDisabled = true,
                     Deployer = deployer,
@@ -163,7 +167,7 @@ public async Task<IActionResult> ZipPushDeployViaUrl(
                     Author = author,
                     AuthorEmail = authorEmail,
                     Message = message,
-                    ZipURL = zipUrl,
+                    RemoteURL = zipUrl,
                 };
                 return await PushDeployAsync(deploymentInfo, isAsync, HttpContext);
             }
@@ -193,7 +197,7 @@ public async Task<IActionResult> WarPushDeploy(
                     appName = "ROOT";
                 }
 
-                var deploymentInfo = new ZipDeploymentInfo(_environment, _traceFactory)
+                var deploymentInfo = new ArtifactDeploymentInfo(_environment, _traceFactory)
                 {
                     AllowDeploymentWhileScmDisabled = true,
                     Deployer = deployer,
@@ -213,12 +217,211 @@ public async Task<IActionResult> WarPushDeploy(
                     Author = author,
                     AuthorEmail = authorEmail,
                     Message = message,
-                    ZipURL = null
+                    RemoteURL = null
                 };
                 return await PushDeployAsync(deploymentInfo, isAsync, HttpContext);
             }
         }
 
+        //
+        // Supports:
+        // 1. Deploy artifact in the request body:
+        //    - For this: Query parameters should contain configuration.
+        //                Example: /api/publish?type=war
+        //                Request body should contain the artifact being deployed
+        // 2. URL based deployment:
+        //    - For this: Query parameters should contain configuration. Example: /api/publish?type=war
+        //                Example: /api/publish?type=war
+        //                Request body should contain JSON with 'packageUri' property pointing to the artifact location
+        //                Example: { "packageUri": "http://foo/bar.war?accessToken=123" }
+        // 3. ARM template based deployment:
+        //    - For this: Query parameters are not supported.
+        //                Request body should contain JSON with configuration as well as the artifact location
+        //                Example: { "properties": { "type": "war", "packageUri": "http://foo/bar.war?accessToken=123" } }
+        //
+        // Note: As summarized in #1 and #2 above, request body can be either binary content or JSON.
+        // We interpret the content based on the Content-Type.
+        // To keep things simple, we don't use decorated parameters to automatically ready the Request body.
+        //
+        [HttpPost]
+        [HttpPut]
+        [DisableRequestSizeLimit]
+        [DisableFormValueModelBinding]
+        public async Task<IActionResult> OneDeploy(
+            [FromQuery] string type = null,
+            [FromQuery] bool async = false,
+            [FromQuery] string path = null,
+            [FromQuery] bool? restart = true,
+            [FromQuery] bool? clean = null,
+            [FromQuery] bool ignoreStack = true,
+            [FromQuery] bool trackDeploymentProgress = false
+            )
+        {
+            string remoteArtifactUrl = null;
+
+            using (_tracer.Step(Constants.OneDeploy))
+            {
+                try
+                {
+                    if (Request.MediaTypeContains("application/json"))
+                    {
+                        string jsonString;
+                        using (StreamReader reader = new StreamReader(Request.Body, Encoding.UTF8))
+                        {
+                            jsonString = await reader.ReadToEndAsync();
+                        }
+
+                        var requestJson = JObject.Parse(jsonString);
+
+                        if (ArmUtils.IsArmRequest(Request))
+                        {
+                            requestJson = requestJson.Value<JObject>("properties");
+
+                            type = requestJson.Value<string>("type");
+                            async = requestJson.Value<bool>("async");
+                            path = requestJson.Value<string>("path");
+                            restart = requestJson.Value<bool?>("restart");
+                            clean = requestJson.Value<bool?>("clean");
+                            ignoreStack = requestJson.Value<bool>("ignorestack");
+                        }
+
+                        remoteArtifactUrl = ArmUtils.IsArmRequest(Request) ? GetArticfactURLFromARMJSON(requestJson) : GetArtifactURLFromJSON(requestJson);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    return StatusCode400(ex.ToString());
+                }
+
+                //
+                // 'async' is not a CSharp-ish variable name. And although it is a valid variable name, some
+                // IDEs confuse it to be the 'async' keyword in C#.
+                // On the other hand, isAsync is not a good name for the query-parameter.
+                // So we use 'async' as the query parameter, and then assign it to the C# variable 'isAsync'
+                // at the earliest. Hereon, we use just 'isAsync'.
+                //
+                bool isAsync = async;
+
+                ArtifactType artifactType = ArtifactType.Unknown;
+                try
+                {
+                    artifactType = (ArtifactType)Enum.Parse(typeof(ArtifactType), type, ignoreCase: true);
+                }
+                catch
+                {
+                    return StatusCode400($"type='{type}' not recognized");
+                }
+
+                var deploymentInfo = new ArtifactDeploymentInfo(_environment, _traceFactory)
+                {
+                    ArtifactType = artifactType,
+                    AllowDeploymentWhileScmDisabled = true,
+                    Deployer = Constants.OneDeploy,
+                    IsContinuous = false,
+                    AllowDeferredDeployment = false,
+                    IsReusable = false,
+                    TargetRootPath = _environment.WebRootPath,
+                    TargetChangeset = DeploymentManager.CreateTemporaryChangeSet(message: Constants.OneDeploy),
+                    CommitId = null,
+                    DeploymentTrackingId = trackDeploymentProgress ? Guid.NewGuid().ToString() : null,
+                    RepositoryType = RepositoryType.None,
+                    RemoteURL = remoteArtifactUrl,
+                    Fetch = OneDeployFetch,
+                    DoFullBuildByDefault = false,
+                    Message = Constants.OneDeploy,
+                    WatchedFileEnabled = false,
+                    CleanupTargetDirectory = clean.GetValueOrDefault(false),
+                    RestartAllowed = restart.GetValueOrDefault(true),
+                };
+
+                string error;
+                switch (artifactType)
+                {
+                    case ArtifactType.War:
+                        if (!OneDeployHelper.EnsureValidStack(artifactType, new List<string> { OneDeployHelper.Tomcat, OneDeployHelper.JBossEap }, ignoreStack, out error))
+                        {
+                            return StatusCode400(error);
+                        }
+
+                        // If path is non-null, we assume this is a legacy war deployment, i.e. equivalent of wardeploy
+                        if (!string.IsNullOrWhiteSpace(path))
+                        {
+                            //
+                            // For legacy war deployments, the only path allowed is webapps/<directory-name>
+                            //
+
+                            if (!OneDeployHelper.EnsureValidPath(artifactType, OneDeployHelper.WwwrootDirectoryRelativePath, ref path, out error))
+                            {
+                                return StatusCode400(error);
+                            }
+
+                            if (!OneDeployHelper.IsLegacyWarPathValid(path))
+                            {
+                                return StatusCode400($"path='{path}' is invalid. When type={artifactType}, the only allowed paths are webapps/<directory-name> or /home/site/wwwroot/webapps/<directory-name>. " +
+                                                     $"Example: path=webapps/ROOT or path=/home/site/wwwroot/webapps/ROOT");
+                            }
+
+                            deploymentInfo.TargetRootPath = Path.Combine(_environment.WebRootPath, path);
+                            deploymentInfo.Fetch = LocalZipHandler;
+
+                            // Legacy war deployment is equivalent to wardeploy
+                            // So always do clean deploy.
+                            deploymentInfo.CleanupTargetDirectory = true;
+                            artifactType = ArtifactType.Zip;
+                        }
+                        else
+                        {
+                            // For type=war, if no path is specified, the target file is app.war
+                            deploymentInfo.TargetFileName = "app.war";
+                        }
+
+                        break;
+
+                    case ArtifactType.Jar:
+                        if (!OneDeployHelper.EnsureValidStack(artifactType, new List<string> { OneDeployHelper.JavaSE }, ignoreStack, out error))
+                        {
+                            return StatusCode400(error);
+                        }
+
+                        deploymentInfo.TargetFileName = "app.jar";
+                        break;
+
+                    case ArtifactType.Ear:
+                        if (!OneDeployHelper.EnsureValidStack(artifactType, new List<string> { OneDeployHelper.JBossEap }, ignoreStack, out error))
+                        {
+                            return StatusCode400(error);
+                        }
+
+                        deploymentInfo.TargetFileName = "app.ear";
+                        break;                   
+
+                    case ArtifactType.Static:
+                        if (!OneDeployHelper.EnsureValidPath(artifactType, OneDeployHelper.WwwrootDirectoryRelativePath, ref path, out error))
+                        {
+                            return StatusCode400(error);
+                        }
+
+                        OneDeployHelper.SetTargetSubDirectoyAndFileNameFromRelativePath(deploymentInfo, path);
+
+                        break;
+
+                    case ArtifactType.Zip:
+                        deploymentInfo.Fetch = LocalZipHandler;
+                        deploymentInfo.TargetSubDirectoryRelativePath = path;
+
+                        // Deployments for type=zip default to clean=true
+                        deploymentInfo.CleanupTargetDirectory = clean.GetValueOrDefault(true);
+
+                        break;
+
+                    default:
+                        return StatusCode400($"Artifact type '{artifactType}' not supported");
+                }
+
+                return await PushDeployAsync(deploymentInfo, isAsync, HttpContext);
+            }
+        }
+
         private string GetZipURLFromJSON(JObject requestObject)
         {
             using (_tracer.Step("Reading the zip URL from the request JSON"))
@@ -246,18 +449,27 @@ private string GetZipURLFromJSON(JObject requestObject)
             }
         }
 
-        private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentInfo, bool isAsync,
+        private async Task<IActionResult> PushDeployAsync(ArtifactDeploymentInfo deploymentInfo, bool isAsync,
             HttpContext context)
         {
 
+            string artifactTempPath;
+            if (string.IsNullOrWhiteSpace(deploymentInfo.TargetFileName))
+            {
+                artifactTempPath = Path.Combine(_environment.ZipTempPath, Guid.NewGuid() + ".zip");
+            }
+            else
+            {
+                artifactTempPath = Path.Combine(_environment.ZipTempPath, deploymentInfo.TargetFileName);
+            }
+
             var oryxManifestFile = Path.Combine(_environment.WebRootPath, "oryx-manifest.toml");
             if (FileSystemHelpers.FileExists(oryxManifestFile))
             {
                 _tracer.Step("Removing previous build artifact's manifest file");
                 FileSystemHelpers.DeleteFileSafe(oryxManifestFile);
             }
-
-            var zipFilePath = Path.Combine(_environment.ZipTempPath, Guid.NewGuid() + ".zip");
+            
 
             if (_settings.RunFromLocalZip())
             {
@@ -265,29 +477,29 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
             }
             else
             {
-                using (_tracer.Step("Writing zip file to {0}", zipFilePath))
+                using (_tracer.Step("Writing artifact file to {0}", artifactTempPath))
                 {
                     if (!string.IsNullOrEmpty(context.Request.ContentType) &&
                         context.Request.ContentType.Contains("multipart/form-data", StringComparison.OrdinalIgnoreCase))
                     {
                         FormValueProvider formModel;
-                        using (_tracer.Step("Writing zip file to {0}", zipFilePath))
+                        using (_tracer.Step("Writing zip file to {0}", artifactTempPath))
                         {
-                            using (var file = System.IO.File.Create(zipFilePath))
+                            using (var file = System.IO.File.Create(artifactTempPath))
                             {
                                 formModel = await Request.StreamFile(file);
                             }
                         }
                     }
-                    else if (deploymentInfo.ZipURL != null)
+                    else if (deploymentInfo.RemoteURL != null)
                     {
-                        using (_tracer.Step("Writing zip file from packageUri to {0}", zipFilePath))
+                        using (_tracer.Step("Writing zip file from packageUri to {0}", artifactTempPath))
                         {
                             using (var httpClient = new HttpClient())
-                            using (var fileStream = new FileStream(zipFilePath,
+                            using (var fileStream = new FileStream(artifactTempPath,
                                 FileMode.Create, FileAccess.Write, FileShare.None, bufferSize: 4096, useAsync: true))
                             {
-                                var zipUrlRequest = new HttpRequestMessage(HttpMethod.Get, deploymentInfo.ZipURL);
+                                var zipUrlRequest = new HttpRequestMessage(HttpMethod.Get, deploymentInfo.RemoteURL);
                                 var zipUrlResponse = await httpClient.SendAsync(zipUrlRequest);
 
                                 try
@@ -296,7 +508,7 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
                                 }
                                 catch (HttpRequestException hre)
                                 {
-                                    _tracer.TraceError(hre, "Failed to get file from packageUri {0}", deploymentInfo.ZipURL);
+                                    _tracer.TraceError(hre, "Failed to get file from packageUri {0}", deploymentInfo.RemoteURL);
                                     throw;
                                 }
 
@@ -309,14 +521,14 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
                     }
                     else
                     {
-                        using (var file = System.IO.File.Create(zipFilePath))
+                        using (var file = System.IO.File.Create(artifactTempPath))
                         {
                             await Request.Body.CopyToAsync(file);
                         }
                     }
                 }
 
-                deploymentInfo.RepositoryUrl = zipFilePath;
+                deploymentInfo.RepositoryUrl = artifactTempPath;
             }
 
             var result =
@@ -359,7 +571,7 @@ private async Task<IActionResult> PushDeployAsync(ZipDeploymentInfo deploymentIn
         private Task LocalZipFetch(IRepository repository, DeploymentInfoBase deploymentInfo, string targetBranch,
             ILogger logger, ITracer tracer)
         {
-            var zipDeploymentInfo = (ZipDeploymentInfo) deploymentInfo;
+            var zipDeploymentInfo = (ArtifactDeploymentInfo)deploymentInfo;
 
             // For this kind of deployment, RepositoryUrl is a local path.
             var sourceZipFile = zipDeploymentInfo.RepositoryUrl;
@@ -407,17 +619,17 @@ private Task LocalZipFetch(IRepository repository, DeploymentInfoBase deployment
             }
 
             CommitRepo(repository, zipDeploymentInfo);
-            return Task.CompletedTask;      
+            return Task.CompletedTask;
         }
 
         private async Task LocalZipHandler(IRepository repository, DeploymentInfoBase deploymentInfo,
             string targetBranch, ILogger logger, ITracer tracer)
         {
-            if (_settings.RunFromLocalZip() && deploymentInfo is ZipDeploymentInfo)
+            if (_settings.RunFromLocalZip() && deploymentInfo is ArtifactDeploymentInfo)
             {
                 // If this is a Run-From-Zip deployment, then we need to extract function.json
                 // from the zip file into path zipDeploymentInfo.SyncFunctionsTrigersPath
-                ExtractTriggers(repository, deploymentInfo as ZipDeploymentInfo);
+                ExtractTriggers(repository, deploymentInfo as ArtifactDeploymentInfo);
             }
             else
             {
@@ -425,13 +637,13 @@ private async Task LocalZipHandler(IRepository repository, DeploymentInfoBase de
             }
         }
 
-        private void ExtractTriggers(IRepository repository, ZipDeploymentInfo zipDeploymentInfo)
+        private void ExtractTriggers(IRepository repository, ArtifactDeploymentInfo zipDeploymentInfo)
         {
             FileSystemHelpers.EnsureDirectory(zipDeploymentInfo.SyncFunctionsTriggersPath);
             // Loading the zip file depends on how fast the file system is.
             // Tested Azure Files share with a zip containing 120k files (160 MBs)
             // takes 20 seconds to load. On my machine it takes 900 msec.
-            using (var zip = ZipFile.OpenRead(Path.Combine(_environment.SitePackagesPath, zipDeploymentInfo.ZipName)))
+            using (var zip = ZipFile.OpenRead(Path.Combine(_environment.SitePackagesPath, zipDeploymentInfo.ArtifactFileName)))
             {
                 var entries = zip.Entries
                     // Only select host.json, proxies.json, or function.json that are from top level directories only
@@ -459,7 +671,7 @@ bool isFunctionJson(string fullName)
             }
         }
 
-        private static void CommitRepo(IRepository repository, ZipDeploymentInfo zipDeploymentInfo)
+        private static void CommitRepo(IRepository repository, ArtifactDeploymentInfo zipDeploymentInfo)
         {
             // Needed in order for repository.GetChangeSet() to work.
             // Similar to what OneDriveHelper and DropBoxHelper do.
@@ -482,9 +694,9 @@ private static void CreateZipSymlinks(IDictionary<string, string> symLinks, stri
             }
         }
 
-        private async Task WriteSitePackageZip(ZipDeploymentInfo zipDeploymentInfo, ITracer tracer)
+        private async Task WriteSitePackageZip(ArtifactDeploymentInfo zipDeploymentInfo, ITracer tracer)
         {
-            var filePath = Path.Combine(_environment.SitePackagesPath, zipDeploymentInfo.ZipName);
+            var filePath = Path.Combine(_environment.SitePackagesPath, zipDeploymentInfo.ArtifactFileName);
             // Make sure D:\home\data\SitePackages exists
             FileSystemHelpers.EnsureDirectory(_environment.SitePackagesPath);
             using (_tracer.Step("Writing zip file to {0}", filePath))
@@ -542,5 +754,124 @@ private void DeleteFilesAndDirsExcept(string fileToKeep, string dirToKeep, ITrac
                 throw;
             }
         }
+
+        private string GetArticfactURLFromARMJSON(JObject requestObject)
+        {
+            using (_tracer.Step("Reading the artifact URL from the ARM request JSON"))
+            {
+                try
+                {
+                    // ARM template should have properties field and a packageUri field inside the properties field.
+                    string packageUri = requestObject.Value<JObject>("properties").Value<string>("packageUri");
+                    if (string.IsNullOrEmpty(packageUri))
+                    {
+                        throw new ArgumentException("Invalid Url in the JSON request");
+                    }
+                    return packageUri;
+                }
+                catch (Exception ex)
+                {
+                    _tracer.TraceError(ex, "Error reading the URL from the JSON {0}", requestObject.ToString());
+                    throw;
+                }
+            }
+        }
+
+        private string GetArtifactURLFromJSON(JObject requestObject)
+        {
+            using (_tracer.Step("Reading the zip URL from the request JSON"))
+            {
+                try
+                {
+                    string packageUri = requestObject.Value<string>("packageUri");
+                    if (string.IsNullOrEmpty(packageUri))
+                    {
+                        throw new ArgumentException("Request body does not contain packageUri");
+                    }
+
+                    Uri zipUri = null;
+                    if (!Uri.TryCreate(packageUri, UriKind.Absolute, out zipUri))
+                    {
+                        throw new ArgumentException("Malformed packageUri");
+                    }
+                    return packageUri;
+                }
+                catch (Exception ex)
+                {
+                    _tracer.TraceError(ex, "Error reading the URL from the JSON {0}", requestObject.ToString());
+                    throw;
+                }
+            }
+        }
+
+        private async Task OneDeployFetch(IRepository repository, DeploymentInfoBase deploymentInfo, string targetBranch,
+          ILogger logger, ITracer tracer)
+        {
+            var artifactDeploymentInfo = (ArtifactDeploymentInfo)deploymentInfo;
+
+            // For this kind of deployment, RepositoryUrl is a local path.
+            var sourceZipFile = artifactDeploymentInfo.RepositoryUrl;
+
+            // This is the path where the artifact being deployed is staged, before it is copied to the final target location
+            var artifactDirectoryStagingPath = repository.RepositoryPath;
+
+            var info = FileSystemHelpers.FileInfoFromFileName(sourceZipFile);
+            var sizeInMb = (info.Length / (1024f * 1024f)).ToString("0.00", CultureInfo.InvariantCulture);
+
+            var message = String.Format(
+                CultureInfo.InvariantCulture,
+                "Cleaning up temp folders from previous zip deployments and extracting pushed zip file {0} ({1} MB) to {2}",
+                info.FullName,
+                sizeInMb,
+                artifactDirectoryStagingPath);
+
+            using (tracer.Step(message))
+            {
+                var targetInfo = FileSystemHelpers.DirectoryInfoFromDirectoryName(artifactDirectoryStagingPath);
+                if (targetInfo.Exists)
+                {
+                    // If the staging path already exists, rename it so we can delete it later
+                    var moveTarget = Path.Combine(targetInfo.Parent.FullName, Path.GetRandomFileName());
+                    using (tracer.Step(string.Format("Renaming ({0}) to ({1})", targetInfo.FullName, moveTarget)))
+                    {
+                        targetInfo.MoveTo(moveTarget);
+                    }
+                }
+
+                //
+                // We want to create a directory structure under 'extractTargetDirectory'
+                // such that it exactly matches the directory structure specified
+                // by deploymentInfo.TargetSubDirectoryRelativePath
+                //
+                string stagingSubDirPath = artifactDirectoryStagingPath;
+
+                if (!string.IsNullOrWhiteSpace(artifactDeploymentInfo.TargetSubDirectoryRelativePath))
+                {
+                    stagingSubDirPath = Path.Combine(artifactDirectoryStagingPath, artifactDeploymentInfo.TargetSubDirectoryRelativePath);
+                }
+
+                // Create artifact staging directory hierarchy before later use
+                Directory.CreateDirectory(stagingSubDirPath);
+
+                var artifactFileStagingPath = Path.Combine(stagingSubDirPath, deploymentInfo.TargetFileName);
+
+                var srcInfo = FileSystemHelpers.DirectoryInfoFromDirectoryName(deploymentInfo.RepositoryUrl);
+                using (tracer.Step(string.Format("Moving {0} to {1}", targetInfo.FullName, artifactFileStagingPath)))
+                {
+                    srcInfo.MoveTo(artifactFileStagingPath);
+                }
+
+                // Deletes all files and directories except for artifactFileStagingPath and artifactDirectoryStagingPath
+                DeleteFilesAndDirsExcept(artifactFileStagingPath, artifactDirectoryStagingPath, tracer);
+
+                // The deployment flow expects at least 1 commit in the IRepository commit, refer to CommitRepo() for more info
+                CommitRepo(repository, artifactDeploymentInfo);
+            }
+        }
+
+        private ObjectResult StatusCode400(string message)
+        {
+            return StatusCode(StatusCodes.Status400BadRequest, message);
+        }
     }
 }
\ No newline at end of file
diff --git a/Kudu.Services/Util/RequestHelper.cs b/Kudu.Services/Util/RequestHelper.cs
new file mode 100644
index 00000000..c44dc25b
--- /dev/null
+++ b/Kudu.Services/Util/RequestHelper.cs
@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Http;
+using System;
+using System.Linq;
+
+namespace Kudu.Services.Util
+{
+    public static class RequestHelper
+    {
+        public static bool MediaTypeContains(this HttpRequest request, string lookupValue)
+        {
+            if (string.IsNullOrWhiteSpace(request.ContentType))
+            {
+                return false;
+            }
+
+            var tokens = request.ContentType.Split(';').Where(token =>
+            {
+                return token.Trim().Equals(lookupValue, StringComparison.OrdinalIgnoreCase);
+            });
+
+            return tokens.Any();
+        }
+    }
+}

From a17a854c53ff8c392de4bb9259ba26462b6ff26c Mon Sep 17 00:00:00 2001
From: Hamza Assyad <assyad@outlook.com>
Date: Thu, 13 May 2021 08:25:24 -0700
Subject: [PATCH 235/245] Logic app scaler bugfix and zipdeploy k8se deploy try
 add instead of add (#205)

* Logic app scaler bugfix and zipdeploy k8se deploy try add instead of add

* Update workflowapp test

Co-authored-by: Hamza Assyad <haassyad@microsoft.com>
---
 Kudu.Core/Functions/KedaFunctionTriggerProvider.cs          | 2 +-
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs                      | 2 +-
 Kudu.Services.Web/KubeMiddleware.cs                         | 6 +++---
 .../Core/Function/KedaFunctionTriggersProviderTests.cs      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 9c8a24c2..c94899b6 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -316,7 +316,7 @@ internal static bool TryGetWorkflowKedaTrigger(string hostJsonText, string appNa
                     // NOTE(haassyad): We only have one queue partition in single tenant.
                     ["queueName"] = StringHelper.GetWorkflowQueueNameInternal(queuePrefix, 1),
                     ["queueLength"] = queueLength,
-                    ["connectionStringFromEnv"] = "AzureWebJobsStorage",
+                    ["connectionFromEnv"] = "AzureWebJobsStorage",
                 }
             };
 
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 81434611..15185b47 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -171,7 +171,7 @@ public static void UpdateContextWithAppSettings(HttpContext context)
                 var key = setting.Key.Substring(appSettingsPrefix.Length);
                 appSettings[key] = setting.Value;
             }
-            context.Items.Add("appSettings", appSettings);
+            context.Items.TryAdd("appSettings", appSettings);
         }
 
         private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> functionTriggers, BuildMetadata buildMetadata)
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 3a1fc537..106a6a26 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -64,10 +64,10 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             }
 
             // Cache the App Environment for this request
-            context.Items.Add("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace, appType));
+            context.Items.TryAdd("environment", GetEnvironment(homeDir, appName, null, null, appNamenamespace, appType));
 
             // Cache the appName for this request
-            context.Items.Add("appName", appName);
+            context.Items.TryAdd("appName", appName);
 
             // Add All AppSettings to the context.
             K8SEDeploymentHelper.UpdateContextWithAppSettings(context);
@@ -75,7 +75,7 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             // Cache the appNamenamespace for this request if it's not empty or null
             if (!string.IsNullOrEmpty(appNamenamespace))
             {
-                context.Items.Add("appNamespace", appNamenamespace);
+                context.Items.TryAdd("appNamespace", appNamenamespace);
             }
 
             string[] pathParts = context.Request.Path.ToString().Split("/");
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index b932263a..8a904404 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -82,7 +82,7 @@ public void WorkflowApp( string expectedQueueName, string expectedQueueLength, s
                 var actualQueueLength = Assert.Contains("queueLength", queueTrigger.Metadata);
                 Assert.Equal(actualQueueLength, expectedQueueLength);
 
-                string connectionStringFromEnv = Assert.Contains("connectionStringFromEnv", queueTrigger.Metadata);
+                string connectionStringFromEnv = Assert.Contains("connectionFromEnv", queueTrigger.Metadata);
                 Assert.Equal("AzureWebJobsStorage", connectionStringFromEnv);
             }
             finally

From 96aae86c637493f987b7ceccda5a3d432de59a96 Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ushio <ushio@simplearchitect.com>
Date: Wed, 19 May 2021 16:34:30 -0700
Subject: [PATCH 236/245] Fix: [Functions][Kubernetes]SyncTrigger issue (#208)

---
 .../Functions/KedaFunctionTriggerProvider.cs  | 13 ++++
 Kudu.Core/Functions/SyncTriggerHandler.cs     |  8 +--
 Kudu.Core/Kube/SecretProvider.cs              | 69 ++++++++++++++++++-
 Kudu.Core/Kube/SyncTriggerAuthenticator.cs    | 19 ++++-
 Kudu.Services.Web/Startup.cs                  |  2 +-
 Kudu.Services/Function/FunctionController.cs  |  2 +-
 .../KedaFunctionTriggersProviderTests.cs      | 69 ++++++++++++++++++-
 .../Core/Function/SyncTriggerHandlerTests.cs  |  3 +-
 8 files changed, 172 insertions(+), 13 deletions(-)

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index c94899b6..2cfaba6e 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -112,6 +112,12 @@ public static IEnumerable<ScaleTrigger> GetFunctionTriggers(IEnumerable<JObject>
             return CreateScaleTriggers(triggerBindings, hostJsonText, appSettings);
         }
 
+        public static IEnumerable<ScaleTrigger> GetFunctionTriggersFromSyncTriggerPayload(string synctriggerPayload,
+            string hostJsonText, IDictionary<string, string> appSettings)
+        {
+            return CreateScaleTriggers(ParseSyncTriggerPayload(synctriggerPayload), hostJsonText, appSettings);
+        }
+
         internal static IEnumerable<ScaleTrigger> CreateScaleTriggers(IEnumerable<FunctionTrigger> triggerBindings, string hostJsonText, IDictionary<string, string> appSettings)
         {
 
@@ -138,6 +144,13 @@ bool IsDurable(FunctionTrigger function) =>
             return kedaScaleTriggers;
         }
 
+        internal static IEnumerable<FunctionTrigger> ParseSyncTriggerPayload(string payload)
+        {
+            var payloadJson = JObject.Parse(payload);
+            var triggers = (JArray)payloadJson["triggers"];
+            return triggers.Select(o => o.ToObject<JObject>())
+                .Select(o => new FunctionTrigger(o["functionName"].ToString(), o, o["type"].ToString()));
+        }
 
         internal static IEnumerable<FunctionTrigger> ParseFunctionJson(string functionName, JObject functionJson)
         {
diff --git a/Kudu.Core/Functions/SyncTriggerHandler.cs b/Kudu.Core/Functions/SyncTriggerHandler.cs
index ede8ea1c..f58d7ea0 100644
--- a/Kudu.Core/Functions/SyncTriggerHandler.cs
+++ b/Kudu.Core/Functions/SyncTriggerHandler.cs
@@ -62,10 +62,9 @@ public Tuple<IEnumerable<ScaleTrigger>, string> GetScaleTriggers(string function
                     return new Tuple<IEnumerable<ScaleTrigger>, string>(null, "Function trigger payload is null or empty.");
                 }
 
-                var triggersJson = JArray.Parse(functionTriggersPayload).Select(o => o.ToObject<JObject>());
-
-                // TODO: https://github.com/Azure/azure-functions-host/issues/7288 should change how we parse hostJsonText here.
-                scaleTriggers = KedaFunctionTriggerProvider.GetFunctionTriggers(triggersJson, string.Empty, _appSettings);
+                scaleTriggers =
+                    KedaFunctionTriggerProvider.GetFunctionTriggersFromSyncTriggerPayload(functionTriggersPayload,
+                        string.Empty, _appSettings);
                 if (!scaleTriggers.Any())
                 {
                     return new Tuple<IEnumerable<ScaleTrigger>, string>(null, "No triggers in the payload");
@@ -78,5 +77,6 @@ public Tuple<IEnumerable<ScaleTrigger>, string> GetScaleTriggers(string function
 
             return new Tuple<IEnumerable<ScaleTrigger>, string>(scaleTriggers, null); ;
         }
+
     }
 }
diff --git a/Kudu.Core/Kube/SecretProvider.cs b/Kudu.Core/Kube/SecretProvider.cs
index b1b4ba00..a3435a2c 100644
--- a/Kudu.Core/Kube/SecretProvider.cs
+++ b/Kudu.Core/Kube/SecretProvider.cs
@@ -4,23 +4,26 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.IO;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 
 namespace Kudu.Core.Kube
 {
 
     public class SecretProvider
     {
-        private readonly HttpClient _httpClient = new HttpClient();
         private readonly string _secretKubeApiUrlPlaceHolder = "https://kubernetes.default.svc.cluster.local/api/v1/namespaces/{0}/secrets/{1}";
         private readonly string _rbacServiceActTokenFilePath = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+        private const string _caFilePath = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt";
 
         public async Task<string> GetSecretContent(string secretName, string secretNamespace)
         {
             var responseBodyContent = "";
             var secretKubeApiUrl = string.Format(_secretKubeApiUrlPlaceHolder, secretNamespace, secretName);
             var accessToken = await GetAccessToken();
-            _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + accessToken);
-            var responseMessage = await _httpClient.GetAsync(secretKubeApiUrl);
+            var httpClient = CreateHttpClient();
+            httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer " + accessToken);
+            var responseMessage = await httpClient.GetAsync(secretKubeApiUrl);
 
             if (responseMessage.StatusCode == System.Net.HttpStatusCode.NotFound)
             {
@@ -45,5 +48,65 @@ private async Task<string> GetAccessToken()
 
             return accessToken;
         }
+
+        private static HttpClient CreateHttpClient()
+        {
+            var client = new HttpClient(new HttpClientHandler
+            {
+                ServerCertificateCustomValidationCallback = ServerCertificateValidationCallback
+            });
+
+            return client;
+        }
+
+        private static bool ServerCertificateValidationCallback(
+            HttpRequestMessage request,
+            X509Certificate2 certificate,
+            X509Chain certChain,
+            SslPolicyErrors sslPolicyErrors)
+        {
+            if (sslPolicyErrors == SslPolicyErrors.None)
+            {
+                // certificate is already valid
+                return true;
+            }
+            else if (sslPolicyErrors == SslPolicyErrors.RemoteCertificateNameMismatch ||
+                sslPolicyErrors == SslPolicyErrors.RemoteCertificateNotAvailable)
+            {
+                // api-server cert must exist and have the right subject
+                return false;
+            }
+            else if (sslPolicyErrors == SslPolicyErrors.RemoteCertificateChainErrors)
+            {
+                // only remaining error state is RemoteCertificateChainErrors
+                // check custom CA
+                var privateChain = new X509Chain();
+                privateChain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
+
+                var caCert = new X509Certificate2(_caFilePath);
+                // https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.x509certificates.x509chainpolicy?view=netcore-2.2
+                // Add CA cert to the chain store to include it in the chain check.
+                privateChain.ChainPolicy.ExtraStore.Add(caCert);
+                // Build the chain for `certificate` which should be the self-signed kubernetes api-server cert.
+                privateChain.Build(certificate);
+
+                foreach (X509ChainStatus chainStatus in privateChain.ChainStatus)
+                {
+                    if (chainStatus.Status != X509ChainStatusFlags.NoError &&
+                        // root CA cert is not always trusted.
+                        chainStatus.Status != X509ChainStatusFlags.UntrustedRoot)
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+            else
+            {
+                // Unknown sslPolicyErrors
+                return false;
+            }
+        }
     }
 }
diff --git a/Kudu.Core/Kube/SyncTriggerAuthenticator.cs b/Kudu.Core/Kube/SyncTriggerAuthenticator.cs
index a82e723f..450fbe29 100644
--- a/Kudu.Core/Kube/SyncTriggerAuthenticator.cs
+++ b/Kudu.Core/Kube/SyncTriggerAuthenticator.cs
@@ -51,7 +51,7 @@ public async static Task<bool> AuthenticateCaller(Dictionary<string, IEnumerable
 
             //If the encryption key secret is null or empty in the Kubernetes - return false
             var secretProvider = new SecretProvider();
-            var encryptionKeySecretContent = await secretProvider.GetSecretContent(funcAppName + "-encryptionkey".ToLower(), funcAppNamespace);
+            var encryptionKeySecretContent = await secretProvider.GetSecretContent(funcAppName + "-secrets".ToLower(), funcAppNamespace);
             if (string.IsNullOrEmpty(encryptionKeySecretContent))
             {
                 return false;
@@ -64,10 +64,25 @@ public async static Task<bool> AuthenticateCaller(Dictionary<string, IEnumerable
                 return false;
             }
 
-            var decryptedToken = Decrypt(Encoding.UTF8.GetBytes(functionEncryptionKey), funcAppAuthToken);
+            var decryptedToken = Decrypt(GetKeyBytes(functionEncryptionKey), funcAppAuthToken);
+
             return ValidateToken(decryptedToken);
         }
 
+        public static byte[] GetKeyBytes(string hexOrBase64)
+        {
+            // only support 32 bytes (256 bits) key length
+            if (hexOrBase64.Length == 64)
+            {
+                return Enumerable.Range(0, hexOrBase64.Length)
+                    .Where(x => x % 2 == 0)
+                    .Select(x => Convert.ToByte(hexOrBase64.Substring(x, 2), 16))
+                    .ToArray();
+            }
+
+            return Convert.FromBase64String(hexOrBase64);
+        }
+
         private static bool ValidateToken(string token)
         {
             if (string.IsNullOrEmpty(token))
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index cfd34246..ed33041e 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -681,7 +681,7 @@ public void Configure(IApplicationBuilder app,
 
                 routes.MapHttpRouteDual("sync-function-triggers-put", "operations/settriggers",
                    new { controller = "Function", action = "SyncTrigger" },
-                   new { verb = new HttpMethodRouteConstraint("PUT") });
+                   new { verb = new HttpMethodRouteConstraint("POST") });
 
                 // catch all unregistered url to properly handle not found
                 // routes.MapRoute("error-404", "{*path}", new {controller = "Error404", action = "Handle"});
diff --git a/Kudu.Services/Function/FunctionController.cs b/Kudu.Services/Function/FunctionController.cs
index b101a7f8..36b8616a 100644
--- a/Kudu.Services/Function/FunctionController.cs
+++ b/Kudu.Services/Function/FunctionController.cs
@@ -39,7 +39,7 @@ public FunctionController(ITracer tracer,
         /// Sync triggers to the k8se function apps
         /// </summary>
         /// <returns></returns>
-        [HttpPut]
+        [HttpPost]
         public async Task<IActionResult> SyncTrigger()
         {
             try
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index 8a904404..cd0e784c 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -159,7 +159,7 @@ public void PopulateMetadataDictionary_KedaV2_OnlyKedaSupportedTriggers()
                     ""authLevel"": ""anonymous""
                 }]
             }";
-
+            
             var jsonObj = JObject.Parse(jsonText);
 
             var triggers = KedaFunctionTriggerProvider.GetFunctionTriggers(new[] { jsonObj }, string.Empty, new Dictionary<string, string>());
@@ -167,6 +167,73 @@ public void PopulateMetadataDictionary_KedaV2_OnlyKedaSupportedTriggers()
             Assert.Equal(0, triggers.Count());
         }
 
+        [Fact]
+        public void ConversionFromSyncTriggerPayloadToFunctionTrigger()
+        {
+            var inputPayload = @"
+{
+    ""triggers"": [
+        {
+            ""name"": ""myQueueItem"",
+            ""type"": ""queueTrigger"",
+            ""direction"": ""in"",
+            ""queueName"": ""js-queue-items"",
+            ""connection"": ""AzureWebJobsStorage"",
+            ""functionName"": ""QueueTrigger""
+        }
+    ],
+    ""functions"": [
+        {
+            ""name"": ""QueueTrigger"",
+            ""script_root_path_href"": ""https://tsushiququecon1901.limaarcncsenv19--k53aemd.northcentralusstage.k4apps.io/admin/vfs/home/site/wwwroot/QueueTrigger/"",
+            ""script_href"": ""https://tsushiququecon1901.limaarcncsenv19--k53aemd.northcentralusstage.k4apps.io/admin/vfs/home/site/wwwroot/QueueTrigger/index.js"",
+            ""config_href"": ""https://tsushiququecon1901.limaarcncsenv19--k53aemd.northcentralusstage.k4apps.io/admin/vfs/home/site/wwwroot/QueueTrigger/function.json"",
+            ""test_data_href"": ""https://tsushiququecon1901.limaarcncsenv19--k53aemd.northcentralusstage.k4apps.io/admin/vfs/tmp/FunctionsData/QueueTrigger.dat"",
+            ""href"": ""https://tsushiququecon1901.limaarcncsenv19--k53aemd.northcentralusstage.k4apps.io/admin/functions/QueueTrigger"",
+            ""invoke_url_template"": null,
+            ""language"": ""node"",
+            ""config"": {
+                ""bindings"": [
+                    {
+                        ""name"": ""myQueueItem"",
+                        ""type"": ""queueTrigger"",
+                        ""direction"": ""in"",
+                        ""queueName"": ""js-queue-items"",
+                        ""connection"": ""AzureWebJobsStorage""
+                    }
+                ]
+            },
+            ""files"": null,
+            ""test_data"": """",
+            ""isDisabled"": false,
+            ""isDirect"": false,
+            ""isProxy"": false
+        }
+    ]
+}
+";
+            var expectedJObjectString = @"
+        {
+            ""name"": ""myQueueItem"",
+            ""type"": ""queueTrigger"",
+            ""direction"": ""in"",
+            ""queueName"": ""js-queue-items"",
+            ""connection"": ""AzureWebJobsStorage"",
+            ""functionName"": ""QueueTrigger""
+        }
+";
+
+            var expectedJObject = JObject.Parse(expectedJObjectString);
+            IEnumerable<KedaFunctionTriggerProvider.FunctionTrigger> results = KedaFunctionTriggerProvider.ParseSyncTriggerPayload(inputPayload);
+            var actual = results.FirstOrDefault();
+            Assert.NotNull(actual);
+            Assert.Equal("QueueTrigger", actual.FunctionName);
+            Assert.Equal("myQueueItem", actual.Binding["name"]);
+            Assert.Equal("js-queue-items", actual.Binding["queueName"]);
+            Assert.Equal("in", actual.Binding["direction"]);
+            Assert.Equal("AzureWebJobsStorage", actual.Binding["connection"]);
+        }
+
         [Fact]
         public void UpdateFunctionTriggerBindingExpression_Replace_Expression()
         {
diff --git a/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs b/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
index f33bca89..bd3ef022 100644
--- a/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
+++ b/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
@@ -1,5 +1,6 @@
 using Kudu.Core.Functions;
 using System.Linq;
+using Newtonsoft.Json.Linq;
 using Xunit;
 
 namespace Kudu.Tests.Core.Function
@@ -7,7 +8,7 @@ namespace Kudu.Tests.Core.Function
     public class SyncTriggerHandlerTests
     {
         [Theory]
-        [InlineData("[{\"type\":\"httpTrigger\",\"methods\":[\"get\",\"post\"],\"authLevel\":\"function\",\"name\":\"req\",\"functionName\":\"Function1 - Oct152020 - 1\"},{\"type\":\"queueTrigger\",\"connection\":\"AzureWebJobsStorage\",\"queueName\":\"myqueue - 1\",\"name\":\"myQueueItem\",\"functionName\":\"Function2\"}]")]
+        [InlineData("{\"triggers\":[{\"type\":\"httpTrigger\",\"methods\":[\"get\",\"post\"],\"authLevel\":\"function\",\"name\":\"req\",\"functionName\":\"Function1 - Oct152020 - 1\"},{\"type\":\"queueTrigger\",\"connection\":\"AzureWebJobsStorage\",\"queueName\":\"myqueue - 1\",\"name\":\"myQueueItem\",\"functionName\":\"Function2\"}], \"functions\":[]}")]
         [InlineData("Invalid json")]
         [InlineData(null)]
         public void GetScaleTriggersTest(string functionTriggerPayload)

From 7a3eef6e32d8332d2cd9e8bce9bed24d2d6bb5da Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ushio <ushio@simplearchitect.com>
Date: Fri, 21 May 2021 05:27:48 -0700
Subject: [PATCH 237/245] Include extensions section from host.joson to create
 scale triggers (#209)

---
 .../Functions/KedaFunctionTriggerProvider.cs  | 23 +++++++--
 Kudu.Core/Functions/SyncTriggerHandler.cs     |  2 +-
 .../KedaFunctionTriggersProviderTests.cs      | 48 +++++++++++--------
 .../Core/Function/SyncTriggerHandlerTests.cs  | 29 ++++++++++-
 4 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 2cfaba6e..332f5f0b 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -106,16 +106,16 @@ string ReplaceMatchedBindingExpression(Match match)
         public static IEnumerable<ScaleTrigger> GetFunctionTriggers(IEnumerable<JObject> functionsJson, string hostJsonText, IDictionary<string, string> appSettings)
         {
             var triggerBindings = functionsJson
-            .Select(o => ParseFunctionJson(o["functionName"]?.ToString(), o))
-            .SelectMany(i => i);
+                .Select(o => ParseFunctionJson(o["functionName"]?.ToString(), o))
+                .SelectMany(i => i);
 
             return CreateScaleTriggers(triggerBindings, hostJsonText, appSettings);
         }
 
         public static IEnumerable<ScaleTrigger> GetFunctionTriggersFromSyncTriggerPayload(string synctriggerPayload,
-            string hostJsonText, IDictionary<string, string> appSettings)
+            IDictionary<string, string> appSettings)
         {
-            return CreateScaleTriggers(ParseSyncTriggerPayload(synctriggerPayload), hostJsonText, appSettings);
+            return CreateScaleTriggers(ParseSyncTriggerPayload(synctriggerPayload), ParseHostJsonPayload(synctriggerPayload), appSettings);
         }
 
         internal static IEnumerable<ScaleTrigger> CreateScaleTriggers(IEnumerable<FunctionTrigger> triggerBindings, string hostJsonText, IDictionary<string, string> appSettings)
@@ -144,6 +144,21 @@ bool IsDurable(FunctionTrigger function) =>
             return kedaScaleTriggers;
         }
 
+        internal static string ParseHostJsonPayload(string payload)
+        {
+            var payloadJson = JObject.Parse(payload);
+            var extensions = (JObject) payloadJson["extensions"];
+            if (extensions != null)
+            {
+                var hostJsonPayload = new JObject {{"extensions", extensions}};
+                return hostJsonPayload.ToString();
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
+
         internal static IEnumerable<FunctionTrigger> ParseSyncTriggerPayload(string payload)
         {
             var payloadJson = JObject.Parse(payload);
diff --git a/Kudu.Core/Functions/SyncTriggerHandler.cs b/Kudu.Core/Functions/SyncTriggerHandler.cs
index f58d7ea0..eeb824e4 100644
--- a/Kudu.Core/Functions/SyncTriggerHandler.cs
+++ b/Kudu.Core/Functions/SyncTriggerHandler.cs
@@ -64,7 +64,7 @@ public Tuple<IEnumerable<ScaleTrigger>, string> GetScaleTriggers(string function
 
                 scaleTriggers =
                     KedaFunctionTriggerProvider.GetFunctionTriggersFromSyncTriggerPayload(functionTriggersPayload,
-                        string.Empty, _appSettings);
+                         _appSettings);
                 if (!scaleTriggers.Any())
                 {
                     return new Tuple<IEnumerable<ScaleTrigger>, string>(null, "No triggers in the payload");
diff --git a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
index cd0e784c..a5b2209a 100644
--- a/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
+++ b/Kudu.Tests/Core/Function/KedaFunctionTriggersProviderTests.cs
@@ -12,7 +12,7 @@ namespace Kudu.Tests.Core.Function
     public class KedaFunctionTriggersProviderTests
     {
         [Fact]
-        public void DurableFunctionApp()
+        public void DurableFunctions_DeployAsZip()
         {
             // Generate a zip archive with a host.json and the contents of a Durable Function app
             string zipFilePath = Path.GetTempFileName();
@@ -30,26 +30,7 @@ public void DurableFunctionApp()
             try
             {
                 IEnumerable<ScaleTrigger> result = KedaFunctionTriggerProvider.GetFunctionTriggers(zipFilePath);
-                Assert.Equal(3, result.Count());
-
-                ScaleTrigger mssqlTrigger = Assert.Single(result, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
-                string query = Assert.Contains("query", mssqlTrigger.Metadata);
-                Assert.False(string.IsNullOrEmpty(query));
-
-                string targetValue = Assert.Contains("targetValue", mssqlTrigger.Metadata);
-                Assert.False(string.IsNullOrEmpty(targetValue));
-                Assert.True(double.TryParse(targetValue, out _));
-
-                string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
-                Assert.Equal("SQLDB_Connection", connectionStringName);
-
-                ScaleTrigger queueTrigger = Assert.Single(result, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
-                string functionName = Assert.Contains("functionName", queueTrigger.Metadata);
-                Assert.Equal("f4", functionName);
-
-                ScaleTrigger httpTrigger = Assert.Single(result, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
-                functionName = Assert.Contains("functionName", httpTrigger.Metadata);
-                Assert.Equal("f5", functionName);
+                ValidateDurableTriggers(result);
             }
             finally
             {
@@ -57,6 +38,31 @@ public void DurableFunctionApp()
             }
         }
 
+        internal static void ValidateDurableTriggers(IEnumerable<ScaleTrigger> triggers)
+        {
+            Assert.Equal(3, triggers.Count());
+
+            ScaleTrigger mssqlTrigger = Assert.Single(triggers, trigger => trigger.Type.Equals("mssql", StringComparison.OrdinalIgnoreCase));
+            string query = Assert.Contains("query", mssqlTrigger.Metadata);
+            Assert.NotNull(query);
+            Assert.Contains("dt.GetScaleRecommendation", query);
+
+            string targetValue = Assert.Contains("targetValue", mssqlTrigger.Metadata);
+            Assert.False(string.IsNullOrEmpty(targetValue));
+            Assert.True(double.TryParse(targetValue, out _));
+
+            string connectionStringName = Assert.Contains("connectionStringFromEnv", mssqlTrigger.Metadata);
+            Assert.Equal("SQLDB_Connection", connectionStringName);
+
+            ScaleTrigger queueTrigger = Assert.Single(triggers, trigger => trigger.Type.Equals("azure-queue", StringComparison.OrdinalIgnoreCase));
+            string functionName = Assert.Contains("functionName", queueTrigger.Metadata);
+            Assert.Equal("f4", functionName);
+
+            ScaleTrigger httpTrigger = Assert.Single(triggers, trigger => trigger.Type.Equals("httpTrigger", StringComparison.OrdinalIgnoreCase));
+            functionName = Assert.Contains("functionName", httpTrigger.Metadata);
+            Assert.Equal("f5", functionName);
+        }
+
         [Theory]
         [InlineData("flowc1712a574433c1djobtriggers00", "10", "haassyad-scaling-lima", "workflowApp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.ScaleMonitor.KEDA.TargetQueueLength"":10}}}}")]
         [InlineData("flowdc234f1fbd9ff3fjobtriggers00", "20", "n/a", "workflowApp,functionapp", @"{""version"":""2.0"",""extensionBundle"":{""id"": ""Microsoft.Azure.Functions.ExtensionBundle.Workflows"", ""version"": ""[1.*, 2.0.0)""}, ""extensions"":{""workflow"":{""Settings"":{""Runtime.HostId"":""haassyad-applicationinsights""}}}}")]
diff --git a/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs b/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
index bd3ef022..cee1783c 100644
--- a/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
+++ b/Kudu.Tests/Core/Function/SyncTriggerHandlerTests.cs
@@ -1,5 +1,8 @@
-using Kudu.Core.Functions;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using Kudu.Core.Functions;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
 
@@ -24,5 +27,29 @@ public void GetScaleTriggersTest(string functionTriggerPayload)
                 Assert.True(scaleTriggers != null && scaleTriggers.Item1 != null && scaleTriggers.Item1.ToList<ScaleTrigger>().Count > 0);
             }
         }
+
+        [Fact]
+        public void DurableFunctions_SyncTriggers()
+        {
+            // NOTE: Same basic inputs as KedaFunctionTriggersProviderTests.DurableFunctionsApp
+            JObject syncTriggersPayloadJson = new JObject(
+                new JProperty("extensions", JObject.Parse(@"{""durableTask"":{""hubName"":""DFTest"",""storageProvider"":{""type"":""mssql"",""connectionStringName"":""SQLDB_Connection""}}}")),
+                new JProperty("triggers", new JArray(
+                    JObject.Parse(@"{""functionName"":""f1"",""type"":""orchestrationTrigger"",""name"":""context""}"),
+                    JObject.Parse(@"{""functionName"":""f2"",""type"":""entityTrigger"",""name"":""ctx""}"),
+                    JObject.Parse(@"{""functionName"":""f3"",""type"":""activityTrigger"",""name"":""input""}"),
+                    JObject.Parse(@"{""functionName"":""f4"",""type"":""queueTrigger"",""connection"":""AzureWebjobsStorage"",""queueName"":""queue"",""name"":""queueItem""}"),
+                    JObject.Parse(@"{""functionName"":""f5"",""type"":""httpTrigger"",""methods"":[""post""],""authLevel"":""anonymous"",""name"":""req""}"))));
+
+            string serializedPayload = syncTriggersPayloadJson.ToString(Formatting.None);
+
+            var syncTriggerHandler = new SyncTriggerHandler(null, null, null);
+            (IEnumerable<ScaleTrigger> triggers, string error) = syncTriggerHandler.GetScaleTriggers(serializedPayload);
+            Assert.Null(error);
+            Assert.NotNull(triggers);
+
+            // We expect the same output as the other Durable Functions test
+            KedaFunctionTriggersProviderTests.ValidateDurableTriggers(triggers);
+        }
     }
 }

From bda83a99340b7ce5dadd7b8b239c53ce79679ec7 Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ushio <ushio@simplearchitect.com>
Date: Fri, 21 May 2021 09:19:34 -0700
Subject: [PATCH 238/245] Fix Kafka Trigger Metadata (#210)

---
 Kudu.Core/Functions/KedaFunctionTriggerProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
index 332f5f0b..b4b098a2 100644
--- a/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
+++ b/Kudu.Core/Functions/KedaFunctionTriggerProvider.cs
@@ -380,7 +380,7 @@ internal static IDictionary<string, string> PopulateMetadataDictionary(JToken t,
                     break;
 
                 case TriggerTypes.Kafka:
-                    metadata["bootstrapServers"] = metadata["brokerList"];
+                    metadata["bootstrapServersFromEnv"] = metadata["brokerList"];
                     metadata.Remove("brokerList");
                     metadata.Remove("protocol");
                     metadata.Remove("authenticationMode");

From d92a89d4497c0682b873b8db6c87bb1b44bc8085 Mon Sep 17 00:00:00 2001
From: Sanchit Mehta <sanchit.mehta602@gmail.com>
Date: Mon, 24 May 2021 06:55:52 -0700
Subject: [PATCH 239/245] SSH Fixes +  Remove References to Unused Routes 
 (#211)

* Added Instance support

* Added WebSSH capability

* Minor fix

* Minor fix

* ../Kudu.Services/DebugExtension/InstanceController.cs

* Move proxy to startup

* Moved to middleware for proxying

* Block Bash Console URL

* Remove non implemented routes+fix settings injection
---
 .../Settings/IDeploymentSettingsManager.cs    |   2 +-
 .../Infrastructure/ExecutableExtensions.cs    |   2 +-
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs        |  38 ++
 Kudu.Core/K8SE/PodInstance.cs                 |  19 +
 Kudu.Core/Kudu.Core.csproj                    |   3 +-
 .../Settings/DeploymentSettingsManager.cs     |  11 +-
 Kudu.Services.Web/InstanceMiddleware.cs       | 187 +++++++++
 Kudu.Services.Web/KubeMiddleware.cs           |  46 ++-
 Kudu.Services.Web/Kudu.Services.Web.csproj    |   1 +
 .../DebugConsole/DebugConsoleController.cs    |  27 --
 .../Pages/DebugConsole/LinuxConsole.cshtml    |  23 --
 .../Pages/DebugConsole/WindowsConsole.cshtml  | 192 ---------
 Kudu.Services.Web/Pages/Env.cshtml            |   2 +-
 Kudu.Services.Web/Pages/Index.cshtml          |  12 -
 .../DebugConsole2/DebugConsole2Controller.cs  |  27 --
 .../NewUI/DebugConsole2/LinuxConsole2.cshtml  |  23 --
 .../DebugConsole2/WindowsConsole2.cshtml      | 192 ---------
 Kudu.Services.Web/Pages/NewUI/Env.cshtml      |   4 +-
 Kudu.Services.Web/Pages/NewUI/Index.cshtml    |  34 --
 Kudu.Services.Web/Pages/NewUI/_Layout.cshtml  |  15 -
 .../Pages/NewUI/kududebug.cshtml              |   3 -
 Kudu.Services.Web/Pages/NewUI/webssh.cshtml   |   2 +-
 Kudu.Services.Web/Pages/_Layout.cshtml        |   4 +-
 Kudu.Services.Web/Startup.cs                  |  82 +---
 Kudu.Services.Web/Tracing/TraceMiddleware.cs  |   2 +-
 .../DebugExtension/InstanceController.cs      | 387 ++++++++++++++++++
 Kudu.Services/Settings/SettingsController.cs  |   9 +-
 27 files changed, 714 insertions(+), 635 deletions(-)
 create mode 100644 Kudu.Core/K8SE/PodInstance.cs
 create mode 100644 Kudu.Services.Web/InstanceMiddleware.cs
 delete mode 100644 Kudu.Services.Web/Pages/DebugConsole/DebugConsoleController.cs
 delete mode 100644 Kudu.Services.Web/Pages/DebugConsole/LinuxConsole.cshtml
 delete mode 100644 Kudu.Services.Web/Pages/DebugConsole/WindowsConsole.cshtml
 delete mode 100644 Kudu.Services.Web/Pages/NewUI/DebugConsole2/DebugConsole2Controller.cs
 delete mode 100644 Kudu.Services.Web/Pages/NewUI/DebugConsole2/LinuxConsole2.cshtml
 delete mode 100644 Kudu.Services.Web/Pages/NewUI/DebugConsole2/WindowsConsole2.cshtml
 delete mode 100644 Kudu.Services.Web/Pages/NewUI/kududebug.cshtml
 create mode 100644 Kudu.Services/DebugExtension/InstanceController.cs

diff --git a/Kudu.Contracts/Settings/IDeploymentSettingsManager.cs b/Kudu.Contracts/Settings/IDeploymentSettingsManager.cs
index 43a8689f..2dd5eebb 100644
--- a/Kudu.Contracts/Settings/IDeploymentSettingsManager.cs
+++ b/Kudu.Contracts/Settings/IDeploymentSettingsManager.cs
@@ -5,7 +5,7 @@ namespace Kudu.Contracts.Settings
     public interface IDeploymentSettingsManager
     {
         void SetValue(string key, string value);
-        IEnumerable<KeyValuePair<string, string>> GetValues();
+        IEnumerable<KeyValuePair<string, string>> GetValues(IDictionary<string, string> injectedSettings);
 
         /// <summary>
         /// Gets a value for the key from an unified list of environment, per site settings and defaults.
diff --git a/Kudu.Core/Infrastructure/ExecutableExtensions.cs b/Kudu.Core/Infrastructure/ExecutableExtensions.cs
index dc85ed34..a8290058 100644
--- a/Kudu.Core/Infrastructure/ExecutableExtensions.cs
+++ b/Kudu.Core/Infrastructure/ExecutableExtensions.cs
@@ -27,7 +27,7 @@ public static void PrependToPath(this Executable exe, IEnumerable<string> paths)
 
         public static void AddDeploymentSettingsAsEnvironmentVariables(this Executable exe, IDeploymentSettingsManager deploymentSettingsManager)
         {
-            IEnumerable<KeyValuePair<string, string>> deploymentSettings = deploymentSettingsManager.GetValues();
+            IEnumerable<KeyValuePair<string, string>> deploymentSettings = deploymentSettingsManager.GetValues(new Dictionary<string, string>());
             foreach (var keyValuePair in deploymentSettings)
             {
                 exe.EnvironmentVariables[keyValuePair.Key] = keyValuePair.Value;
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index 15185b47..a57ffbd9 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.Caching;
 using System.Text;
 using Microsoft.Extensions.Primitives;
 
@@ -18,6 +19,12 @@ public static class K8SEDeploymentHelper
 
         public static ITracer _tracer;
         public static ILogger _logger;
+        private static ObjectCache cache = MemoryCache.Default;
+        private static CacheItemPolicy instanceCachePolicy = new CacheItemPolicy
+        {
+            AbsoluteExpiration = DateTimeOffset.Now.AddSeconds(30.0),
+
+        };
 
         // K8SE_BUILD_SERVICE not null or empty
         public static bool IsK8SEEnvironment()
@@ -40,6 +47,30 @@ public static string GetLinuxFxVersion(string appName)
             return RunBuildCtlCommand(cmd.ToString(), "Retrieving framework info...");
         }
 
+        /// <summary>
+        /// Calls into buildctl to get a list of instaces for an app
+        /// </summary>
+        /// <param name="appName"></param>
+        /// <returns></returns>
+        public static List<PodInstance> GetInstances(string appName)
+        {
+            var cachedInstances = cache.Get(appName);
+            if (cachedInstances == null)
+            {
+                var cmd = new StringBuilder();
+                BuildCtlArgumentsHelper.AddBuildCtlCommand(cmd, "get");
+                BuildCtlArgumentsHelper.AddAppNameArgument(cmd, appName);
+                BuildCtlArgumentsHelper.AddAppPropertyArgument(cmd, "podInstances");
+                var instList = RunBuildCtlCommand(cmd.ToString(), "Getting app instances...");
+                byte[] data = Convert.FromBase64String(instList);
+                string json = Encoding.UTF8.GetString(data);
+                cachedInstances = JsonConvert.DeserializeObject<List<PodInstance>>(json);
+                cache.Add(appName, cachedInstances, instanceCachePolicy);
+            }
+
+            return (List<PodInstance>)cachedInstances;
+        }
+
         /// <summary>
         /// Calls into buildctl to update a BuildVersion of
         /// the K8SE App
@@ -171,6 +202,13 @@ public static void UpdateContextWithAppSettings(HttpContext context)
                 var key = setting.Key.Substring(appSettingsPrefix.Length);
                 appSettings[key] = setting.Value;
             }
+
+            // Filter out App Settings headers
+            foreach (var key in appSettingsWithHeader.ToList())
+            {
+                context.Request.Headers.Remove(key);
+            }
+
             context.Items.TryAdd("appSettings", appSettings);
         }
 
diff --git a/Kudu.Core/K8SE/PodInstance.cs b/Kudu.Core/K8SE/PodInstance.cs
new file mode 100644
index 00000000..690f5c82
--- /dev/null
+++ b/Kudu.Core/K8SE/PodInstance.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+
+namespace Kudu.Core.K8SE
+{
+    public class PodInstance
+    {
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
+
+        [JsonProperty(PropertyName = "ipAddr")]
+        public string IpAddress { get; set; }
+
+        [JsonProperty(PropertyName = "nodeName")]
+        public string NodeName { get; set; }
+
+        [JsonProperty(PropertyName = "startTime")]
+        public string StartTime { get; set; }
+    }
+}
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index ddbe0481..74c04b4e 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -35,10 +35,11 @@
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="0.1.78-alpha" />
     <PackageReference Include="ncrontab" Version="3.3.0" />
     <PackageReference Include="NuGet.Protocol" Version="4.8.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="System.IO.Abstractions" Version="2.1.0.192" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
+    <PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Kudu.Core/Settings/DeploymentSettingsManager.cs b/Kudu.Core/Settings/DeploymentSettingsManager.cs
index cdb1a125..9889051c 100644
--- a/Kudu.Core/Settings/DeploymentSettingsManager.cs
+++ b/Kudu.Core/Settings/DeploymentSettingsManager.cs
@@ -50,7 +50,7 @@ public static IDeploymentSettingsManager BuildPerDeploymentSettingsManager(strin
             return new DeploymentSettingsManager(perSiteSettings, combinedSettingsProviders.ToArray());
         }
 
-        public IEnumerable<KeyValuePair<string, string>> GetValues()
+        public IEnumerable<KeyValuePair<string, string>> GetValues(IDictionary<string, string> injectedSettings)
         {
             Dictionary<string, string> values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
@@ -63,6 +63,15 @@ public IEnumerable<KeyValuePair<string, string>> GetValues()
                 }
             }
 
+            if(injectedSettings != null)
+            {
+                foreach (var setting in injectedSettings)
+                {
+                    values[setting.Key] = setting.Value;
+                }
+            }
+
+
             return values;
         }
 
diff --git a/Kudu.Services.Web/InstanceMiddleware.cs b/Kudu.Services.Web/InstanceMiddleware.cs
new file mode 100644
index 00000000..82bd6569
--- /dev/null
+++ b/Kudu.Services.Web/InstanceMiddleware.cs
@@ -0,0 +1,187 @@
+using Kudu.Core.K8SE;
+using Microsoft.AspNetCore.Http;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Kudu.Services.Web
+{
+    public class InstanceMiddleware
+    {
+        private readonly RequestDelegate _next;
+        private static readonly HttpClient _httpClient = new HttpClient(new HttpClientHandler()
+        {
+            AllowAutoRedirect = false,
+            MaxConnectionsPerServer = int.MaxValue,
+            UseCookies = false,
+        });
+
+        private const string CDN_HEADER_NAME = "Cache-Control";
+        private static readonly string[] NotForwardedHttpHeaders = new[] { "Connection", "Host" };
+
+        static Regex rx = new Regex(@"^(\/instances\/)([A-Z0-9a-z\-]*)(\/)(.*)$",
+          RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        public InstanceMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public async Task Invoke(HttpContext context)
+        {
+            Console.WriteLine($"Instance Middleware");
+
+            if (context.Request.Path.Value.StartsWith("/instances/", StringComparison.OrdinalIgnoreCase)
+                && context.Request.Path.Value.IndexOf("/webssh") < 0)
+            {
+                Console.WriteLine($"Getting target URI");
+                var targetUri = await RewriteInstanceUri(context);
+                Console.WriteLine($"Got target URI");
+
+                if (targetUri != null)
+                {
+                    var requestMessage = GenerateProxifiedRequest(context, targetUri);
+                    await SendAsync(context, requestMessage);
+
+                    return;
+                }
+            }
+
+            await _next(context);
+        }
+
+        private async Task SendAsync(HttpContext context, HttpRequestMessage requestMessage)
+        {
+            using (var responseMessage = await _httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, context.RequestAborted))
+            {
+                context.Response.StatusCode = (int)responseMessage.StatusCode;
+
+                foreach (var header in responseMessage.Headers)
+                {
+                    context.Response.Headers[header.Key] = header.Value.ToArray();
+                }
+
+                foreach (var header in responseMessage.Content.Headers)
+                {
+                    context.Response.Headers[header.Key] = header.Value.ToArray();
+                }
+
+                context.Response.Headers.Remove("transfer-encoding");
+
+                if (!context.Response.Headers.ContainsKey(CDN_HEADER_NAME))
+                {
+                    context.Response.Headers.Add(CDN_HEADER_NAME, "no-cache, no-store");
+                }
+
+                await responseMessage.Content.CopyToAsync(context.Response.Body);
+            }
+        }
+
+        private static HttpRequestMessage GenerateProxifiedRequest(HttpContext context, Uri targetUri)
+        {
+            var requestMessage = new HttpRequestMessage();
+            CopyRequestContentAndHeaders(context, requestMessage);
+
+            requestMessage.RequestUri = targetUri;
+            requestMessage.Headers.Host = targetUri.Host;
+            requestMessage.Method = GetMethod(context.Request.Method);
+
+
+            return requestMessage;
+        }
+
+        private static void CopyRequestContentAndHeaders(HttpContext context, HttpRequestMessage requestMessage)
+        {
+            var requestMethod = context.Request.Method;
+            if (!HttpMethods.IsGet(requestMethod) &&
+                !HttpMethods.IsHead(requestMethod) &&
+                !HttpMethods.IsDelete(requestMethod) &&
+                !HttpMethods.IsTrace(requestMethod))
+            {
+                var streamContent = new StreamContent(context.Request.Body);
+                requestMessage.Content = streamContent;
+            }
+
+            foreach (var header in context.Request.Headers)
+            {
+                if (!NotForwardedHttpHeaders.Contains(header.Key))
+                {
+                    if (header.Key != "User-Agent")
+                    {
+                        if (!requestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray()) && requestMessage.Content != null)
+                        {
+                            requestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray());
+                        }
+                    }
+                    else
+                    {
+                        string userAgent = header.Value.Count > 0 ? (header.Value[0] + " " + context.TraceIdentifier) : string.Empty;
+
+                        if (!requestMessage.Headers.TryAddWithoutValidation(header.Key, userAgent) && requestMessage.Content != null)
+                        {
+                            requestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, userAgent);
+                        }
+                    }
+
+                }
+            }
+        }
+
+        private static HttpMethod GetMethod(string method)
+        {
+            if (HttpMethods.IsDelete(method)) return HttpMethod.Delete;
+            if (HttpMethods.IsGet(method)) return HttpMethod.Get;
+            if (HttpMethods.IsHead(method)) return HttpMethod.Head;
+            if (HttpMethods.IsOptions(method)) return HttpMethod.Options;
+            if (HttpMethods.IsPost(method)) return HttpMethod.Post;
+            if (HttpMethods.IsPut(method)) return HttpMethod.Put;
+            if (HttpMethods.IsTrace(method)) return HttpMethod.Trace;
+            return new HttpMethod(method);
+        }
+
+        public Task<Uri> RewriteInstanceUri(HttpContext context)
+        {
+            Match m = rx.Match(context.Request.Path);
+            if (m.Success && m.Groups.Count >= 4)
+            {
+                // Find matches.
+
+                var instanceId = m.Groups[2].Value;
+                var remainingPath = m.Groups[4].Value;
+                Console.WriteLine(instanceId);
+                Console.WriteLine(remainingPath);
+                List<PodInstance> instances = K8SEDeploymentHelper.GetInstances(K8SEDeploymentHelper.GetAppName(context));
+                PodInstance instance = instances.Where(i => i.Name.Equals(instanceId, System.StringComparison.OrdinalIgnoreCase)).FirstOrDefault(); ;
+
+                // handle null, 0 instances
+                if(string.IsNullOrEmpty(remainingPath))
+                {
+                    return null;
+                }
+                
+                if(instances == null || instances.Count == 0)
+                {
+                    throw new ArgumentOutOfRangeException($"Instance '{instanceId}' not found");
+                }
+
+                if (instances.Count > 0 && instanceId.Equals("any", System.StringComparison.OrdinalIgnoreCase))
+                {
+                    instance = instances[0];
+                }
+
+                var newUri = $"http://{instance.IpAddress}:1601/{remainingPath}{context.Request.QueryString}";
+                Console.WriteLine($"URI: http://{instance.IpAddress}:1601/{remainingPath}{context.Request.QueryString}");
+                var targetUri = new Uri(newUri);
+                return Task.FromResult(targetUri);
+            }
+            else
+            {
+                Console.WriteLine($"Different count {m.Groups.Count} , Success? {m.Success}");
+            }
+
+            return Task.FromResult((Uri)null);
+        }
+    }
+}
diff --git a/Kudu.Services.Web/KubeMiddleware.cs b/Kudu.Services.Web/KubeMiddleware.cs
index 106a6a26..a6d65c39 100644
--- a/Kudu.Services.Web/KubeMiddleware.cs
+++ b/Kudu.Services.Web/KubeMiddleware.cs
@@ -11,10 +11,7 @@
 using Kudu.Core.Helpers;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using Kudu.Core.K8SE;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Primitives;
 
 namespace Kudu.Services.Web
 {
@@ -72,6 +69,49 @@ public async Task Invoke(HttpContext context, IEnvironment environment, IServerC
             // Add All AppSettings to the context.
             K8SEDeploymentHelper.UpdateContextWithAppSettings(context);
 
+            PodInstance instance = null;
+
+            if (context.Request.Path.Value.StartsWith("/instances/", StringComparison.OrdinalIgnoreCase)
+                && context.Request.Path.Value.IndexOf("/webssh") > 0)
+            {
+                List<PodInstance> instances = K8SEDeploymentHelper.GetInstances(appName);
+
+                int idx = context.Request.Path.Value.IndexOf("/webssh");
+                string instanceId = context.Request.Path.Value.Substring(0, idx).Replace("/instances/", "");
+                Console.WriteLine($"\n\n\n\n inst id {instanceId}");
+                if (instances.Count > 0)
+                {
+                    instance = instances.Where(i => i.Name.Equals(instanceId, System.StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+                }
+
+                if (instances.Count > 0 && instanceId.Equals("any", System.StringComparison.OrdinalIgnoreCase))
+                {
+                    instance = instances[0];
+                }
+
+                if (instance == null)
+                {
+                    context.Response.StatusCode = StatusCodes.Status404NotFound;
+                    await context.Response.WriteAsync("Instance not found");
+                    return;
+                }
+
+                int idx2 = context.Request.Path.Value.IndexOf("/webssh");
+                context.Request.Path = context.Request.Path.Value.Substring(idx2);
+                if (!context.Request.Headers.ContainsKey("WEBSITE_SSH_USER"))
+                {
+                    context.Request.Headers.Add("WEBSITE_SSH_USER", "root");
+                }
+                if (!context.Request.Headers.ContainsKey("WEBSITE_SSH_PASSWORD"))
+                {
+                    context.Request.Headers.Add("WEBSITE_SSH_PASSWORD", "Docker!");
+                }
+                if (!context.Request.Headers.ContainsKey("WEBSITE_SSH_IP"))
+                {
+                    context.Request.Headers.Add("WEBSITE_SSH_IP", instance.IpAddress);
+                }
+            }
+
             // Cache the appNamenamespace for this request if it's not empty or null
             if (!string.IsNullOrEmpty(appNamenamespace))
             {
diff --git a/Kudu.Services.Web/Kudu.Services.Web.csproj b/Kudu.Services.Web/Kudu.Services.Web.csproj
index 9fa0b730..b5077be2 100644
--- a/Kudu.Services.Web/Kudu.Services.Web.csproj
+++ b/Kudu.Services.Web/Kudu.Services.Web.csproj
@@ -33,6 +33,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Runtime" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
+    <PackageReference Include="System.Runtime.Caching" Version="0.1.3" />
   </ItemGroup>
   <Target Name="_IncludePrePublishGeneratedContent" BeforeTargets="GetCopyToPublishDirectoryItems" Condition=" '$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true' " />
   <ItemGroup>
diff --git a/Kudu.Services.Web/Pages/DebugConsole/DebugConsoleController.cs b/Kudu.Services.Web/Pages/DebugConsole/DebugConsoleController.cs
deleted file mode 100644
index b4e85b5b..00000000
--- a/Kudu.Services.Web/Pages/DebugConsole/DebugConsoleController.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Kudu.Core.Helpers;
-
-namespace Kudu.Services.Web.Pages.DebugConsole
-{
-    // CORE NOTE This is a new shim to get the right console to load; couldn't do it the way it was originally done
-    // due to the differences in the way the new razor pages work
-    public class DebugConsoleController : Controller
-    {
-        public ActionResult Index()
-        {
-            var os = OSDetector.IsOnWindows() ? "Windows" : "Linux";
-            return View($"~/Pages/DebugConsole/{os}Console.cshtml");
-        }
-
-        public ActionResult LinuxConsole()
-        {
-            return View($"~/Pages/DebugConsole/LinuxConsole.cshtml");
-        }
-
-        public ActionResult WindowsConsole()
-        {
-            return View($"~/Pages/DebugConsole/WindowsConsole.cshtml");
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/Kudu.Services.Web/Pages/DebugConsole/LinuxConsole.cshtml b/Kudu.Services.Web/Pages/DebugConsole/LinuxConsole.cshtml
deleted file mode 100644
index 80a340e0..00000000
--- a/Kudu.Services.Web/Pages/DebugConsole/LinuxConsole.cshtml
+++ /dev/null
@@ -1,23 +0,0 @@
-@{
-    ViewData["Title"] = "Diagnostic Console";
-    Layout = "~/Pages/_Layout.cshtml";
-}
-
-<head>
-    <link href="~/Content/Styles/FileBrowser.css" rel="stylesheet" />
-    <link href="//functionscdn.azureedge.net/public/kudu/font-awesome/4.0.2/css/font-awesome.css" rel="stylesheet" />
-    <script src="//ajax.aspnetcdn.com/ajax/knockout/knockout-2.2.1.js" type="text/javascript"></script>
-</head>
-
-<div id="main" class="container">
-    <div class="view main-view">
-        <div id="KuduExecConsole" class="left-aligned" style="height: 70%"></div>
-    </div>
-</div>
-
-<script src="~/Content/Scripts/KuduExec.js"></script>
-<script>
-    LoadConsole();
-</script>
-<script src="~/Content/Scripts/jquery-console/jquery.console.js"></script>
-<script src="~/Content/Scripts/HelperScript.js"></script>
\ No newline at end of file
diff --git a/Kudu.Services.Web/Pages/DebugConsole/WindowsConsole.cshtml b/Kudu.Services.Web/Pages/DebugConsole/WindowsConsole.cshtml
deleted file mode 100644
index 098e1c74..00000000
--- a/Kudu.Services.Web/Pages/DebugConsole/WindowsConsole.cshtml
+++ /dev/null
@@ -1,192 +0,0 @@
-@{
-    ViewData["Title"] = "Diagnostic Console";
-    Layout = "~/Pages/_Layout.cshtml";
-}
-
-<head>
-    <link href="~/Content/Styles/FileBrowser.css" rel="stylesheet" />
-    <link href="//functionscdn.azureedge.net/public/kudu/font-awesome/4.0.2/css/font-awesome.css" rel="stylesheet" />
-    <script src="//ajax.aspnetcdn.com/ajax/knockout/knockout-2.2.1.js" type="text/javascript"></script>
-    <script src="https://functionscdn.azureedge.net/public/kudu/libs/ace/1.2.9/ace.js" type="text/javascript"></script>
-    <script src="https://functionscdn.azureedge.net/public/kudu/libs/ace/1.2.9/ext-modelist.js" type="text/javascript"></script>
-</head>
-
-<div id="main" class="container">
-    <!-- Render toast notifications here -->
-    <div id="toast"></div>
-    <div class="view main-view" data-bind="visible: !fileEdit()">
-        <div id="fileList">
-            <div id="operations" class="h3" style="position: relative">
-                <span data-bind="visible: selected().parent" style="display: none">
-                    <a href="#" data-bind="click: selected().selectParent, attr: { title: selected().parent && ('Up to ' + selected().parent.name()) }">...</a> /
-                </span>
-                <span data-bind="text: selected().name()">/</span>
-                <span class="dropdown">
-                    <button style="padding: 2px 6px" class="btn dropdown-toggle" type="button" id="new-item-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                        <i class="glyphicon glyphicon-plus "></i>
-                    </button>
-                    <ul class="dropdown-menu" aria-labelledby="new-item-dropdown">
-                        <li><a href="#" id="createFolder">New folder</a></li>
-                        <li><a href="#" id="createFile">New file</a></li>
-                    </ul>
-                </span>
-                <span style="color: #ddd; margin-left: 5px; margin-right: 5px">|</span>
-                <span data-bind="text: selected().children().length">0</span> items
-
-                <span style="color: #ddd; margin-left: 5px; margin-right: 0">|</span>
-                <a class="btn" href="#" data-bind="click: function() { root.selectNode() }">
-                    <i class="h4 glyphicon glyphicon-home" title="Home"></i>
-                </a>
-                <a class="btn" href="#" data-bind="click: function() { selectSpecialDir('LocalSiteRoot') }, visible: showSiteRoot">
-                    <i class="h4 glyphicon glyphicon-globe" title="Site Root"></i>
-                </a>
-                <a class="btn" href="#" data-bind="click: function() { selectSpecialDir('SystemDrive') }">
-                    <i class="h4 glyphicon glyphicon-hdd" title="System Drive"></i>
-                </a>
-                <div class="spinner">
-                    <button class="btn btn-info box-border" style="display: none" data-bind="visible: isTransferInProgress(), click: showCopyProgressModal">
-                        <span id="copy-percentage" title="percentage copy"></span>
-                    </button>
-                    <img data-bind="visible: koprocessing()" class="paKman" src="/Content/Images/paKman.gif" title="Please wait" />
-                    <i data-bind="visible: errorText, attr: {title: errorText}" class="alert-warning glyphicon glyphicon-exclamation-sign" style="display: none"></i>
-                </div>
-            </div>
-            <div class="table-container">
-                <div id="upload-unzip" class="show-on-hover">
-                    <div class="zip-upload-text">Drag here to upload and unzip <br /><span class="glyphicon glyphicon-folder-open"></span></div>
-                </div>
-                <table class="table table-striped table-bordered table-hover table-condensed table-responsive">
-                    <thead>
-                        <tr>
-                            <th scope="col" style="width: 10%"></th>
-                            <th scope="col" style="width: 55%">Name</th>
-                            <th scope="col" style="width: 20%">Modified</th>
-                            <th scope="col" style="width: 15%">Size</th>
-                        </tr>
-                    </thead>
-                    <tbody data-bind="foreach: selected().children(), visible: true" style="display: none">
-                        <tr>
-                            <td class="actions">
-                                <div data-bind="visible: !editing()">
-                                    <a data-bind="attr: { href: url() }" target="_blank">
-                                        <i class="glyphicon glyphicon-download-alt" title="Download"></i>
-                                    </a>
-                                    <!--
-                                        Ace hooks an event handler on glyphicon-pencil.
-                                        See ~/content/scripts/ace-init.js
-                                    -->
-                                    <span data-bind="if: !isDirectory()">
-                                        <a data-bind="click: editItem" href="#">
-                                            <i class="glyphicon glyphicon-pencil" title="Edit"></i>
-                                        </a>
-                                    </span>
-                                    <a href="#" data-bind="click: deleteItem">
-                                        <i class="glyphicon glyphicon-minus-sign" title="Delete"></i>
-                                    </a>
-                                </div>
-                            </td>
-                            <td class="name">
-                                <span data-bind="if: isDirectory()">
-                                    <i class="glyphicon glyphicon-folder-open" title="Folder"></i>&nbsp;
-                                    <a href="#" data-bind="click: selectNode, text: name, visible: !editing()" target="_blank"></a>
-                                    <input type="text" data-bind="value: name, valueUpdate: 'afterKeyDown', visible: editing()" />
-                                </span>
-                                <span data-bind="if: !isDirectory()">
-                                    <i class="glyphicon glyphicon-file" title="File"></i>
-                                    <span data-bind="text: name"></span>
-                                    <input type="text" data-bind="value: name, valueUpdate: 'afterKeyDown', visible: editing()" />
-                                </span>
-                            </td>
-                            <td data-bind="text: modifiedTime" class="date"></td>
-                            <td data-bind="text: size" class="size"></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div id="resizeHandle">
-            <h4>
-                <span class="down" title="Slide down"><i class="glyphicon glyphicon-chevron-down"></i></span>
-                <span class="up" title="Slide up"><i class="glyphicon glyphicon-chevron-up"></i></span>
-            </h4>
-        </div>
-        <a id="SwitchConsoleLink" href="javascript:SwitchConsole();" class="right">Use old console</a>
-        <div id="KuduExecConsoleV2" class="left-aligned"></div>
-        <!-- File upload progress modal -->
-        <div class="modal fade" id="files-transfered-modal" tabindex="-1" role="dialog" aria-labelledby="errorTitle" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header" style="border: 0"></div>
-                    <div class="modal-body" data-bind="if: copyProgStats" style='overflow-y: scroll; height:400px; '>
-                        <table class="table table-striped table-nonfluid">
-                            <tbody data-bind="foreach: { data: Object.keys(copyProgStats()), as: 'item' }">
-                                <tr>
-                                    <td>
-                                        <span style="word-wrap: break-word;" data-bind="text: item"></span>
-                                        <div class="progress">
-                                            <div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar"
-                                                 aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:70%"
-                                                 data-bind="style: { width: $root.getCopyPercentage($parent.copyProgStats()[item]) + '%' },
-                                                 css: { 'progress-bar-info' : $root.getCopyPercentage($parent.copyProgStats()[item]) < 100,
-                                                    'progress-bar-success': $root.getCopyPercentage($parent.copyProgStats()[item]) >= 100  },
-                                                    text: $root.getCopyPercentageDisplay($parent.copyProgStats()[item])">0%
-                                            </div>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                    <div class="modal-footer" style="border: 0">
-                        <button type="button" class="btn btn-default" data-bind="click: clearCopyProgressCache">Clear</button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="view edit-view" data-bind="visible: fileEdit() " style="display: none">
-        <div class="form-group">
-            <form role="form">
-                <p>
-                    <button class="btn btn-primary btn-default"
-                            style="margin-right: 10px" data-bind="click: function () { return fileEdit().saveItemAndClose(); }">
-                        Save
-                    </button>
-                    <button class="btn" style="margin-right: 10px" data-bind="click: cancelEdit">Cancel</button>
-                    <span id="statusbar" class="statusbar"></span>
-                    <span id="acehelp" class="btn btn-info right" onclick="showAceHelpModal();">Help</span>
-                </p>
-                <!-- Ace Help Modal -->
-                <div class="modal fade" id="ace-help-modal" tabindex="-1" role="dialog" aria-hidden="true">
-                    <div class="modal-dialog">
-                        <div class="modal-content">
-                            <div class="modal-header" style="border: 0">
-                                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                                <h4 class="modal-title">Keyboard Shortcuts</h4>
-                            </div>
-                            <div class="modal-body">
-                                Loading...
-                            </div>
-                            <div class="modal-footer" style="border: 0">
-                                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <!-- Ace editor starts -->
-                <div id="editor" data-bind="ace: editText"></div>
-                <!-- Ace editor ends -->
-            </form>
-        </div>
-    </div>
-</div>
-<script src="~/content/scripts/jquery.signalR-2.1.1.min.js"></script>
-<script src="~/content/scripts/kuduexec.js"></script>
-<script src="~/content/scripts/kuduexecV2.js"></script>
-<script src="~/api/filesystemhub/hubs"></script>
-<script src="~/content/scripts/vkbeautify.0.99.00.beta.js"></script>
-<script src="~/content/scripts/filebrowser.js"></script>
-<script src="~/content/scripts/jquery-console/jquery.console.js"></script>
-<script src="~/content/scripts/ace-init.js"></script>
-<script src="~/content/scripts/HelperScript.js"></script>
diff --git a/Kudu.Services.Web/Pages/Env.cshtml b/Kudu.Services.Web/Pages/Env.cshtml
index 7e23bb7e..e81fe20c 100644
--- a/Kudu.Services.Web/Pages/Env.cshtml
+++ b/Kudu.Services.Web/Pages/Env.cshtml
@@ -63,7 +63,7 @@
             </li>
         }
         
-        @foreach (KeyValuePair<string, string> kv in _settingsManager.GetValues())
+        @foreach (KeyValuePair<string, string> kv in _settingsManager.GetValues((IDictionary<string, string>)HttpContext.Items["appSettings"]))
         {
             
                 if (kv.Value != null)
diff --git a/Kudu.Services.Web/Pages/Index.cshtml b/Kudu.Services.Web/Pages/Index.cshtml
index 1cf11845..74a0ef52 100644
--- a/Kudu.Services.Web/Pages/Index.cshtml
+++ b/Kudu.Services.Web/Pages/Index.cshtml
@@ -106,18 +106,6 @@
         <li>
             <a href="api/vfs">Files</a>
         </li>
-        <li>
-            <a href="api/logs/docker">Current Docker logs</a> (<a href="api/logs/docker/zip">Download as zip</a>)
-        </li>
-    </ul>
-    <h3>Browse Directory</h3>
-    <ul>
-        <li>
-            <a href="deploymentlogs">Deployment Logs</a>
-        </li>
-        <li>
-            <a href="wwwroot">Site wwwroot</a>
-        </li>
     </ul>
     <h3>More information about Kudu can be found on the <a href="https://github.com/projectkudu/kudu/wiki">wiki</a>.</h3>
 </div>
diff --git a/Kudu.Services.Web/Pages/NewUI/DebugConsole2/DebugConsole2Controller.cs b/Kudu.Services.Web/Pages/NewUI/DebugConsole2/DebugConsole2Controller.cs
deleted file mode 100644
index d801917b..00000000
--- a/Kudu.Services.Web/Pages/NewUI/DebugConsole2/DebugConsole2Controller.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Kudu.Core.Helpers;
-
-namespace Kudu.Services.Web.Pages.NewUI.DebugConsole2
-{
-    // CORE NOTE This is a new shim to get the right console to load; couldn't do it the way it was originally done
-    // due to the differences in the way the new razor pages work
-    public class DebugConsole2Controller : Controller
-    {
-        public ActionResult Index()
-        {
-            var os = OSDetector.IsOnWindows() ? "Windows" : "Linux";
-            return View($"~/Pages/NewUI/DebugConsole2/{os}Console2.cshtml");
-        }
-
-        public ActionResult LinuxConsole()
-        {
-            return View($"~/Pages/NewUI/DebugConsole/LinuxConsole2.cshtml");
-        }
-
-        public ActionResult WindowsConsole()
-        {
-            return View($"~/Pages/NewUI/DebugConsole2/WindowsConsole2.cshtml");
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/Kudu.Services.Web/Pages/NewUI/DebugConsole2/LinuxConsole2.cshtml b/Kudu.Services.Web/Pages/NewUI/DebugConsole2/LinuxConsole2.cshtml
deleted file mode 100644
index 9bf943b7..00000000
--- a/Kudu.Services.Web/Pages/NewUI/DebugConsole2/LinuxConsole2.cshtml
+++ /dev/null
@@ -1,23 +0,0 @@
-@{
-    ViewData["Title"] = "Diagnostic Console";
-    Layout = "~/Pages/NewUI/_Layout.cshtml";
-}
-
-<head>
-    <link href="~/Content/Styles/FileBrowser.css" rel="stylesheet" />
-    <link href="//functionscdn.azureedge.net/public/kudu/font-awesome/4.0.2/css/font-awesome.css" rel="stylesheet" />
-    <script src="//ajax.aspnetcdn.com/ajax/knockout/knockout-2.2.1.js" type="text/javascript"></script>
-</head>
-
-<div id="main" class="container">
-    <div class="view main-view">
-        <div id="KuduExecConsole" class="left-aligned" style="height: 70%"></div>
-    </div>
-</div>
-
-<script src="~/Content/Scripts/KuduExec.js"></script>
-<script>
-    LoadConsole();
-</script>
-<script src="~/Content/Scripts/jquery-console/jquery.console.js"></script>
-<script src="~/Content/Scripts/HelperScript.js"></script>
\ No newline at end of file
diff --git a/Kudu.Services.Web/Pages/NewUI/DebugConsole2/WindowsConsole2.cshtml b/Kudu.Services.Web/Pages/NewUI/DebugConsole2/WindowsConsole2.cshtml
deleted file mode 100644
index d4707d3c..00000000
--- a/Kudu.Services.Web/Pages/NewUI/DebugConsole2/WindowsConsole2.cshtml
+++ /dev/null
@@ -1,192 +0,0 @@
-@{
-    ViewData["Title"] = "Diagnostic Console";
-    Layout = "~/Pages/NewUI/_Layout.cshtml";
-}
-
-<head>
-    <link href="~/Content/Styles/FileBrowser.css" rel="stylesheet" />
-    <link href="//functionscdn.azureedge.net/public/kudu/font-awesome/4.0.2/css/font-awesome.css" rel="stylesheet" />
-    <script src="//ajax.aspnetcdn.com/ajax/knockout/knockout-2.2.1.js" type="text/javascript"></script>
-    <script src="https://functionscdn.azureedge.net/public/kudu/libs/ace/1.2.9/ace.js" type="text/javascript"></script>
-    <script src="https://functionscdn.azureedge.net/public/kudu/libs/ace/1.2.9/ext-modelist.js" type="text/javascript"></script>
-</head>
-
-<div id="main" class="container">
-    <!-- Render toast notifications here -->
-    <div id="toast"></div>
-    <div class="view main-view" data-bind="visible: !fileEdit()">
-        <div id="fileList">
-            <div id="operations" class="h3" style="position: relative">
-                <span data-bind="visible: selected().parent" style="display: none">
-                    <a href="#" data-bind="click: selected().selectParent, attr: { title: selected().parent && ('Up to ' + selected().parent.name()) }">...</a> /
-                </span>
-                <span data-bind="text: selected().name()">/</span>
-                <span class="dropdown">
-                    <button style="padding: 2px 6px" class="btn dropdown-toggle" type="button" id="new-item-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                        <i class="glyphicon glyphicon-plus "></i>
-                    </button>
-                    <ul class="dropdown-menu" aria-labelledby="new-item-dropdown">
-                        <li><a href="#" id="createFolder">New folder</a></li>
-                        <li><a href="#" id="createFile">New file</a></li>
-                    </ul>
-                </span>
-                <span style="color: #ddd; margin-left: 5px; margin-right: 5px">|</span>
-                <span data-bind="text: selected().children().length">0</span> items
-
-                <span style="color: #ddd; margin-left: 5px; margin-right: 0">|</span>
-                <a class="btn" href="#" data-bind="click: function() { root.selectNode() }">
-                    <i class="h4 glyphicon glyphicon-home" title="Home"></i>
-                </a>
-                <a class="btn" href="#" data-bind="click: function() { selectSpecialDir('LocalSiteRoot') }, visible: showSiteRoot">
-                    <i class="h4 glyphicon glyphicon-globe" title="Site Root"></i>
-                </a>
-                <a class="btn" href="#" data-bind="click: function() { selectSpecialDir('SystemDrive') }">
-                    <i class="h4 glyphicon glyphicon-hdd" title="System Drive"></i>
-                </a>
-                <div class="spinner">
-                    <button class="btn btn-info box-border" style="display: none" data-bind="visible: isTransferInProgress(), click: showCopyProgressModal">
-                        <span id="copy-percentage" title="percentage copy"></span>
-                    </button>
-                    <img data-bind="visible: koprocessing()" class="paKman" src="/Content/Images/paKman.gif" title="Please wait" />
-                    <i data-bind="visible: errorText, attr: {title: errorText}" class="alert-warning glyphicon glyphicon-exclamation-sign" style="display: none"></i>
-                </div>
-            </div>
-            <div class="table-container">
-                <div id="upload-unzip" class="show-on-hover">
-                    <div class="zip-upload-text">Drag here to upload and unzip <br /><span class="glyphicon glyphicon-folder-open"></span></div>
-                </div>
-                <table class="table table-striped table-bordered table-hover table-condensed table-responsive">
-                    <thead>
-                        <tr>
-                            <th scope="col" style="width: 10%"></th>
-                            <th scope="col" style="width: 55%">Name</th>
-                            <th scope="col" style="width: 20%">Modified</th>
-                            <th scope="col" style="width: 15%">Size</th>
-                        </tr>
-                    </thead>
-                    <tbody data-bind="foreach: selected().children(), visible: true" style="display: none">
-                        <tr>
-                            <td class="actions">
-                                <div data-bind="visible: !editing()">
-                                    <a data-bind="attr: { href: url() }" target="_blank">
-                                        <i class="glyphicon glyphicon-download-alt" title="Download"></i>
-                                    </a>
-                                    <!--
-                                        Ace hooks an event handler on glyphicon-pencil.
-                                        See ~/content/scripts/ace-init.js
-                                    -->
-                                    <span data-bind="if: !isDirectory()">
-                                        <a data-bind="click: editItem" href="#">
-                                            <i class="glyphicon glyphicon-pencil" title="Edit"></i>
-                                        </a>
-                                    </span>
-                                    <a href="#" data-bind="click: deleteItem">
-                                        <i class="glyphicon glyphicon-minus-sign" title="Delete"></i>
-                                    </a>
-                                </div>
-                            </td>
-                            <td class="name">
-                                <span data-bind="if: isDirectory()">
-                                    <i class="glyphicon glyphicon-folder-open" title="Folder"></i>&nbsp;
-                                    <a href="#" data-bind="click: selectNode, text: name, visible: !editing()" target="_blank"></a>
-                                    <input type="text" data-bind="value: name, valueUpdate: 'afterKeyDown', visible: editing()" />
-                                </span>
-                                <span data-bind="if: !isDirectory()">
-                                    <i class="glyphicon glyphicon-file" title="File"></i>
-                                    <span data-bind="text: name"></span>
-                                    <input type="text" data-bind="value: name, valueUpdate: 'afterKeyDown', visible: editing()" />
-                                </span>
-                            </td>
-                            <td data-bind="text: modifiedTime" class="date"></td>
-                            <td data-bind="text: size" class="size"></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div id="resizeHandle">
-            <h4>
-                <span class="down" title="Slide down"><i class="glyphicon glyphicon-chevron-down"></i></span>
-                <span class="up" title="Slide up"><i class="glyphicon glyphicon-chevron-up"></i></span>
-            </h4>
-        </div>
-        <a id="SwitchConsoleLink" href="javascript:SwitchConsole();" class="right">Use old console</a>
-        <div id="KuduExecConsoleV2" class="left-aligned"></div>
-        <!-- File upload progress modal -->
-        <div class="modal fade" id="files-transfered-modal" tabindex="-1" role="dialog" aria-labelledby="errorTitle" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header" style="border: 0"></div>
-                    <div class="modal-body" data-bind="if: copyProgStats" style='overflow-y: scroll; height:400px; '>
-                        <table class="table table-striped table-nonfluid">
-                            <tbody data-bind="foreach: { data: Object.keys(copyProgStats()), as: 'item' }">
-                                <tr>
-                                    <td>
-                                        <span style="word-wrap: break-word;" data-bind="text: item"></span>
-                                        <div class="progress">
-                                            <div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar"
-                                                 aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:70%"
-                                                 data-bind="style: { width: $root.getCopyPercentage($parent.copyProgStats()[item]) + '%' },
-                                                 css: { 'progress-bar-info' : $root.getCopyPercentage($parent.copyProgStats()[item]) < 100,
-                                                    'progress-bar-success': $root.getCopyPercentage($parent.copyProgStats()[item]) >= 100  },
-                                                    text: $root.getCopyPercentageDisplay($parent.copyProgStats()[item])">0%
-                                            </div>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                    <div class="modal-footer" style="border: 0">
-                        <button type="button" class="btn btn-default" data-bind="click: clearCopyProgressCache">Clear</button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="view edit-view" data-bind="visible: fileEdit() " style="display: none">
-        <div class="form-group">
-            <form role="form">
-                <p>
-                    <button class="btn btn-primary btn-default"
-                            style="margin-right: 10px" data-bind="click: function () { return fileEdit().saveItemAndClose(); }">
-                        Save
-                    </button>
-                    <button class="btn" style="margin-right: 10px" data-bind="click: cancelEdit">Cancel</button>
-                    <span id="statusbar" class="statusbar"></span>
-                    <span id="acehelp" class="btn btn-info right" onclick="showAceHelpModal();">Help</span>
-                </p>
-                <!-- Ace Help Modal -->
-                <div class="modal fade" id="ace-help-modal" tabindex="-1" role="dialog" aria-hidden="true">
-                    <div class="modal-dialog">
-                        <div class="modal-content">
-                            <div class="modal-header" style="border: 0">
-                                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                                <h4 class="modal-title">Keyboard Shortcuts</h4>
-                            </div>
-                            <div class="modal-body">
-                                Loading...
-                            </div>
-                            <div class="modal-footer" style="border: 0">
-                                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <!-- Ace editor starts -->
-                <div id="editor" data-bind="ace: editText"></div>
-                <!-- Ace editor ends -->
-            </form>
-        </div>
-    </div>
-</div>
-<script src="~/content/scripts/jquery.signalR-2.1.1.min.js"></script>
-<script src="~/content/scripts/kuduexec.js"></script>
-<script src="~/content/scripts/kuduexecV2.js"></script>
-<script src="~/api/filesystemhub/hubs"></script>
-<script src="~/content/scripts/vkbeautify.0.99.00.beta.js"></script>
-<script src="~/content/scripts/filebrowser.js"></script>
-<script src="~/content/scripts/jquery-console/jquery.console.js"></script>
-<script src="~/content/scripts/ace-init.js"></script>
-<script src="~/content/scripts/HelperScript.js"></script>
diff --git a/Kudu.Services.Web/Pages/NewUI/Env.cshtml b/Kudu.Services.Web/Pages/NewUI/Env.cshtml
index 7e23bb7e..35287327 100644
--- a/Kudu.Services.Web/Pages/NewUI/Env.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Env.cshtml
@@ -62,8 +62,8 @@
                 @name = @System.Configuration.ConfigurationManager.AppSettings[name]
             </li>
         }
-        
-        @foreach (KeyValuePair<string, string> kv in _settingsManager.GetValues())
+
+        @foreach (KeyValuePair<string, string> kv in _settingsManager.GetValues((IDictionary<string, string>)HttpContext.Items["appSettings"]))
         {
             
                 if (kv.Value != null)
diff --git a/Kudu.Services.Web/Pages/NewUI/Index.cshtml b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
index e9f0937a..f347ff79 100644
--- a/Kudu.Services.Web/Pages/NewUI/Index.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/Index.cshtml
@@ -143,24 +143,12 @@
                             <li>
                                 <a href="/newui/jsonviewer?view_url=/api/settings">App Settings</a>
                             </li>
-                            <li>
-                                <a href="/newui/wwwroot">Browse WWWRoot</a>
-                            </li>
                             <li>
                                 <a href="/newui/jsonviewer?view_url=/diagnostics/runtime">System Configuration</a>
                             </li>
                             <li>
                                 <a href="/newui/jsonviewer?view_url=/api/vfs">Virtual File System API</a>
                             </li>
-                            <li>
-                                <a href="/newui/logs">Browse Logs Dir</a>
-                            </li>
-                            <li>
-                                <a href="/newui/jsonviewer?view_url=/api/scan/start">Scan file system</a>
-                            </li>
-                            <li>
-                                <a href="/newui/jsonviewer?view_url=/api/scan/results">Get All Scans</a>
-                            </li>
                         </ul>
                     </small>
                 </div>
@@ -185,28 +173,6 @@
                 </div>
             </div>
         </div>
-        <div class="card offset-md-1 col-xs-6 shadow-sm border-0" style="background-color: rgb(244, 245, 247); width: 20.8333%">
-            <div class="container">
-                <div class="row" style="margin: 10px; border-bottom: 1px solid #e3e3e3">
-                    <h6 class="font-weight-normal"><i class="fab fa-docker"></i>&nbsp;Web App Container</h6>
-                </div>
-                <div class="row" style="margin: 10px">
-                    <small>
-                        <ul class="list-unstyled" style="text-align: left; line-height: 25px">
-                            <li>
-                                <a href="/newui/jsonviewer?view_url=/api/logs/docker">Current Container Logs</a>
-                            </li>
-                            <li>
-                                <a href="/api/logs/docker/zip">Download All Container Logs</a>
-                            </li>
-                            <li hidden>
-                                <a href="#">Process Dump</a>
-                            </li>
-                        </ul>
-                    </small>
-                </div>
-            </div>
-        </div>
         <div class="col-md-1" style="width: 8.3333%"></div>
     </div>
 </div>
diff --git a/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml b/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
index 09a07e64..732a8ed9 100644
--- a/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/_Layout.cshtml
@@ -86,16 +86,6 @@
               <i class="feather fas fa-terminal clr-icon-navbar"></i> WebSSH
             </a>
           </li>
-          <li class="nav-item">
-            <a class="nav-link" href="/newui/kududebug">
-              <i class="feather fas fa-laptop-code clr-icon-navbar"></i> Bash
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="/api/logstream" title="If no log events are being generated the page may not load.">
-              <i class="feather fas fa-stream clr-icon-navbar"></i> Log stream
-            </a>
-          </li>
           <li class="nav-item" hidden>
             <a class="nav-link" href="#">
               <i class="feather fas fa-user-md clr-icon-navbar"></i> App Lens
@@ -106,11 +96,6 @@
               <i class="feather fas fa-globe-americas clr-icon-navbar"></i> Kudu REST APIs
             </a>
           </li>
-          <li class="nav-item">
-            <a class="nav-link" href="https://code.visualstudio.com/docs/azure/remote-debugging">
-              <i class="feather fas fa-bolt clr-icon-navbar"></i> VSCode Remote Debugging
-            </a>
-          </li>
         </ul>
         <!--
         <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
diff --git a/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml b/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml
deleted file mode 100644
index 4ef3c9bf..00000000
--- a/Kudu.Services.Web/Pages/NewUI/kududebug.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@page
-<button onclick="location.href='/webssh/host?debugconsolereq=true'" style="position: fixed; top:70px; right:30px;" type="button" class="btn btn-outline-light border-0"><i class="fas fa-expand-arrows-alt"></i></button>
-<iframe src="/webssh/host?debugconsolereq=true" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:calc(100vh - 85px);marginx-top:40px;"></iframe>
diff --git a/Kudu.Services.Web/Pages/NewUI/webssh.cshtml b/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
index 220ac651..5f9fa9b4 100644
--- a/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
+++ b/Kudu.Services.Web/Pages/NewUI/webssh.cshtml
@@ -1,3 +1,3 @@
 @page
-<button onclick="location.href='/webssh/host'" style="position: fixed;top:70px; right:30px;" type="button" class="btn btn-outline-light border-0"><i class="fas fa-expand-arrows-alt"></i></button>
+<button onclick="location.href='/instances/any/webssh/host'" style="position: fixed;top:70px; right:30px;" type="button" class="btn btn-outline-light border-0"><i class="fas fa-expand-arrows-alt"></i></button>
 <iframe src="/webssh/host" frameborder="0" scrolling="no" seamless="seamless" style="display:block; width:100%; height:calc(100vh - 85px);marginx-top:40px;"></iframe>
\ No newline at end of file
diff --git a/Kudu.Services.Web/Pages/_Layout.cshtml b/Kudu.Services.Web/Pages/_Layout.cshtml
index 25416f55..d4cff81e 100644
--- a/Kudu.Services.Web/Pages/_Layout.cshtml
+++ b/Kudu.Services.Web/Pages/_Layout.cshtml
@@ -67,9 +67,7 @@
             <div class="collapse navbar-collapse">
                 <ul class="nav navbar-nav">
                     <li><a class="navbar-brand" style="padding-top: 17px" href="~/Env">Environment</a></li>
-                    <li><a class="navbar-brand" style="padding-top: 17px" href="~/webssh/host">SSH</a></li>
-                    <li><a class="navbar-brand" style="padding-top: 17px" href="~/DebugConsole">Bash</a></li>
-                    <li><a class="navbar-brand" style="padding-top: 17px" href="~/api/logstream" title="If no log events are being generated the page may not load.">Log stream</a></li>
+                    <li><a class="navbar-brand" style="padding-top: 17px" href="~/instances/any/webssh/host">SSH</a></li>
                 </ul>
                 @{
                     var email = httpContextAccessor.HttpContext.Request.Headers["X-MS-CLIENT-PRINCIPAL-NAME"].ToString();
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index ed33041e..816fe09f 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -45,6 +45,8 @@
 using Microsoft.AspNetCore.Authentication;
 using Kudu.Services.Web.Services;
 using Kudu.Core.K8SE;
+using System.Net.Http;
+using Microsoft.AspNetCore.Routing;
 
 namespace Kudu.Services.Web
 {
@@ -338,6 +340,8 @@ public void Configure(IApplicationBuilder app,
             {
                 KeepAliveInterval = TimeSpan.FromSeconds(15)
             };
+            app.UseMiddleware<InstanceMiddleware>();
+
             app.UseWebSockets(webSocketOptions);
 
             var containsRelativePath = new Func<HttpContext, bool>(i =>
@@ -358,6 +362,8 @@ public void Configure(IApplicationBuilder app,
                 app.UseKubeMiddleware();
             }
 
+            ProxyRequestIfRelativeUrlMatches(@"/webssh", "http", "127.0.0.1", KuduWebUtil.GetWebSSHProxyPort(), app);
+
             app.MapWhen(containsRelativeProvisionPath, application => application.Run(async context =>
             {
                 FileSystemHelpers.EnsureDirectory("/home/apps/"+context.Request.Path.Value.Replace("/api/provision/", ""));
@@ -376,17 +382,15 @@ public void Configure(IApplicationBuilder app,
 
             app.UseResponseCompression();
 
-            var containsRelativePath3 = new Func<HttpContext, bool>(i =>
-                i.Request.Path.Value.StartsWith("/AppServiceTunnel/Tunnel.ashx", StringComparison.OrdinalIgnoreCase));
+            //var containsRelativePath3 = new Func<HttpContext, bool>(i =>
+            //    i.Request.Path.Value.StartsWith("/AppServiceTunnel/Tunnel.ashx", StringComparison.OrdinalIgnoreCase));
 
-            app.MapWhen(containsRelativePath3, builder => builder.UseMiddleware<DebugExtensionMiddleware>());
+            //app.MapWhen(containsRelativePath3, builder => builder.UseMiddleware<DebugExtensionMiddleware>());
 
             applicationLifetime.ApplicationStopping.Register(OnShutdown);
 
             app.UseStaticFiles();
 
-            ProxyRequestIfRelativeUrlMatches(@"/webssh", "http", "127.0.0.1", KuduWebUtil.GetWebSSHProxyPort() , app);
-
             var configuration = app.ApplicationServices.GetRequiredService<IServerConfiguration>();
 
             // CORE TODO any equivalent for this? Needed?
@@ -409,10 +413,6 @@ public void Configure(IApplicationBuilder app,
                 appBranch => appBranch.RunUploadPackHandler());
             //app.MapWhen("/{repository}/git-upload-pack", appBranch => appBranch.RunUploadPackHandler());
 
-            // Push url
-            // Fetch hook
-            app.Map("/deploy", appBranch => appBranch.RunFetchHandler());
-
             // Log streaming
             app.Map("/api/logstream", appBranch => appBranch.RunLogStreamHandler());
 
@@ -420,12 +420,6 @@ public void Configure(IApplicationBuilder app,
             // Clone url
             // Custom GIT repositories, which can be served from any directory that has a git repo
 
-            // Sets up the file server to web app's wwwroot
-            KuduWebUtil.SetupFileServer(app, _webAppRuntimeEnvironment.WebRootPath, "/wwwroot");
-            
-            // Sets up the file server to LogFiles
-            KuduWebUtil.SetupFileServer(app, Path.Combine(_webAppRuntimeEnvironment.LogFilesPath,"kudu","deployment"), "/deploymentlogs");
-
             app.UseSwagger();
 
             app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "Kudu API Docs"); });
@@ -491,18 +485,6 @@ public void Configure(IApplicationBuilder app,
                 routes.MapHttpRouteDual("onedeploy", "publish",
                     new { controller = "PushDeployment", action = "OneDeploy" });
 
-                // Support Linux Consumption Function app on Service Fabric Mesh
-                routes.MapRoute("admin-instance-info", "admin/instance/info",
-                    new {controller = "LinuxConsumptionInstanceAdmin", action = "Info"},
-                    new {verb = new HttpMethodRouteConstraint("GET")});
-                routes.MapRoute("admin-instance-assign", "admin/instance/assign",
-                    new {controller = "LinuxConsumptionInstanceAdmin", action = "AssignAsync" },
-                    new {verb = new HttpMethodRouteConstraint("POST")});
-
-                // Live Command Line
-                routes.MapHttpRouteDual("execute-command", "command",
-                    new {controller = "Command", action = "ExecuteCommand"},
-                    new {verb = new HttpMethodRouteConstraint("POST")});
 
                 // Deployments
                 routes.MapHttpRouteDual("all-deployments", "deployments",
@@ -544,42 +526,6 @@ public void Configure(IApplicationBuilder app,
                     new {controller = "Deployment", action = "IsDeploying"},
                     new {verb = new HttpMethodRouteConstraint("GET")});
 
-                // Initiate Scan 
-                routes.MapRoute("start-clamscan", "api/scan/start/",
-                    new { controller = "Scan", action = "ExecuteScan" },
-                    new { verb = new HttpMethodRouteConstraint("GET") });
-
-                //Get scan status
-                routes.MapRoute("get-scan-status", "/api/scan/{scanId}/track",
-                    new { controller = "Scan", action = "GetScanStatus" },
-                    new { verb = new HttpMethodRouteConstraint("GET") });
-
-                //Get unique scan result
-                routes.MapRoute("get-scan-result", "/api/scan/{scanId}/result",
-                    new { controller = "Scan", action = "GetScanLog" },
-                    new { verb = new HttpMethodRouteConstraint("GET") });
-
-                //Get all scan result
-                routes.MapRoute("get-all-scan-result", "/api/scan/results",
-                    new { controller = "Scan", action = "GetScanResults" },
-                    new { verb = new HttpMethodRouteConstraint("GET") });
-
-                //Stop scan
-                routes.MapRoute("stop-scan", "/api/scan/stop",
-                    new { controller = "Scan", action = "StopScan" },
-                    new { verb = new HttpMethodRouteConstraint("DELETE") });
-
-                // SSHKey
-                routes.MapHttpRouteDual("get-sshkey", "api/sshkey",
-                    new {controller = "SSHKey", action = "GetPublicKey"},
-                    new {verb = new HttpMethodRouteConstraint("GET")});
-                routes.MapHttpRouteDual("put-sshkey", "api/sshkey",
-                    new {controller = "SSHKey", action = "SetPrivateKey"},
-                    new {verb = new HttpMethodRouteConstraint("PUT")});
-                routes.MapHttpRouteDual("delete-sshkey", "api/sshkey",
-                    new {controller = "SSHKey", action = "DeleteKeyPair"},
-                    new {verb = new HttpMethodRouteConstraint("DELETE")});
-
                 // Environment
                 routes.MapHttpRouteDual("get-env", "environment", new {controller = "Environment", action = "Get"},
                     new {verb = new HttpMethodRouteConstraint("GET")});
@@ -611,12 +557,6 @@ public void Configure(IApplicationBuilder app,
                     new {controller = "Diagnostics", action = "Delete"},
                     new {verb = new HttpMethodRouteConstraint("DELETE")});
 
-                // Logs
-                foreach (var url in new[] {"/logstream", "/logstream/{*path}"})
-                {
-                    app.Map(url, appBranch => appBranch.RunLogStreamHandler());
-                }
-
                 routes.MapHttpRouteDual("recent-logs", "api/logs/recent",
                     new {controller = "Diagnostics", action = "GetRecentLogs"},
                     new {verb = new HttpMethodRouteConstraint("GET")});
@@ -717,12 +657,12 @@ private static void ProxyRequestIfRelativeUrlMatches(
             IApplicationBuilder app)
         {
             var containsRelativePath = new Func<HttpContext, bool>(i =>
-                i.Request.Path.Value.StartsWith(relativeUrl, StringComparison.OrdinalIgnoreCase));
+                i.Request.Path.Value.StartsWith("/webssh", StringComparison.OrdinalIgnoreCase));
             app.MapWhen(containsRelativePath, builder => builder.RunProxy(new ProxyOptions
             {
                 Scheme = scheme,
                 Host = host,
-                Port = port
+                Port = port,
             }));
         }
 
diff --git a/Kudu.Services.Web/Tracing/TraceMiddleware.cs b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
index 10836499..7cacdcd9 100644
--- a/Kudu.Services.Web/Tracing/TraceMiddleware.cs
+++ b/Kudu.Services.Web/Tracing/TraceMiddleware.cs
@@ -57,7 +57,7 @@ public async Task Invoke(HttpContext context)
             catch (Exception ex)
             {
                 await Task.Run(() => LogException(context, ex));
-                ExceptionDispatchInfo.Capture(ex.InnerException ?? ex).Throw();
+                //ExceptionDispatchInfo.Capture(ex.InnerException ?? ex).Throw();
             }
             // At the end of the pipe
             EndRequest(context);
diff --git a/Kudu.Services/DebugExtension/InstanceController.cs b/Kudu.Services/DebugExtension/InstanceController.cs
new file mode 100644
index 00000000..967c4b41
--- /dev/null
+++ b/Kudu.Services/DebugExtension/InstanceController.cs
@@ -0,0 +1,387 @@
+using Kudu.Core.K8SE;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.Extensions.Caching.Memory;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace Kudu.Services.DebugExtension
+{
+    [Route("/instances")]
+    public class InstanceController : Controller
+    {
+        private static readonly HttpClient _httpClient = new HttpClient();
+        //private static readonly MemoryCache _cache = new MemoryCache();
+
+        [HttpGet]
+        public async Task<List<PodInstance>> GetInstances()
+        {
+            if(K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                return K8SEDeploymentHelper.GetInstances(K8SEDeploymentHelper.GetAppName(HttpContext));
+            }
+
+            return null;
+        }
+
+        [HttpGet]
+        [Route("{instanceId}")]
+        public async Task<PodInstance> GetInstance(string instanceId)
+        {
+            if (K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                var instances = K8SEDeploymentHelper.GetInstances(K8SEDeploymentHelper.GetAppName(HttpContext));
+                PodInstance instance = null;
+                if (instances.Count > 0)
+                {
+                    instance = instances.Where(i => i.Name.Equals(instanceId, System.StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+                }
+
+                if (instances.Count > 0 && instanceId.Equals("any", System.StringComparison.OrdinalIgnoreCase))
+                {
+                    instance = instances[0];
+                }
+
+                return instance;
+            }
+
+            return null;
+        }
+
+        /*
+        [Route("{instanceId}/gcdump")]
+
+        public async Task<HttpResponseMessage> GetGcDump(string instanceId)
+        {
+            var instances = K8SEDeploymentHelper.GetInstances(K8SEDeploymentHelper.GetAppName(HttpContext));
+            PodInstance instance = null;
+            if (instances.Count > 0)
+            {
+                instance = instances.Where(i => i.Name.Equals(instanceId, System.StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            }
+
+            if (instances.Count > 0 && instanceId.Equals("any", System.StringComparison.OrdinalIgnoreCase))
+            {
+                instance = instances[0];
+            }
+
+            if (instance == null)
+            {
+                return NotFound("Invalid instance");
+            }
+
+            var httpClientHandler = new HttpClientHandler
+            {
+                AllowAutoRedirect = false
+            };
+            using (var httpClient = new HttpClient())
+            {
+                string absoluteUrl = _baseUri.ToString() + "/" + url + Request.RequestUri.Query;
+                var proxyRequest = new HttpRequestMessage(Request.Method, absoluteUrl);
+                foreach (var header in Request.Headers)
+                {
+                    proxyRequest.Headers.Add(header.Key, header.Value);
+                }
+
+                return await httpClient.SendAsync(proxyRequest, HttpCompletionOption.ResponseContentRead);
+            }
+        }
+
+        
+        [Route("{instanceId}/remotedebug")]
+        public IActionResult RemoteDebug(string instanceId)
+        {
+
+            var instances = K8SEDeploymentHelper.GetInstances(K8SEDeploymentHelper.GetAppName(HttpContext));
+            PodInstance instance = null;
+            if (instances.Count > 0)
+            {
+                instance = instances.Where(i => i.Name.Equals(instanceId, System.StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            }
+
+            if (instances.Count > 0 && instanceId.Equals("any", System.StringComparison.OrdinalIgnoreCase))
+            {
+                instance = instances[0];
+            }
+
+            if (instance == null)
+            {
+                return "Invalid instance";
+            }
+
+            using (Socket testSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+            {
+                testSocket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, true);
+                testSocket.Connect(new IPEndPoint(IPAddress.Parse(ipAddress), debugPort));
+                context.Response.StatusCode = 200;
+                _logger.LogInformation("GetStats success " + ipAddress + ":" + debugPort);
+                if (IsV2StatusAPIRequest)
+                {
+                    var response = new LSiteStatusResponse(lSiteStatus, debugPort, true);
+                    var json = JsonConvert.SerializeObject(response);
+                    await context.Response.WriteAsync(json);
+                }
+                else
+                {
+                    await context.Response.WriteAsync("SUCCESS:" + debugPort);
+                }
+            }
+        }
+        */
+
+        /*
+        [Route("{instanceId}/gcdump")]
+        public async Task<string> GetGCDump(string instanceId)
+        {
+            var httpClientHandler = new HttpClientHandler
+            {
+                AllowAutoRedirect = false
+            };
+            var webRequest = new HttpClient(httpClientHandler);
+
+            var buffer = new byte[4 * 1024];
+            var localResponse = HttpContext.Response;
+            try
+            {
+                using (var remoteStream = await webRequest.GetStreamAsync(url))
+                {
+                    var bytesRead = remoteStream.Read(buffer, 0, buffer.Length);
+
+                    localResponse.Clear();
+                    localResponse.ContentType = "application/octet-stream";
+                    var uri = "";
+                    var scheme = HttpContext.Request.Scheme;
+                    if (scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
+                    {
+                        scheme = "http";
+                    }
+                    if (HttpContext.Request.Path.StartsWithSegments($"/instances/{instanceId}", out var remainingPath))
+                    {
+                        Console.WriteLine("PATH STRING : " + remainingPath);
+                        uri = $"{scheme}://localhost:3000" + remainingPath);
+                    }
+                    var fileName = Path.GetFileName(url);
+                    localResponse.Headers.Add("Content-Disposition", "attachment; filename=" + fileName);
+
+                    if (remoteStream.Length != -1)
+                        localResponse.ContentLength = remoteStream.Length;
+
+                    while (bytesRead > 0) // && localResponse.IsClientConnected)
+                    {
+                        await localResponse.Body.WriteAsync(buffer, 0, bytesRead);
+                        bytesRead = remoteStream.Read(buffer, 0, buffer.Length);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                // Do some logging here
+            }
+        }
+        
+
+        [Route("{instanceId}/gcdump")]
+        public async Task<string> GetGcDump(string instanceId)
+        {
+            var instances = K8SEDeploymentHelper.GetInstances(K8SEDeploymentHelper.GetAppName(HttpContext));
+            PodInstance instance = null;
+            if (instances.Count > 0)
+            {
+                instance = instances.Where(i => i.Name.Equals(instanceId, System.StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            }
+
+            if (instances.Count > 0 && instanceId.Equals("any", System.StringComparison.OrdinalIgnoreCase))
+            {
+                instance = instances[0];
+            }
+
+            if (instance == null)
+            {
+                return "Invalid instance";
+            }
+
+            var httpClientHandler = new HttpClientHandler
+            {
+                AllowAutoRedirect = false
+            };
+            var webRequest = new HttpClient(httpClientHandler);
+            var url = $"http://{instance.IpAddress}:1601/dump";
+            var buffer = new byte[4 * 1024];
+            var localResponse = HttpContext.Response;
+            try
+            {
+                using (var remoteStream = await webRequest.GetStreamAsync(url))
+                {
+                    var bytesRead = remoteStream.Read(buffer, 0, buffer.Length);
+
+                    localResponse.Clear();
+                    localResponse.ContentType = "application/octet-stream";  
+                    var uri = "";
+                    var scheme = HttpContext.Request.Scheme;
+                    if (scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
+                    {
+                        scheme = "http";
+                    }
+                    if (HttpContext.Request.Path.StartsWithSegments($"/instances/{instanceId}", out var remainingPath))
+                    {
+                        Console.WriteLine("PATH STRING : " + remainingPath);
+                        uri = $"{scheme}://{instance.IpAddress}:1601{remainingPath}";
+                        Console.WriteLine($"PATH STRING : {scheme}://{instance.IpAddress}:1601{remainingPath}");
+
+                    }
+                    var fileName = Path.GetFileName(url);
+                    localResponse.Headers.Add("Content-Disposition", "attachment; filename=" + fileName);
+
+                    if (remoteStream.Length != -1)
+                        localResponse.ContentLength = remoteStream.Length;
+
+                    while (bytesRead > 0) // && localResponse.IsClientConnected)
+                    {
+                        await localResponse.Body.WriteAsync(buffer, 0, bytesRead);
+                        bytesRead = remoteStream.Read(buffer, 0, buffer.Length);
+                    }
+
+                    return File(bytesRead, "application/vnd.openxmlformats", "fileName.xlsx");
+                }
+            }
+            catch (Exception e)
+            {
+                // Do some logging here
+            }
+        }
+
+        /*
+        public async Task<string> SSH(string instanceId, string subpath)
+        {
+            if(K8SEDeploymentHelper.IsK8SEEnvironment())
+            {
+                
+                var instances = K8SEDeploymentHelper.GetInstances(K8SEDeploymentHelper.GetAppName(HttpContext));
+                PodInstance instance = null;
+                if (instances.Count > 0)
+                {
+                    instance = instances.Where(i => i.Name.Equals(instanceId, System.StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+                }
+
+                if(instances.Count > 0 && instanceId.Equals("any", System.StringComparison.OrdinalIgnoreCase))
+                {
+                    instance = instances[0];
+                }
+
+                if(instance == null)
+                {
+                    return "Invalid instance";
+                }
+                
+                var instance = new PodInstance()
+                {
+                    Name = "codeapp-sample-8994dbf4d-vsdr5",
+                    IpAddress = "10.244.1.62",
+                    NodeName = "node",
+                };
+
+                var targetUri = BuildTargetUri(HttpContext.Request, instanceId);
+                var targetRequestMessage = CreateTargetMessage(HttpContext, targetUri, instance);
+
+                using (var responseMessage = await _httpClient.SendAsync(targetRequestMessage, HttpCompletionOption.ResponseHeadersRead, HttpContext.RequestAborted))
+                {
+                    //HttpContext.Response.StatusCode = (int)responseMessage.StatusCode;
+                    //CopyFromTargetResponseHeaders(HttpContext, responseMessage);
+                    await responseMessage.Content.CopyToAsync(HttpContext.Response.Body);
+                }
+                
+            }
+            return null;
+        }
+
+        */
+        private HttpRequestMessage CreateTargetMessage(HttpContext context, Uri targetUri, PodInstance instance)
+        {
+            var requestMessage = new HttpRequestMessage();
+            CopyFromOriginalRequestContentAndHeaders(context, requestMessage);
+
+            requestMessage.RequestUri = targetUri;
+            requestMessage.Headers.Host = targetUri.Host;
+            requestMessage.Method = GetMethod(context.Request.Method);
+            if(!requestMessage.Headers.Contains("WEBSITE_SSH_USER"))
+            {
+                requestMessage.Headers.Add("WEBSITE_SSH_USER", "root");
+            }
+            if (!requestMessage.Headers.Contains("WEBSITE_SSH_PASSWORD"))
+            {
+                requestMessage.Headers.Add("WEBSITE_SSH_PASSWORD", "Docker!");
+            }
+            if (!requestMessage.Headers.Contains("WEBSITE_SSH_IP"))
+            {
+                requestMessage.Headers.Add("WEBSITE_SSH_IP", instance.IpAddress);
+            }
+            return requestMessage;
+        }
+
+        private void CopyFromOriginalRequestContentAndHeaders(HttpContext context, HttpRequestMessage requestMessage)
+        {
+            var requestMethod = context.Request.Method;
+
+            if (!HttpMethods.IsGet(requestMethod) &&
+              !HttpMethods.IsHead(requestMethod) &&
+              !HttpMethods.IsDelete(requestMethod) &&
+              !HttpMethods.IsTrace(requestMethod))
+            {
+                var streamContent = new StreamContent(context.Request.Body);
+                requestMessage.Content = streamContent;
+            }
+
+            foreach (var header in context.Request.Headers)
+            {
+                requestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray());
+            }
+        }
+
+        private void CopyFromTargetResponseHeaders(HttpContext context, HttpResponseMessage responseMessage)
+        {
+            foreach (var header in responseMessage.Headers)
+            {
+                context.Response.Headers[header.Key] = header.Value.ToArray();
+            }
+
+            foreach (var header in responseMessage.Content.Headers)
+            {
+                context.Response.Headers[header.Key] = header.Value.ToArray();
+            }
+            context.Response.Headers.Remove("transfer-encoding");
+        }
+        private static HttpMethod GetMethod(string method)
+        {
+            if (HttpMethods.IsDelete(method)) return HttpMethod.Delete;
+            if (HttpMethods.IsGet(method)) return HttpMethod.Get;
+            if (HttpMethods.IsHead(method)) return HttpMethod.Head;
+            if (HttpMethods.IsOptions(method)) return HttpMethod.Options;
+            if (HttpMethods.IsPost(method)) return HttpMethod.Post;
+            if (HttpMethods.IsPut(method)) return HttpMethod.Put;
+            if (HttpMethods.IsTrace(method)) return HttpMethod.Trace;
+            return new HttpMethod(method);
+        }
+
+        private Uri BuildTargetUri(HttpRequest request, string instanceId)
+        {
+            Uri targetUri = null;
+            var scheme = request.Scheme;
+            if(scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
+            {
+                scheme = "http";
+            }
+            if (request.Path.StartsWithSegments($"/instances/{instanceId}", out var remainingPath))
+            {
+                Console.WriteLine("PATH STRING : " + remainingPath);
+                targetUri = new Uri($"{scheme}://localhost:3000" + remainingPath);
+            }
+
+            return targetUri;
+        }
+    }
+}
diff --git a/Kudu.Services/Settings/SettingsController.cs b/Kudu.Services/Settings/SettingsController.cs
index 898bf3dd..66c53a29 100644
--- a/Kudu.Services/Settings/SettingsController.cs
+++ b/Kudu.Services/Settings/SettingsController.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
+using Kudu.Core.K8SE;
 
 namespace Kudu.Services.Settings
 {
@@ -106,7 +107,13 @@ public IActionResult Delete(string key)
         /// <returns></returns>
         public IActionResult GetAll()
         {
-            return Ok(_settingsManager.GetValues());
+            IDictionary<string, string> appSettings = new Dictionary<string, string>();
+            if (K8SEDeploymentHelper.IsK8SEEnvironment() && HttpContext != null)
+            {
+                appSettings = (IDictionary<string, string>)HttpContext.Items["appSettings"];
+            }
+
+            return Ok(_settingsManager.GetValues(appSettings));
         }
 
         /// <summary>

From 632fd9a90d8cc98d8cea7127839710bc124ed731 Mon Sep 17 00:00:00 2001
From: Ahmed ElSayed <ahmels@microsoft.com>
Date: Mon, 24 May 2021 15:22:47 -0700
Subject: [PATCH 240/245] Fix sync triggers (#212)

---
 Kudu.Core/Functions/SyncTriggerHandler.cs |  9 +------
 Kudu.Core/K8SE/K8SEDeploymentHelper.cs    | 31 ++++++++++-------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/Kudu.Core/Functions/SyncTriggerHandler.cs b/Kudu.Core/Functions/SyncTriggerHandler.cs
index eeb824e4..bc2addf9 100644
--- a/Kudu.Core/Functions/SyncTriggerHandler.cs
+++ b/Kudu.Core/Functions/SyncTriggerHandler.cs
@@ -38,15 +38,8 @@ public async Task<string> SyncTriggers(string functionTriggersPayload)
 
                 var scaleTriggers = scaleTriggersContent.Item1;
                 string appName = _environment.K8SEAppName;
-                string buildNumber = Guid.NewGuid().ToString();
-                var buildMetadata = new BuildMetadata()
-                {
-                    AppName = appName,
-                    BuildVersion = buildNumber,
-                    AppSubPath = string.Empty
-                };
 
-                await Task.Run(() => K8SEDeploymentHelper.UpdateFunctionAppTriggers(appName, scaleTriggers, buildMetadata));
+                await Task.Run(() => K8SEDeploymentHelper.UpdateFunctionAppTriggers(appName, scaleTriggers, null));
             }
 
             return null;
diff --git a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
index a57ffbd9..52451087 100644
--- a/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
+++ b/Kudu.Core/K8SE/K8SEDeploymentHelper.cs
@@ -181,7 +181,7 @@ public static string GetAppKind(HttpContext context)
                 throw new InvalidOperationException("Couldn't recognize AppKind");
             }
 
-            return appKind;           
+            return appKind;
         }
 
         public static string GetAppNamespace(HttpContext context)
@@ -214,33 +214,30 @@ public static void UpdateContextWithAppSettings(HttpContext context)
 
         private static string GetFunctionAppPatchJson(IEnumerable<ScaleTrigger> functionTriggers, BuildMetadata buildMetadata)
         {
-            if (functionTriggers == null || !functionTriggers.Any())
+            if ((functionTriggers == null || !functionTriggers.Any()) && buildMetadata == null)
             {
                 return null;
             }
 
-            if (buildMetadata == null )
+            var patchAppJson = new PatchAppJson { PatchSpec = new PatchSpec { } };
+            if (functionTriggers?.Any() == true)
             {
-                return null;
+                patchAppJson.PatchSpec.TriggerOptions = new TriggerOptions
+                {
+                    Triggers = functionTriggers
+                };
             }
 
-            var patchAppJson = new PatchAppJson
+            if (buildMetadata != null)
             {
-                PatchSpec = new PatchSpec
+                patchAppJson.PatchSpec.Code = new CodeSpec
                 {
-                    TriggerOptions = new TriggerOptions
-                    {
-                        Triggers = functionTriggers
-                    },
-                    Code = new CodeSpec
+                    PackageRef = new PackageReference
                     {
-                        PackageRef = new PackageReference
-                        {
-                            BuildMetadata = GetBuildMetadataStr(buildMetadata),
-                        }
+                        BuildMetadata = GetBuildMetadataStr(buildMetadata),
                     }
-                }
-            };
+                };
+            }
 
             var str= System.Convert.ToBase64String(ASCIIEncoding.ASCII.GetBytes(JsonConvert.SerializeObject(patchAppJson)));
             Console.WriteLine("Test Str:     " + str);

From 130001790280ac450765fe173fa6af71aecbac4b Mon Sep 17 00:00:00 2001
From: Ahmed ElSayed <ahmels@microsoft.com>
Date: Mon, 24 May 2021 16:51:19 -0700
Subject: [PATCH 241/245] Fix DefaultValueHandling in sync triggers (#213)

---
 Kudu.Core/Functions/PatchSpec.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kudu.Core/Functions/PatchSpec.cs b/Kudu.Core/Functions/PatchSpec.cs
index 111bba6e..d80f5df5 100644
--- a/Kudu.Core/Functions/PatchSpec.cs
+++ b/Kudu.Core/Functions/PatchSpec.cs
@@ -7,10 +7,10 @@ namespace Kudu.Core.Functions
 {
     public class PatchSpec
     {
-        [JsonProperty(PropertyName = "triggerOptions")]
+        [JsonProperty(PropertyName = "triggerOptions", DefaultValueHandling = DefaultValueHandling.Ignore)]
         public TriggerOptions TriggerOptions { get; set; }
 
-        [JsonProperty(PropertyName = "code")]
+        [JsonProperty(PropertyName = "code", DefaultValueHandling = DefaultValueHandling.Ignore)]
         public CodeSpec Code { get; set; }
     }
 }

From 45644b1532d272ac7061d5d05c4a697cd52b559e Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ushio <ushio@simplearchitect.com>
Date: Mon, 21 Jun 2021 08:07:03 -0700
Subject: [PATCH 242/245] Migrate netcoreapp3.1 and ILogger (#214)

---
 .github/workflows/pr-validation.yml           | 25 +++++++++++++++++++
 Kudu.Console/Kudu.Console.csproj              |  2 +-
 Kudu.Contracts/Kudu.Contracts.csproj          |  2 +-
 .../Oryx/AppServiceOryxArguments.cs           |  9 ++++---
 .../Deployment/Oryx/OryxBuildConstants.cs     |  2 +-
 Kudu.Core/Kudu.Core.csproj                    |  2 +-
 .../SourceControl/Git/KnownEnvironment.cs     |  2 +-
 Kudu.Services.Web/Kudu.Services.Web.csproj    |  7 +++---
 Kudu.Services.Web/KuduWebUtil.cs              |  6 ++---
 Kudu.Services.Web/Program.cs                  |  6 +++++
 .../Properties/launchSettings.json            |  6 ++++-
 Kudu.Services.Web/Startup.cs                  | 24 ++++++++----------
 .../DebugExtensionMiddleware.cs               |  6 ++---
 .../DebugExtension/InstanceController.cs      |  1 -
 Kudu.Services/Diagnostics/LogStreamManager.cs |  4 +--
 Kudu.Services/Function/FunctionController.cs  |  1 -
 .../Infrastructure/FileCallbackResult.cs      |  1 -
 Kudu.Services/Kudu.Services.csproj            |  3 ++-
 Kudu.Services/Zip/ZipController.cs            |  1 -
 .../Oryx/OryxArgumentsAppServiceTests.cs      | 24 +++++++++---------
 .../Oryx/OryxArgumentsFactoryTests.cs         |  3 ++-
 .../Oryx/OryxArgumentsFunctionAppTests.cs     |  2 +-
 ...gumentsLinuxConsumptionFunctionAppTests.cs | 13 +++++-----
 Kudu.Tests/Kudu.Tests.csproj                  |  2 +-
 24 files changed, 93 insertions(+), 61 deletions(-)
 create mode 100644 .github/workflows/pr-validation.yml

diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
new file mode 100644
index 00000000..79686a38
--- /dev/null
+++ b/.github/workflows/pr-validation.yml
@@ -0,0 +1,25 @@
+name: Pull Request Validation for feature/k8se
+
+on:
+  push:
+    branches: [ feature/k8se ]
+  pull_request:
+    branches: [ feature/k8se ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal
\ No newline at end of file
diff --git a/Kudu.Console/Kudu.Console.csproj b/Kudu.Console/Kudu.Console.csproj
index 43de69bd..87788eac 100644
--- a/Kudu.Console/Kudu.Console.csproj
+++ b/Kudu.Console/Kudu.Console.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
     <AssemblyName>kudu</AssemblyName>
   </PropertyGroup>
diff --git a/Kudu.Contracts/Kudu.Contracts.csproj b/Kudu.Contracts/Kudu.Contracts.csproj
index 1ea09fef..c9e6f745 100644
--- a/Kudu.Contracts/Kudu.Contracts.csproj
+++ b/Kudu.Contracts/Kudu.Contracts.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 616b26cd..61d29cd2 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -206,6 +206,10 @@ public string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment e
                     {
                         Version = "2.1";
                     }
+                    else if (Version == "3.0")
+                    {
+                        Version = "3.1";
+                    }
 
                     OryxArgumentsHelper.AddLanguageVersion(args, Version);
                     break;
@@ -251,10 +255,9 @@ public string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment e
             {
                 OryxArgumentsHelper.AddPythonVirtualEnv(args, VirtualEnv);
             }
+            // OryxArgumentsHelper.AddDebugLog(args);
 
-            OryxArgumentsHelper.AddDebugLog(args);
-
-            return args.ToString();
+           return args.ToString();
         }
 
         public bool SkipKuduSync { get; set; }
diff --git a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
index 0ca96396..44d817ac 100644
--- a/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
+++ b/Kudu.Core/Deployment/Oryx/OryxBuildConstants.cs
@@ -22,7 +22,7 @@ internal static class FunctionAppWorkerRuntimeDefaults
         {
             public static readonly string Node = "8.15";
             public static readonly string Python = "3.6";
-            public static readonly string Dotnet = "2.2";
+            public static readonly string Dotnet = "3.1";
             public static readonly string PHP = "7.3";
         }
 
diff --git a/Kudu.Core/Kudu.Core.csproj b/Kudu.Core/Kudu.Core.csproj
index 74c04b4e..9f1d8ee3 100644
--- a/Kudu.Core/Kudu.Core.csproj
+++ b/Kudu.Core/Kudu.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Kudu.Core/SourceControl/Git/KnownEnvironment.cs b/Kudu.Core/SourceControl/Git/KnownEnvironment.cs
index 1cdfdf5a..67895f43 100644
--- a/Kudu.Core/SourceControl/Git/KnownEnvironment.cs
+++ b/Kudu.Core/SourceControl/Git/KnownEnvironment.cs
@@ -14,7 +14,7 @@ internal static class KnownEnvironment
         // Command to launch the post receive hook
         // CORE NOTE modified the script to run "dotnet," assuming EXEPATH points
         // to a framework-dependent Core app.
-        public static string KUDUCOMMAND = "benv dotnet=2.2 dotnet \"$" + EXEPATH + "\" " +
+        public static string KUDUCOMMAND = "benv dotnet=3-lts dotnet \"$" + EXEPATH + "\" " +
                                            "\"$" + APPPATH + "\" " +
                                            "\"$" + MSBUILD + "\" " +
                                            "\"$" + DEPLOYER + "\"";
diff --git a/Kudu.Services.Web/Kudu.Services.Web.csproj b/Kudu.Services.Web/Kudu.Services.Web.csproj
index b5077be2..62d982ca 100644
--- a/Kudu.Services.Web/Kudu.Services.Web.csproj
+++ b/Kudu.Services.Web/Kudu.Services.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
   </PropertyGroup>
   <!-- Supressing Net Core migration warnings-->
@@ -26,14 +26,13 @@
     <PackageReference Include="AspNetCore.RouteAnalyzer" Version="0.5.3" />
     <PackageReference Include="KubernetesClient" Version="1.5.25" />
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Proxy" />
     <PackageReference Include="Microsoft.Diagnostics.Runtime" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
-    <PackageReference Include="System.Runtime.Caching" Version="0.1.3" />
+    <PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
   </ItemGroup>
   <Target Name="_IncludePrePublishGeneratedContent" BeforeTargets="GetCopyToPublishDirectoryItems" Condition=" '$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true' " />
   <ItemGroup>
diff --git a/Kudu.Services.Web/KuduWebUtil.cs b/Kudu.Services.Web/KuduWebUtil.cs
index 6604f78f..427a16df 100644
--- a/Kudu.Services.Web/KuduWebUtil.cs
+++ b/Kudu.Services.Web/KuduWebUtil.cs
@@ -220,12 +220,12 @@ internal static void MigrateToNetCorePatch(IEnvironment environment)
                 {
                     if(isRunningOnAzure)
                     {
-                        FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("/usr/bin/mono", "benv dotnet=2.2 dotnet"));
+                        FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("/usr/bin/mono", "benv dotnet=3-lts dotnet"));
                     }
                 }
                 else if(!fileText.Contains("benv") && fileText.Contains("dotnet") && isRunningOnAzure)
                 {
-                    FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("dotnet", "benv dotnet=2.2 dotnet"));
+                    FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("dotnet", "benv dotnet=3-lts dotnet"));
                 }
                 
             }
@@ -299,7 +299,7 @@ internal static ILogger GetDeploymentLogger(IServiceProvider serviceProvider)
         /// Returns a specified environment configuration as the current webapp's
         /// default configuration during the runtime.
         /// </summary>
-        internal static IEnvironment GetEnvironment(IHostingEnvironment hostingEnvironment,
+        internal static IEnvironment GetEnvironment(IWebHostEnvironment hostingEnvironment,
             IDeploymentSettingsManager settings = null,
             HttpContext httpContext = null)
         {
diff --git a/Kudu.Services.Web/Program.cs b/Kudu.Services.Web/Program.cs
index 042b0c85..8453f60d 100644
--- a/Kudu.Services.Web/Program.cs
+++ b/Kudu.Services.Web/Program.cs
@@ -4,6 +4,7 @@
 using log4net.Config;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace Kudu.Services.Web
 {
@@ -18,6 +19,11 @@ public static void Main(string[] args)
 
         private static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
+                .ConfigureLogging(logging =>
+                {
+                    logging.AddConsole();
+                    logging.AddEventSourceLogger();
+                })
                 .UseKestrel(options => { options.Limits.MaxRequestBodySize = null; })
                 .UseStartup<Startup>();
     }
diff --git a/Kudu.Services.Web/Properties/launchSettings.json b/Kudu.Services.Web/Properties/launchSettings.json
index 69f18189..8fe25514 100644
--- a/Kudu.Services.Web/Properties/launchSettings.json
+++ b/Kudu.Services.Web/Properties/launchSettings.json
@@ -13,7 +13,7 @@
       "launchBrowser": true,
       "environmentVariables": {
         "K8SE_BUILD_SERVICE": "yes",
-        "HOME": "C:\\work\\function-apps\\HttpFunApp1\\bin\\Debug\\netcoreapp2.2",
+        "HOME": "C:\\work\\function-apps\\HttpFunApp1\\bin\\Debug\\netcoreapp3.1",
         "ASPNETCORE_ENVIRONMENT": "Production"
       },
       "applicationUrl": "http://0.0.0.0:16018/"
@@ -22,6 +22,10 @@
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
+        "BUILD_FLAGS": "UseExpressBuild",
+        "ENABLE_ORYX_BUILD": "true",
+        "K8SE_BUILD_SERVICE": "true",
+        "HOME": "C:\\repos\\wwwroot",
         "ASPNETCORE_ENVIRONMENT": "Production"
       },
       "applicationUrl": "http://0.0.0.0:16018/"
diff --git a/Kudu.Services.Web/Startup.cs b/Kudu.Services.Web/Startup.cs
index 816fe09f..d4703114 100644
--- a/Kudu.Services.Web/Startup.cs
+++ b/Kudu.Services.Web/Startup.cs
@@ -3,7 +3,6 @@
 using System.Configuration;
 using System.IO;
 using System.Net;
-using System.Net.Http.Formatting;
 using System.Reflection;
 using AspNetCore.RouteAnalyzer;
 using Kudu.Contracts;
@@ -47,17 +46,20 @@
 using Kudu.Core.K8SE;
 using System.Net.Http;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Hosting;
+using Microsoft.OpenApi.Models;
+using IApplicationLifetime = Microsoft.AspNetCore.Hosting.IApplicationLifetime;
 
 namespace Kudu.Services.Web
 {
     public class Startup
     {
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IWebHostEnvironment _hostingEnvironment;
         private IEnvironment _webAppRuntimeEnvironment;
         private IDeploymentSettingsManager _noContextDeploymentsSettingsManager;
         private static readonly ServerConfiguration ServerConfiguration = new ServerConfiguration();
 
-        public Startup(IConfiguration configuration, IHostingEnvironment hostingEnvironment)
+        public Startup(IConfiguration configuration, IWebHostEnvironment hostingEnvironment)
         {
             Console.WriteLine(@"Startup : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
             Configuration = configuration;
@@ -95,16 +97,14 @@ public void ConfigureServices(IServiceCollection services)
             // Kudu.Services contains all the Controllers 
             var kuduServicesAssembly = Assembly.Load("Kudu.Services");
 
-            services.AddMvcCore()
-                .AddRazorPages()
-                .AddJsonFormatters()
-                .AddJsonOptions(options => options.SerializerSettings.ContractResolver = new DefaultContractResolver())
+            services.AddMvcCore(options => options.EnableEndpointRouting = false)
+                .AddRazorPages().AddMvcOptions(options => options.EnableEndpointRouting = false)
                 .AddApplicationPart(kuduServicesAssembly).AddControllersAsServices()
                 .AddApiExplorer();
 
             services.AddSwaggerGen(c =>
             {
-                c.SwaggerDoc("v1", new Info {Title = "Kudu API Docs"});
+                c.SwaggerDoc("v1", new OpenApiInfo {Title = "Kudu API Docs"});
                 // Setting the comments path for the Swagger JSON and UI.
                 var xmlFile = $"Kudu.Services.xml";
                 var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
@@ -318,11 +318,9 @@ public void Configure(IApplicationBuilder app,
         {
             Console.WriteLine(@"Configure : " + DateTime.Now.ToString("hh.mm.ss.ffffff"));
 
-            loggerFactory.AddEventSourceLogger();
-
             KuduWebUtil.MigrateToNetCorePatch(_webAppRuntimeEnvironment);
-
-            if (_hostingEnvironment.IsDevelopment())
+            
+            if (HostEnvironmentEnvExtensions.IsDevelopment(_hostingEnvironment))
             {
                 app.UseDeveloperExceptionPage();
             }
@@ -398,8 +396,6 @@ public void Configure(IApplicationBuilder app,
             //GlobalConfiguration.Configuration.Formatters.Clear();
             //GlobalConfiguration.Configuration.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always;
 
-            var jsonFormatter = new JsonMediaTypeFormatter();
-
 
             // CORE TODO concept of "deprecation" in routes for traces, Do we need this for linux ?
 
diff --git a/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs b/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
index 8748c805..03acc629 100644
--- a/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
+++ b/Kudu.Services/DebugExtension/DebugExtensionMiddleware.cs
@@ -51,7 +51,7 @@ public void ConfigureLogging()
         {
             if (loggerFactory == null)
             {
-                loggerFactory = new LoggerFactory();
+                loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
 
                 string level = Environment.GetEnvironmentVariable("APPSVC_TUNNEL_VERBOSITY");
                 LogLevel logLevel = LogLevel.Information;
@@ -76,10 +76,10 @@ public void ConfigureLogging()
                     }
                     Console.WriteLine("Setting LogLevel to " + level);
                 }
-
-                loggerFactory.AddConsole(logLevel);
             }
 
+            
+
             if (_logger == null)
             {
                 _logger = loggerFactory.CreateLogger<DebugExtensionMiddleware>();
diff --git a/Kudu.Services/DebugExtension/InstanceController.cs b/Kudu.Services/DebugExtension/InstanceController.cs
index 967c4b41..fecab24f 100644
--- a/Kudu.Services/DebugExtension/InstanceController.cs
+++ b/Kudu.Services/DebugExtension/InstanceController.cs
@@ -1,7 +1,6 @@
 using Kudu.Core.K8SE;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.Extensions.Caching.Memory;
 using System;
 using System.Collections.Generic;
diff --git a/Kudu.Services/Diagnostics/LogStreamManager.cs b/Kudu.Services/Diagnostics/LogStreamManager.cs
index 63a43fd1..0bab1e01 100644
--- a/Kudu.Services/Diagnostics/LogStreamManager.cs
+++ b/Kudu.Services/Diagnostics/LogStreamManager.cs
@@ -372,10 +372,10 @@ private Action<T1, T2> DoSafeAction<T1, T2, T3>(Action<T1, T2, T3> func, string
         
         private void DisableResponseBuffering(HttpContext context)
         {
-            IHttpBufferingFeature bufferingFeature = context.Features.Get<IHttpBufferingFeature>();
+            IHttpResponseBodyFeature bufferingFeature = context.Features.Get<IHttpResponseBodyFeature>();
             if (bufferingFeature != null)
             {
-                bufferingFeature.DisableResponseBuffering();
+                bufferingFeature.DisableBuffering();
             }
         }
         
diff --git a/Kudu.Services/Function/FunctionController.cs b/Kudu.Services/Function/FunctionController.cs
index 36b8616a..b59d80f8 100644
--- a/Kudu.Services/Function/FunctionController.cs
+++ b/Kudu.Services/Function/FunctionController.cs
@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Remotion.Linq.Parsing.Structure.IntermediateModel;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Kudu.Services/Infrastructure/FileCallbackResult.cs b/Kudu.Services/Infrastructure/FileCallbackResult.cs
index e9eeaba8..c4f5d605 100644
--- a/Kudu.Services/Infrastructure/FileCallbackResult.cs
+++ b/Kudu.Services/Infrastructure/FileCallbackResult.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
diff --git a/Kudu.Services/Kudu.Services.csproj b/Kudu.Services/Kudu.Services.csproj
index b1bfdb26..96a158da 100644
--- a/Kudu.Services/Kudu.Services.csproj
+++ b/Kudu.Services/Kudu.Services.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
   </PropertyGroup>
   <PropertyGroup>
@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Kudu.Contracts\Kudu.Contracts.csproj" />
diff --git a/Kudu.Services/Zip/ZipController.cs b/Kudu.Services/Zip/ZipController.cs
index e0320f80..727aa99d 100644
--- a/Kudu.Services/Zip/ZipController.cs
+++ b/Kudu.Services/Zip/ZipController.cs
@@ -2,7 +2,6 @@
 using Kudu.Core;
 using Kudu.Services.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Internal;
 using System;
 using System.IO.Abstractions;
 using System.IO.Compression;
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
index a0ed14f2..d7672db4 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
@@ -28,9 +28,9 @@ public void DefaultTest()
 
         [Theory]
         [InlineData("NODE", "8.15", true, false, BuildOptimizationsFlags.CompressModules)]
-        [InlineData("PYTHON", "3.6", true, false, BuildOptimizationsFlags.None)]
+        [InlineData("PYTHON", "3.6", true, false, BuildOptimizationsFlags.CompressModules)]
         [InlineData("PHP", "7.3", true, false, BuildOptimizationsFlags.None)]
-        [InlineData("DOTNETCORE", "2.2", true, true, BuildOptimizationsFlags.UseTempDirectory)]
+        [InlineData("DOTNETCORE", "3.1", true, true, BuildOptimizationsFlags.UseTempDirectory)]
         public void ArgumentPropertyTest(string language, string version,
             bool expectedRunOryxBuild, bool expectedSkipKuduSync, BuildOptimizationsFlags expectedFlags)
         {
@@ -51,13 +51,13 @@ public void ArgumentPropertyTest(string language, string version,
 
         [Theory]
         [InlineData("NODE", "8.12",
-            "oryx build OutputPath -o OutputPath --platform nodejs --platform-version 8.12 -i BuildTempPath -p compress_node_modules=tar-gz")]
+            "oryx build RepositoryPath -o BuildTempPath --platform nodejs -i BuildTempPath -p compress_node_modules=tar-gz")]
         [InlineData("PYTHON", "3.6",
-            "oryx build OutputPath -o OutputPath --platform python --platform-version 3.6 -p virtualenv_name=antenv3.6")]
+            "oryx build RepositoryPath -o BuildTempPath --platform python --platform-version 3.6 -i BuildTempPath -p compress_virtualenv=tar-gz -p virtualenv_name=antenv3.6")]
         [InlineData("PHP", "7.3",
-            "oryx build OutputPath -o OutputPath --platform php --platform-version 7.3")]
-        [InlineData("DOTNETCORE", "2.2",
-            "oryx build RepositoryPath -o OutputPath --platform dotnet --platform-version 2.2 -i BuildTempPath")]
+            "oryx build OutputPath -o OutputPath --platform php")]
+        [InlineData("DOTNETCORE", "3.1",
+            "oryx build RepositoryPath -o OutputPath --platform dotnet --platform-version 3.1 -i BuildTempPath")]
         public void CommandGenerationTest(string language, string version, string expectedCommand)
         {
             var mockedEnvironment = new Dictionary<string, string>()
@@ -128,15 +128,15 @@ public void NodejsUseExpressBuildTest()
             {
                 IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
-                Assert.Equal("oryx build OutputPath -o OutputPath --platform nodejs --platform-version 8.12 -i BuildTempPath -p compress_node_modules=zip",
+                Assert.Equal("oryx build RepositoryPath -o BuildTempPath --platform nodejs -i BuildTempPath",
                     args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
 
         [Theory]
-        [InlineData("2.7", "oryx build OutputPath -o OutputPath --platform python --platform-version 2.7 -p virtualenv_name=antenv2.7")]
-        [InlineData("3.6", "oryx build OutputPath -o OutputPath --platform python --platform-version 3.6 -p virtualenv_name=antenv3.6")]
-        [InlineData("3.7", "oryx build OutputPath -o OutputPath --platform python --platform-version 3.7 -p virtualenv_name=antenv")]
+        [InlineData("2.7", "oryx build RepositoryPath -o BuildTempPath --platform python --platform-version 2.7 -i BuildTempPath -p compress_virtualenv=tar-gz -p virtualenv_name=antenv2.7")]
+        [InlineData("3.6", "oryx build RepositoryPath -o BuildTempPath --platform python --platform-version 3.6 -i BuildTempPath -p compress_virtualenv=tar-gz -p virtualenv_name=antenv3.6")]
+        [InlineData("3.7", "oryx build RepositoryPath -o BuildTempPath --platform python --platform-version 3.7 -i BuildTempPath -p compress_virtualenv=tar-gz -p virtualenv_name=antenv")]
         public void PythonVirtualEnvironmentNamingTest(string version, string expectedCommand)
         {
             var mockedEnvironment = new Dictionary<string, string>()
@@ -231,7 +231,7 @@ public void MissingOutputPathTest()
             {
                 IOryxArguments args = new AppServiceOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
-                Assert.Equal("oryx build  -o  --platform python --platform-version 3.6 -p virtualenv_name=antenv3.6",
+                Assert.Equal("oryx build RepositoryPath -o BuildTempPath --platform python --platform-version 3.6 -i BuildTempPath -p compress_virtualenv=tar-gz -p virtualenv_name=antenv3.6",
                     args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment()));
             }
         }
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
index 792c4406..0b3481e0 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFactoryTests.cs
@@ -110,6 +110,7 @@ public void BuildCommandForFunctionApp()
             }
         }
 
+        // TODO check if it is proper change
         [Fact]
         public void BuildCommandForLinuxConsumptionFunctionApp()
         {
@@ -123,7 +124,7 @@ public void BuildCommandForLinuxConsumptionFunctionApp()
             {
                 IOryxArguments args = OryxArgumentsFactory.CreateOryxArguments(TestMockedEnvironment.GetMockedEnvironment());
                 string command = args.GenerateOryxBuildCommand(deploymentContext, TestMockedEnvironment.GetMockedEnvironment());
-                Assert.Equal(@"oryx build repositorypath -o repositorypath", command);
+                Assert.Equal(@"oryx build repositorypath -o ", command);
             }
         }
 
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
index 10caaf5b..04269790 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsFunctionAppTests.cs
@@ -57,7 +57,7 @@ public void ArgumentPropertyTest(string functions_worker_runtime,
         [InlineData("PHP",
             "oryx build OutputPath -o OutputPath --platform php --platform-version 7.3 -i BuildTempPath")]
         [InlineData("DOTNET",
-            "oryx build OutputPath -o OutputPath --platform dotnet --platform-version 2.2 -i BuildTempPath")]
+            "oryx build OutputPath -o OutputPath --platform dotnet --platform-version 3.1 -i BuildTempPath")]
         public void CommandGenerationTest(string functions_worker_runtime, string expected_command)
         {
             var mockedEnvironment = new Dictionary<string, string>()
diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs
index cb3f01ef..848fa924 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsLinuxConsumptionFunctionAppTests.cs
@@ -8,6 +8,7 @@ namespace Kudu.Tests.Core.Deployment.Oryx
     [Collection("MockedEnvironmentVariablesCollection")]
     public class OryxArgumentsLinuxConsumptionFunctionAppTests
     {
+        // TODO check if it is proper change
         [Fact]
         public void DefaultTest()
         {
@@ -23,7 +24,7 @@ public void DefaultTest()
                 OutputPath = "OutputPath"
             };
             string command = args.GenerateOryxBuildCommand(mockedContext, TestMockedEnvironment.GetMockedEnvironment());
-            Assert.Equal("oryx build RepositoryPath -o RepositoryPath", command);
+            Assert.Equal("oryx build RepositoryPath -o OutputPath", command);
         }
 
         [Theory]
@@ -48,16 +49,16 @@ public void ArgumentPropertyTest(string functions_worker_runtime,
             }
         }
 
+        // TODO Check if this is the proper change.
         [Theory]
         [InlineData("NODE",
-            "oryx build RepositoryPath -o RepositoryPath --platform nodejs --platform-version 8.15")]
+            "oryx build RepositoryPath -o OutputPath --platform nodejs --platform-version 8.15")]
         [InlineData("PYTHON",
-            "oryx build RepositoryPath -o RepositoryPath --platform python --platform-version 3.6 " +
-            "-p packagedir=.python_packages\\lib\\python3.6\\site-packages")]
+            "oryx build RepositoryPath -o OutputPath --platform python --platform-version 3.6 -p packagedir=.python_packages\\lib\\python3.6\\site-packages")]
         [InlineData("PHP",
-            "oryx build RepositoryPath -o RepositoryPath --platform php --platform-version 7.3")]
+            "oryx build RepositoryPath -o OutputPath --platform php --platform-version 7.3")]
         [InlineData("DOTNET",
-            "oryx build RepositoryPath -o RepositoryPath --platform dotnet --platform-version 2.2")]
+            "oryx build RepositoryPath -o OutputPath --platform dotnet --platform-version 3.1")]
         public void CommandGenerationTest(string functions_worker_runtime, string expected_command)
         {
             var mockedEnvironment = new Dictionary<string, string>()
diff --git a/Kudu.Tests/Kudu.Tests.csproj b/Kudu.Tests/Kudu.Tests.csproj
index 35fea095..83706244 100644
--- a/Kudu.Tests/Kudu.Tests.csproj
+++ b/Kudu.Tests/Kudu.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

From b012ad4166a855dce25857f16e299d20a4dd2d16 Mon Sep 17 00:00:00 2001
From: Satish Ranjan <satishra@microsoft.com>
Date: Wed, 7 Jul 2021 15:19:43 -0700
Subject: [PATCH 243/245] fixing feature/k8se branch's
 GetArticfactURLFromARMJSON to read packageUri for arm call from OneDeployAPI

---
 Kudu.Services/Deployment/PushDeploymentController.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kudu.Services/Deployment/PushDeploymentController.cs b/Kudu.Services/Deployment/PushDeploymentController.cs
index b15e5ee4..7eebb039 100644
--- a/Kudu.Services/Deployment/PushDeploymentController.cs
+++ b/Kudu.Services/Deployment/PushDeploymentController.cs
@@ -393,7 +393,7 @@ public async Task<IActionResult> OneDeploy(
                         }
 
                         deploymentInfo.TargetFileName = "app.ear";
-                        break;                   
+                        break;
 
                     case ArtifactType.Static:
                         if (!OneDeployHelper.EnsureValidPath(artifactType, OneDeployHelper.WwwrootDirectoryRelativePath, ref path, out error))
@@ -469,7 +469,7 @@ private async Task<IActionResult> PushDeployAsync(ArtifactDeploymentInfo deploym
                 _tracer.Step("Removing previous build artifact's manifest file");
                 FileSystemHelpers.DeleteFileSafe(oryxManifestFile);
             }
-            
+
 
             if (_settings.RunFromLocalZip())
             {
@@ -762,7 +762,7 @@ private string GetArticfactURLFromARMJSON(JObject requestObject)
                 try
                 {
                     // ARM template should have properties field and a packageUri field inside the properties field.
-                    string packageUri = requestObject.Value<JObject>("properties").Value<string>("packageUri");
+                    string packageUri = requestObject.Value<JObject>("properties") != null ? requestObject.Value<JObject>("properties").Value<string>("packageUri") : requestObject.Value<string>("packageUri");
                     if (string.IsNullOrEmpty(packageUri))
                     {
                         throw new ArgumentException("Invalid Url in the JSON request");

From 53fc5c85c33533aca90781cc693eff2924a3488d Mon Sep 17 00:00:00 2001
From: Layla Liu <layliu@microsoft.com>
Date: Fri, 3 Sep 2021 15:59:40 +0800
Subject: [PATCH 244/245] Fix the incorrect repository folder for oryx build

---
 Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
index 61d29cd2..08a0ad4c 100644
--- a/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
+++ b/Kudu.Core/Deployment/Oryx/AppServiceOryxArguments.cs
@@ -167,7 +167,7 @@ public string GenerateOryxBuildCommand(DeploymentContext context, IEnvironment e
 
                 case Framework.PHP:
                     // Input/Output
-                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.OutputPath, destination: context.OutputPath);
+                    OryxArgumentsHelper.AddOryxBuildCommand(args, source: context.RepositoryPath, destination: context.OutputPath);
                     OryxArgumentsHelper.AddLanguage(args, "php");
                     break;
             }

From 00047454c1b92e079f16cf710e2ab7263cc54726 Mon Sep 17 00:00:00 2001
From: Layla Liu <layliu@microsoft.com>
Date: Sat, 9 Oct 2021 16:29:25 +0800
Subject: [PATCH 245/245] Fix test case

---
 Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
index d7672db4..346336c7 100644
--- a/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
+++ b/Kudu.Tests/Core/Deployment/Oryx/OryxArgumentsAppServiceTests.cs
@@ -55,7 +55,7 @@ public void ArgumentPropertyTest(string language, string version,
         [InlineData("PYTHON", "3.6",
             "oryx build RepositoryPath -o BuildTempPath --platform python --platform-version 3.6 -i BuildTempPath -p compress_virtualenv=tar-gz -p virtualenv_name=antenv3.6")]
         [InlineData("PHP", "7.3",
-            "oryx build OutputPath -o OutputPath --platform php")]
+            "oryx build RepositoryPath -o OutputPath --platform php")]
         [InlineData("DOTNETCORE", "3.1",
             "oryx build RepositoryPath -o OutputPath --platform dotnet --platform-version 3.1 -i BuildTempPath")]
         public void CommandGenerationTest(string language, string version, string expectedCommand)