Allow multi patch http content type header (#521)

* header from obj

* update git version mod

* remove json patch test

* test for json patch

Author: tg123

.github/workflows/buildtest.yaml

@@ -8,7 +8,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     name: Dotnet build
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Setup dotnet SDK 2.1
@@ -19,6 +19,10 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '3.1.x'          
+      - name: Setup dotnet SDK 5
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'          
       - name: Setup Format
         run: dotnet tool install -g dotnet-format
       - name: Check Format
@@ -48,6 +52,10 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '3.1.x'          
+      - name: Setup dotnet SDK 5
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'                
       - name: Minikube
         run: minikube start
       - name: Test

src/KubernetesClient/Kubernetes.Header.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Net.Http.Headers;
+using k8s.Models;
+
+namespace k8s
+{
+    public partial class Kubernetes
+    {
+        public virtual MediaTypeHeaderValue GetHeader(object body)
+        {
+            if (body == null)
+            {
+                throw new ArgumentNullException(nameof(body));
+            }
+
+            return MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+        }
+
+
+        public virtual MediaTypeHeaderValue GetHeader(V1Patch body)
+        {
+            if (body == null)
+            {
+                throw new ArgumentNullException(nameof(body));
+            }
+
+            switch (body.Type)
+            {
+                case V1Patch.PatchType.JsonPatch:
+                    return MediaTypeHeaderValue.Parse("application/json-patch+json; charset=utf-8");
+                case V1Patch.PatchType.MergePatch:
+                    return MediaTypeHeaderValue.Parse("application/merge-patch+json; charset=utf-8");
+                case V1Patch.PatchType.StrategicMergePatch:
+                    return MediaTypeHeaderValue.Parse("application/strategic-merge-patch+json; charset=utf-8");
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(body.Type), "");
+            }
+        }
+    }
+}

src/KubernetesClient/KubernetesClient.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Authors>The Kubernetes Project Authors</Authors>
     <Copyright>2017 The Kubernetes Project Authors</Copyright>
@@ -30,18 +30,19 @@
     <PackageReference Include="AutoMapper" Version="7.0.1" Condition="'$(TargetFramework)' == 'net452'" />
     <PackageReference Include="AutoMapper" Version="9.0.0" Condition="'$(TargetFramework)' != 'net452'" />
     <PackageReference Include="Fractions" Version="4.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="1.1.2" Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.1'" />
-    <PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="3.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.50" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.1.3" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" Condition="'$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netcoreapp2.1'" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net452'" />
     <PackageReference Include="YamlDotNet" Version="8.1.2" />
     <PackageReference Include="System.Buffers" Version="4.5.1" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+    <Reference Include="System.Runtime.InteropServices" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

src/KubernetesClient/V1Patch.cs

@@ -1,5 +1,4 @@
 using System;
-using Microsoft.AspNetCore.JsonPatch;
 using Newtonsoft.Json;
 
 namespace k8s.Models
@@ -9,38 +8,32 @@ public partial class V1Patch
     {
         public enum PatchType
         {
+            Unknown,
             JsonPatch,
             MergePatch,
             StrategicMergePatch,
         }
 
         public PatchType Type { get; private set; }
 
-        public V1Patch(IJsonPatchDocument jsonPatch)
-            : this((object)jsonPatch)
+        public V1Patch(object body, PatchType type)
         {
-        }
-
-        public V1Patch(String body, PatchType type)
-            : this(body)
-        {
-            this.Type = type;
+            Content = body;
+            Type = type;
+            CustomInit();
         }
 
         partial void CustomInit()
         {
-            if (Content is IJsonPatchDocument)
+            if (Content == null)
             {
-                Type = PatchType.JsonPatch;
-                return;
+                throw new ArgumentNullException(nameof(Content), "object must be set");
             }
 
-            if (Content is String)
+            if (Type == PatchType.Unknown)
             {
-                return;
+                throw new ArgumentException("patch type must be set", nameof(Type));
             }
-
-            throw new NotSupportedException();
         }
     }
 }