chore: update protos dependency (#108)

This updates to the latest protos. These properly namespace the protos to `Momento.Protos`, hence the updates necessary to the client code here.
momentohq · Aug 11, 2022 · 70676fb · 70676fb
1 parent 2e8d77c
commit 70676fb
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 34 deletions.
diff --git a/Momento/Incubating/Internal/ScsDataClient.cs b/Momento/Incubating/Internal/ScsDataClient.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using CacheClient;
 using Google.Protobuf;
+using Momento.Protos.CacheClient;
+using MomentoSdk.Exceptions;
+using MomentoSdk.Incubating.Responses;
 using MomentoSdk.Internal;
 using MomentoSdk.Internal.ExtensionMethods;
-using MomentoSdk.Incubating.Responses;
-using MomentoSdk.Exceptions;
 
 namespace MomentoSdk.Incubating.Internal;
 

diff --git a/Momento/Incubating/Responses/CacheDictionaryFetchResponse.cs b/Momento/Incubating/Responses/CacheDictionaryFetchResponse.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Google.Protobuf.Collections;
-using CacheClient;
-using MomentoSdk.Responses;
+using Momento.Protos.CacheClient;
 using MomentoSdk.Internal;
+using MomentoSdk.Responses;
 
 namespace MomentoSdk.Incubating.Responses;
 

diff --git a/Momento/Incubating/Responses/CacheDictionaryGetBatchResponse.cs b/Momento/Incubating/Responses/CacheDictionaryGetBatchResponse.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using CacheClient;
+using Momento.Protos.CacheClient;
 using MomentoSdk.Responses;
 
 

diff --git a/Momento/Incubating/Responses/CacheDictionaryGetResponse.cs b/Momento/Incubating/Responses/CacheDictionaryGetResponse.cs
@@ -1,7 +1,7 @@
-using CacheClient;
-using Google.Protobuf;
-using MomentoSdk.Responses;
+using Google.Protobuf;
+using Momento.Protos.CacheClient;
 using MomentoSdk.Exceptions;
+using MomentoSdk.Responses;
 
 namespace MomentoSdk.Incubating.Responses;
 

diff --git a/Momento/Incubating/Responses/CacheSetFetchResponse.cs b/Momento/Incubating/Responses/CacheSetFetchResponse.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using Google.Protobuf;
 using Google.Protobuf.Collections;
-using CacheClient;
+using Momento.Protos.CacheClient;
 using MomentoSdk.Internal;
 using MomentoSdk.Responses;
 

diff --git a/Momento/Internal/ControlGrpcManager.cs b/Momento/Internal/ControlGrpcManager.cs
@@ -1,9 +1,9 @@
 using System;
+using System.Collections.Generic;
 using Grpc.Core;
 using Grpc.Core.Interceptors;
 using Grpc.Net.Client;
-using ControlClient;
-using System.Collections.Generic;
+using Momento.Protos.ControlClient;
 using static System.Reflection.Assembly;
 
 namespace MomentoSdk.Internal;

diff --git a/Momento/Internal/DataGrpcManager.cs b/Momento/Internal/DataGrpcManager.cs
@@ -1,9 +1,9 @@
 using System;
-using CacheClient;
+using System.Collections.Generic;
 using Grpc.Core;
 using Grpc.Core.Interceptors;
 using Grpc.Net.Client;
-using System.Collections.Generic;
+using Momento.Protos.CacheClient;
 using static System.Reflection.Assembly;
 
 namespace MomentoSdk.Internal;

diff --git a/Momento/Internal/ScsControlClient.cs b/Momento/Internal/ScsControlClient.cs
@@ -1,7 +1,7 @@
 using System;
-using MomentoSdk.Responses;
+using Momento.Protos.ControlClient;
 using MomentoSdk.Exceptions;
-using ControlClient;
+using MomentoSdk.Responses;
 
 namespace MomentoSdk.Internal;
 
@@ -51,7 +51,7 @@ public ListCachesResponse ListCaches(string? nextPageToken = null)
         _ListCachesRequest request = new _ListCachesRequest() { NextToken = nextPageToken == null ? "" : nextPageToken };
         try
         {
-            ControlClient._ListCachesResponse result = this.grpcManager.Client.ListCaches(request, deadline: CalculateDeadline());
+            _ListCachesResponse result = this.grpcManager.Client.ListCaches(request, deadline: CalculateDeadline());
             return new ListCachesResponse(result);
         }
         catch (Exception e)

diff --git a/Momento/Internal/ScsDataClient.cs b/Momento/Internal/ScsDataClient.cs
@@ -1,13 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MomentoSdk.Internal.ExtensionMethods;
-using MomentoSdk.Responses;
-using MomentoSdk.Exceptions;
-using CacheClient;
 using Google.Protobuf;
 using Grpc.Core;
-using System.Collections.Generic;
+using Momento.Protos.CacheClient;
+using MomentoSdk.Exceptions;
+using MomentoSdk.Internal.ExtensionMethods;
+using MomentoSdk.Responses;
 
 namespace MomentoSdk.Internal;
 

diff --git a/Momento/MomentoSdk.csproj b/Momento/MomentoSdk.csproj
@@ -39,7 +39,7 @@
 		<PackageReference Include="Google.Protobuf" Version="3.19.0" />
 		<PackageReference Include="Grpc.Net.Client" Version="2.40.0" />
 		<PackageReference Include="Grpc.Core" Version="2.41.1" />
-		<PackageReference Include="Momento.Protos" Version="0.23.2" />
+		<PackageReference Include="Momento.Protos" Version="0.25.0" />
 		<PackageReference Include="JWT" Version="8.4.2" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0" />
 	</ItemGroup>

diff --git a/Momento/Responses/CacheGetResponse.cs b/Momento/Responses/CacheGetResponse.cs
@@ -1,5 +1,5 @@
-using CacheClient;
-using Google.Protobuf;
+using Google.Protobuf;
+using Momento.Protos.CacheClient;
 
 namespace MomentoSdk.Responses;
 

diff --git a/Momento/Responses/CacheGetStatus.cs b/Momento/Responses/CacheGetStatus.cs
@@ -1,4 +1,4 @@
-using CacheClient;
+using Momento.Protos.CacheClient;
 using MomentoSdk.Exceptions;
 
 namespace MomentoSdk.Responses;

diff --git a/Momento/Responses/CacheSetResponse.cs b/Momento/Responses/CacheSetResponse.cs
@@ -1,6 +1,4 @@
-using CacheClient;
-
-namespace MomentoSdk.Responses;
+namespace MomentoSdk.Responses;
 
 public class CacheSetResponse
 {

diff --git a/Momento/Responses/ListCachesResponse.cs b/Momento/Responses/ListCachesResponse.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Momento.Protos.ControlClient;
 
 namespace MomentoSdk.Responses;
 
@@ -7,11 +8,11 @@ public class ListCachesResponse
     public List<CacheInfo> Caches { get; }
     public string? NextPageToken { get; }
 
-    public ListCachesResponse(ControlClient._ListCachesResponse result)
+    public ListCachesResponse(_ListCachesResponse result)
     {
         NextPageToken = result.NextToken == "" ? null : result.NextToken;
         Caches = new List<CacheInfo>();
-        foreach (ControlClient._Cache c in result.Cache)
+        foreach (_Cache c in result.Cache)
         {
             Caches.Add(new CacheInfo(c.CacheName));
         }

diff --git a/MomentoTest/Responses/CacheGetResponseTest.cs b/MomentoTest/Responses/CacheGetResponseTest.cs
@@ -1,8 +1,8 @@
-using CacheClient;
-using Google.Protobuf;
-using Xunit;
+using Google.Protobuf;
+using Momento.Protos.CacheClient;
 using MomentoSdk.Exceptions;
 using MomentoSdk.Responses;
+using Xunit;
 
 namespace MomentoTest.Responses;