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

Use nil checks for defaults when applicable #12099

Merged
merged 1 commit into from Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -0,0 +1,4 @@
changes:
- type: fix
scope: sdkgen/go
description: Prevent defaults from overriding set values.
16 changes: 12 additions & 4 deletions pkg/codegen/go/gen.go
Expand Up @@ -1350,8 +1350,12 @@ func (pkg *pkgContext) genObjectDefaultFunc(w io.Writer, name string,
if err != nil {
return err
}
pkg.needsUtils = true
fmt.Fprintf(w, "if isZero(tmp.%s) {\n", pkg.fieldName(nil, p))
if isNilType(p.Type) {
fmt.Fprintf(w, "if tmp.%s == nil {\n", pkg.fieldName(nil, p))
} else {
pkg.needsUtils = true
fmt.Fprintf(w, "if isZero(tmp.%s) {\n", pkg.fieldName(nil, p))
}
AaronFriel marked this conversation as resolved.
Show resolved Hide resolved
pkg.assignProperty(w, p, "tmp", dv, !p.IsRequired())
fmt.Fprintf(w, "}\n")
} else if funcName := pkg.provideDefaultsFuncName(p.Type); funcName != "" {
Expand Down Expand Up @@ -1708,8 +1712,12 @@ func (pkg *pkgContext) genResource(w io.Writer, r *schema.Resource, generateReso
if err != nil {
return err
}
pkg.needsUtils = true
fmt.Fprintf(w, "\tif isZero(args.%s) {\n", pkg.fieldName(r, p))
if isNilType(p.Type) {
fmt.Fprintf(w, "\tif args.%s == nil {\n", pkg.fieldName(r, p))
} else {
pkg.needsUtils = true
fmt.Fprintf(w, "\tif isZero(args.%s) {\n", pkg.fieldName(r, p))
}
assign(p, dv)
fmt.Fprintf(w, "\t}\n")
} else if name := pkg.provideDefaultsFuncName(p.Type); name != "" && !pkg.disableObjectDefaults {
Expand Down
Expand Up @@ -10,7 +10,6 @@
"plant-provider/tree/v1/init.go",
"plant-provider/tree/v1/nursery.go",
"plant-provider/tree/v1/pulumiEnums.go",
"plant-provider/tree/v1/pulumiUtilities.go",
"plant-provider/tree/v1/rubberTree.go"
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -10,7 +10,6 @@
"plant/tree/v1/init.go",
"plant/tree/v1/nursery.go",
"plant/tree/v1/pulumiEnums.go",
"plant/tree/v1/pulumiUtilities.go",
"plant/tree/v1/rubberTree.go"
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -12,6 +12,10 @@ namespace Pulumi.FooBar
[FooBarResourceType("foobar::ModuleResource")]
public partial class ModuleResource : global::Pulumi.CustomResource
{
[Output("optional_bool")]
public Output<bool?> Optional_bool { get; private set; } = null!;


/// <summary>
/// Create a ModuleResource resource with the given unique name, arguments, and options.
/// </summary>
Expand Down