Merge pull request #40 from simongdavies/dynamic-route-update

Dynamic route update
deislabs · Jul 26, 2021 · 4faddce · 4faddce
2 parents 038f881 + 488e009
commit 4faddce
Show file tree

Hide file tree

Showing 61 changed files with 968 additions and 423 deletions.
diff --git a/examples/bindlesource/README.md b/examples/bindlesource/README.md
@@ -1,8 +1,8 @@
 # Using Bindle to serve WAGI Modules
 
-This example shows how to use [Bindle](https://github.com/deislabs/bindle) to host Wagi modules and serve them in wagi-dotnet.
+This example shows how to serve WASM WAGI mdoules hosted in [Bindle](https://github.com/deislabs/bindle) from wagi-dotnet.
 
-The example is configured to load three bindles from a bindle server located at `https://bindle.deislabs.io/v1`. Each bindle contains a single WASM module with a single hello world type function.
+The example is configured to load three bindles from a bindle server located at `https://bindle.deislabs.io/v1`. Each bindle contains a single WASM WAGI module with a single hello world type function.
 
 Clone the repo, switch to the examples/bindlesource folder and then run:
 
@@ -85,9 +85,9 @@ The configuration for this example can be found in the [appsettings.Development.
 Example Configuration file:
 
 ``` json
-  // The name of the configuration section for the WASM route handler, by default this is expected to be called WASM.
-  "WASM": {
-    // The relative path to the directory where WASM modules defined in this configuration section are to be downloaded to.
+  // The name of the configuration section for the WAGI route handler, by default this is expected to be called Wagi.
+  "Wagi": {
+    // The relative path to the directory where WAGI modules defined in this configuration section are to be downloaded to.
     "ModulePath": "modules",
     // The path to a bindle server containing the bindle definitions.
     "BindleServer" : "https://bindle.deislabs.io/v1",

diff --git a/examples/bindlesource/Startup.cs b/examples/bindlesource/Startup.cs
@@ -1,26 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Deislabs.WAGI.Extensions;
-using Microsoft.AspNetCore.Authentication.Cookies;
+using Deislabs.Wagi.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace BindleSource
 {
     public class Startup
     {
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
-                      .AddCookie();
-            services.AddAuthorization();
+            services.AddHttpClient();
+            services.AddWagi(Configuration);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -33,11 +34,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseRouting();
 
-            app.UseAuthorization();
-
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapWASMModules();
+                endpoints.MapWagiModules();
             });
         }
     }

diff --git a/examples/bindlesource/appsettings.Development.json b/examples/bindlesource/appsettings.Development.json
@@ -7,26 +7,26 @@
             "Deislabs.WAGI": "Trace"
         }
     },
-    "WASM": {
+    "Wagi": {
         "ModulePath": "modules",
-        "BindleServer" : "https://bindle.deislabs.io/v1",
+        "BindleServer": "https://bindle.deislabs.io/v1",
         "Bindles": {
             "Current": {
                 "Name": "hippos.rocks/helloworld/1.0.0",
-                "Route" : "/"
+                "Route": "/"
             },
             "Version 1.1.0": {
                 "Name": "hippos.rocks/helloworld/1.1.0",
-                "Route" : "/1.1.0",
-                "Hostnames" : [
+                "Route": "/1.1.0",
+                "Hostnames": [
                     "127.0.0.1:5004",
                     "127.0.0.1:5005"
                 ]
             },
             "Version v1": {
                 "Name": "hippos.rocks/helloworld/1.1.0",
-                "Route" : "/v1",
-                "Hostnames" : [
+                "Route": "/v1",
+                "Hostnames": [
                     "127.0.0.1:5003"
                 ]
             }

diff --git a/examples/fibonacci.test/FibonacciTest.cs b/examples/fibonacci.test/FibonacciTest.cs
@@ -12,7 +12,7 @@ public FibonacciTest()
             factory = new WebApplicationFactory<Startup>();
         }
         [Fact]
-        public async Task TestInvokeWASM()
+        public async Task TestInvokeWagi()
         {
             var client = factory.CreateClient();
 

diff --git a/examples/fibonacci/README.md b/examples/fibonacci/README.md
@@ -35,9 +35,9 @@ fib(93)=12200160415121876738
 The configuration for this is example can be found in the [appsettings.Development.json](appsettings.Development.json) configuration file:
 
 ``` json
-  // The name of the configuration section for the WASM route handler, by default this is expected to be called WASM.
-  "WASM": {
-    // The relative path to the directory where WASM modules defined in this configuration section are located.
+  // The name of the configuration section for the WAGI route handler, by default this is expected to be called Wagi.
+  "Wagi": {
+    // The relative path to the directory where WAGI modules defined in this configuration section are located.
     "ModulePath": "modules",
     // A dictionary of one or more modules to be exposed by the application
     "Modules": {

diff --git a/examples/fibonacci/Startup.cs b/examples/fibonacci/Startup.cs
@@ -1,17 +1,27 @@
-using Deislabs.WAGI.Extensions;
+using Deislabs.Wagi.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace Fibonacci
 {
     public class Startup
     {
+        public IConfiguration Configuration { get; }
+
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddHttpClient();
+            services.AddWagi(Configuration);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -26,7 +36,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapWASMModules();
+                endpoints.MapWagiModules();
             });
         }
     }

diff --git a/examples/fibonacci/appsettings.Development.json b/examples/fibonacci/appsettings.Development.json
@@ -7,7 +7,7 @@
       "Deislabs.WAGI": "Trace"
     }
   },
-  "WASM": {
+  "Wagi": {
     "ModulePath": "modules",
     "Modules": {
       "fibonacci": {

diff --git a/examples/simplehttp.test/SimpleHttpTest.cs b/examples/simplehttp.test/SimpleHttpTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Net.Http;
 using System.Net.Http.Json;
@@ -28,7 +28,7 @@ public SimplehttpTestFixture()
             this.AccountKey = Environment.GetEnvironmentVariable(SimplehttpTestFixture.TestStorageAccountKeyEnvVar);
             // TODO: create the container if not existing
             this.ContainerName = "wagitest";
-            this.TestPostData = "Hello from wagi-experimental-http";
+            this.TestPostData = "Hello from wasi-experimental-http";
 
         }
     }
@@ -68,7 +68,7 @@ public async Task TestReadWriteBlob()
         {
             var configData = $@"
       {{
-        ""WASM"": {{
+        ""Wagi"": {{
           ""Modules"": {{
             ""Write blob"": {{
               ""Environment"" :{{

diff --git a/examples/simplehttp/README.md b/examples/simplehttp/README.md
@@ -47,7 +47,7 @@ The Azure blob example requires an [Azure account] (https://azure.microsoft.com/
 To create blobs in the Azure Storage service configure the WAGI Modules with details of the [Azure Storage Account](https://docs.microsoft.com/en-us/azure/storage/common/storage-account-create?tabs=azure-portal) to read and write to, modify [appsettings.Development.json](appsettings.Development.json) as follows:
 
 ```
- "WASM": {
+ "Wagi": {
     "ModulePath": "modules",
     "Modules": {
       "Write blob": {
@@ -58,7 +58,7 @@ To create blobs in the Azure Storage service configure the WAGI Modules with det
           "STORAGE_MASTER_KEY" : "" // STORAGE_MASTER_KEY should be set to one of the Azure storage account keys
         },
         "AllowedHosts": [
-          "https://<storage_account>.blob.core.windows.net" // replace <storage_account> with the storage account name
+          "https://YOUR_STORAGE_ACCOUNT.blob.core.windows.net" // replace YOUR_STORAGE_ACCOUNT with the storage account name
         ],
         "HttpMethod": "post",
         "Route" : "/writeblob"
@@ -71,7 +71,7 @@ To create blobs in the Azure Storage service configure the WAGI Modules with det
           "STORAGE_MASTER_KEY" : "" // STORAGE_MASTER_KEY should be set to one of the Azure storage account keys
         },
         "AllowedHosts": [
-          "https://<storage_account>.blob.core.windows.net" // replace <storage_account> with the storage 
+          "https://YOUR_STORAGE_ACCOUNT.blob.core.windows.net" // replace YOUR_STORAGE_ACCOUNT with the storage 
         ],
         "Route" : "/readblob"
       }

diff --git a/examples/simplehttp/Startup.cs b/examples/simplehttp/Startup.cs
@@ -1,24 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Deislabs.WAGI.Extensions;
-using Microsoft.AspNetCore.Authentication.Cookies;
+using Deislabs.Wagi.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace Simplehttp
 {
     public class Startup
     {
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddHttpClient();
+            services.AddWagi(Configuration);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -33,7 +36,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapWASMModules();
+                endpoints.MapWagiModules();
             });
         }
     }

diff --git a/examples/simplehttp/appsettings.Development.json b/examples/simplehttp/appsettings.Development.json
@@ -8,7 +8,7 @@
       "Wasi.Experimental.Http": "Trace"
     }
   },
-  "WASM": {
+  "Wagi": {
     "ModulePath": "modules",
     "Modules": {
       "Simple Test": {
@@ -30,7 +30,7 @@
           "STORAGE_MASTER_KEY" : ""
         },
         "AllowedHosts": [
-          "https://<storage_account>.blob.core.windows.net"
+            "https://YOUR_STORAGE_ACCOUNT.blob.core.windows.net"
         ],
         "HttpMethod": "post",
         "Route": "/writeblob"
@@ -43,7 +43,7 @@
           "STORAGE_MASTER_KEY" : ""
         },
         "AllowedHosts": [
-          "https://<storage_account>.blob.core.windows.net"
+            "https://YOUR_STORAGE_ACCOUNT.blob.core.windows.net"
         ],
         "Route": "/readblob"
       }

diff --git a/examples/watm.test/WatmTest.cs b/examples/watm.test/WatmTest.cs
@@ -13,7 +13,7 @@ public WatmTest()
             factory = new WebApplicationFactory<Startup>();
         }
         [Fact]
-        public async Task TestInvokeWASM()
+        public async Task TestInvokeWagi()
         {
             var client = factory.CreateClient();
 

diff --git a/examples/watm/README.md b/examples/watm/README.md
@@ -35,9 +35,9 @@ Hello World!
 The configuration for this is example can be found in the [appsettings.Development.json](appsettings.Development.json) configuration file:
 
 ``` json
-  // The name of the configuration section for the WASM route handler, by default this is expected to be called WASM.
-  "WASM": {
-    // The relative path to the directory where WASM modules defined in this configuration section are located.
+  // The name of the configuration section for the WAGI route handler, by default this is expected to be called Wagi.
+  "Wagi": {
+    // The relative path to the directory where WAGI modules defined in this configuration section are located.
     "ModulePath": "modules",
     // A dictionary of one or more modules to be exposed by the application
     "Modules": {

diff --git a/examples/watm/Startup.cs b/examples/watm/Startup.cs
@@ -1,26 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Deislabs.WAGI.Extensions;
-using Microsoft.AspNetCore.Authentication.Cookies;
+using Deislabs.Wagi.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace Watm
 {
     public class Startup
     {
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
-                      .AddCookie();
-            services.AddAuthorization();
+            services.AddHttpClient();
+            services.AddWagi(Configuration);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -33,11 +34,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseRouting();
 
-            app.UseAuthorization();
-
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapWASMModules();
+                endpoints.MapWagiModules();
             });
         }
     }

diff --git a/examples/watm/appsettings.Development.json b/examples/watm/appsettings.Development.json
@@ -7,7 +7,7 @@
       "Deislabs.WAGI": "Trace"
     }
   },
-  "WASM": {
+  "Wagi": {
     "ModulePath": "modules",
     "Modules": {
       "hellowat": {

diff --git a/examples/watmwithauth/Properties/launchSettings.json b/examples/watmwithauth/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "watm": {
+    "watmwithauth": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,