Skip to content

Commit

Permalink
Merge #11343
Browse files Browse the repository at this point in the history 
11343: [nodejs/sdk-gen] Simplify default options for function invokes r=Zaid-Ajaj a=Zaid-Ajaj

This came up as part of the my work on simplified functions (multi args / single output) so here is a PR for this specific change

Co-authored-by: Zaid Ajaj <zaid.naom@gmail.com>
  • Loading branch information
@bors @Zaid-Ajaj
bors[bot] and Zaid-Ajaj committed Nov 14, 2022
2 parents e3002b0 + 06f98d9 commit 1170a51
Show file tree
Hide file tree
Showing 26 changed files with 26 additions and 104 deletions.
5 changes: 1 addition & 4 deletions pkg/codegen/nodejs/gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1110,11 +1110,8 @@ func (mod *modContext) genFunction(w io.Writer, fun *schema.Function) (functionF
}

// If the caller didn't request a specific version, supply one using the version of this library.
fmt.Fprintf(w, " if (!opts) {\n")
fmt.Fprintf(w, " opts = {}\n")
fmt.Fprintf(w, " }\n")
fmt.Fprintf(w, "\n")
fmt.Fprintf(w, " opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);\n")
fmt.Fprintf(w, " opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});\n")

// Now simply invoke the runtime function with the arguments, returning the results.
fmt.Fprintf(w, " return pulumi.runtime.invoke(\"%s\", {\n", fun.Token)
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import * as pulumiRandom from "@pulumi/random";

export function argFunction(args?: ArgFunctionArgs, opts?: pulumi.InvokeOptions): Promise<ArgFunctionResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("example::argFunction", {
"name": args.name,
}, opts);
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ import * as pulumi from "@pulumi/pulumi";
import * as utilities from "./utilities";

export function funcWithSecrets(args: FuncWithSecretsArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithSecretsResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::funcWithSecrets", {
"cryptoKey": args.cryptoKey,
"plaintext": args.plaintext,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ import * as utilities from "./utilities";
* API Version: 2020-12-01-preview.
*/
export function listConfigurations(args: ListConfigurationsArgs, opts?: pulumi.InvokeOptions): Promise<ListConfigurationsResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("myedgeorder::listConfigurations", {
"configurationFilters": args.configurationFilters,
"customerSubscriptionDetails": args.customerSubscriptionDetails,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ import * as utilities from "./utilities";
* API Version: 2020-12-01-preview.
*/
export function listProductFamilies(args: ListProductFamiliesArgs, opts?: pulumi.InvokeOptions): Promise<ListProductFamiliesResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("myedgeorder::listProductFamilies", {
"customerSubscriptionDetails": args.customerSubscriptionDetails,
"expand": args.expand,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ import * as utilities from "./utilities";
/** @deprecated aws.getAmiIds has been deprecated in favor of aws.ec2.getAmiIds */
export function getAmiIds(args: GetAmiIdsArgs, opts?: pulumi.InvokeOptions): Promise<GetAmiIdsResult> {
pulumi.log.warn("getAmiIds is deprecated: aws.getAmiIds has been deprecated in favor of aws.ec2.getAmiIds")
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::getAmiIds", {
"executableUsers": args.executableUsers,
"filters": args.filters,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ import * as utilities from "./utilities";
* API Version: 2021-02-01.
*/
export function listStorageAccountKeys(args: ListStorageAccountKeysArgs, opts?: pulumi.InvokeOptions): Promise<ListStorageAccountKeysResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::listStorageAccountKeys", {
"accountName": args.accountName,
"expand": args.expand,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ import * as utilities from "./utilities";
*/
export function funcWithAllOptionalInputs(args?: FuncWithAllOptionalInputsArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithAllOptionalInputsResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::funcWithAllOptionalInputs", {
"a": args.a,
"b": args.b,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithConstInput.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ import * as utilities from "./utilities";
*/
export function funcWithConstInput(args?: FuncWithConstInputArgs, opts?: pulumi.InvokeOptions): Promise<void> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::funcWithConstInput", {
"plainInput": args.plainInput,
}, opts);
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import * as utilities from "./utilities";
* Check codegen of functions with default values.
*/
export function funcWithDefaultValue(args: FuncWithDefaultValueArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithDefaultValueResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::funcWithDefaultValue", {
"a": args.a,
"b": args.b,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ import * as utilities from "./utilities";
*/
export function funcWithDictParam(args?: FuncWithDictParamArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithDictParamResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::funcWithDictParam", {
"a": args.a,
"b": args.b,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import * as utilities from "./utilities";
* n/a
*/
export function funcWithEmptyOutputs(args: FuncWithEmptyOutputsArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithEmptyOutputsResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::funcWithEmptyOutputs", {
"name": args.name,
}, opts);
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ import * as utilities from "./utilities";
*/
export function funcWithListParam(args?: FuncWithListParamArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithListParamResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::funcWithListParam", {
"a": args.a,
"b": args.b,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ import * as utilities from "./utilities";
* API Version: 2020-11-01.
*/
export function getBastionShareableLink(args: GetBastionShareableLinkArgs, opts?: pulumi.InvokeOptions): Promise<GetBastionShareableLinkResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::getBastionShareableLink", {
"bastionHostName": args.bastionHostName,
"resourceGroupName": args.resourceGroupName,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/getClientConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import * as utilities from "./utilities";
* Failing example taken from azure-native. Original doc: Use this function to access the current configuration of the native Azure provider.
*/
export function getClientConfig(opts?: pulumi.InvokeOptions): Promise<GetClientConfigResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::getClientConfig", {
}, opts);
}
Expand Down
5 changes: 1 addition & 4 deletions ...codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ import * as utilities from "./utilities";
* API Version: 2018-06-01.
*/
export function getIntegrationRuntimeObjectMetadatum(args: GetIntegrationRuntimeObjectMetadatumArgs, opts?: pulumi.InvokeOptions): Promise<GetIntegrationRuntimeObjectMetadatumResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::getIntegrationRuntimeObjectMetadatum", {
"factoryName": args.factoryName,
"integrationRuntimeName": args.integrationRuntimeName,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ import * as utilities from "./utilities";
* API Version: 2021-02-01.
*/
export function listStorageAccountKeys(args: ListStorageAccountKeysArgs, opts?: pulumi.InvokeOptions): Promise<ListStorageAccountKeysResult> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::listStorageAccountKeys", {
"accountName": args.accountName,
"expand": args.expand,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ import * as utilities from "./utilities";
*/
export function funcWithAllOptionalInputs(args?: FuncWithAllOptionalInputsArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithAllOptionalInputsResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("example::funcWithAllOptionalInputs", {
"a": args.a ? inputs.helmReleaseSettingsProvideDefaults(args.a) : undefined,
"b": args.b,
Expand Down
5 changes: 1 addition & 4 deletions ...n/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ import * as utilities from "./utilities";
*/
export function funcWithAllOptionalInputs(args?: FuncWithAllOptionalInputsArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithAllOptionalInputsResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mypkg::funcWithAllOptionalInputs", {
"a": args.a ? inputs.helmReleaseSettingsProvideDefaults(args.a) : undefined,
"b": args.b,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ import * as utilities from "./utilities";
*/
export function funcWithAllOptionalInputs(args?: FuncWithAllOptionalInputsArgs, opts?: pulumi.InvokeOptions): Promise<FuncWithAllOptionalInputsResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("configstation::funcWithAllOptionalInputs", {
"a": args.a,
"b": args.b,
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/regress-8403/nodejs/getCustomDbRoles.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import * as utilities from "./utilities";

export function getCustomDbRoles(args?: GetCustomDbRolesArgs, opts?: pulumi.InvokeOptions): Promise<GetCustomDbRolesResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("mongodbatlas::getCustomDbRoles", {
}, opts);
}
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/regress-node-8110/nodejs/exampleFunc.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ import * as utilities from "./utilities";

export function exampleFunc(args?: ExampleFuncArgs, opts?: pulumi.InvokeOptions): Promise<void> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("my8110::exampleFunc", {
"enums": args.enums,
}, opts);
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/simple-plain-schema/nodejs/doFoo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ import * as outputs from "./types/output";
import * as utilities from "./utilities";

export function doFoo(args: DoFooArgs, opts?: pulumi.InvokeOptions): Promise<void> {
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("example::doFoo", {
"foo": args.foo,
}, opts);
Expand Down
5 changes: 1 addition & 4 deletions .../testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import {Resource} from "./index";

export function argFunction(args?: ArgFunctionArgs, opts?: pulumi.InvokeOptions): Promise<ArgFunctionResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("example::argFunction", {
"arg1": args.arg1,
}, opts);
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import {Resource} from "./index";

export function argFunction(args?: ArgFunctionArgs, opts?: pulumi.InvokeOptions): Promise<ArgFunctionResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("example::argFunction", {
"arg1": args.arg1,
}, opts);
Expand Down
5 changes: 1 addition & 4 deletions pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import {Resource} from "./index";

export function argFunction(args?: ArgFunctionArgs, opts?: pulumi.InvokeOptions): Promise<ArgFunctionResult> {
args = args || {};
if (!opts) {
opts = {}
}

opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
return pulumi.runtime.invoke("example::argFunction", {
"arg1": args.arg1,
}, opts);
Expand Down

0 comments on commit 1170a51

Please sign in to comment.