Merge pull request #3 from ThreeMammals/master

Master merge

Author: jlukawska

README.md

@@ -1,10 +1,10 @@
-[<img src="https://threemammals.com/ocelot_logo.png">](https://threemammals.com/ocelot)
+[<img src="https://threemammals.com/images/ocelot_logo.png">](https://threemammals.com/ocelot)
 
 [![CircleCI](https://circleci.com/gh/ThreeMammals/Ocelot/tree/master.svg?style=svg)](https://circleci.com/gh/ThreeMammals/Ocelot/tree/master)
 
 [![Coverage Status](https://coveralls.io/repos/github/ThreeMammals/Ocelot/badge.svg?branch=master)](https://coveralls.io/github/ThreeMammals/Ocelot?branch=master)
 
-[Slack](threemammals.slack.com)
+[Slack](https://threemammals.slack.com)
 
 # Ocelot
 
@@ -48,7 +48,7 @@ A quick list of Ocelot's capabilities for more information see the [documentatio
 * Retry policies / QoS
 * Load Balancing
 * Logging / Tracing / Correlation
-* Headers / Query String / Claims Transformation
+* Headers / Method / Query String / Claims Transformation
 * Custom Middleware / Delegating Handlers
 * Configuration / Administration REST API
 * Platform / Cloud Agnostic

build.cake

@@ -134,11 +134,12 @@ Task("RunUnitTests")
 		var coverageSummaryFile = GetSubDirectories(artifactsForUnitTestsDir).First().CombineWithFilePath(File("coverage.opencover.xml"));
 		Information(coverageSummaryFile);
 		Information(artifactsForUnitTestsDir);
+
 		// todo bring back report generator to get a friendly report
 		// ReportGenerator(coverageSummaryFile, artifactsForUnitTestsDir);
 		// https://github.com/danielpalme/ReportGenerator
-	
-		if (IsRunningOnCircleCI())
+		
+		if (IsRunningOnCircleCI() && IsMaster())
 		{
 			var repoToken = EnvironmentVariable(coverallsRepoToken);
 			if (string.IsNullOrEmpty(repoToken))
@@ -497,4 +498,9 @@ private string GetResource(string url)
 private bool IsRunningOnCircleCI()
 {
     return !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("CIRCLECI"));
+}
+
+private bool IsMaster()
+{
+    return Environment.GetEnvironmentVariable("CIRCLE_BRANCH").ToLower() == "master";
 }

docs/features/configuration.rst

@@ -14,7 +14,7 @@ Then add the following to your ConfigureServices method.
     s.AddOcelot()
      .AddKubernetes();
 
-If you have services deployed in kubernetes you will normally use the naming service to access them. Default usePodServiceAccount = True, which means that ServiceAccount using Pod to access the service of the k8s cluster needs to be ServiceAccount based on RABC authorization
+If you have services deployed in kubernetes you will normally use the naming service to access them. Default usePodServiceAccount = True, which means that ServiceAccount using Pod to access the service of the k8s cluster needs to be ServiceAccount based on RBAC authorization
 
 .. code-block::csharp
     public static class OcelotBuilderExtensions

docs/features/kubernetes.rst

@@ -0,0 +1,28 @@
+HTTP Method Transformation
+==========================
+
+Ocelot allows the user to change the HTTP request method that will be used when making a request to a downstream service.
+
+This achieved by setting the following ReRoute configuration:
+
+.. code-block:: json
+
+    {
+        "DownstreamPathTemplate": "/{url}",
+        "UpstreamPathTemplate": "/{url}",
+        "UpstreamHttpMethod": [
+            "Get"
+        ],
+        "DownstreamHttpMethod": "POST",
+        "DownstreamScheme": "http",
+        "DownstreamHostAndPorts": [
+            {
+                "Host": "localhost",
+                "Port": 53271
+            }
+        ],
+    }
+
+The key property here is DownstreamHttpMethod which is set as POST and the ReRoute will only match on GET as set by UpstreamHttpMethod.
+
+This feature can be useful when interacting with downstream apis that only support POST and you want to present some kind of RESTful interface.

docs/features/methodtransformation.rst

@@ -23,7 +23,7 @@ Thanks for taking a look at the Ocelot documentation. Please use the left hand n
    features/requestaggregation
    features/graphql
    features/servicediscovery
-   features/servicefabric
+   features/servicefabric
    features/kubernetes
    features/authentication
    features/authorisation
@@ -33,6 +33,7 @@ Thanks for taking a look at the Ocelot documentation. Please use the left hand n
    features/caching
    features/qualityofservice
    features/headerstransformation 
+   features/methodtransformation
    features/claimstransformation 
    features/logging
    features/tracing

docs/index.rst

@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Folder Include="wwwroot\"/>
+    <Folder Include="wwwroot\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App"/>
-    <PackageReference Include="Ocelot" Version="12.0.1"/>
-    <PackageReference Include="Ocelot.Administration" Version="0.1.0"/>
+    <PackageReference Include="Ocelot" Version="14.0.3" />
+    <PackageReference Include="Ocelot.Administration" Version="14.0.3" />
+
   </ItemGroup>
 </Project>

samples/AdministrationApi/AdministrationApi.csproj

@@ -1,19 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Ocelot.Administration;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
-using Ocelot.Administration;
+using System.IO;
 
 namespace AdministrationApi
 {
-  public class Program
+    public class Program
 {
     public static void Main(string[] args)
     {

samples/AdministrationApi/Program.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Ocelot.DependencyInjection;
 using Ocelot.Middleware;
 using Ocelot.Provider.Kubernetes;
@@ -18,7 +19,7 @@ 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)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {

samples/OcelotKube/ApiGateway/Startup.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -28,7 +29,7 @@ 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)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {