maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix NRE in C# mocks and include the stack to result again (#4656)

Browse source 
Fix NRE in C# mocks and include the stack to result again
This commit is contained in:
Mikhail Shilkov 2020-05-18 17:18:12 +02:00 committed by GitHub
parent 30b12cff49
commit 5b0c4e162d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -6,6 +6,9 @@ CHANGELOG
- Add support for untagged outputs in Go SDK.
[#4640](https://github.com/pulumi/pulumi/pull/4640)
- Fix a Regression in .NET unit testing.
[#4656](https://github.com/pulumi/pulumi/pull/4656)
## 2.2.1 (2020-05-13)
- Add new brew target to fix homebrew builds
[#4633](https://github.com/pulumi/pulumi/pull/4633)

12
sdk/dotnet/Pulumi.Tests/Mocks/MocksTests.cs
View file

@ -38,6 +38,18 @@ namespace Pulumi.Tests.Mocks
var ip = await instance.PublicIp.GetValueAsync();
Assert.Equal("203.0.113.12", ip);
}
[Fact]
public async Task TestStack()
{
var resources = await Testing.RunAsync<MyStack>();
var stack = resources.OfType<MyStack>().FirstOrDefault();
Assert.NotNull(stack);
var ip = await stack.PublicIp.GetValueAsync();
Assert.Equal("203.0.113.12", ip);
}
}
public static class Testing

4
sdk/dotnet/Pulumi.Tests/Mocks/TestStack.cs
View file

@ -19,9 +19,13 @@ namespace Pulumi.Tests.Mocks
public class MyStack : Stack
{
[Output("publicIp")]
public Output<string> PublicIp { get; private set; } = null!;
public MyStack()
{
var myInstance = new Instance("instance", new InstanceArgs());
this.PublicIp = myInstance.PublicIp;
}
}
}

11
sdk/dotnet/Pulumi/Testing/MockMonitor.cs
View file

@ -49,22 +49,23 @@ namespace Pulumi.Testing
public async Task<RegisterResourceResponse> RegisterResourceAsync(Resource resource, RegisterResourceRequest request)
{
lock (this.Resources)
{
this.Resources.Add(resource);
}
if (request.Type == Stack._rootPulumiStackTypeName)
{
return new RegisterResourceResponse
{
Urn = NewUrn(request.Parent, request.Type, request.Name),
Object = new Struct(),
};
}
var (id, state) = await _mocks.NewResourceAsync(request.Type, request.Name, ToDictionary(request.Object),
request.Provider, request.ImportId).ConfigureAwait(false);
lock (this.Resources)
{
this.Resources.Add(resource);
}
return new RegisterResourceResponse
{
Id = id ?? request.ImportId,