Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make OutputConstructorAttribute optional #439

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/unreleased/Improvements-438.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
component: sdk
kind: Improvements
body: Make OutputConstructorAttribute optional
time: 2024-12-30T10:48:22.983
custom:
PR: "438"
29 changes: 29 additions & 0 deletions sdk/Pulumi.Tests/Serialization/RecordTypeConverterTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using Pulumi.Serialization;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xunit;

namespace Pulumi.Tests.Serialization
{
public class RecordTypeConverterTests : ConverterTests
{
[OutputType]
public record RecordOutput(string Value1, string Value2);

[Fact]
public async Task TestRecord()
{
var data = Converter.ConvertValue<RecordOutput>(NoWarn, "", await SerializeToValueAsync(new Dictionary<string, object>
{
{ "Value1", "lorem" },
{ "Value2", "ipsum" }
}));

Assert.Equal("lorem", data.Value.Value1);
Assert.Equal("ipsum", data.Value.Value2);
}
}
}
18 changes: 16 additions & 2 deletions sdk/Pulumi/Serialization/Converter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,21 @@ static bool CheckEnumType(Type targetType, Type underlyingType)
}

private static ConstructorInfo? GetPropertyConstructor(Type outputTypeArg)
=> outputTypeArg.GetConstructors(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance).FirstOrDefault(
c => c.GetCustomAttribute<OutputConstructorAttribute>() != null);
{
var constructors = outputTypeArg.GetConstructors(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
var outputConstructor = constructors.FirstOrDefault(c => c.GetCustomAttribute<OutputConstructorAttribute>() != null);
if (outputConstructor != null)
{
return outputConstructor;
}

var publicConstructors = constructors.Where(x => x.IsPublic).ToArray();
if (publicConstructors.Length == 1)
{
return publicConstructors[0];
}

return null;
}
}
}