fix: remove gRPC Core

aneoconsulting · May 6, 2024 · e63dfd5 · e63dfd5
1 parent 6812303
commit e63dfd5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 49 deletions.
diff --git a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj
@@ -8,12 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ArmoniK.Api.Client" Version="3.17.0" />
-    <PackageReference Include="Grpc.Core" Version="2.46.6" />
+    <PackageReference Include="ArmoniK.Api.Client" Version="3.17.2-flremovegrpccore.1.d0aa290" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Client/src/Common/Submitter/ChannelPool.cs b/Client/src/Common/Submitter/ChannelPool.cs
@@ -107,21 +107,6 @@ private static bool ShutdownOnFailure(ChannelBase channel)
     {
       switch (channel)
       {
-        case Channel chan:
-          switch (chan.State)
-          {
-            case ChannelState.TransientFailure:
-              chan.ShutdownAsync()
-                  .Wait();
-              return true;
-            case ChannelState.Shutdown:
-              return true;
-            case ChannelState.Idle:
-            case ChannelState.Connecting:
-            case ChannelState.Ready:
-            default:
-              return false;
-          }
 #if NET5_0_OR_GREATER
         case GrpcChannel chan:
           switch (chan.State)

diff --git a/Client/src/Common/Submitter/ClientServiceConnector.cs b/Client/src/Common/Submitter/ClientServiceConnector.cs
@@ -14,8 +14,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-
 using ArmoniK.Api.Client.Options;
 using ArmoniK.Api.Client.Submitter;
 
@@ -49,23 +47,6 @@ public static ChannelPool ControlPlaneConnectionPool(Properties      properties,
                     OverrideTargetName    = properties.TargetNameOverride,
                   };
 
-    if (properties.ControlPlaneUri.Scheme == Uri.UriSchemeHttps && options.AllowUnsafeConnection && string.IsNullOrEmpty(options.OverrideTargetName))
-    {
-#if NET5_0_OR_GREATER
-      var doOverride = !string.IsNullOrEmpty(options.CaCert);
-#else
-      var doOverride = true;
-#endif
-      if (doOverride)
-      {
-        // Doing it here once to improve performance
-        options.OverrideTargetName = GrpcChannelFactory.GetOverrideTargetName(options,
-                                                                              GrpcChannelFactory.GetServerCertificate(properties.ControlPlaneUri,
-                                                                                                                      options)) ?? "";
-      }
-    }
-
-
     return new ChannelPool(() => GrpcChannelFactory.CreateChannel(options,
                                                                   loggerFactory?.CreateLogger(typeof(ClientServiceConnector))));
   }

diff --git a/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj b/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Common/ArmoniK.EndToEndTests.Common.csproj
@@ -12,13 +12,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ArmoniK.Api.Common" Version="3.17.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+    <PackageReference Include="ArmoniK.Api.Common" Version="3.17.2-flremovegrpccore.1.d0aa290" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj b/Worker/src/Common/ArmoniK.DevelopmentKit.Worker.Common.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ArmoniK.Api.Worker" Version="3.17.0" />
+    <PackageReference Include="ArmoniK.Api.Worker" Version="3.17.2-flremovegrpccore.1.d0aa290" />
     <PackageReference Include="AWSSDK.S3" Version="3.7.106.1" />
     <!-- AWSSDK.SecurityToken is used by AWSSDK.S3 to automatically get credentials from pod secrets -->
     <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.103.16" />