Skip to content

Commit a444c93

Browse files
Revert accidental commit Handle logging arguments in provider's getEngineAddress
1 parent af981dd commit a444c93

File tree

3 files changed

+4
-118
lines changed

3 files changed

+4
-118
lines changed

.changes/unreleased/bug-fixes-536.yaml

-6
This file was deleted.

sdk/Pulumi.Tests/Provider/ProviderTests.cs

-74
Original file line numberDiff line numberDiff line change
@@ -86,78 +86,4 @@ public async Task NotImplementedErrorIncludesName()
8686
Assert.Contains("GetSchema", exc.Message);
8787
}
8888
}
89-
90-
public class ProviderEngineAddressTests
91-
{
92-
private static string? GetEngineAddress(string[] args)
93-
{
94-
// Helper method to access the private static method for testing
95-
var method = typeof(Pulumi.Experimental.Provider.Provider).GetMethod(
96-
"GetEngineAddress",
97-
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
98-
return (string?)method?.Invoke(null, new object[] { args });
99-
}
100-
101-
[Fact]
102-
public void GetEngineAddress_WithValidAddress_ReturnsAddress()
103-
{
104-
var args = new[] { "127.0.0.1:51776" };
105-
var address = GetEngineAddress(args);
106-
Assert.Equal("127.0.0.1:51776", address);
107-
}
108-
109-
[Fact]
110-
public void GetEngineAddress_WithLoggingArgs_ReturnsAddress()
111-
{
112-
var args = new[] {
113-
"--logtostderr",
114-
"-v=3",
115-
"127.0.0.1:51776",
116-
"--logflow"
117-
};
118-
var address = GetEngineAddress(args);
119-
Assert.Equal("127.0.0.1:51776", address);
120-
}
121-
122-
[Fact]
123-
public void GetEngineAddress_WithTracingArg_ReturnsAddress()
124-
{
125-
var args = new[] {
126-
"--tracing",
127-
"1",
128-
"127.0.0.1:51776"
129-
};
130-
var address = GetEngineAddress(args);
131-
Assert.Equal("127.0.0.1:51776", address);
132-
}
133-
134-
[Fact]
135-
public void GetEngineAddress_WithNoArgs_ThrowsException()
136-
{
137-
var args = Array.Empty<string>();
138-
var ex = Assert.Throws<ArgumentException>(() => GetEngineAddress(args));
139-
Assert.Equal("No engine address provided in arguments", ex.Message);
140-
}
141-
142-
[Fact]
143-
public void GetEngineAddress_WithOnlyLoggingArgs_ThrowsException()
144-
{
145-
var args = new[] { "--logtostderr", "-v=3", "--logflow" };
146-
var ex = Assert.Throws<ArgumentException>(() => GetEngineAddress(args));
147-
Assert.Equal("No engine address provided in arguments", ex.Message);
148-
}
149-
150-
[Fact]
151-
public void GetEngineAddress_WithMultipleAddresses_ThrowsException()
152-
{
153-
var args = new[] {
154-
"127.0.0.1:51776",
155-
"127.0.0.1:51777"
156-
};
157-
var ex = Assert.Throws<ArgumentException>(() => GetEngineAddress(args));
158-
Assert.Equal(
159-
"Expected exactly one engine address argument, but got 2 non-logging arguments",
160-
ex.Message);
161-
}
162-
}
16389
}

sdk/Pulumi/Provider/Provider.cs

+4-38
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,6 @@ internal static Microsoft.Extensions.Hosting.IHost BuildHost(
542542
// maxRpcMessageSize raises the gRPC Max message size from `4194304` (4mb) to `419430400` (400mb)
543543
var maxRpcMessageSize = 400 * 1024 * 1024;
544544

545-
var engineAddress = GetEngineAddress(args);
546-
547545
return Host.CreateDefaultBuilder()
548546
.ConfigureWebHostDefaults(webBuilder =>
549547
{
@@ -562,7 +560,10 @@ internal static Microsoft.Extensions.Hosting.IHost BuildHost(
562560
config.Sources.Clear();
563561

564562
var memConfig = new Dictionary<string, string?>();
565-
memConfig.Add("Host", engineAddress);
563+
if (args.Length > 0)
564+
{
565+
memConfig.Add("Host", args[0]);
566+
}
566567
if (version != null)
567568
{
568569
memConfig.Add("Version", version);
@@ -599,41 +600,6 @@ internal static Microsoft.Extensions.Hosting.IHost BuildHost(
599600
})
600601
.Build();
601602
}
602-
603-
private static string? GetEngineAddress(string[] args)
604-
{
605-
var cleanArgs = new List<string>();
606-
607-
for (int i = 0; i < args.Length; i++)
608-
{
609-
var arg = args[i];
610-
611-
// Skip logging-related arguments
612-
if (arg == "--logtostderr") continue;
613-
if (arg.StartsWith("-v=")) continue;
614-
if (arg == "--logflow") continue;
615-
if (arg == "--tracing")
616-
{
617-
i++; // Skip the tracing value
618-
continue;
619-
}
620-
621-
cleanArgs.Add(arg);
622-
}
623-
624-
if (cleanArgs.Count == 0)
625-
{
626-
throw new ArgumentException("No engine address provided in arguments");
627-
}
628-
629-
if (cleanArgs.Count > 1)
630-
{
631-
throw new ArgumentException(
632-
$"Expected exactly one engine address argument, but got {cleanArgs.Count} non-logging arguments");
633-
}
634-
635-
return cleanArgs[0];
636-
}
637603
}
638604

639605
class ResourceProviderService : ResourceProvider.ResourceProviderBase, IDisposable

0 commit comments

Comments
 (0)