From 338dd865dfa1bfc7f44ec1394aab1d7d6e49232f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:50:38 +0000 Subject: [PATCH 1/5] Bump Microsoft.Extensions.Caching.Memory in /test/Ocelot.AcceptanceTests Bumps [Microsoft.Extensions.Caching.Memory](https://github.com/dotnet/runtime) from 8.0.0 to 8.0.1. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.0...v8.0.1) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Caching.Memory dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../Ocelot.AcceptanceTests.csproj | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj index 968fd5e79..da3788fd8 100644 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -87,21 +87,21 @@ - + - - - - - - - - + + + + + + + + - + From b256f8d6a360051f7bc93689a664238faab53a80 Mon Sep 17 00:00:00 2001 From: Raman Maksimchuk Date: Tue, 15 Oct 2024 19:22:53 +0300 Subject: [PATCH 2/5] Revert "Bump Microsoft.Extensions.Caching.Memory in /test/Ocelot.AcceptanceTests" This reverts commit 338dd865dfa1bfc7f44ec1394aab1d7d6e49232f. --- .../Ocelot.AcceptanceTests.csproj | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj index da3788fd8..968fd5e79 100644 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -87,21 +87,21 @@ - + - - - - - - - - + + + + + + + + - + From c63f875f4044b2ef25b0a221d2e6b16f6ad0d160 Mon Sep 17 00:00:00 2001 From: Raman Maksimchuk Date: Tue, 15 Oct 2024 19:41:18 +0300 Subject: [PATCH 3/5] Bump Microsoft.Extensions.Caching.Memory to 6.0.2/8.0.1 --- test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj | 4 ++-- test/Ocelot.UnitTests/Ocelot.UnitTests.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj index 968fd5e79..3bca55705 100644 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -75,7 +75,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj index 2ba5a4959..a0bd59d1f 100644 --- a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj +++ b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj @@ -81,7 +81,7 @@ - + @@ -105,7 +105,7 @@ - + From 1f165e32ed1643b814ba6b2e10d7c182af27fcc8 Mon Sep 17 00:00:00 2001 From: Raman Maksimchuk Date: Tue, 15 Oct 2024 20:50:57 +0300 Subject: [PATCH 4/5] Bump Microsoft.Extensions.* to 8.0.1 Microsoft.AspNetCore.* to 6.0.35/8.0.10 Microsoft.Data.SQLite to 6.0.35/8.0.10 --- .../Ocelot.Administration.csproj | 4 ++-- .../Ocelot.Cache.CacheManager.csproj | 4 ++-- src/Ocelot/Ocelot.csproj | 8 ++++---- .../Ocelot.AcceptanceTests.csproj | 12 ++++++------ .../Ocelot.IntegrationTests.csproj | 15 +++++++++------ test/Ocelot.ManualTest/Ocelot.ManualTest.csproj | 11 +++++++---- test/Ocelot.UnitTests/Ocelot.UnitTests.csproj | 12 ++++++------ 7 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/Ocelot.Administration/Ocelot.Administration.csproj b/src/Ocelot.Administration/Ocelot.Administration.csproj index e2b8ed463..08e3c9938 100644 --- a/src/Ocelot.Administration/Ocelot.Administration.csproj +++ b/src/Ocelot.Administration/Ocelot.Administration.csproj @@ -42,7 +42,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj b/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj index 0e8d704ee..92fdb9b7a 100644 --- a/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj +++ b/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj @@ -61,8 +61,8 @@ - - + + diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj index 2171a5f62..82bfb452f 100644 --- a/src/Ocelot/Ocelot.csproj +++ b/src/Ocelot/Ocelot.csproj @@ -43,8 +43,8 @@ - - + + @@ -53,8 +53,8 @@ - - + + diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj index 3bca55705..4a2955773 100644 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -74,7 +74,7 @@ - + @@ -100,14 +100,14 @@ - + - - - - + + + + diff --git a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj index 0b5f20d0e..e09b6ac15 100644 --- a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj +++ b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj @@ -56,7 +56,8 @@ - + + @@ -68,6 +69,7 @@ + @@ -78,13 +80,14 @@ - + + - - - - + + + + diff --git a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj index 45b21c6a5..aceeab861 100644 --- a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj +++ b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj @@ -38,6 +38,7 @@ + @@ -48,6 +49,7 @@ + @@ -58,12 +60,13 @@ + - - - - + + + + diff --git a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj index a0bd59d1f..909c6081b 100644 --- a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj +++ b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj @@ -80,7 +80,7 @@ - + @@ -104,14 +104,14 @@ - + - - - - + + + + From fec47e84ca4b7cfbd8cde998cbd714592eb69a74 Mon Sep 17 00:00:00 2001 From: Raman Maksimchuk Date: Tue, 15 Oct 2024 20:51:52 +0300 Subject: [PATCH 5/5] Delete obsolete files --- .../IKubeApiClientFactory.cs | 9 -------- .../KubeApiClientFactory.cs | 22 ------------------- .../Ocelot.Provider.Kubernetes.csproj | 4 ---- 3 files changed, 35 deletions(-) delete mode 100644 src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs delete mode 100644 src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs diff --git a/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs b/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs deleted file mode 100644 index 56f175014..000000000 --- a/src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs +++ /dev/null @@ -1,9 +0,0 @@ -using KubeClient; - -namespace Ocelot.Provider.Kubernetes -{ - public interface IKubeApiClientFactory - { - IKubeApiClient Get(KubeRegistryConfiguration config); - } -} diff --git a/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs b/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs deleted file mode 100644 index 48719940c..000000000 --- a/src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs +++ /dev/null @@ -1,22 +0,0 @@ -using KubeClient; - -namespace Ocelot.Provider.Kubernetes -{ - public class KubeApiClientFactory : IKubeApiClientFactory - { - public IKubeApiClient Get(KubeRegistryConfiguration config) - { - var option = new KubeClientOptions - { - ApiEndPoint = config.ApiEndPoint - }; - if (!string.IsNullOrEmpty(config?.AccessToken)) - { - option.AccessToken = config.AccessToken; - option.AuthStrategy = config.AuthStrategy; - option.AllowInsecure = config.AllowInsecure; - } - return KubeApiClient.Create(option); - } - } -} diff --git a/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj b/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj index 4941194e9..d3e2ce806 100644 --- a/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj +++ b/src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj @@ -24,10 +24,6 @@ True 1591 - - - -