[codegen/go] Update Go SDK function output to check for errors (#9274)

* [codegen/go] Update Go SDK function output to check for errors Fixes pulumi/pulumi-aws#1872. This should result in the following sample output in the Go SDK: ``` func GetPolicyDocumentOutput(ctx *pulumi.Context, args GetPolicyDocumentOutputArgs, opts ...pulumi.InvokeOption) GetPolicyDocumentResultOutput { return pulumi.ToOutputWithContext(context.Background(), args). ApplyT(func(v interface{}) (GetPolicyDocumentResult, error) { args := v.(GetPolicyDocumentArgs) r, err := GetPolicyDocument(ctx, &args, opts...) if err != nil { return nil, err } if r == nil { return nil, fmt.Errorf("expected either result or error to be nil, not both") } return *r, err }).(GetPolicyDocumentResultOutput) } ``` * Fix generated code panic on *nil (#9284) * [codegen/go] Update Go SDK function output to check for errors Fixes pulumi/pulumi-aws#1872. This should result in the following sample output in the Go SDK: ``` func GetPolicyDocumentOutput(ctx *pulumi.Context, args GetPolicyDocumentOutputArgs, opts ...pulumi.InvokeOption) GetPolicyDocumentResultOutput { return pulumi.ToOutputWithContext(context.Background(), args). ApplyT(func(v interface{}) (GetPolicyDocumentResult, error) { args := v.(GetPolicyDocumentArgs) r, err := GetPolicyDocument(ctx, &args, opts...) if r != nil { s = *r } return s, err }).(GetPolicyDocumentResultOutput) } ``` * Alternate fix to safeguard dereferencing nil * Accept codegen changes in the test suite Co-authored-by: Guinevere Saenger <guinevere@pulumi.com> * Update CHANGELOG_PENDING.md Co-authored-by: Anton Tayanovskyy <anton@pulumi.com>
pulumi · Mar 25, 2022 · de0dcbf · de0dcbf
1 parent 13756ec
commit de0dcbf
Show file tree

Hide file tree

Showing 18 changed files with 91 additions and 19 deletions.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -34,9 +34,12 @@
 
 - [cli/engine] - Fix a panic due to passing `""` as the ID for a resource read.
   [#9243](https://github.com/pulumi/pulumi/pull/9243)
-  
+
 - [cli/engine] - Fix a panic due to `Check` failing while using update plans.
   [#9254](https://github.com/pulumi/pulumi/pull/9254)
-  
+
 - [cli] - Stack names correctly take `org set-default` into account when printing.
   [#9240](https://github.com/pulumi/pulumi/pull/9240)
+
+- [codegen/go] - Fix Go SDK function output to check for errors
+  [pulumi-aws#1872](https://github.com/pulumi/pulumi-aws/issues/1872)
diff --git a/pkg/codegen/go/gen.go b/pkg/codegen/go/gen.go
@@ -2073,11 +2073,16 @@ func ${fn}Output(ctx *pulumi.Context, args ${fn}OutputArgs, opts ...pulumi.Invok
 		ApplyT(func(v interface{}) (${fn}Result, error) {
 			args := v.(${fn}Args)
 			r, err := ${fn}(ctx, &args, opts...)
-			return *r, err
+			var s ${fn}Result
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(${outputType})
 }
 
 `
+
 	code = strings.ReplaceAll(code, "${fn}", originalName)
 	code = strings.ReplaceAll(code, "${outputType}", resultTypeName)
 	fmt.Fprintf(w, code)

diff --git a/pkg/codegen/testing/test/testdata/external-resource-schema/go/example/argFunction.go b/pkg/codegen/testing/test/testdata/external-resource-schema/go/example/argFunction.go
@@ -33,7 +33,11 @@ func ArgFunctionOutput(ctx *pulumi.Context, args ArgFunctionOutputArgs, opts ...
 		ApplyT(func(v interface{}) (ArgFunctionResult, error) {
 			args := v.(ArgFunctionArgs)
 			r, err := ArgFunction(ctx, &args, opts...)
-			return *r, err
+			var s ArgFunctionResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(ArgFunctionResultOutput)
 }
 

diff --git a/...codegen/testing/test/testdata/output-funcs-edgeorder/go/myedgeorder/listConfigurations.go b/...codegen/testing/test/testdata/output-funcs-edgeorder/go/myedgeorder/listConfigurations.go
@@ -43,7 +43,11 @@ func ListConfigurationsOutput(ctx *pulumi.Context, args ListConfigurationsOutput
 		ApplyT(func(v interface{}) (ListConfigurationsResult, error) {
 			args := v.(ListConfigurationsArgs)
 			r, err := ListConfigurations(ctx, &args, opts...)
-			return *r, err
+			var s ListConfigurationsResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(ListConfigurationsResultOutput)
 }
 

diff --git a/...odegen/testing/test/testdata/output-funcs-edgeorder/go/myedgeorder/listProductFamilies.go b/...odegen/testing/test/testdata/output-funcs-edgeorder/go/myedgeorder/listProductFamilies.go
@@ -45,7 +45,11 @@ func ListProductFamiliesOutput(ctx *pulumi.Context, args ListProductFamiliesOutp
 		ApplyT(func(v interface{}) (ListProductFamiliesResult, error) {
 			args := v.(ListProductFamiliesArgs)
 			r, err := ListProductFamilies(ctx, &args, opts...)
-			return *r, err
+			var s ListProductFamiliesResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(ListProductFamiliesResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/go/mypkg/getAmiIds.go b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/go/mypkg/getAmiIds.go
@@ -60,7 +60,11 @@ func GetAmiIdsOutput(ctx *pulumi.Context, args GetAmiIdsOutputArgs, opts ...pulu
 		ApplyT(func(v interface{}) (GetAmiIdsResult, error) {
 			args := v.(GetAmiIdsArgs)
 			r, err := GetAmiIds(ctx, &args, opts...)
-			return *r, err
+			var s GetAmiIdsResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(GetAmiIdsResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/go/mypkg/listStorageAccountKeys.go b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/go/mypkg/listStorageAccountKeys.go
@@ -41,7 +41,11 @@ func ListStorageAccountKeysOutput(ctx *pulumi.Context, args ListStorageAccountKe
 		ApplyT(func(v interface{}) (ListStorageAccountKeysResult, error) {
 			args := v.(ListStorageAccountKeysArgs)
 			r, err := ListStorageAccountKeys(ctx, &args, opts...)
-			return *r, err
+			var s ListStorageAccountKeysResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(ListStorageAccountKeysResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/funcWithAllOptionalInputs.go b/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/funcWithAllOptionalInputs.go
@@ -36,7 +36,11 @@ func FuncWithAllOptionalInputsOutput(ctx *pulumi.Context, args FuncWithAllOption
 		ApplyT(func(v interface{}) (FuncWithAllOptionalInputsResult, error) {
 			args := v.(FuncWithAllOptionalInputsArgs)
 			r, err := FuncWithAllOptionalInputs(ctx, &args, opts...)
-			return *r, err
+			var s FuncWithAllOptionalInputsResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(FuncWithAllOptionalInputsResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/funcWithDefaultValue.go b/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/funcWithDefaultValue.go
@@ -47,7 +47,11 @@ func FuncWithDefaultValueOutput(ctx *pulumi.Context, args FuncWithDefaultValueOu
 		ApplyT(func(v interface{}) (FuncWithDefaultValueResult, error) {
 			args := v.(FuncWithDefaultValueArgs)
 			r, err := FuncWithDefaultValue(ctx, &args, opts...)
-			return *r, err
+			var s FuncWithDefaultValueResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(FuncWithDefaultValueResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/funcWithDictParam.go b/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/funcWithDictParam.go
@@ -34,7 +34,11 @@ func FuncWithDictParamOutput(ctx *pulumi.Context, args FuncWithDictParamOutputAr
 		ApplyT(func(v interface{}) (FuncWithDictParamResult, error) {
 			args := v.(FuncWithDictParamArgs)
 			r, err := FuncWithDictParam(ctx, &args, opts...)
-			return *r, err
+			var s FuncWithDictParamResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(FuncWithDictParamResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/funcWithListParam.go b/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/funcWithListParam.go
@@ -34,7 +34,11 @@ func FuncWithListParamOutput(ctx *pulumi.Context, args FuncWithListParamOutputAr
 		ApplyT(func(v interface{}) (FuncWithListParamResult, error) {
 			args := v.(FuncWithListParamArgs)
 			r, err := FuncWithListParam(ctx, &args, opts...)
-			return *r, err
+			var s FuncWithListParamResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(FuncWithListParamResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/getBastionShareableLink.go b/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/getBastionShareableLink.go
@@ -41,7 +41,11 @@ func GetBastionShareableLinkOutput(ctx *pulumi.Context, args GetBastionShareable
 		ApplyT(func(v interface{}) (GetBastionShareableLinkResult, error) {
 			args := v.(GetBastionShareableLinkArgs)
 			r, err := GetBastionShareableLink(ctx, &args, opts...)
-			return *r, err
+			var s GetBastionShareableLinkResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(GetBastionShareableLinkResultOutput)
 }
 

diff --git a/...degen/testing/test/testdata/output-funcs/go/mypkg/getIntegrationRuntimeObjectMetadatum.go b/...degen/testing/test/testdata/output-funcs/go/mypkg/getIntegrationRuntimeObjectMetadatum.go
@@ -45,7 +45,11 @@ func GetIntegrationRuntimeObjectMetadatumOutput(ctx *pulumi.Context, args GetInt
 		ApplyT(func(v interface{}) (GetIntegrationRuntimeObjectMetadatumResult, error) {
 			args := v.(GetIntegrationRuntimeObjectMetadatumArgs)
 			r, err := GetIntegrationRuntimeObjectMetadatum(ctx, &args, opts...)
-			return *r, err
+			var s GetIntegrationRuntimeObjectMetadatumResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(GetIntegrationRuntimeObjectMetadatumResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/listStorageAccountKeys.go b/pkg/codegen/testing/test/testdata/output-funcs/go/mypkg/listStorageAccountKeys.go
@@ -41,7 +41,11 @@ func ListStorageAccountKeysOutput(ctx *pulumi.Context, args ListStorageAccountKe
 		ApplyT(func(v interface{}) (ListStorageAccountKeysResult, error) {
 			args := v.(ListStorageAccountKeysArgs)
 			r, err := ListStorageAccountKeys(ctx, &args, opts...)
-			return *r, err
+			var s ListStorageAccountKeysResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(ListStorageAccountKeysResultOutput)
 }
 

diff --git a/...degen/testing/test/testdata/plain-object-defaults/go/example/funcWithAllOptionalInputs.go b/...degen/testing/test/testdata/plain-object-defaults/go/example/funcWithAllOptionalInputs.go
@@ -51,7 +51,11 @@ func FuncWithAllOptionalInputsOutput(ctx *pulumi.Context, args FuncWithAllOption
 		ApplyT(func(v interface{}) (FuncWithAllOptionalInputsResult, error) {
 			args := v.(FuncWithAllOptionalInputsArgs)
 			r, err := FuncWithAllOptionalInputs(ctx, &args, opts...)
-			return *r, err
+			var s FuncWithAllOptionalInputsResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(FuncWithAllOptionalInputsResultOutput)
 }
 

diff --git a/...sting/test/testdata/plain-object-disable-defaults/go/example/funcWithAllOptionalInputs.go b/...sting/test/testdata/plain-object-disable-defaults/go/example/funcWithAllOptionalInputs.go
@@ -36,7 +36,11 @@ func FuncWithAllOptionalInputsOutput(ctx *pulumi.Context, args FuncWithAllOption
 		ApplyT(func(v interface{}) (FuncWithAllOptionalInputsResult, error) {
 			args := v.(FuncWithAllOptionalInputsArgs)
 			r, err := FuncWithAllOptionalInputs(ctx, &args, opts...)
-			return *r, err
+			var s FuncWithAllOptionalInputsResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(FuncWithAllOptionalInputsResultOutput)
 }
 

diff --git a/...ting/test/testdata/simple-resource-schema-custom-pypackage-name/go/example/argFunction.go b/...ting/test/testdata/simple-resource-schema-custom-pypackage-name/go/example/argFunction.go
@@ -32,7 +32,11 @@ func ArgFunctionOutput(ctx *pulumi.Context, args ArgFunctionOutputArgs, opts ...
 		ApplyT(func(v interface{}) (ArgFunctionResult, error) {
 			args := v.(ArgFunctionArgs)
 			r, err := ArgFunction(ctx, &args, opts...)
-			return *r, err
+			var s ArgFunctionResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(ArgFunctionResultOutput)
 }
 

diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema/go/example/argFunction.go b/pkg/codegen/testing/test/testdata/simple-resource-schema/go/example/argFunction.go
@@ -33,7 +33,11 @@ func ArgFunctionOutput(ctx *pulumi.Context, args ArgFunctionOutputArgs, opts ...
 		ApplyT(func(v interface{}) (ArgFunctionResult, error) {
 			args := v.(ArgFunctionArgs)
 			r, err := ArgFunction(ctx, &args, opts...)
-			return *r, err
+			var s ArgFunctionResult
+			if r != nil {
+				s = *r
+			}
+			return s, err
 		}).(ArgFunctionResultOutput)
 }