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

Update codegen output

Browse source
This commit is contained in:
Ian Wahbe 2021-11-19 16:17:46 -08:00
parent c4784a518a
commit a9b899df5d
9 changed files with 83 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/codegen/internal/test/testdata/dashed-import-schema/nodejs/tree/v1/rubberTree.ts vendored
View file

@ -58,22 +58,11 @@ export class RubberTree extends pulumi.CustomResource {
if ((!args || args.diameter === undefined) && !opts.urn) {
throw new Error("Missing required property 'diameter'");
}
<<<<<<< HEAD
inputs["container"] = args ? args.container : undefined;
inputs["diameter"] = args ? args.diameter : undefined;
inputs["farm"] = (args ? args.farm : undefined) ?? "(unknown)";
inputs["size"] = (args ? args.size : undefined) ?? "medium";
inputs["type"] = (args ? args.type : undefined) ?? "Burgundy";
=======
if ((!args || args.type === undefined) && !opts.urn) {
throw new Error("Missing required property 'type'");
}
resourceInputs["container"] = args ? (args.container ? pulumi.output(args.container).apply(inputs.containerArgsProvideDefaults) : undefined) : undefined;
resourceInputs["diameter"] = (args ? args.diameter : undefined) ?? 6;
resourceInputs["diameter"] = args ? args.diameter : undefined;
resourceInputs["farm"] = (args ? args.farm : undefined) ?? "(unknown)";
resourceInputs["size"] = (args ? args.size : undefined) ?? "medium";
resourceInputs["type"] = (args ? args.type : undefined) ?? "Burgundy";
>>>>>>> master
}
if (!opts.version) {
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});

80
pkg/codegen/internal/test/testdata/env-helper/docs/foo/_index.md vendored
View file

@ -639,15 +639,7 @@ All [input](#inputs) properties are implicitly available as output properties. A
<span class="property-indicator"></span>
<span class="property-type"><a href="#helmreleasesettings">Helm<wbr>Release<wbr>Settings</a></span>
</dt>
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-required"
title="Required">
<span id="thinker_csharp">
<a href="#thinker_csharp" style="color: inherit; text-decoration: inherit;">Thinker</a>
</span>
<span class="property-indicator"></span>
<span class="property-type">string</span>
</dt>
<dd>{{% md %}}To ask and answer{{% /md %}}</dd><dt class="property-optional"
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-optional"
title="Optional">
<span id="answer_csharp">
<a href="#answer_csharp" style="color: inherit; text-decoration: inherit;">Answer</a>
@ -679,7 +671,15 @@ All [input](#inputs) properties are implicitly available as output properties. A
<span class="property-indicator"></span>
<span class="property-type"><a href="#layeredtype">Layered<wbr>Type</a></span>
</dt>
<dd>{{% md %}}{{% /md %}}</dd></dl>
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-optional"
title="Optional">
<span id="thinker_csharp">
<a href="#thinker_csharp" style="color: inherit; text-decoration: inherit;">Thinker</a>
</span>
<span class="property-indicator"></span>
<span class="property-type">string</span>
</dt>
<dd>{{% md %}}To ask and answer{{% /md %}}</dd></dl>
{{% /choosable %}}
{{% choosable language go %}}
@ -691,15 +691,7 @@ All [input](#inputs) properties are implicitly available as output properties. A
<span class="property-indicator"></span>
<span class="property-type"><a href="#helmreleasesettings">Helm<wbr>Release<wbr>Settings</a></span>
</dt>
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-required"
title="Required">
<span id="thinker_go">
<a href="#thinker_go" style="color: inherit; text-decoration: inherit;">Thinker</a>
</span>
<span class="property-indicator"></span>
<span class="property-type">string</span>
</dt>
<dd>{{% md %}}To ask and answer{{% /md %}}</dd><dt class="property-optional"
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-optional"
title="Optional">
<span id="answer_go">
<a href="#answer_go" style="color: inherit; text-decoration: inherit;">Answer</a>
@ -731,7 +723,15 @@ All [input](#inputs) properties are implicitly available as output properties. A
<span class="property-indicator"></span>
<span class="property-type"><a href="#layeredtype">Layered<wbr>Type</a></span>
</dt>
<dd>{{% md %}}{{% /md %}}</dd></dl>
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-optional"
title="Optional">
<span id="thinker_go">
<a href="#thinker_go" style="color: inherit; text-decoration: inherit;">Thinker</a>
</span>
<span class="property-indicator"></span>
<span class="property-type">string</span>
</dt>
<dd>{{% md %}}To ask and answer{{% /md %}}</dd></dl>
{{% /choosable %}}
{{% choosable language nodejs %}}
@ -743,15 +743,7 @@ All [input](#inputs) properties are implicitly available as output properties. A
<span class="property-indicator"></span>
<span class="property-type"><a href="#helmreleasesettings">Helm<wbr>Release<wbr>Settings</a></span>
</dt>
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-required"
title="Required">
<span id="thinker_nodejs">
<a href="#thinker_nodejs" style="color: inherit; text-decoration: inherit;">thinker</a>
</span>
<span class="property-indicator"></span>
<span class="property-type">string</span>
</dt>
<dd>{{% md %}}To ask and answer{{% /md %}}</dd><dt class="property-optional"
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-optional"
title="Optional">
<span id="answer_nodejs">
<a href="#answer_nodejs" style="color: inherit; text-decoration: inherit;">answer</a>
@ -783,7 +775,15 @@ All [input](#inputs) properties are implicitly available as output properties. A
<span class="property-indicator"></span>
<span class="property-type"><a href="#layeredtype">Layered<wbr>Type</a></span>
</dt>
<dd>{{% md %}}{{% /md %}}</dd></dl>
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-optional"
title="Optional">
<span id="thinker_nodejs">
<a href="#thinker_nodejs" style="color: inherit; text-decoration: inherit;">thinker</a>
</span>
<span class="property-indicator"></span>
<span class="property-type">string</span>
</dt>
<dd>{{% md %}}To ask and answer{{% /md %}}</dd></dl>
{{% /choosable %}}
{{% choosable language python %}}
@ -795,15 +795,7 @@ All [input](#inputs) properties are implicitly available as output properties. A
<span class="property-indicator"></span>
<span class="property-type"><a href="#helmreleasesettings">Helm<wbr>Release<wbr>Settings</a></span>
</dt>
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-required"
title="Required">
<span id="thinker_python">
<a href="#thinker_python" style="color: inherit; text-decoration: inherit;">thinker</a>
</span>
<span class="property-indicator"></span>
<span class="property-type">str</span>
</dt>
<dd>{{% md %}}To ask and answer{{% /md %}}</dd><dt class="property-optional"
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-optional"
title="Optional">
<span id="answer_python">
<a href="#answer_python" style="color: inherit; text-decoration: inherit;">answer</a>
@ -835,7 +827,15 @@ All [input](#inputs) properties are implicitly available as output properties. A
<span class="property-indicator"></span>
<span class="property-type"><a href="#layeredtype">Layered<wbr>Type</a></span>
</dt>
<dd>{{% md %}}{{% /md %}}</dd></dl>
<dd>{{% md %}}{{% /md %}}</dd><dt class="property-optional"
title="Optional">
<span id="thinker_python">
<a href="#thinker_python" style="color: inherit; text-decoration: inherit;">thinker</a>
</span>
<span class="property-indicator"></span>
<span class="property-type">str</span>
</dt>
<dd>{{% md %}}To ask and answer{{% /md %}}</dd></dl>
{{% /choosable %}}

4
pkg/codegen/internal/test/testdata/env-helper/dotnet/Inputs/LayeredTypeArgs.cs vendored
View file

@ -42,8 +42,8 @@ namespace Pulumi.Example.Inputs
/// <summary>
/// To ask and answer
/// </summary>
[Input("thinker", required: true)]
public Input<string> Thinker { get; set; } = null!;
[Input("thinker")]
public Input<string>? Thinker { get; set; }
public LayeredTypeArgs()
{

10
pkg/codegen/internal/test/testdata/env-helper/go/example/pulumiTypes.go vendored
View file

@ -375,7 +375,7 @@ type LayeredType struct {
Question *string `pulumi:"question"`
Recursive *LayeredType `pulumi:"recursive"`
// To ask and answer
Thinker string `pulumi:"thinker"`
Thinker *string `pulumi:"thinker"`
}
// LayeredTypeInput is an input type that accepts LayeredTypeArgs and LayeredTypeOutput values.
@ -400,7 +400,7 @@ type LayeredTypeArgs struct {
Question pulumi.StringPtrInput `pulumi:"question"`
Recursive LayeredTypePtrInput `pulumi:"recursive"`
// To ask and answer
Thinker pulumi.StringInput `pulumi:"thinker"`
Thinker pulumi.StringPtrInput `pulumi:"thinker"`
}
func (LayeredTypeArgs) ElementType() reflect.Type {
@ -505,8 +505,8 @@ func (o LayeredTypeOutput) Recursive() LayeredTypePtrOutput {
}
// To ask and answer
func (o LayeredTypeOutput) Thinker() pulumi.StringOutput {
return o.ApplyT(func(v LayeredType) string { return v.Thinker }).(pulumi.StringOutput)
func (o LayeredTypeOutput) Thinker() pulumi.StringPtrOutput {
return o.ApplyT(func(v LayeredType) *string { return v.Thinker }).(pulumi.StringPtrOutput)
}
type LayeredTypePtrOutput struct{ *pulumi.OutputState }
@ -587,7 +587,7 @@ func (o LayeredTypePtrOutput) Thinker() pulumi.StringPtrOutput {
if v == nil {
return nil
}
return &v.Thinker
return v.Thinker
}).(pulumi.StringPtrOutput)
}

2
pkg/codegen/internal/test/testdata/env-helper/nodejs/types/input.ts vendored
View file

@ -109,7 +109,7 @@ export interface LayeredTypeArgs {
/**
* To ask and answer
*/
thinker: pulumi.Input<string>;
thinker?: pulumi.Input<string>;
}
/**
* layeredTypeArgsProvideDefaults sets the appropriate defaults for LayeredTypeArgs

37
pkg/codegen/internal/test/testdata/env-helper/python/pulumi_example/_inputs.py vendored
View file

@ -196,22 +196,19 @@ class KubeClientSettingsArgs:
class LayeredTypeArgs:
def __init__(__self__, *,
other: pulumi.Input['HelmReleaseSettingsArgs'],
thinker: pulumi.Input[str],
answer: Optional[pulumi.Input[float]] = None,
plain_other: Optional['HelmReleaseSettingsArgs'] = None,
question: Optional[pulumi.Input[str]] = None,
recursive: Optional[pulumi.Input['LayeredTypeArgs']] = None):
recursive: Optional[pulumi.Input['LayeredTypeArgs']] = None,
thinker: Optional[pulumi.Input[str]] = None):
"""
Make sure that defaults propagate through types
:param pulumi.Input[str] thinker: To ask and answer
:param pulumi.Input[float] answer: The answer to the question
:param 'HelmReleaseSettingsArgs' plain_other: Test how plain types interact
:param pulumi.Input[str] question: The question already answered
:param pulumi.Input[str] thinker: To ask and answer
"""
pulumi.set(__self__, "other", other)
if thinker is None:
thinker = 'not a good interaction'
pulumi.set(__self__, "thinker", thinker)
if answer is None:
answer = 42
if answer is not None:
@ -224,6 +221,10 @@ class LayeredTypeArgs:
pulumi.set(__self__, "question", question)
if recursive is not None:
pulumi.set(__self__, "recursive", recursive)
if thinker is None:
thinker = 'not a good interaction'
if thinker is not None:
pulumi.set(__self__, "thinker", thinker)
@property
@pulumi.getter
@ -234,18 +235,6 @@ class LayeredTypeArgs:
def other(self, value: pulumi.Input['HelmReleaseSettingsArgs']):
pulumi.set(self, "other", value)
@property
@pulumi.getter
def thinker(self) -> pulumi.Input[str]:
"""
To ask and answer
"""
return pulumi.get(self, "thinker")
@thinker.setter
def thinker(self, value: pulumi.Input[str]):
pulumi.set(self, "thinker", value)
@property
@pulumi.getter
def answer(self) -> Optional[pulumi.Input[float]]:
@ -291,6 +280,18 @@ class LayeredTypeArgs:
def recursive(self, value: Optional[pulumi.Input['LayeredTypeArgs']]):
pulumi.set(self, "recursive", value)
@property
@pulumi.getter
def thinker(self) -> Optional[pulumi.Input[str]]:
"""
To ask and answer
"""
return pulumi.get(self, "thinker")
@thinker.setter
def thinker(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "thinker", value)
@pulumi.input_type
class TypArgs:

2
pkg/codegen/internal/test/testdata/env-helper/schema.json vendored
View file

@ -156,7 +156,7 @@
"$ref": "#/types/example:index:LayeredType"
}
},
"required": ["other", "thinker"]
"required": ["other"]
},
"example:index:KubeClientSettings": {
"description": "Options for tuning the Kubernetes client used by a Provider.",

46
pkg/codegen/internal/test/testdata/plain-and-default/nodejs/moduleResource.ts vendored
View file

@ -68,43 +68,23 @@ export class ModuleResource extends pulumi.CustomResource {
if ((!args || args.required_string === undefined) && !opts.urn) {
throw new Error("Missing required property 'required_string'");
}
<<<<<<< HEAD
inputs["default_bool"] = (args ? args.default_bool : undefined) ?? true;
inputs["default_enum"] = (args ? args.default_enum : undefined) ?? 4;
inputs["default_number"] = (args ? args.default_number : undefined) ?? 42;
inputs["default_string"] = (args ? args.default_string : undefined) ?? "buzzer";
inputs["optional_enum"] = (args ? args.optional_enum : undefined) ?? 8;
inputs["plain_optional_bool"] = (args ? args.plain_optional_bool : undefined) ?? true;
inputs["plain_optional_number"] = (args ? args.plain_optional_number : undefined) ?? 42;
inputs["plain_optional_string"] = (args ? args.plain_optional_string : undefined) ?? "buzzer";
inputs["plain_required_bool"] = args ? args.plain_required_bool : undefined;
inputs["plain_required_enum"] = args ? args.plain_required_enum : undefined;
inputs["plain_required_number"] = args ? args.plain_required_number : undefined;
inputs["plain_required_string"] = args ? args.plain_required_string : undefined;
inputs["required_bool"] = args ? args.required_bool : undefined;
inputs["required_enum"] = args ? args.required_enum : undefined;
inputs["required_number"] = args ? args.required_number : undefined;
inputs["required_string"] = args ? args.required_string : undefined;
inputs["string_const"] = "val";
=======
resourceInputs["optional_bool"] = (args ? args.optional_bool : undefined) ?? true;
resourceInputs["optional_const"] = "val";
resourceInputs["default_bool"] = (args ? args.default_bool : undefined) ?? true;
resourceInputs["default_enum"] = (args ? args.default_enum : undefined) ?? 4;
resourceInputs["default_number"] = (args ? args.default_number : undefined) ?? 42;
resourceInputs["default_string"] = (args ? args.default_string : undefined) ?? "buzzer";
resourceInputs["optional_enum"] = (args ? args.optional_enum : undefined) ?? 8;
resourceInputs["optional_number"] = (args ? args.optional_number : undefined) ?? 42;
resourceInputs["optional_string"] = (args ? args.optional_string : undefined) ?? "buzzer";
resourceInputs["plain_optional_bool"] = (args ? args.plain_optional_bool : undefined) ?? true;
resourceInputs["plain_optional_const"] = "val";
resourceInputs["plain_optional_number"] = (args ? args.plain_optional_number : undefined) ?? 42;
resourceInputs["plain_optional_string"] = (args ? args.plain_optional_string : undefined) ?? "buzzer";
resourceInputs["plain_required_bool"] = (args ? args.plain_required_bool : undefined) ?? true;
resourceInputs["plain_required_const"] = "val";
resourceInputs["plain_required_number"] = (args ? args.plain_required_number : undefined) ?? 42;
resourceInputs["plain_required_string"] = (args ? args.plain_required_string : undefined) ?? "buzzer";
resourceInputs["required_bool"] = (args ? args.required_bool : undefined) ?? true;
resourceInputs["required_enum"] = (args ? args.required_enum : undefined) ?? 4;
resourceInputs["required_number"] = (args ? args.required_number : undefined) ?? 42;
resourceInputs["required_string"] = (args ? args.required_string : undefined) ?? "buzzer";
>>>>>>> master
resourceInputs["plain_required_bool"] = args ? args.plain_required_bool : undefined;
resourceInputs["plain_required_enum"] = args ? args.plain_required_enum : undefined;
resourceInputs["plain_required_number"] = args ? args.plain_required_number : undefined;
resourceInputs["plain_required_string"] = args ? args.plain_required_string : undefined;
resourceInputs["required_bool"] = args ? args.required_bool : undefined;
resourceInputs["required_enum"] = args ? args.required_enum : undefined;
resourceInputs["required_number"] = args ? args.required_number : undefined;
resourceInputs["required_string"] = args ? args.required_string : undefined;
resourceInputs["string_const"] = "val";
} else {
}
if (!opts.version) {

10
pkg/codegen/internal/test/testdata/simple-enum-schema/nodejs/tree/v1/rubberTree.ts vendored
View file

@ -58,19 +58,11 @@ export class RubberTree extends pulumi.CustomResource {
if ((!args || args.type === undefined) && !opts.urn) {
throw new Error("Missing required property 'type'");
}
<<<<<<< HEAD
inputs["container"] = args ? args.container : undefined;
inputs["diameter"] = (args ? args.diameter : undefined) ?? 6;
inputs["farm"] = (args ? args.farm : undefined) ?? "(unknown)";
inputs["size"] = (args ? args.size : undefined) ?? "medium";
inputs["type"] = args ? args.type : undefined;
=======
resourceInputs["container"] = args ? (args.container ? pulumi.output(args.container).apply(inputs.containerArgsProvideDefaults) : undefined) : undefined;
resourceInputs["diameter"] = (args ? args.diameter : undefined) ?? 6;
resourceInputs["farm"] = (args ? args.farm : undefined) ?? "(unknown)";
resourceInputs["size"] = (args ? args.size : undefined) ?? "medium";
resourceInputs["type"] = (args ? args.type : undefined) ?? "Burgundy";
>>>>>>> master
resourceInputs["type"] = args ? args.type : undefined;
}
if (!opts.version) {
opts = pulumi.mergeOptions(opts, { version: utilities.getVersion()});