From 79cbc7768921636da9b1f02d055ba69696ac7291 Mon Sep 17 00:00:00 2001 From: Zaid Ajaj Date: Fri, 2 Dec 2022 11:27:56 +0100 Subject: [PATCH 1/2] [ts] Generate JS doc comments for output-versioned invokes and use explicit any type. --- ...tput-versioned-invokes-and-use-explicit-any-type.yaml | 4 ++++ pkg/codegen/nodejs/gen.go | 9 ++++++++- .../external-resource-schema/nodejs/argFunction.ts | 2 +- .../testdata/functions-secrets/nodejs/funcWithSecrets.ts | 2 +- .../output-funcs-edgeorder/nodejs/listConfigurations.ts | 6 +++++- .../output-funcs-edgeorder/nodejs/listProductFamilies.ts | 6 +++++- .../testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts | 6 +++++- .../nodejs/listStorageAccountKeys.ts | 6 +++++- .../output-funcs/nodejs/funcWithAllOptionalInputs.ts | 5 ++++- .../testdata/output-funcs/nodejs/funcWithDefaultValue.ts | 5 ++++- .../testdata/output-funcs/nodejs/funcWithDictParam.ts | 5 ++++- .../testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts | 5 ++++- .../testdata/output-funcs/nodejs/funcWithListParam.ts | 5 ++++- .../output-funcs/nodejs/getBastionShareableLink.ts | 6 +++++- .../nodejs/getIntegrationRuntimeObjectMetadatum.ts | 6 +++++- .../output-funcs/nodejs/listStorageAccountKeys.ts | 6 +++++- .../nodejs/funcWithAllOptionalInputs.ts | 5 ++++- .../nodejs/funcWithAllOptionalInputs.ts | 5 ++++- .../nodejs/funcWithAllOptionalInputs.ts | 5 ++++- .../nodejs/argFunction.ts | 2 +- .../simple-resource-schema/nodejs/argFunction.ts | 2 +- .../testdata/simple-yaml-schema/nodejs/argFunction.ts | 2 +- 22 files changed, 84 insertions(+), 21 deletions(-) create mode 100644 changelog/pending/20221202--sdkgen-nodejs--generate-js-doc-comments-for-output-versioned-invokes-and-use-explicit-any-type.yaml diff --git a/changelog/pending/20221202--sdkgen-nodejs--generate-js-doc-comments-for-output-versioned-invokes-and-use-explicit-any-type.yaml b/changelog/pending/20221202--sdkgen-nodejs--generate-js-doc-comments-for-output-versioned-invokes-and-use-explicit-any-type.yaml new file mode 100644 index 000000000000..1178adfe4c09 --- /dev/null +++ b/changelog/pending/20221202--sdkgen-nodejs--generate-js-doc-comments-for-output-versioned-invokes-and-use-explicit-any-type.yaml @@ -0,0 +1,4 @@ +changes: +- type: fix + scope: sdkgen/nodejs + description: Generate JS doc comments for output-versioned invokes and use explicit any type. diff --git a/pkg/codegen/nodejs/gen.go b/pkg/codegen/nodejs/gen.go index 68dc85ed508c..ddb270a50dcd 100644 --- a/pkg/codegen/nodejs/gen.go +++ b/pkg/codegen/nodejs/gen.go @@ -1182,6 +1182,13 @@ func (mod *modContext) genFunctionOutputVersion( return info, nil } + // Write the TypeDoc/JSDoc for the data source function. + printComment(w, codegen.FilterExamples(fun.Comment, "typescript"), "", "") + + if fun.DeprecationMessage != "" { + fmt.Fprintf(w, "/** @deprecated %s */\n", fun.DeprecationMessage) + } + originalName := tokenToFunctionName(fun.Token) fnOutput := fmt.Sprintf("%sOutput", originalName) info.functionOutputVersionName = fnOutput @@ -1197,7 +1204,7 @@ func (mod *modContext) genFunctionOutputVersion( fmt.Fprintf(w, ` export function %s(%sopts?: pulumi.InvokeOptions): pulumi.Output<%s> { - return pulumi.output(args).apply(a => %s(a, opts)) + return pulumi.output(args).apply((a: any) => %s(a, opts)) } `, fnOutput, argsig, functionReturnType(fun), originalName) fmt.Fprintf(w, "\n") diff --git a/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts b/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts index 9f832312a1d4..635a919fb696 100644 --- a/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts +++ b/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts @@ -24,7 +24,7 @@ export interface ArgFunctionResult { } export function argFunctionOutput(args?: ArgFunctionOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => argFunction(a, opts)) + return pulumi.output(args).apply((a: any) => argFunction(a, opts)) } export interface ArgFunctionOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts b/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts index 8b75a40c9dce..8831f1e32c24 100644 --- a/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts +++ b/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts @@ -26,7 +26,7 @@ export interface FuncWithSecretsResult { } export function funcWithSecretsOutput(args: FuncWithSecretsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithSecrets(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithSecrets(a, opts)) } export interface FuncWithSecretsOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts index 621472d12ac6..4def328a264f 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts @@ -49,9 +49,13 @@ export interface ListConfigurationsResult { */ readonly value: outputs.ConfigurationResponse[]; } +/** + * The list of configurations. + * API Version: 2020-12-01-preview. + */ export function listConfigurationsOutput(args: ListConfigurationsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => listConfigurations(a, opts)) + return pulumi.output(args).apply((a: any) => listConfigurations(a, opts)) } export interface ListConfigurationsOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts index 7e40a8978ef7..2aeb4424960a 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts @@ -54,9 +54,13 @@ export interface ListProductFamiliesResult { */ readonly value: outputs.ProductFamilyResponse[]; } +/** + * The list of product families. + * API Version: 2020-12-01-preview. + */ export function listProductFamiliesOutput(args: ListProductFamiliesOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => listProductFamilies(a, opts)) + return pulumi.output(args).apply((a: any) => listProductFamilies(a, opts)) } export interface ListProductFamiliesOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts index f0442d8731e7..08035afb3ca9 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts @@ -71,9 +71,13 @@ export interface GetAmiIdsResult { readonly owners: string[]; readonly sortAscending?: boolean; } +/** + * Taken from pulumi-AWS to regress an issue + */ +/** @deprecated aws.getAmiIds has been deprecated in favor of aws.ec2.getAmiIds */ export function getAmiIdsOutput(args: GetAmiIdsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => getAmiIds(a, opts)) + return pulumi.output(args).apply((a: any) => getAmiIds(a, opts)) } /** diff --git a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts index 8dddb08e03a0..9efa2363b0a6 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts @@ -44,9 +44,13 @@ export interface ListStorageAccountKeysResult { */ readonly keys: outputs.StorageAccountKeyResponse[]; } +/** + * The response from the ListKeys operation. + * API Version: 2021-02-01. + */ export function listStorageAccountKeysOutput(args: ListStorageAccountKeysOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => listStorageAccountKeys(a, opts)) + return pulumi.output(args).apply((a: any) => listStorageAccountKeys(a, opts)) } export interface ListStorageAccountKeysOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts index bc200f397990..f98746d5392f 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts @@ -31,9 +31,12 @@ export interface FuncWithAllOptionalInputsArgs { export interface FuncWithAllOptionalInputsResult { readonly r: string; } +/** + * Check codegen of functions with all optional inputs. + */ export function funcWithAllOptionalInputsOutput(args?: FuncWithAllOptionalInputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithAllOptionalInputs(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithAllOptionalInputs(a, opts)) } export interface FuncWithAllOptionalInputsOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts index 46cf712cb8c7..17fa7f768acf 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts @@ -24,9 +24,12 @@ export interface FuncWithDefaultValueArgs { export interface FuncWithDefaultValueResult { readonly r: string; } +/** + * Check codegen of functions with default values. + */ export function funcWithDefaultValueOutput(args: FuncWithDefaultValueOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithDefaultValue(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithDefaultValue(a, opts)) } export interface FuncWithDefaultValueOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts index 0a329bab92cf..1db14e961e60 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts @@ -25,9 +25,12 @@ export interface FuncWithDictParamArgs { export interface FuncWithDictParamResult { readonly r: string; } +/** + * Check codegen of functions with a Dict parameter. + */ export function funcWithDictParamOutput(args?: FuncWithDictParamOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithDictParam(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithDictParam(a, opts)) } export interface FuncWithDictParamOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts index c43d08ecd98c..ecab2db7e75c 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts @@ -24,9 +24,12 @@ export interface FuncWithEmptyOutputsArgs { export interface FuncWithEmptyOutputsResult { } +/** + * n/a + */ export function funcWithEmptyOutputsOutput(args: FuncWithEmptyOutputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithEmptyOutputs(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithEmptyOutputs(a, opts)) } export interface FuncWithEmptyOutputsOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts index b33e356a2914..e683bdd514bd 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts @@ -25,9 +25,12 @@ export interface FuncWithListParamArgs { export interface FuncWithListParamResult { readonly r: string; } +/** + * Check codegen of functions with a List parameter. + */ export function funcWithListParamOutput(args?: FuncWithListParamOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithListParam(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithListParam(a, opts)) } export interface FuncWithListParamOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts index 012ecdacf241..afb609060f44 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts @@ -44,9 +44,13 @@ export interface GetBastionShareableLinkResult { */ readonly nextLink?: string; } +/** + * Response for all the Bastion Shareable Link endpoints. + * API Version: 2020-11-01. + */ export function getBastionShareableLinkOutput(args: GetBastionShareableLinkOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => getBastionShareableLink(a, opts)) + return pulumi.output(args).apply((a: any) => getBastionShareableLink(a, opts)) } export interface GetBastionShareableLinkOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts index 9757f6be5a5f..9ff807ecec57 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts @@ -53,9 +53,13 @@ export interface GetIntegrationRuntimeObjectMetadatumResult { */ readonly value?: (outputs.SsisEnvironmentResponse | outputs.SsisFolderResponse | outputs.SsisPackageResponse | outputs.SsisProjectResponse)[]; } +/** + * Another failing example. A list of SSIS object metadata. + * API Version: 2018-06-01. + */ export function getIntegrationRuntimeObjectMetadatumOutput(args: GetIntegrationRuntimeObjectMetadatumOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => getIntegrationRuntimeObjectMetadatum(a, opts)) + return pulumi.output(args).apply((a: any) => getIntegrationRuntimeObjectMetadatum(a, opts)) } export interface GetIntegrationRuntimeObjectMetadatumOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts index 8dddb08e03a0..9efa2363b0a6 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts @@ -44,9 +44,13 @@ export interface ListStorageAccountKeysResult { */ readonly keys: outputs.StorageAccountKeyResponse[]; } +/** + * The response from the ListKeys operation. + * API Version: 2021-02-01. + */ export function listStorageAccountKeysOutput(args: ListStorageAccountKeysOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => listStorageAccountKeys(a, opts)) + return pulumi.output(args).apply((a: any) => listStorageAccountKeys(a, opts)) } export interface ListStorageAccountKeysOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts b/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts index 13a332a41acf..3b98fa862155 100644 --- a/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts +++ b/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts @@ -33,9 +33,12 @@ export interface FuncWithAllOptionalInputsArgs { export interface FuncWithAllOptionalInputsResult { readonly r: string; } +/** + * Check codegen of functions with all optional inputs. + */ export function funcWithAllOptionalInputsOutput(args?: FuncWithAllOptionalInputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithAllOptionalInputs(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithAllOptionalInputs(a, opts)) } export interface FuncWithAllOptionalInputsOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts b/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts index 52e75acdbaf7..ddbcbc55a846 100644 --- a/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts +++ b/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts @@ -33,9 +33,12 @@ export interface FuncWithAllOptionalInputsArgs { export interface FuncWithAllOptionalInputsResult { readonly r: string; } +/** + * Check codegen of functions with all optional inputs. + */ export function funcWithAllOptionalInputsOutput(args?: FuncWithAllOptionalInputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithAllOptionalInputs(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithAllOptionalInputs(a, opts)) } export interface FuncWithAllOptionalInputsOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts b/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts index cc910deecb14..c7c1f55ff655 100644 --- a/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts +++ b/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts @@ -31,9 +31,12 @@ export interface FuncWithAllOptionalInputsArgs { export interface FuncWithAllOptionalInputsResult { readonly r: string; } +/** + * Check codegen of functions with all optional inputs. + */ export function funcWithAllOptionalInputsOutput(args?: FuncWithAllOptionalInputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => funcWithAllOptionalInputs(a, opts)) + return pulumi.output(args).apply((a: any) => funcWithAllOptionalInputs(a, opts)) } export interface FuncWithAllOptionalInputsOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts b/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts index 8234ea34165b..f8271a57bca2 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts @@ -24,7 +24,7 @@ export interface ArgFunctionResult { } export function argFunctionOutput(args?: ArgFunctionOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => argFunction(a, opts)) + return pulumi.output(args).apply((a: any) => argFunction(a, opts)) } export interface ArgFunctionOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts b/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts index 8234ea34165b..f8271a57bca2 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts @@ -24,7 +24,7 @@ export interface ArgFunctionResult { } export function argFunctionOutput(args?: ArgFunctionOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => argFunction(a, opts)) + return pulumi.output(args).apply((a: any) => argFunction(a, opts)) } export interface ArgFunctionOutputArgs { diff --git a/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts b/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts index 8234ea34165b..f8271a57bca2 100644 --- a/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts +++ b/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts @@ -24,7 +24,7 @@ export interface ArgFunctionResult { } export function argFunctionOutput(args?: ArgFunctionOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { - return pulumi.output(args).apply(a => argFunction(a, opts)) + return pulumi.output(args).apply((a: any) => argFunction(a, opts)) } export interface ArgFunctionOutputArgs { From 31a240b7313a359c6f57a1c1c1a53489c2607244 Mon Sep 17 00:00:00 2001 From: Zaid Ajaj Date: Mon, 5 Dec 2022 12:55:29 +0100 Subject: [PATCH 2/2] Remove newline between function definition and doc comments --- pkg/codegen/nodejs/gen.go | 3 +-- .../testdata/external-resource-schema/nodejs/argFunction.ts | 1 - .../test/testdata/functions-secrets/nodejs/funcWithSecrets.ts | 1 - .../output-funcs-edgeorder/nodejs/listConfigurations.ts | 1 - .../output-funcs-edgeorder/nodejs/listProductFamilies.ts | 1 - .../test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts | 1 - .../output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts | 1 - .../testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts | 1 - .../test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts | 1 - .../test/testdata/output-funcs/nodejs/funcWithDictParam.ts | 1 - .../test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts | 1 - .../test/testdata/output-funcs/nodejs/funcWithListParam.ts | 1 - .../testdata/output-funcs/nodejs/getBastionShareableLink.ts | 1 - .../nodejs/getIntegrationRuntimeObjectMetadatum.ts | 1 - .../testdata/output-funcs/nodejs/listStorageAccountKeys.ts | 1 - .../plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts | 1 - .../nodejs/funcWithAllOptionalInputs.ts | 1 - .../provider-config-schema/nodejs/funcWithAllOptionalInputs.ts | 1 - .../nodejs/argFunction.ts | 1 - .../test/testdata/simple-resource-schema/nodejs/argFunction.ts | 1 - .../test/testdata/simple-yaml-schema/nodejs/argFunction.ts | 1 - 21 files changed, 1 insertion(+), 22 deletions(-) diff --git a/pkg/codegen/nodejs/gen.go b/pkg/codegen/nodejs/gen.go index ddb270a50dcd..3423952f6714 100644 --- a/pkg/codegen/nodejs/gen.go +++ b/pkg/codegen/nodejs/gen.go @@ -1202,8 +1202,7 @@ func (mod *modContext) genFunctionOutputVersion( } argsig = fmt.Sprintf("args%s: %s, ", optFlag, argTypeName) - fmt.Fprintf(w, ` -export function %s(%sopts?: pulumi.InvokeOptions): pulumi.Output<%s> { + fmt.Fprintf(w, `export function %s(%sopts?: pulumi.InvokeOptions): pulumi.Output<%s> { return pulumi.output(args).apply((a: any) => %s(a, opts)) } `, fnOutput, argsig, functionReturnType(fun), originalName) diff --git a/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts b/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts index 635a919fb696..1b09c43c3695 100644 --- a/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts +++ b/pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/argFunction.ts @@ -22,7 +22,6 @@ export interface ArgFunctionArgs { export interface ArgFunctionResult { readonly age?: number; } - export function argFunctionOutput(args?: ArgFunctionOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => argFunction(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts b/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts index 8831f1e32c24..c448da9975de 100644 --- a/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts +++ b/pkg/codegen/testing/test/testdata/functions-secrets/nodejs/funcWithSecrets.ts @@ -24,7 +24,6 @@ export interface FuncWithSecretsResult { readonly id: string; readonly plaintext: string; } - export function funcWithSecretsOutput(args: FuncWithSecretsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithSecrets(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts index 4def328a264f..4faa092ce0f9 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listConfigurations.ts @@ -53,7 +53,6 @@ export interface ListConfigurationsResult { * The list of configurations. * API Version: 2020-12-01-preview. */ - export function listConfigurationsOutput(args: ListConfigurationsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => listConfigurations(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts index 2aeb4424960a..2560edf35bcf 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/listProductFamilies.ts @@ -58,7 +58,6 @@ export interface ListProductFamiliesResult { * The list of product families. * API Version: 2020-12-01-preview. */ - export function listProductFamiliesOutput(args: ListProductFamiliesOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => listProductFamilies(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts index 08035afb3ca9..161ba9db80e5 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/getAmiIds.ts @@ -75,7 +75,6 @@ export interface GetAmiIdsResult { * Taken from pulumi-AWS to regress an issue */ /** @deprecated aws.getAmiIds has been deprecated in favor of aws.ec2.getAmiIds */ - export function getAmiIdsOutput(args: GetAmiIdsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => getAmiIds(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts index 9efa2363b0a6..f075f8e33216 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/listStorageAccountKeys.ts @@ -48,7 +48,6 @@ export interface ListStorageAccountKeysResult { * The response from the ListKeys operation. * API Version: 2021-02-01. */ - export function listStorageAccountKeysOutput(args: ListStorageAccountKeysOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => listStorageAccountKeys(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts index f98746d5392f..7cae54e402d6 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithAllOptionalInputs.ts @@ -34,7 +34,6 @@ export interface FuncWithAllOptionalInputsResult { /** * Check codegen of functions with all optional inputs. */ - export function funcWithAllOptionalInputsOutput(args?: FuncWithAllOptionalInputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithAllOptionalInputs(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts index 17fa7f768acf..992b9cf8600b 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDefaultValue.ts @@ -27,7 +27,6 @@ export interface FuncWithDefaultValueResult { /** * Check codegen of functions with default values. */ - export function funcWithDefaultValueOutput(args: FuncWithDefaultValueOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithDefaultValue(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts index 1db14e961e60..6717c9b477cd 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithDictParam.ts @@ -28,7 +28,6 @@ export interface FuncWithDictParamResult { /** * Check codegen of functions with a Dict parameter. */ - export function funcWithDictParamOutput(args?: FuncWithDictParamOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithDictParam(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts index ecab2db7e75c..228f98fab6cf 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithEmptyOutputs.ts @@ -27,7 +27,6 @@ export interface FuncWithEmptyOutputsResult { /** * n/a */ - export function funcWithEmptyOutputsOutput(args: FuncWithEmptyOutputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithEmptyOutputs(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts index e683bdd514bd..8e023f754fec 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/funcWithListParam.ts @@ -28,7 +28,6 @@ export interface FuncWithListParamResult { /** * Check codegen of functions with a List parameter. */ - export function funcWithListParamOutput(args?: FuncWithListParamOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithListParam(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts index afb609060f44..ad6fe4549811 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getBastionShareableLink.ts @@ -48,7 +48,6 @@ export interface GetBastionShareableLinkResult { * Response for all the Bastion Shareable Link endpoints. * API Version: 2020-11-01. */ - export function getBastionShareableLinkOutput(args: GetBastionShareableLinkOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => getBastionShareableLink(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts index 9ff807ecec57..3b74b1561440 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/getIntegrationRuntimeObjectMetadatum.ts @@ -57,7 +57,6 @@ export interface GetIntegrationRuntimeObjectMetadatumResult { * Another failing example. A list of SSIS object metadata. * API Version: 2018-06-01. */ - export function getIntegrationRuntimeObjectMetadatumOutput(args: GetIntegrationRuntimeObjectMetadatumOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => getIntegrationRuntimeObjectMetadatum(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts index 9efa2363b0a6..f075f8e33216 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts +++ b/pkg/codegen/testing/test/testdata/output-funcs/nodejs/listStorageAccountKeys.ts @@ -48,7 +48,6 @@ export interface ListStorageAccountKeysResult { * The response from the ListKeys operation. * API Version: 2021-02-01. */ - export function listStorageAccountKeysOutput(args: ListStorageAccountKeysOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => listStorageAccountKeys(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts b/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts index 3b98fa862155..81fa726ebe9b 100644 --- a/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts +++ b/pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/funcWithAllOptionalInputs.ts @@ -36,7 +36,6 @@ export interface FuncWithAllOptionalInputsResult { /** * Check codegen of functions with all optional inputs. */ - export function funcWithAllOptionalInputsOutput(args?: FuncWithAllOptionalInputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithAllOptionalInputs(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts b/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts index ddbcbc55a846..0a83946ddaf6 100644 --- a/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts +++ b/pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/funcWithAllOptionalInputs.ts @@ -36,7 +36,6 @@ export interface FuncWithAllOptionalInputsResult { /** * Check codegen of functions with all optional inputs. */ - export function funcWithAllOptionalInputsOutput(args?: FuncWithAllOptionalInputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithAllOptionalInputs(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts b/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts index c7c1f55ff655..0adca720a3cd 100644 --- a/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts +++ b/pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/funcWithAllOptionalInputs.ts @@ -34,7 +34,6 @@ export interface FuncWithAllOptionalInputsResult { /** * Check codegen of functions with all optional inputs. */ - export function funcWithAllOptionalInputsOutput(args?: FuncWithAllOptionalInputsOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => funcWithAllOptionalInputs(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts b/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts index f8271a57bca2..ed27f855683c 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/nodejs/argFunction.ts @@ -22,7 +22,6 @@ export interface ArgFunctionArgs { export interface ArgFunctionResult { readonly result?: Resource; } - export function argFunctionOutput(args?: ArgFunctionOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => argFunction(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts b/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts index f8271a57bca2..ed27f855683c 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema/nodejs/argFunction.ts @@ -22,7 +22,6 @@ export interface ArgFunctionArgs { export interface ArgFunctionResult { readonly result?: Resource; } - export function argFunctionOutput(args?: ArgFunctionOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => argFunction(a, opts)) } diff --git a/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts b/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts index f8271a57bca2..ed27f855683c 100644 --- a/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts +++ b/pkg/codegen/testing/test/testdata/simple-yaml-schema/nodejs/argFunction.ts @@ -22,7 +22,6 @@ export interface ArgFunctionArgs { export interface ArgFunctionResult { readonly result?: Resource; } - export function argFunctionOutput(args?: ArgFunctionOutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output { return pulumi.output(args).apply((a: any) => argFunction(a, opts)) }