From 9f5e5b5db7ae5a4f1c4c1fe165841a5a59b59d19 Mon Sep 17 00:00:00 2001 From: Ian Wahbe Date: Mon, 28 Nov 2022 11:26:32 -0800 Subject: [PATCH] Fix capitalization for generated `fs.readdirSync` --- ...s--fix-capitalization-when-generating-fs-readdirsync.yaml | 4 ++++ pkg/codegen/nodejs/gen_program_expressions.go | 2 +- pkg/codegen/testing/test/program_driver.go | 5 ++--- .../test/testdata/aws-s3-folder-pp/nodejs/aws-s3-folder.ts | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 changelog/pending/20221128--programgen-nodejs--fix-capitalization-when-generating-fs-readdirsync.yaml diff --git a/changelog/pending/20221128--programgen-nodejs--fix-capitalization-when-generating-fs-readdirsync.yaml b/changelog/pending/20221128--programgen-nodejs--fix-capitalization-when-generating-fs-readdirsync.yaml new file mode 100644 index 000000000000..94dafdbf717c --- /dev/null +++ b/changelog/pending/20221128--programgen-nodejs--fix-capitalization-when-generating-fs-readdirsync.yaml @@ -0,0 +1,4 @@ +changes: +- type: fix + scope: programgen/nodejs + description: Fix capitalization when generating `fs.readdirSync`. diff --git a/pkg/codegen/nodejs/gen_program_expressions.go b/pkg/codegen/nodejs/gen_program_expressions.go index 9ef51257bde5..888906582ede 100644 --- a/pkg/codegen/nodejs/gen_program_expressions.go +++ b/pkg/codegen/nodejs/gen_program_expressions.go @@ -429,7 +429,7 @@ func (g *generator) GenFunctionCallExpression(w io.Writer, expr *model.FunctionC case "readFile": g.Fgenf(w, "fs.readFileSync(%v)", expr.Args[0]) case "readDir": - g.Fgenf(w, "fs.readDirSync(%v)", expr.Args[0]) + g.Fgenf(w, "fs.readdirSync(%v)", expr.Args[0]) case "secret": g.Fgenf(w, "pulumi.secret(%v)", expr.Args[0]) case "split": diff --git a/pkg/codegen/testing/test/program_driver.go b/pkg/codegen/testing/test/program_driver.go index 6b7669f2a20c..ad4ce4c55636 100644 --- a/pkg/codegen/testing/test/program_driver.go +++ b/pkg/codegen/testing/test/program_driver.go @@ -66,13 +66,12 @@ var PulumiPulumiProgramTests = []ProgramTest{ { Directory: "aws-s3-folder", Description: "AWS S3 Folder", - ExpectNYIDiags: allProgLanguages.Except("go"), - SkipCompile: allProgLanguages.Except("dotnet"), + ExpectNYIDiags: codegen.NewStringSet("dotnet", "python"), + SkipCompile: codegen.NewStringSet("go", "python"), // Blocked on python: TODO[pulumi/pulumi#8062]: Re-enable this test. // Blocked on go: // TODO[pulumi/pulumi#8064] // TODO[pulumi/pulumi#8065] - // Blocked on nodejs: TODO[pulumi/pulumi#8063] }, { Directory: "aws-eks", diff --git a/pkg/codegen/testing/test/testdata/aws-s3-folder-pp/nodejs/aws-s3-folder.ts b/pkg/codegen/testing/test/testdata/aws-s3-folder-pp/nodejs/aws-s3-folder.ts index d7863011e199..9b969dd944d8 100644 --- a/pkg/codegen/testing/test/testdata/aws-s3-folder-pp/nodejs/aws-s3-folder.ts +++ b/pkg/codegen/testing/test/testdata/aws-s3-folder-pp/nodejs/aws-s3-folder.ts @@ -9,7 +9,7 @@ const siteBucket = new aws.s3.Bucket("siteBucket", {website: { const siteDir = "www"; // For each file in the directory, create an S3 object stored in `siteBucket` const files: aws.s3.BucketObject[] = []; -for (const range of fs.readDirSync(siteDir).map((v, k) => ({key: k, value: v}))) { +for (const range of fs.readdirSync(siteDir).map((v, k) => ({key: k, value: v}))) { files.push(new aws.s3.BucketObject(`files-${range.key}`, { bucket: siteBucket.id, key: range.value,