Test GetSchema and gen-sdk with the dotnet testprovider (#418)

Change the TestProvider test to also check that GetSchema and gen-sdk
works.

Author: Frassle

integration_tests/integration_dotnet_test.go

@@ -27,6 +27,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pulumi/pulumi/pkg/v3/engine"
 	"github.com/pulumi/pulumi/pkg/v3/testing/integration"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/apitype"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
@@ -530,6 +531,13 @@ func TestProvider(t *testing.T) {
 			assert.Equal(t, "hello", stack.Outputs["echoB"])
 			assert.Equal(t, []interface{}{float64(1), "goodbye", true}, stack.Outputs["echoC"])
 		},
+		PrePrepareProject: func(info *engine.Projinfo) error {
+			e := ptesting.NewEnvironment(t)
+			e.CWD = info.Root
+			path := info.Proj.Plugins.Providers[0].Path
+			_, _ = e.RunCommand("pulumi", "package", "gen-sdk", path, "--language", "dotnet")
+			return nil
+		},
 	})
 }
 

integration_tests/provider/Program.cs

@@ -3,22 +3,23 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Pulumi;
+using Pulumi.Testprovider;
 
 class Program
 {
     static Task<int> Main(string[] args)
     {
         return Deployment.RunAsync(() =>
         {
-            var customA = new TestResource("a", new TestResourceArgs { Echo = 42 });
-            var customB = new TestResource("b", new TestResourceArgs { Echo = "hello" });
-            var customC = new TestResource("c", new TestResourceArgs { Echo = new object[] { 1, "goodbye", true} });
+            var customA = new Echo("a", new EchoArgs { Value = 42 });
+            var customB = new Echo("b", new EchoArgs { Value = "hello" });
+            var customC = new Echo("c", new EchoArgs { Value = new object[] { 1, "goodbye", true} });
 
             return new Dictionary<string, object?>
             {
-                {  "echoA", customA.Echo },
-                {  "echoB", customB.Echo },
-                {  "echoC", customC.Echo },
+                {  "echoA", customA.Value },
+                {  "echoB", customB.Value },
+                {  "echoC", customC.Value },
             };
         });
     }

integration_tests/provider/Provider.csproj

@@ -1,10 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <DefaultItemExcludes>$(DefaultItemExcludes);sdk/**/*.cs</DefaultItemExcludes>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition=" '$(TARGET_FRAMEWORK)' != '' ">$(TARGET_FRAMEWORK)</TargetFramework>
     <TargetFramework Condition=" '$(TARGET_FRAMEWORK)' == '' ">net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="sdk\dotnet\Pulumi.Testprovider.csproj" />
+  </ItemGroup>
+
 </Project>

integration_tests/provider/TestResource.cs

@@ -14,6 +14,42 @@ public TestProvider(IHost host) {
         this.host = host;
     }
 
+    public override Task<GetSchemaResponse> GetSchema(GetSchemaRequest request, CancellationToken ct)
+    {
+        var schema = """
+{
+    "name": "testprovider",
+    "version": "1.0.0",
+    "meta": {
+        "supportPack": true
+    },
+    "resources": {
+        "testprovider:index:Echo": {
+            "description": "A test resource that echoes its input.",
+            "properties": {
+                "value": {
+                    "$ref": "pulumi.json#/Any",
+                    "description": "Input to echo."
+                }
+            },
+            "inputProperties": {
+                "value": {
+                    "$ref": "pulumi.json#/Any",
+                    "description": "Input to echo."
+                }
+            },
+            "type": "object"
+        }
+    }
+}
+""";
+
+        return Task.FromResult(new GetSchemaResponse()
+        {
+            Schema = schema,
+        });
+    }
+
     public override Task<CheckResponse> CheckConfig(CheckRequest request, CancellationToken ct)
     {
         return Task.FromResult(new CheckResponse() { Inputs = request.NewInputs });
@@ -44,10 +80,10 @@ public override Task<CheckResponse> Check(CheckRequest request, CancellationToke
     public override Task<DiffResponse> Diff(DiffRequest request, CancellationToken ct)
     {
         if (request.Type == "testprovider:index:Echo") {
-            var changes = !request.OldState["echo"].Equals(request.NewInputs["echo"]);
+            var changes = !request.OldState["value"].Equals(request.NewInputs["value"]);
             return Task.FromResult(new DiffResponse() {
                 Changes = changes,
-                Replaces = new string[] { "echo" },
+                Replaces = new string[] { "value" },
             });
         }
         else if (request.Type == "testprovider:index:Random")
@@ -84,7 +120,7 @@ public override Task<CreateResponse> Create(CreateRequest request, CancellationT
     {
         if (request.Type == "testprovider:index:Echo") {
             var outputs = new Dictionary<string, PropertyValue>();
-            outputs.Add("echo", request.Properties["echo"]);
+            outputs.Add("value", request.Properties["value"]);
 
             ++this.id;
             return Task.FromResult(new CreateResponse() {

integration_tests/testprovider/TestProvider.cs

@@ -5,6 +5,7 @@
     <TargetFramework Condition=" '$(TARGET_FRAMEWORK)' != '' ">$(TARGET_FRAMEWORK)</TargetFramework>
     <TargetFramework Condition=" '$(TARGET_FRAMEWORK)' == '' ">net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <LangVersion>11</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

integration_tests/testprovider/TestProvider.csproj

@@ -938,7 +938,7 @@ func (host *dotnetLanguageHost) GetProgramDependencies(
 func (host *dotnetLanguageHost) RunPlugin(
 	req *pulumirpc.RunPluginRequest, server pulumirpc.LanguageRuntime_RunPluginServer,
 ) error {
-	logging.V(5).Infof("Attempting to run dotnet plugin in %s", req.Program)
+	logging.V(5).Infof("Attempting to run dotnet plugin in %s", req.Pwd)
 
 	closer, stdout, stderr, err := rpcutil.MakeRunPluginStreams(server, false)
 	if err != nil {
@@ -965,15 +965,15 @@ func (host *dotnetLanguageHost) RunPlugin(
 		if req.Info.EntryPoint != "" {
 			project = filepath.Join(project, req.Info.EntryPoint)
 		}
-		args = append(args, "--project", project)
+		args = append(args, "--project", project, "--")
 	}
 
 	// Add on all the request args to start this plugin
 	args = append(args, req.Args...)
 
 	if logging.V(5) {
 		commandStr := strings.Join(args, " ")
-		logging.V(5).Infoln("Language host launching process: ", executable, commandStr)
+		logging.V(5).Infoln("Language host launching process: ", executable, " ", commandStr)
 	}
 
 	// Now simply spawn a process to execute the requested program, wiring up stdout/stderr directly.