Update .NET SDK to 1.3.1 and add proxy tests (#536)

temporalio · Sep 12, 2024 · b7535b1 · b7535b1
1 parent b0aab59
commit b7535b1
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 4 deletions.
diff --git a/cmd/run_dotnet.go b/cmd/run_dotnet.go
@@ -68,6 +68,9 @@ func (r *Runner) RunDotNetExternal(ctx context.Context, run *cmd.Run) error {
 	if r.config.ClientCertPath != "" {
 		args = append(args, "--client-cert-path", r.config.ClientCertPath, "--client-key-path", r.config.ClientKeyPath)
 	}
+	if r.config.HTTPProxyURL != "" {
+		args = append(args, "--http-proxy-url", r.config.HTTPProxyURL)
+	}
 	args = append(args, run.ToArgs()...)
 	cmd, err := r.program.NewCommand(ctx, args...)
 	if err == nil {

diff --git a/dotnet.csproj b/dotnet.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="Temporalio" Version="1.3.0">
+    <PackageReference Include="Temporalio" Version="1.3.1">
       <!--
         We have to make sure this isn't included transitively so it can be
         overridden.

diff --git a/features/client/http_proxy/feature.cs b/features/client/http_proxy/feature.cs
@@ -0,0 +1,33 @@
+namespace client.http_proxy;
+
+using Temporalio.Client;
+using Temporalio.Features.Harness;
+using Temporalio.Worker;
+using Temporalio.Workflows;
+
+class Feature : IFeature
+{
+    public static void ConfigureClient(
+        Runner runner, TemporalClientConnectOptions options, bool useAuth)
+    {
+        var uri = new Uri(runner.HttpProxyUrl ?? throw new InvalidOperationException("Missing proxy URL"));
+        options.HttpConnectProxy = new() { TargetHost = $"{uri.Host}:{uri.Port}" };
+        if (useAuth)
+        {
+            options.HttpConnectProxy!.BasicAuth = ("proxy-user", "proxy-pass");
+        }
+    }
+
+    public void ConfigureClient(Runner runner, TemporalClientConnectOptions options) =>
+        ConfigureClient(runner, options, useAuth: false);
+
+    public void ConfigureWorker(Runner runner, TemporalWorkerOptions options) =>
+        options.AddWorkflow<MyWorkflow>();
+
+    [Workflow]
+    class MyWorkflow
+    {
+        [WorkflowRun]
+        public async Task<string> RunAsync() => "done";
+    }
+}
diff --git a/features/client/http_proxy_auth/feature.cs b/features/client/http_proxy_auth/feature.cs
@@ -0,0 +1,22 @@
+namespace client.http_proxy_auth;
+
+using Temporalio.Client;
+using Temporalio.Features.Harness;
+using Temporalio.Worker;
+using Temporalio.Workflows;
+
+class Feature : IFeature
+{
+    public void ConfigureClient(Runner runner, TemporalClientConnectOptions options) =>
+        http_proxy.Feature.ConfigureClient(runner, options, useAuth: true);
+
+    public void ConfigureWorker(Runner runner, TemporalWorkerOptions options) =>
+        options.AddWorkflow<MyWorkflow>();
+
+    [Workflow]
+    class MyWorkflow
+    {
+        [WorkflowRun]
+        public async Task<string> RunAsync() => "done";
+    }
+}
diff --git a/harness/dotnet/Temporalio.Features.Harness/App.cs b/harness/dotnet/Temporalio.Features.Harness/App.cs
@@ -27,6 +27,10 @@ public static class App
         name: "--client-key-path",
         description: "Path to a client key for TLS");
 
+    private static readonly Option<string?> httpProxyUrlOption = new(
+        name: "--http-proxy-url",
+        description: "HTTP proxy URL");
+
     private static readonly Argument<List<(string, string)>> featuresArgument = new(
         name: "features",
         parse: result => result.Tokens.Select(token =>
@@ -56,6 +60,7 @@ private static Command CreateCommand()
         cmd.AddOption(namespaceOption);
         cmd.AddOption(clientCertPathOption);
         cmd.AddOption(clientKeyPathOption);
+        cmd.AddOption(httpProxyUrlOption);
         cmd.AddArgument(featuresArgument);
         cmd.SetHandler(RunCommandAsync);
         return cmd;
@@ -98,8 +103,13 @@ private static async Task RunCommandAsync(InvocationContext ctx)
                 throw new InvalidOperationException($"Unable to find feature for dir {dir}");
             try
             {
-                await new Runner(clientOptions, taskQueue, feature, loggerFactory).RunAsync(
-                    ctx.GetCancellationToken());
+                await new Runner(
+                    clientOptions,
+                    taskQueue,
+                    feature,
+                    loggerFactory,
+                    ctx.ParseResult.GetValueForOption(httpProxyUrlOption)
+                ).RunAsync(ctx.GetCancellationToken());
             }
             catch (TestSkippedException e)
             {

diff --git a/harness/dotnet/Temporalio.Features.Harness/Runner.cs b/harness/dotnet/Temporalio.Features.Harness/Runner.cs
@@ -48,11 +48,13 @@ internal Runner(
         TemporalClientConnectOptions clientConnectOptions,
         string taskQueue,
         PreparedFeature feature,
-        ILoggerFactory loggerFactory)
+        ILoggerFactory loggerFactory,
+        string? httpProxyUrl)
     {
         PreparedFeature = feature;
         Logger = loggerFactory.CreateLogger(PreparedFeature.FeatureType);
         Feature = (IFeature)Activator.CreateInstance(PreparedFeature.FeatureType, true)!;
+        HttpProxyUrl = httpProxyUrl;
 
         ClientOptions = (TemporalClientConnectOptions)clientConnectOptions.Clone();
         Feature.ConfigureClient(this, ClientOptions);
@@ -71,6 +73,8 @@ internal Runner(
 
     public TemporalWorkerOptions WorkerOptions { get; private init; }
 
+    public string? HttpProxyUrl { get; private init; }
+
     /// <summary>
     /// Run the feature with the given cancellation token.
     /// </summary>