chore: add preprocessor directoves for unity build

momentohq · Sep 11, 2023 · 8f8bbf4 · 8f8bbf4
1 parent 056c33a
commit 8f8bbf4
Show file tree

Hide file tree

Showing 26 changed files with 67 additions and 3 deletions.
diff --git a/.github/workflows/on-push-to-release-branch.yaml b/.github/workflows/on-push-to-release-branch.yaml
@@ -65,7 +65,7 @@ jobs:
             rm -rf bin
             VERSION="${{ needs.release.outputs.version }}"
             echo "version: ${VERSION}"
-            dotnet build --configuration Release -f netstandard2.0 -p:DefineConstants=USE_GRPC_WEB
+            dotnet build --configuration Release -f netstandard2.0 -p:DefineConstants=USE_GRPC_WEB;BUILD_FOR_UNITY
             DLL_FILE=./bin/Release/netstandard2.0/Momento.Sdk.dll
             ARCHIVE_FILE_NAME=Momento.Sdk.Unity.${VERSION}.dll
             AUTH="Authorization: token ${{ secrets.MOMENTO_MACHINE_USER_GITHUB_TOKEN }}"

diff --git a/src/Momento.Sdk/Auth/AccessControl/DisposableToken.cs b/src/Momento.Sdk/Auth/AccessControl/DisposableToken.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 namespace Momento.Sdk.Auth.AccessControl;
 
 public abstract record DisposableTokenPermission;
@@ -18,3 +19,4 @@ public record CacheItemPermission
 
     public record TopicPermission(TopicRole Role, CacheSelector CacheSelector, TopicSelector TopicSelector) : DisposableTokenPermission;
 }
+#endif
diff --git a/src/Momento.Sdk/Auth/AccessControl/DisposableTokenScope.cs b/src/Momento.Sdk/Auth/AccessControl/DisposableTokenScope.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System.Collections.Generic;
 
 namespace Momento.Sdk.Auth.AccessControl;
@@ -11,3 +12,4 @@ public DisposableTokenScope(List<DisposableTokenPermission> Permissions)
         this.Permissions = Permissions;
     }
 }
+#endif
diff --git a/src/Momento.Sdk/Auth/AccessControl/DisposableTokenScopes.cs b/src/Momento.Sdk/Auth/AccessControl/DisposableTokenScopes.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System.Collections.Generic;
 
 namespace Momento.Sdk.Auth.AccessControl;
@@ -258,3 +259,4 @@ public static DisposableTokenScope TopicPublishOnly(CacheSelector cacheSelector,
         });
     }
 }
+#endif
diff --git a/src/Momento.Sdk/Auth/AccessControl/ExpiresIn.cs b/src/Momento.Sdk/Auth/AccessControl/ExpiresIn.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System;
 
 
@@ -90,3 +91,4 @@ public static ExpiresAt FromEpoch(int? epoch)
         return new ExpiresAt(epoch);
     }
 }
+#endif
diff --git a/src/Momento.Sdk/Auth/AccessControl/Permissions.cs b/src/Momento.Sdk/Auth/AccessControl/Permissions.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 namespace Momento.Sdk.Auth.AccessControl;
 
 public enum CacheRole
@@ -65,3 +66,4 @@ public static SelectByTopicName ByName(string topicName)
         return new SelectByTopicName(topicName);
     }
 }
+#endif
diff --git a/src/Momento.Sdk/Auth/EnvMomentoTokenProvider.cs b/src/Momento.Sdk/Auth/EnvMomentoTokenProvider.cs
@@ -17,8 +17,11 @@ public class EnvMomentoTokenProvider : ICredentialProvider
     public string ControlEndpoint { get; private set; }
     /// <inheritdoc />
     public string CacheEndpoint { get; private set; }
+
+    #if !BUILD_FOR_UNITY
     /// <inheritdoc />
     public string TokenEndpoint { get; private set; }
+    #endif
 
     /// <summary>
     /// Reads and parses a JWT token stored as an environment variable.
@@ -41,7 +44,9 @@ public EnvMomentoTokenProvider(string name)
         var tokenData = AuthUtils.TryDecodeAuthToken(AuthToken);
         ControlEndpoint = tokenData.ControlEndpoint;
         CacheEndpoint = tokenData.CacheEndpoint;
+        #if !BUILD_FOR_UNITY
         TokenEndpoint = tokenData.TokenEndpoint;
+        #endif
         AuthToken = tokenData.AuthToken;
     }
 

diff --git a/src/Momento.Sdk/Auth/ICredentialProvider.cs b/src/Momento.Sdk/Auth/ICredentialProvider.cs
@@ -17,10 +17,13 @@ public interface ICredentialProvider
     /// The host which the Momento client will connect to the Momento data plane
     /// </summary>
     string CacheEndpoint { get; }
+
+    #if !BUILD_FOR_UNITY
     /// <summary>
     /// The host which the Momento client will connect to the token endpoint
     /// </summary>
     string TokenEndpoint { get; }
+    #endif
 
     /// <summary>
     /// Copy constructor to override the CacheEndpoint

diff --git a/src/Momento.Sdk/Auth/StringMomentoTokenProvider.cs b/src/Momento.Sdk/Auth/StringMomentoTokenProvider.cs
@@ -17,8 +17,11 @@ public class StringMomentoTokenProvider : ICredentialProvider
     public string ControlEndpoint { get; private set; }
     /// <inheritdoc />
     public string CacheEndpoint { get; private set; }
+
+    #if !BUILD_FOR_UNITY
     /// <inheritdoc />
     public string TokenEndpoint { get; private set; }
+    #endif
 
     /// <summary>
     /// Reads and parses a JWT token from a string.
@@ -36,7 +39,9 @@ public StringMomentoTokenProvider(string token)
         var tokenData = AuthUtils.TryDecodeAuthToken(AuthToken);
         ControlEndpoint = tokenData.ControlEndpoint;
         CacheEndpoint = tokenData.CacheEndpoint;
+        #if !BUILD_FOR_UNITY
         TokenEndpoint = tokenData.TokenEndpoint;
+        #endif
         AuthToken = tokenData.AuthToken;
     }
 

diff --git a/src/Momento.Sdk/Auth/Utils.cs b/src/Momento.Sdk/Auth/Utils.cs
@@ -10,14 +10,19 @@ internal class TokenAndEndpoints
     public string AuthToken { get; }
     public string ControlEndpoint { get; }
     public string CacheEndpoint { get; }
+
+    #if !BUILD_FOR_UNITY
     public string TokenEndpoint { get; }
+    #endif
 
     public TokenAndEndpoints(string authToken, string controlEndpoint, string cacheEndpoint, string tokenEndpoint)
     {
         AuthToken = authToken;
         ControlEndpoint = controlEndpoint;
         CacheEndpoint = cacheEndpoint;
+        #if !BUILD_FOR_UNITY
         TokenEndpoint = tokenEndpoint;
+        #endif
     }
 }
 
@@ -59,7 +64,9 @@ public static TokenAndEndpoints TryDecodeAuthToken(string authToken)
                     decodedToken.api_key!,
                     "control." + decodedToken.endpoint,
                     "cache." + decodedToken.endpoint,
+                    #if !BUILD_FOR_UNITY
                     "token." + decodedToken.endpoint
+                    #endif
                 );
             }
             else
@@ -69,7 +76,9 @@ public static TokenAndEndpoints TryDecodeAuthToken(string authToken)
                     authToken,
                     claims.ControlEndpoint,
                     claims.CacheEndpoint,
+                    #if !BUILD_FOR_UNITY
                     claims.CacheEndpoint
+                    #endif
                 );
             }
         }

diff --git a/src/Momento.Sdk/AuthClient.cs b/src/Momento.Sdk/AuthClient.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System;
 using System.Threading.Tasks;
 using Momento.Sdk.Auth;
@@ -37,3 +38,4 @@ public void Dispose()
         scsTokenClient.Dispose();
     }
 }
+#endif
diff --git a/src/Momento.Sdk/Config/AuthConfiguration.cs b/src/Momento.Sdk/Config/AuthConfiguration.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using Microsoft.Extensions.Logging;
 using Momento.Sdk.Config.Transport;
 
@@ -49,3 +50,4 @@ public override int GetHashCode()
     }
 
 }
+#endif
diff --git a/src/Momento.Sdk/Config/AuthConfigurations.cs b/src/Momento.Sdk/Config/AuthConfigurations.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -54,3 +55,4 @@ public static IAuthConfiguration Latest(ILoggerFactory? loggerFactory = null)
         }
     }
 }
+#endif
diff --git a/src/Momento.Sdk/Config/IAuthConfiguration.cs b/src/Momento.Sdk/Config/IAuthConfiguration.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using Microsoft.Extensions.Logging;
 using Momento.Sdk.Config.Transport;
 
@@ -20,3 +21,4 @@ public interface IAuthConfiguration
     /// <returns>AuthConfiguration object with custom transport strategy provided</returns>
     public IAuthConfiguration WithTransportStrategy(IAuthTransportStrategy transportStrategy);
 }
+#endif
diff --git a/src/Momento.Sdk/Config/Transport/IAuthTransportStrategy.cs b/src/Momento.Sdk/Config/Transport/IAuthTransportStrategy.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System;
 
 namespace Momento.Sdk.Config.Transport;
@@ -27,3 +28,4 @@ public interface IAuthTransportStrategy
     /// <returns>A new IAuthTransportStrategy with the specified client timeout</returns>
     public IAuthTransportStrategy WithClientTimeout(TimeSpan clientTimeout);
 }
+#endif
diff --git a/src/Momento.Sdk/Config/Transport/StaticAuthTransportStrategy.cs b/src/Momento.Sdk/Config/Transport/StaticAuthTransportStrategy.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System;
 using Microsoft.Extensions.Logging;
 
@@ -62,3 +63,4 @@ public override int GetHashCode()
         return base.GetHashCode();
     }
 }
+#endif
diff --git a/src/Momento.Sdk/IAuthClient.cs b/src/Momento.Sdk/IAuthClient.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System;
 using System.Threading.Tasks;
 using Momento.Sdk.Auth.AccessControl;
@@ -10,3 +11,4 @@ public interface IAuthClient : IDisposable
     public Task<GenerateDisposableTokenResponse> GenerateDisposableTokenAsync(DisposableTokenScope scope,
         ExpiresIn expiresIn);
 }
+#endif
diff --git a/src/Momento.Sdk/Internal/AuthGrpcManager.cs b/src/Momento.Sdk/Internal/AuthGrpcManager.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -103,3 +104,4 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 }
+#endif
diff --git a/src/Momento.Sdk/Internal/LoggingUtils.cs b/src/Momento.Sdk/Internal/LoggingUtils.cs
@@ -486,6 +486,7 @@ public static TError LogTraceTopicSubscriptionError<TError>(this ILogger logger,
         }
 #endif
 
+#if !BUILD_FOR_UNITY
         /// <summary>
         /// Logs a message at TRACE level that indicates that an auth request is about to be executed.
         /// </summary>
@@ -533,7 +534,7 @@ public static TSuccess LogTraceAuthRequestSuccess<TSuccess>(this ILogger logger,
             }
             return success;
         }
-
+#endif
 
         private static string ReadableByteString(ByteString? input)
         {

diff --git a/src/Momento.Sdk/Internal/OldDotNetVersionsRecordWorkaround.cs b/src/Momento.Sdk/Internal/OldDotNetVersionsRecordWorkaround.cs
@@ -1,4 +1,4 @@
-#if !NET5_0_OR_GREATER
+#if !NET5_0_OR_GREATER || !BUILD_FOR_UNITY
 
 using System.ComponentModel;
 

diff --git a/src/Momento.Sdk/Internal/ScsTokenClient.cs b/src/Momento.Sdk/Internal/ScsTokenClient.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System;
 using System.Threading.Tasks;
 using Grpc.Core;
@@ -235,3 +236,4 @@ public void Dispose()
     }
 
 }
+#endif
diff --git a/src/Momento.Sdk/Internal/Utils.cs b/src/Momento.Sdk/Internal/Utils.cs
@@ -3,7 +3,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+
+#if !BUILD_FOR_UNITY
 using Momento.Sdk.Exceptions;
+#endif
 
 namespace Momento.Sdk.Internal;
 
@@ -102,6 +105,7 @@ public static void ArgumentStrictlyPositive(int? argument, string paramName)
         }
     }
 
+    #if !BUILD_FOR_UNITY
     /// <summary>
     /// Throw an exception if the supplied ExpiresIn object is invalid.
     /// </summary>
@@ -122,6 +126,7 @@ public static void CheckValidDisposableTokenExpiry(ExpiresIn expiresIn)
             throw new InvalidArgumentException("Disposable token must expire within 1 hour");
         }
     }
+    #endif
 
     /// <summary>
     /// Defines methods to support comparing containers of reference items by their

diff --git a/src/Momento.Sdk/Responses/GenerateDisposableTokenResponse.cs b/src/Momento.Sdk/Responses/GenerateDisposableTokenResponse.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using Momento.Sdk.Exceptions;
 using Momento.Protos.TokenClient;
 using System;
@@ -94,3 +95,4 @@ public override string ToString()
         }
     }
 }
+#endif
diff --git a/tests/Integration/Momento.Sdk.Tests/AuthClientTest.cs b/tests/Integration/Momento.Sdk.Tests/AuthClientTest.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System.Threading.Tasks;
 using Momento.Sdk.Auth.AccessControl;
 
@@ -23,3 +24,4 @@ public async Task GenerateDisposableAuthToken_HappyPath()
     }
 
 }
+#endif
diff --git a/tests/Integration/Momento.Sdk.Tests/Fixtures.cs b/tests/Integration/Momento.Sdk.Tests/Fixtures.cs
@@ -91,6 +91,7 @@ public class TopicClientCollection : ICollectionFixture<TopicClientFixture>
 }
 #endif
 
+#if !BUILD_FOR_UNITY
 public class AuthClientFixture : IDisposable
 {
     public IAuthClient Client { get; private set; }
@@ -117,6 +118,7 @@ public void Dispose()
         Client.Dispose();
     }
 }
+#endif
 
 /// <summary>
 /// Register the fixture in xUnit.

diff --git a/tests/Unit/Momento.Sdk.Tests/Auth/AccessControl/DisposableTokenScopeTest.cs b/tests/Unit/Momento.Sdk.Tests/Auth/AccessControl/DisposableTokenScopeTest.cs
@@ -1,3 +1,4 @@
+#if !BUILD_FOR_UNITY
 using System.Collections.Generic;
 using FluentAssertions;
 using Momento.Sdk.Auth.AccessControl;
@@ -407,3 +408,4 @@ public void DisposableTokenScopes_TopicPublishOnly()
         }));
     }
 }
+#endif