Fix GetMethodResultName in dotnet and update generated docs

pulumi · Nov 24, 2022 · 46f092b · 46f092b
1 parent 13569c6
commit 46f092b
Show file tree

Hide file tree

Showing 10 changed files with 1,900 additions and 67 deletions.
diff --git a/pkg/codegen/dotnet/doc.go b/pkg/codegen/dotnet/doc.go
@@ -110,26 +110,36 @@ func (d DocLanguageHelper) GetMethodName(m *schema.Method) string {
 func (d DocLanguageHelper) GetMethodResultName(pkg *schema.Package, modName string, r *schema.Resource,
 	m *schema.Method) string {
 
-	if m.Function.ReturnType == nil {
-		//nolint
-		return "void"
-	}
-
-	// if the return type is an object, assume we generated a Result Type for it
-	if _, isObject := m.Function.ReturnType.(*schema.ObjectType); isObject {
-		return fmt.Sprintf("%s.%sResult", resourceName(r), d.GetMethodName(m))
+	var returnType *schema.ObjectType
+	if m.Function.ReturnType != nil {
+		if objectType, ok := m.Function.ReturnType.(*schema.ObjectType); ok {
+			returnType = objectType
+		} else {
+			typeDetails := map[*schema.ObjectType]*typeDetails{}
+			mod := &modContext{
+				pkg:         pkg,
+				mod:         modName,
+				typeDetails: typeDetails,
+				namespaces:  d.Namespaces,
+			}
+			return mod.typeString(m.Function.ReturnType, "", false, false, false)
+		}
 	}
 
-	// otherwise just generate the non-object type
-	typeDetails := map[*schema.ObjectType]*typeDetails{}
-	mod := &modContext{
-		pkg:         pkg,
-		mod:         modName,
-		typeDetails: typeDetails,
-		namespaces:  d.Namespaces,
+	if info, ok := pkg.Language["csharp"].(CSharpPackageInfo); ok {
+		if info.LiftSingleValueMethodReturns && returnType != nil && len(returnType.Properties) == 1 {
+			typeDetails := map[*schema.ObjectType]*typeDetails{}
+			mod := &modContext{
+				pkg:           pkg,
+				mod:           modName,
+				typeDetails:   typeDetails,
+				namespaces:    d.Namespaces,
+				rootNamespace: info.GetRootNamespace(),
+			}
+			return mod.typeString(returnType.Properties[0].Type, "", false, false, false)
+		}
 	}
-
-	return mod.typeString(m.Function.ReturnType, "", false, false, false)
+	return fmt.Sprintf("%s.%sResult", resourceName(r), d.GetMethodName(m))
 }
 
 // GetPropertyName uses the property's csharp-specific language info, if available, to generate

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/docs/funcwithemptyoutputs/_index.md b/pkg/codegen/testing/test/testdata/output-funcs/docs/funcwithemptyoutputs/_index.md
@@ -19,11 +19,6 @@ n/a
 
 ## Using funcWithEmptyOutputs {#using}
 
-Two invocation forms are available. The direct form accepts plain
-arguments and either blocks until the result value is available, or
-returns a Promise-wrapped result. The output form accepts
-Input-wrapped arguments and returns an Output-wrapped result.
-
 <div>
 <pulumi-chooser type="language" options="typescript,python,go,csharp,java,yaml"></pulumi-chooser>
 </div>
@@ -34,8 +29,6 @@ Input-wrapped arguments and returns an Output-wrapped result.
 <div class="highlight"
 ><pre class="chroma"><code class="language-typescript" data-lang="typescript"
 ><span class="k">function </span>funcWithEmptyOutputs<span class="p">(</span><span class="nx">args</span><span class="p">:</span> <span class="nx">FuncWithEmptyOutputsArgs</span><span class="p">,</span> <span class="nx">opts</span><span class="p">?:</span> <span class="nx"><a href="/docs/reference/pkg/nodejs/pulumi/pulumi/#InvokeOptions">InvokeOptions</a></span><span class="p">): Promise&lt;<span class="nx"><a href="#result">FuncWithEmptyOutputsResult</a></span>></span
-><span class="k">
-function </span>funcWithEmptyOutputsOutput<span class="p">(</span><span class="nx">args</span><span class="p">:</span> <span class="nx">FuncWithEmptyOutputsOutputArgs</span><span class="p">,</span> <span class="nx">opts</span><span class="p">?:</span> <span class="nx"><a href="/docs/reference/pkg/nodejs/pulumi/pulumi/#InvokeOptions">InvokeOptions</a></span><span class="p">): Output&lt;<span class="nx"><a href="#result">FuncWithEmptyOutputsResult</a></span>></span
 ></code></pre></div>
 </pulumi-choosable>
 </div>
@@ -46,9 +39,6 @@ function </span>funcWithEmptyOutputsOutput<span class="p">(</span><span class="n
 <div class="highlight"><pre class="chroma"><code class="language-python" data-lang="python"
 ><span class="k">def </span>func_with_empty_outputs<span class="p">(</span><span class="nx">name</span><span class="p">:</span> <span class="nx">Optional[str]</span> = None<span class="p">,</span>
                             <span class="nx">opts</span><span class="p">:</span> <span class="nx"><a href="/docs/reference/pkg/python/pulumi/#pulumi.InvokeOptions">Optional[InvokeOptions]</a></span> = None<span class="p">) -&gt;</span> <span>FuncWithEmptyOutputsResult</span
-><span class="k">
-def </span>func_with_empty_outputs_output<span class="p">(</span><span class="nx">name</span><span class="p">:</span> <span class="nx">Optional[pulumi.Input[str]]</span> = None<span class="p">,</span>
-                            <span class="nx">opts</span><span class="p">:</span> <span class="nx"><a href="/docs/reference/pkg/python/pulumi/#pulumi.InvokeOptions">Optional[InvokeOptions]</a></span> = None<span class="p">) -&gt;</span> <span>Output[FuncWithEmptyOutputsResult]</span
 ></code></pre></div>
 </pulumi-choosable>
 </div>
@@ -58,8 +48,6 @@ def </span>func_with_empty_outputs_output<span class="p">(</span><span class="nx
 <pulumi-choosable type="language" values="go">
 <div class="highlight"><pre class="chroma"><code class="language-go" data-lang="go"
 ><span class="k">func </span>FuncWithEmptyOutputs<span class="p">(</span><span class="nx">ctx</span><span class="p"> *</span><span class="nx"><a href="https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v3/go/pulumi?tab=doc#Context">Context</a></span><span class="p">,</span> <span class="nx">args</span><span class="p"> *</span><span class="nx">FuncWithEmptyOutputsArgs</span><span class="p">,</span> <span class="nx">opts</span><span class="p"> ...</span><span class="nx"><a href="https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v3/go/pulumi?tab=doc#InvokeOption">InvokeOption</a></span><span class="p">) (*<span class="nx"><a href="#result">FuncWithEmptyOutputsResult</a></span>, error)</span
-><span class="k">
-func </span>FuncWithEmptyOutputsOutput<span class="p">(</span><span class="nx">ctx</span><span class="p"> *</span><span class="nx"><a href="https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v3/go/pulumi?tab=doc#Context">Context</a></span><span class="p">,</span> <span class="nx">args</span><span class="p"> *</span><span class="nx">FuncWithEmptyOutputsOutputArgs</span><span class="p">,</span> <span class="nx">opts</span><span class="p"> ...</span><span class="nx"><a href="https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v3/go/pulumi?tab=doc#InvokeOption">InvokeOption</a></span><span class="p">) FuncWithEmptyOutputsResultOutput</span
 ></code></pre></div>
 
 &gt; Note: This function is named `FuncWithEmptyOutputs` in the Go SDK.
@@ -72,8 +60,7 @@ func </span>FuncWithEmptyOutputsOutput<span class="p">(</span><span class="nx">c
 <pulumi-choosable type="language" values="csharp">
 <div class="highlight"><pre class="chroma"><code class="language-csharp" data-lang="csharp"><span class="k">public static class </span><span class="nx">FuncWithEmptyOutputs </span><span class="p">
 {</span><span class="k">
-    public static </span>Task&lt;<span class="nx"><a href="#result">FuncWithEmptyOutputsResult</a></span>> <span class="p">InvokeAsync(</span><span class="nx">FuncWithEmptyOutputsArgs</span><span class="p"> </span><span class="nx">args<span class="p">,</span> <span class="nx"><a href="/docs/reference/pkg/dotnet/Pulumi/Pulumi.InvokeOptions.html">InvokeOptions</a></span><span class="p">? </span><span class="nx">opts = null<span class="p">)</span><span class="k">
-    public static </span>Output&lt;<span class="nx"><a href="#result">FuncWithEmptyOutputsResult</a></span>> <span class="p">Invoke(</span><span class="nx">FuncWithEmptyOutputsInvokeArgs</span><span class="p"> </span><span class="nx">args<span class="p">,</span> <span class="nx"><a href="/docs/reference/pkg/dotnet/Pulumi/Pulumi.InvokeOptions.html">InvokeOptions</a></span><span class="p">? </span><span class="nx">opts = null<span class="p">)</span><span class="p">
+    public static </span>Task&lt;<span class="nx"><a href="#result">FuncWithEmptyOutputsResult</a></span>> <span class="p">InvokeAsync(</span><span class="nx">FuncWithEmptyOutputsArgs</span><span class="p"> </span><span class="nx">args<span class="p">,</span> <span class="nx"><a href="/docs/reference/pkg/dotnet/Pulumi/Pulumi.InvokeOptions.html">InvokeOptions</a></span><span class="p">? </span><span class="nx">opts = null<span class="p">)</span><span class="p">
 }</span></code></pre></div>
 </pulumi-choosable>
 </div>
@@ -201,42 +188,6 @@ The following output properties are available:
 
 
 
-<div>
-<pulumi-choosable type="language" values="csharp">
-<dl class="resources-properties"></dl>
-</pulumi-choosable>
-</div>
-
-<div>
-<pulumi-choosable type="language" values="go">
-<dl class="resources-properties"></dl>
-</pulumi-choosable>
-</div>
-
-<div>
-<pulumi-choosable type="language" values="java">
-<dl class="resources-properties"></dl>
-</pulumi-choosable>
-</div>
-
-<div>
-<pulumi-choosable type="language" values="javascript,typescript">
-<dl class="resources-properties"></dl>
-</pulumi-choosable>
-</div>
-
-<div>
-<pulumi-choosable type="language" values="python">
-<dl class="resources-properties"></dl>
-</pulumi-choosable>
-</div>
-
-<div>
-<pulumi-choosable type="language" values="yaml">
-<dl class="resources-properties"></dl>
-</pulumi-choosable>
-</div>
-
 
 
 

diff --git a/pkg/codegen/testing/test/testdata/simplified-invokes/docs/_index.md b/pkg/codegen/testing/test/testdata/simplified-invokes/docs/_index.md
@@ -0,0 +1,37 @@
+---
+title: "StandardLibrary"
+title_tag: "std.StandardLibrary"
+meta_desc: "Standard library functions"
+layout: api
+no_edit_this_page: true
+---
+
+<!-- WARNING: this file was generated by test. -->
+<!-- Do not edit by hand unless you're certain you know what you are doing! -->
+
+Standard library functions
+
+<h2 id="resources">Resources</h2>
+<ul class="api">
+    <li><a href="provider" title="Provider"><span class="api-symbol api-symbol--resource"></span>Provider</a></li>
+</ul>
+
+<h2 id="functions">Functions</h2>
+<ul class="api">
+    <li><a href="abs" title="Abs"><span class="api-symbol api-symbol--function"></span>Abs</a></li>
+    <li><a href="absmultiargs" title="AbsMultiArgs"><span class="api-symbol api-symbol--function"></span>AbsMultiArgs</a></li>
+    <li><a href="absmultiargsreducedoutput" title="AbsMultiArgsReducedOutput"><span class="api-symbol api-symbol--function"></span>AbsMultiArgsReducedOutput</a></li>
+    <li><a href="absmultiargsreducedoutputswapped" title="AbsMultiArgsReducedOutputSwapped"><span class="api-symbol api-symbol--function"></span>AbsMultiArgsReducedOutputSwapped</a></li>
+    <li><a href="absreducedoutput" title="AbsReducedOutput"><span class="api-symbol api-symbol--function"></span>AbsReducedOutput</a></li>
+</ul>
+
+<h2 id="package-details">Package Details</h2>
+<dl class="package-details">
+	<dt>Repository</dt>
+	<dd><a href="https://github.com/pulumi/pulumi-std">https://github.com/pulumi/pulumi-std</a></dd>
+	<dt>License</dt>
+	<dd></dd>
+	<dt>Version</dt>
+	<dd>1.0.0</dd>
+</dl>
+