knox/fix php oryx build

.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

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 = "1200000";    // 20 mins
+        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";
@@ -84,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";
@@ -105,6 +121,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";
@@ -116,6 +134,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";
@@ -124,11 +143,31 @@ 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 = "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 SiteVersionTxt = "siteversion.txt";
         public const string PackageNameTxt = "packagename.txt";
-        public const string KuduBuild = "1.0.0.5";
+        public const string KuduBuild = "1.0.0.7";
+
+        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";
+        public const string IsK8SEEnvironment = "K8SE_BUILD_SERVICE";
+
+        public const string OneDeploy = "OneDeploy";
+        public const string ArtifactStagingDirectoryName = "extracted";
+
+        public const string K8SEAppTypeDefault = "functionapp,kubernetes,linux";
     }
-}
+}

Kudu.Console/JavaScriptSerializer.cs

@@ -0,0 +1,9 @@
+namespace Kudu.Console
+{
+    internal class JavaScriptSerializer
+    {
+        public JavaScriptSerializer()
+        {
+        }
+    }
+}

Kudu.Console/Kudu.Console.csproj

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
     <AssemblyName>kudu</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="KubernetesClient" Version="1.5.25" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
   </ItemGroup>
 

Kudu.Console/Program.cs

@@ -22,14 +22,23 @@
 using Kudu.Core.Tracing;
 using System.Reflection;
 using XmlSettings;
+using k8s;
+using IRepository = Kudu.Core.SourceControl.IRepository;
+using log4net;
+using log4net.Config;
 
 namespace Kudu.Console
 {
     internal class Program
     {
-
+        private static IEnvironment env;
+        private static IDeploymentSettingsManager settingsManager;
+        private static string appRoot;
+
         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")
             {
@@ -55,14 +64,14 @@ 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);
 
-            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();
@@ -74,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);
@@ -117,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);
 
@@ -126,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;
@@ -139,11 +147,16 @@ 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,
@@ -152,7 +165,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>
             {
@@ -180,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,
@@ -191,11 +205,18 @@ 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);
                     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)
@@ -250,6 +271,7 @@ 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/","");
 
             // CORE TODO : test by setting SCM_REPOSITORY_PATH 
             // REVIEW: this looks wrong because it ignores SCM_REPOSITORY_PATH
@@ -267,12 +289,14 @@ 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);
+                null,
+                appName);
+            return env;
         }
     }
 }

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/"
+    }
+  }
+}

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,
+    }
+}

Kudu.Contracts/Deployment/BuildMetadata.cs

@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+
+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;
+    }
+}