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

fixes

Browse source
This commit is contained in:
Fraser Waters 2021-11-12 18:37:21 +00:00
parent 636f2c9a73
commit 1580b522d3
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sdk/dotnet/Pulumi.Dynamic/Program.cs
View file

@ -10,16 +10,20 @@ public static class Program
{
class DynamicResourceProviderServicer : ResourceProvider.ResourceProviderBase
{
private static (Pulumi.DynamicResourceProvider, ImmutableDictionary<string, object?>) GetProvider(ImmutableDictionary<string, object?> properties)
private static (Pulumi.DynamicResourceProvider, ImmutableDictionary<string, object?>) GetProvider(Struct properties)
{
if (!properties.TryGetValue("__provider", out var providerValue))
var fields = properties.Fields;
if (!fields.TryGetValue("__provider", out var providerValue))
{
var props = string.Concat(properties.Select(item => string.Format("{0} = {1}", item.Key, item.Value)));
var props = string.Concat(fields.Select(item => string.Format("{0} = {1}", item.Key, item.Value)));
var msg = string.Format("Dynamic resource had no '__provider' property, was: {0}", props);
throw new RpcException(new Status(StatusCode.Unknown, msg));
}
if(!(providerValue is string providerString))
var providerString = providerValue.StringValue;
if(providerString == null)
{
throw new RpcException(new Status(StatusCode.Unknown, "Dynamic resource '__provider' property was not a string"));
}
@ -32,7 +36,7 @@ public static class Program
throw new RpcException(new Status(StatusCode.Unknown, "Dynamic resource could not deserialise provider implementation"));
}
return (provider , properties.Remove("__provider"));
return (provider, Pulumi.Serialization.Rpc.DeserialiseProperties(properties));
}
public override Task<CheckResponse> CheckConfig(CheckRequest request, ServerCallContext context)
@ -77,8 +81,7 @@ public static class Program
public override async Task<CreateResponse> Create(CreateRequest request, ServerCallContext context)
{
try {
var properties = Pulumi.Serialization.Rpc.DeserialiseProperties(request.Properties);
var (provider, inputs) = GetProvider(properties);
var (provider, inputs) = GetProvider(request.Properties);
var (id, outputs) = await provider.Create(inputs);
@ -86,7 +89,7 @@ public static class Program
response.Id = id;
response.Properties = Pulumi.Serialization.Rpc.SerialiseProperties(outputs);
// Readd provider
response.Properties.Fields.Add("__provider", request.Properties.Fields["__provider"]);
response.Properties.Fields.Add("__provider", request.Properties.Fields["__provider"]);
return response;
} catch (System.Exception ex)
{

2
sdk/dotnet/Pulumi/Resources/DynamicResource.cs
View file

@ -25,7 +25,7 @@ namespace Pulumi
var knownAssemblies = new string [] {
"Pulumi", "System.Collections.Immutable"
};
return Array.Exists(knownAssemblies, name => name == assembly.FullName);
return !Array.Exists(knownAssemblies, name => name == assembly.FullName);
}
private static ResourceArgs SetProvider(DynamicResourceProvider provider, DynamicResourceArgs? args)

5
tests/integration/integration_dotnet_test.go
View file

@ -596,9 +596,8 @@ func TestAboutDotnet(t *testing.T) {
func TestDynamicDotnet(t *testing.T) {
var randomVal string
integration.ProgramTest(t, &integration.ProgramTestOptions{
PreviewCommandlineFlags: "-v9",
Dir: filepath.Join("dynamic", "dotnet"),
Dependencies: []string{"Pulumi"},
Dir: filepath.Join("dynamic", "dotnet"),
Dependencies: []string{"Pulumi"},
ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
randomVal = stack.Outputs["random_val"].(string)
},