Azure Deployment Logic

ServerCore/Areas/Deployment/DeploymentConfiguration.cs

@@ -0,0 +1,36 @@
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using ServerCore.DataModel;
+
+namespace ServerCore.Areas.Deployment
+{
+    public class DeploymentConfiguration
+    {
+        internal static void ConfigureDatabase(IConfiguration configuration, IServiceCollection services, IHostingEnvironment env)
+        {
+            // Use SQL Database if in Azure, otherwise, use localdb
+            if (env.IsStaging() && Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") == "PuzzleServerTestDeploy")
+            {
+                services.AddDbContext<PuzzleServerContext>
+                    (options => options.UseLazyLoadingProxies()
+                        .UseSqlServer(configuration.GetConnectionString("PuzzleServerSQLConnectionString")));
+            }
+            else if (env.IsProduction() && Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") == "puzzlehunt")
+            {
+                services.AddDbContext<PuzzleServerContext>
+                    (options => options.UseLazyLoadingProxies()
+                        .UseSqlServer(configuration.GetConnectionString("PuzzleServerSQLConnectionString")));
+            }
+            else
+            {
+                services.AddDbContext<PuzzleServerContext>
+                    (options => options.UseLazyLoadingProxies()
+                       //.UseSqlServer(configuration.GetConnectionString("PuzzleServerContextLocal")));
+                       .UseSqlServer(configuration.GetConnectionString("TempDeploy")));
+            }
+        }
+    }
+}

ServerCore/Areas/Identity/IdentityHostingStartup.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using ServerCore.Areas.Deployment;
 using ServerCore.DataModel;
 
 [assembly: HostingStartup(typeof(ServerCore.Areas.Identity.IdentityHostingStartup))]
@@ -14,10 +14,16 @@ public void Configure(IWebHostBuilder builder)
         {
             builder.ConfigureServices((context, services) =>
             {
-                services.AddDbContext<PuzzleServerContext>(options =>
-                    options.UseLazyLoadingProxies()
-                    .UseSqlServer(
-                        context.Configuration.GetConnectionString("PuzzleServerContext")));
+                // Set up to use Azure settings
+                IHostingEnvironment env = context.HostingEnvironment;
+                IConfigurationBuilder configBuilder = new ConfigurationBuilder()
+                    .SetBasePath(env.ContentRootPath)
+                    .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                    .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
+                    .AddEnvironmentVariables();
+                context.Configuration = configBuilder.Build();
+
+                DeploymentConfiguration.ConfigureDatabase(context.Configuration, services, env);
 
                 services.AddDefaultIdentity<IdentityUser>()
                     .AddEntityFrameworkStores<PuzzleServerContext>();

ServerCore/FileManager.cs

@@ -1,14 +1,16 @@
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
-using System;
+using System;
 using System.IO;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
+using Microsoft.WindowsAzure.Storage;
+using Microsoft.WindowsAzure.Storage.Blob;
 
 namespace ServerCore
 {
     public class FileManager
     {
+        public static string ConnectionString { get; set; }
+
         /// <summary>
         /// Uploads a file to blob storage
         /// </summary>
@@ -57,9 +59,8 @@ private static async Task<CloudBlobContainer> GetOrCreateEventContainerAsync(int
         private static CloudStorageAccount StorageAccount
         {
             get
-            {
-                // todo: read the account info from configuration
-                return CloudStorageAccount.Parse("UseDevelopmentStorage=true");
+            { 
+                return CloudStorageAccount.Parse(ConnectionString);
             }
         }
     }

ServerCore/Program.cs

@@ -1,5 +1,8 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Azure.Services.AppAuthentication;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.AzureKeyVault;
 
 namespace ServerCore
 {
@@ -11,8 +14,23 @@ public static void Main(string[] args)
         }
 
         public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+        WebHost.CreateDefaultBuilder(args)
+       //.ConfigureAppConfiguration((ctx, builder) =>
+       //{
+       //    var keyVaultEndpoint = GetKeyVaultEndpoint();
+       //    if (!string.IsNullOrEmpty(keyVaultEndpoint))
+       //    {
+       //        var azureServiceTokenProvider = new AzureServiceTokenProvider();
+       //        var keyVaultClient = new KeyVaultClient(
+       //            new KeyVaultClient.AuthenticationCallback(
+       //                azureServiceTokenProvider.KeyVaultTokenCallback));
+       //        builder.AddAzureKeyVault(
+       //            keyVaultEndpoint, keyVaultClient, new DefaultKeyVaultSecretManager());
+       //    }
+       //})
+    .UseStartup<Startup>()
+     .Build();
+
+      //  private static string GetKeyVaultEndpoint() => "https://PuzzleServerTestKeyVault.vault.azure.net";
     }
 }

ServerCore/Properties/PublishProfiles/PuzzleServerTestDeploy - Web Deploy.pubxml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <ResourceId>/subscriptions/3ffc52f4-eed1-4312-8170-9caf82ff0949/resourcegroups/PuzzleServerTestDeploy/providers/Microsoft.Web/sites/PuzzleServerTestDeploy</ResourceId>
+    <ResourceGroup>PuzzleServerTestDeploy</ResourceGroup>
+    <PublishProvider>AzureWebSite</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>https://puzzleservertestdeploy.azurewebsites.net</SiteUrlToLaunchAfterPublish>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <ProjectGuid>67b91cce-4e3d-4f0f-8a76-eafd37c5f949</ProjectGuid>
+    <MSDeployServiceURL>puzzleservertestdeploy.scm.azurewebsites.net:443</MSDeployServiceURL>
+    <DeployIisAppPath>PuzzleServerTestDeploy</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>True</EnableMSDeployBackup>
+    <UserName>$PuzzleServerTestDeploy</UserName>
+    <_SavePWD>True</_SavePWD>
+    <_DestinationType>AzureWebSite</_DestinationType>
+    <InstallAspNetCoreSiteExtension>False</InstallAspNetCoreSiteExtension>
+    <KeyVaultUri>https://PuzzleServerTestKeyVault.vault.azure.net</KeyVaultUri>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <SelfContained>false</SelfContained>
+    <_IsPortable>true</_IsPortable>
+  </PropertyGroup>
+</Project>

ServerCore/Properties/PublishProfiles/puzzlehunt - WebDeploy Downloaded.xml

@@ -0,0 +1,14 @@
+<publishData>
+  <publishProfile profileName="puzzlehunt - Web Deploy" publishMethod="MSDeploy" publishUrl="puzzlehunt.scm.azurewebsites.net:443" msdeploySite="puzzlehunt" userName="$puzzlehunt" userPWD="saaiNEoRlu8vKA5bzoi9w3x9yqPvDGs0bQthExxc6GPjeqxxY2r3bz2Ah8Qu" destinationAppUrl="http://puzzlehunt.azurewebsites.net" SQLServerDBConnectionString="Data Source=tcp:puzzleserverprod.database.windows.net,1433;Initial Catalog=puzzleserver;User Id=PuzzleServerAdmin@puzzleserverprod.database.windows.net;Password=PuzzlehuntPuzzledayNew!;" mySQLDBConnectionString="" hostingProviderForumLink="" controlPanelLink="http://windows.azure.com" webSystem="WebSites" targetDatabaseEngineType="sqlazuredatabase" targetServerVersion="Version100">
+    <databases>
+      <add name="defaultConnection" connectionString="Data Source=tcp:puzzleserverprod.database.windows.net,1433;Initial Catalog=puzzleserver;User Id=PuzzleServerAdmin@puzzleserverprod.database.windows.net;Password=PuzzlehuntPuzzledayNew!;" providerName="System.Data.SqlClient" type="Sql" targetDatabaseEngineType="sqlazuredatabase" targetServerVersion="Version100" />
+      <add name="PuzzleServerSQLConnectionString" connectionString="Server=tcp:puzzleserverprod.database.windows.net,1433;Initial Catalog=puzzleserver;Persist Security Info=False;User ID=PuzzleServerAdmin;Password=PuzzlehuntPuzzledayNew!;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;" providerName="System.Data.SqlClient" type="Sql" targetDatabaseEngineType="sqlazuredatabase" targetServerVersion="Version100" />
+    </databases>
+  </publishProfile>
+  <publishProfile profileName="puzzlehunt - FTP" publishMethod="FTP" publishUrl="ftp://waws-prod-dm1-103.ftp.azurewebsites.windows.net/site/wwwroot" ftpPassiveMode="True" userName="puzzlehunt\$puzzlehunt" userPWD="saaiNEoRlu8vKA5bzoi9w3x9yqPvDGs0bQthExxc6GPjeqxxY2r3bz2Ah8Qu" destinationAppUrl="http://puzzlehunt.azurewebsites.net" SQLServerDBConnectionString="Data Source=tcp:puzzleserverprod.database.windows.net,1433;Initial Catalog=puzzleserver;User Id=PuzzleServerAdmin@puzzleserverprod.database.windows.net;Password=PuzzlehuntPuzzledayNew!;" mySQLDBConnectionString="" hostingProviderForumLink="" controlPanelLink="http://windows.azure.com" webSystem="WebSites" targetDatabaseEngineType="sqlazuredatabase" targetServerVersion="Version100">
+    <databases>
+      <add name="defaultConnection" connectionString="Data Source=tcp:puzzleserverprod.database.windows.net,1433;Initial Catalog=puzzleserver;User Id=PuzzleServerAdmin@puzzleserverprod.database.windows.net;Password=PuzzlehuntPuzzledayNew!;" providerName="System.Data.SqlClient" type="Sql" targetDatabaseEngineType="sqlazuredatabase" targetServerVersion="Version100" />
+      <add name="PuzzleServerSQLConnectionString" connectionString="Server=tcp:puzzleserverprod.database.windows.net,1433;Initial Catalog=puzzleserver;Persist Security Info=False;User ID=PuzzleServerAdmin;Password=PuzzlehuntPuzzledayNew!;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;" providerName="System.Data.SqlClient" type="Sql" targetDatabaseEngineType="sqlazuredatabase" targetServerVersion="Version100" />
+    </databases>
+  </publishProfile>
+</publishData>

ServerCore/Properties/launchSettings.json

@@ -1,4 +1,4 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
@@ -8,13 +8,13 @@
     }
   },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
+      "IIS Express": {
+        "commandName": "IISExpress",
+        "launchBrowser": true,
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },\
     "ServerCore": {
       "commandName": "Project",
       "launchBrowser": true,
@@ -24,4 +24,4 @@
       "applicationUrl": "http://localhost:44319/"
     }
   }
-}
+}

ServerCore/ServerCore.csproj

@@ -24,6 +24,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureKeyVault.HostingStartup" Version="2.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.2" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.1" />

ServerCore/Startup.cs

@@ -1,21 +1,38 @@
-using Microsoft.AspNetCore.Authorization;
+using System;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Authorization;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using ServerCore.Areas.Deployment;
 using ServerCore.Areas.Identity.UserAuthorizationPolicy;
 using ServerCore.DataModel;
 
 namespace ServerCore
 {
     public class Startup
     {
-        public Startup(IConfiguration configuration)
+        private IHostingEnvironment hostingEnvironment;
+
+        public Startup(IConfiguration configuration, IHostingEnvironment env)
         {
             Configuration = configuration;
+            hostingEnvironment = env;
+        }
+
+        public Startup(IHostingEnvironment env)
+        {
+            // Set up to use Azure settings
+            IConfigurationBuilder configBuilder = new ConfigurationBuilder()
+                .SetBasePath(env.ContentRootPath)
+                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
+                .AddEnvironmentVariables();
+            Configuration = configBuilder.Build();
+
+            hostingEnvironment = env;
         }
 
         public IConfiguration Configuration { get; }
@@ -39,9 +56,8 @@ public void ConfigureServices(IServiceCollection services)
                     options.Conventions.AuthorizeFolder("/ModelBases");
                 });
 
-            services.AddDbContext<PuzzleServerContext>
-                (options => options.UseLazyLoadingProxies()
-                    .UseSqlServer(Configuration.GetConnectionString("PuzzleServerContext")));
+            DeploymentConfiguration.ConfigureDatabase(Configuration, services, hostingEnvironment);
+            FileManager.ConnectionString = Configuration.GetConnectionString("AzureStorageConnectionString");
 
             services.AddAuthentication().AddMicrosoftAccount(microsoftOptions =>
             {
@@ -87,12 +103,23 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            if (env.IsDevelopment())
+            if (env.IsDevelopment() && String.IsNullOrEmpty(Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME")))
+            {
+                app.UseBrowserLink();
+                app.UseDeveloperExceptionPage();
+                PuzzleServerContext.UpdateDatabase(app);
+            }
+            else if (env.IsStaging() && Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") == "PuzzleServerTestDeploy")
             {
                 app.UseBrowserLink();
                 app.UseDeveloperExceptionPage();
                 PuzzleServerContext.UpdateDatabase(app);
             }
+            else if (env.IsProduction() && Environment.GetEnvironmentVariable("WEBSITE_SITE_NAME") == "Puzzlehunt")
+            {
+                app.UseBrowserLink();
+                app.UseDeveloperExceptionPage();
+            }
             else
             {
                 app.UseExceptionHandler("/Error");

ServerCore/appsettings.Development.json

@@ -1,10 +1,22 @@
 {
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:44319/",
+      "sslPort": 0
+    }
+  },
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
       "Default": "Debug",
       "System": "Information",
       "Microsoft": "Information"
     }
+  },
+  "ConnectionStrings": {
+    "PuzzleServerContextLocal": "Server=(localdb)\\MSSQLLocalDB;Database=PuzzleServer;Trusted_Connection=True;MultipleActiveResultSets=true",
+    "AzureStorageConnectionString": "UseDevelopmentStorage=true"
   }
 }

ServerCore/appsettings.Production.json

@@ -0,0 +1,15 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "https://puzzlehunt.azurewebsites.net",
+      "sslPort": 0
+    }
+  },
+  "ConnectionStrings": {
+    "PuzzleServerContext": "",
+    "AzureStorageConnectionString": "",
+    "PuzzleServerSQLConnectionString": ""
+  }
+}

ServerCore/appsettings.Staging.json

@@ -0,0 +1,15 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "https://puzzleservertestdeploy.azurewebsites.net",
+      "sslPort": 0
+    }
+  },
+  "ConnectionStrings": {
+    "PuzzleServerContext": "",
+    "AzureStorageConnectionString": "",
+    "PuzzleServerSQLConnectionString": ""
+  }
+}

ServerCore/appsettings.json

@@ -4,9 +4,5 @@
     "LogLevel": {
       "Default": "Warning"
     }
-  },
-  "ConnectionStrings": {
-    "PuzzleServerContext": "Server=(localdb)\\MSSQLLocalDB;Database=PuzzleServer;Trusted_Connection=True;MultipleActiveResultSets=true",
-    "AzureStorageConnectionString-1": "UseDevelopmentStorage=true"
   }
 }

azure-pipelines.yml

@@ -18,5 +18,4 @@ steps:
     publishWebProjects: True
     arguments: '--configuration $(BuildConfiguration) --output $(Build.ArtifactStagingDirectory)'
     zipAfterPublish: True
-
 - task: PublishBuildArtifacts@1