Skip to content

Commit 95a6828

Browse files
authored
fix(internal/librarian/nodejs): stop renaming snippet metadata files (#4840)
The copySamplesFromStaging function was renaming snippet metadata files from the generator's underscore pattern (snippet_metadata_<api>.json) to a dot pattern (snippet_metadata.<api>.json). This caused repos to end up with both naming variants, since the old dot-pattern files were never cleaned up. Use the generator's underscore pattern as the canonical name.
1 parent aee2374 commit 95a6828

2 files changed

Lines changed: 4 additions & 17 deletions

File tree

internal/librarian/nodejs/generate.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -450,13 +450,6 @@ func copySamplesFromStaging(stagingDir, outDir string) error {
450450
if err != nil {
451451
return err
452452
}
453-
// The generator produces snippet_metadata_<api>.json but the
454-
// existing convention uses snippet_metadata.<api>.json.
455-
base := filepath.Base(rel)
456-
if strings.HasPrefix(base, "snippet_metadata_") {
457-
renamed := "snippet_metadata." + strings.TrimPrefix(base, "snippet_metadata_")
458-
rel = filepath.Join(filepath.Dir(rel), renamed)
459-
}
460453
dst := filepath.Join(outDir, "samples", rel)
461454
if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
462455
return err

internal/librarian/nodejs/generate_test.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -824,13 +824,13 @@ func TestCopySamplesFromStaging(t *testing.T) {
824824
want: "console.log('v1');",
825825
},
826826
{
827-
name: "v1 renamed metadata",
828-
path: filepath.Join(outDir, "samples", "generated", "v1", "snippet_metadata.google.cloud.test.v1.json"),
827+
name: "v1 metadata",
828+
path: filepath.Join(outDir, "samples", "generated", "v1", "snippet_metadata_google.cloud.test.v1.json"),
829829
want: `{"snippets":[]}`,
830830
},
831831
{
832-
name: "v1beta1 renamed metadata",
833-
path: filepath.Join(outDir, "samples", "generated", "v1beta1", "snippet_metadata.google.cloud.test.v1beta1.json"),
832+
name: "v1beta1 metadata",
833+
path: filepath.Join(outDir, "samples", "generated", "v1beta1", "snippet_metadata_google.cloud.test.v1beta1.json"),
834834
want: `{"snippets":["beta"]}`,
835835
},
836836
} {
@@ -844,12 +844,6 @@ func TestCopySamplesFromStaging(t *testing.T) {
844844
}
845845
})
846846
}
847-
848-
// Verify the old underscore-prefixed names do not exist.
849-
oldV1 := filepath.Join(outDir, "samples", "generated", "v1", "snippet_metadata_google.cloud.test.v1.json")
850-
if _, err := os.Stat(oldV1); !errors.Is(err, os.ErrNotExist) {
851-
t.Error("expected snippet_metadata_ file to be renamed, but old name still exists")
852-
}
853847
}
854848

855849
func TestCopySamplesFromStaging_NonExistentDir(t *testing.T) {

0 commit comments

Comments
 (0)