Merge pull request #8 from jbonnett92/master

API Gateway now working with Consul and Swagger implemented
madslundt · Oct 12, 2020 · 1a8e761 · 1a8e761
2 parents 7862ef1 + ea27a53
commit 1a8e761
Show file tree

Hide file tree

Showing 18 changed files with 216 additions and 17 deletions.
diff --git a/ApiGateway/Ocelot/ApiGateway.csproj b/ApiGateway/Ocelot/ApiGateway.csproj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.7" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+    <PackageReference Include="MMLib.SwaggerForOcelot" Version="2.5.1" />
     <PackageReference Include="Ocelot" Version="16.0.1" />
     <PackageReference Include="Ocelot.Administration" Version="16.0.1" />
     <PackageReference Include="Ocelot.Provider.Consul" Version="16.0.1" />

diff --git a/ApiGateway/Ocelot/Configuration/ocelot.global.json b/ApiGateway/Ocelot/Configuration/ocelot.global.json
@@ -29,5 +29,38 @@
     "ExceptionsAllowedBeforeBreaking": 3,
     "DurationOfBreak": 10000,
     "TimeoutValue": 5000
-  }
+  },
+
+  "SwaggerEndPoints": [
+    {
+      "Key": "users",
+      "Config": [
+        {
+          "Name": "Users API",
+          "Version": "v1",
+          "Url": "http://users_service/swagger/v1/swagger.json"
+        }
+      ]
+    },
+    {
+      "Key": "movies",
+      "Config": [
+        {
+          "Name": "Movies API",
+          "Version": "v1",
+          "Url": "http://movies_service/swagger/v1/swagger.json"
+        }
+      ]
+    },
+    {
+      "Key": "reviews",
+      "Config": [
+        {
+          "Name": "Reviews API",
+          "Version": "v1",
+          "Url": "http://reviews_service/swagger/v1/swagger.json"
+        }
+      ]
+    }
+  ]
 }
diff --git a/ApiGateway/Ocelot/Configuration/ocelot.movies.json b/ApiGateway/Ocelot/Configuration/ocelot.movies.json
@@ -8,7 +8,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "movies"
     },
     {
       "DownstreamPathTemplate": "/api/movies/{movieId}/reviews/{everything}",
@@ -18,7 +19,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "movies"
     },
     {
       "DownstreamPathTemplate": "/api/movies",
@@ -28,7 +30,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "movies"
     },
     {
       "DownstreamPathTemplate": "/api/movies/{everything}",
@@ -38,7 +41,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "movies"
     }
   ]
 }
diff --git a/ApiGateway/Ocelot/Configuration/ocelot.reviews.json b/ApiGateway/Ocelot/Configuration/ocelot.reviews.json
@@ -8,7 +8,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "reviews"
     },
     {
       "DownstreamPathTemplate": "/api/reviews/{everything}",
@@ -18,7 +19,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "reviews"
     }
   ]
 }
diff --git a/ApiGateway/Ocelot/Configuration/ocelot.users.json b/ApiGateway/Ocelot/Configuration/ocelot.users.json
@@ -8,7 +8,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "users"
     },
     {
       "DownstreamPathTemplate": "/api/users/{userId}/movies/{everything}",
@@ -18,7 +19,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "users"
     },
 
     {
@@ -29,7 +31,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "users"
     },
     {
       "DownstreamPathTemplate": "/api/users/{userId}/reviews/{everything}",
@@ -39,18 +42,21 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "users"
     },
 
     {
       "DownstreamPathTemplate": "/api/users",
       "DownstreamScheme": "http",
       "UpstreamPathTemplate": "/api/users",
+      "UpstreamHttpMethod": [ "Post", "Get" ],
       "ServiceName": "UsersService",
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "users"
     },
     {
       "DownstreamPathTemplate": "/api/users/{everything}",
@@ -60,7 +66,8 @@
       "FileCacheOptions": { "TtlSeconds": 15 },
       "LoadBalancerOptions": {
         "Type": "LeastConnection"
-      }
+      },
+      "SwaggerKey": "users"
     }
   ]
 }
diff --git a/ApiGateway/Ocelot/Program.cs b/ApiGateway/Ocelot/Program.cs
@@ -7,7 +7,7 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
+            CreateHostBuilder(args).Build().Run(); 
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>

diff --git a/ApiGateway/Ocelot/Startup.cs b/ApiGateway/Ocelot/Startup.cs
@@ -53,6 +53,7 @@ public Startup(IWebHostEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             services
+                .AddSwaggerForOcelot(Configuration)
                 .AddOcelot(Configuration)
                 .AddConsul()
                 .AddConfigStoredInConsul();
@@ -63,6 +64,10 @@ public void Configure(IApplicationBuilder app)
         {
             app.UseStaticFiles();
 
+            app.UseSwaggerForOcelotUI(opt => {
+                opt.PathToSwaggerGenerator = "/swagger/docs";
+            });
+
             app
                 .UseOcelot()
                 .Wait();

diff --git a/ApiGateway/Ocelot/appsettings.json b/ApiGateway/Ocelot/appsettings.json
@@ -8,11 +8,11 @@
     }
   },
   "AllowedHosts": "*",
-
   "GlobalConfiguration": {
     "ServiceDiscoveryProvider": {
       "Type": "PollConsul",
-      "Host": "http://consul",
+      "Scheme": "http",
+      "Host": "consul",
       "Port": 8500,
       "ConfigurationKey": "ApiGateway_1",
       "PollingInterval": 100

diff --git a/Compose/docker-compose.ocelot.yml b/Compose/docker-compose.ocelot.yml
@@ -14,5 +14,6 @@ services:
       - users_service
       - movies_service
       - reviews_service
+      - consul
     depends_on:
       - consul
diff --git a/Compose/docker-compose.yml b/Compose/docker-compose.yml
@@ -92,10 +92,13 @@ services:
     image: consul
     container_name: consul
     restart: on-failure
+    volumes:
+    - consul-data:/consul/config
     ports:
      - "8500:8500"
     networks:
      - network-microservice
 
 volumes:
   elasticsearch-data:
+  consul-data:
diff --git a/Src/MoviesService/Startup.cs b/Src/MoviesService/Startup.cs
@@ -55,6 +55,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
                 app.UseDeveloperExceptionPage();
             }
 
+            UpdateDatabase(app);
+
             app
                 .UseLogging(Configuration, loggerFactory)
                 .UseSwagger(Configuration)
@@ -63,5 +65,18 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
 
             app.UseSubscribeAllEvents();
         }
+
+        private static void UpdateDatabase(IApplicationBuilder app)
+        {
+            using (var serviceScope = app.ApplicationServices
+                .GetRequiredService<IServiceScopeFactory>()
+                .CreateScope())
+            {
+                using (var context = serviceScope.ServiceProvider.GetService<DatabaseContext>())
+                {
+                    context.Database.Migrate();
+                }
+            }
+        }
     }
 }
diff --git a/Src/MoviesService/appsettings.json b/Src/MoviesService/appsettings.json
@@ -51,6 +51,7 @@
   "ConsulOptions": {
     "ConsulAddress": "http://consul:8500",
     "ServiceAddress": "http://movies_service",
+    "ServiceName": "MoviesService",
     "DisableAgentCheck": false,
     "Tags": []
   },

diff --git a/Src/ReviewsService/Startup.cs b/Src/ReviewsService/Startup.cs
@@ -55,6 +55,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
                 app.UseDeveloperExceptionPage();
             }
 
+            UpdateDatabase(app);
+
             app
                 .UseLogging(Configuration, loggerFactory)
                 .UseSwagger(Configuration)
@@ -63,5 +65,18 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
 
             app.UseSubscribeAllEvents();
         } 
+
+        private static void UpdateDatabase(IApplicationBuilder app)
+        {
+            using (var serviceScope = app.ApplicationServices
+                .GetRequiredService<IServiceScopeFactory>()
+                .CreateScope())
+            {
+                using (var context = serviceScope.ServiceProvider.GetService<DatabaseContext>())
+                {
+                    context.Database.Migrate();
+                }
+            }
+        }
     }
 }
diff --git a/Src/ReviewsService/appsettings.json b/Src/ReviewsService/appsettings.json
@@ -9,7 +9,7 @@
   "AllowedHosts": "*",
 
   "ConnectionStrings": {
-    "AppConnection": "Server=localhost,1433;Database=reviews_db;User=sa;Password=pass123!;"
+    "AppConnection": "Server=db,1433;Database=reviews_db;User=sa;Password=pass123!;"
   },
 
   "MessageBrokersOptions": {
@@ -51,6 +51,7 @@
   "ConsulOptions": {
     "ConsulAddress": "http://consul:8500",
     "ServiceAddress": "http://reviews_service",
+    "ServiceName": "ReviewsService",
     "DisableAgentCheck": false,
     "Tags": []
   },

diff --git a/Src/UsersService/Controllers/UserController.cs b/Src/UsersService/Controllers/UserController.cs
@@ -54,5 +54,17 @@ public UserController(IQueryBus queryBus, ICommandBus commandBus)
 
             return Ok(result);
         }
+
+        [HttpGet, Route("")]
+        public async Task<ActionResult<GetUsersQuery.Result>> CreateUser(CancellationToken cancellationToken)
+        {
+            var query = new GetUsersQuery.Query
+            {
+            };
+
+            var result = await _queryBus.Send(query, cancellationToken);
+
+            return Ok(result);
+        }
     }
 }