Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions internal/snippetmetadata/snippetmetadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package snippetmetadata

import (
"bytes"
"encoding/json"
"errors"
"fmt"
Expand Down Expand Up @@ -49,10 +50,18 @@ func readMetadata(path string) (map[string]any, error) {
// writeMetadata formats and writes the given metadata as a JSON file at the
// given path.
func writeMetadata(path string, metadata map[string]any) error {
content, err := json.MarshalIndent(metadata, "", " ")
if err != nil {
var buf bytes.Buffer
enc := json.NewEncoder(&buf)
enc.SetEscapeHTML(false)
enc.SetIndent("", " ")
if err := enc.Encode(metadata); err != nil {
return fmt.Errorf("error encoding snippet metadata file %s: %w", path, err)
}
content := buf.Bytes()
// Trim the trailing newline added by Encode to match the generator's format.
if len(content) > 0 && content[len(content)-1] == '\n' {
Comment thread
codyoss marked this conversation as resolved.
content = content[:len(content)-1]
}
if err := os.WriteFile(path, content, 0644); err != nil {
return fmt.Errorf("error writing snippet metadata file %s: %w", path, err)
}
Expand Down
59 changes: 59 additions & 0 deletions internal/snippetmetadata/snippetmetadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -410,3 +410,62 @@ func copyInputFileToTemp(t *testing.T, inputFile string) string {
}
return path
}

func TestHTMLCharsNoEscape(t *testing.T) {
for _, test := range []struct {
name string
input string
run func(string) error
want string
}{
{
name: "updateLibraryVersion",
input: `{
"clientLibrary": {
"someFieldWithHTML": "a > b & c < d",
"version": "1.0.0"
}
}`,
run: func(path string) error {
return updateLibraryVersion(path, "1.2.0")
},
want: `{
"clientLibrary": {
"someFieldWithHTML": "a > b & c < d",
"version": "1.2.0"
}
}`,
},
{
name: "reformat",
input: `{
"someFieldWithHTML": "a > b & c < d"
}`,
run: func(path string) error {
return reformat(path)
},
want: `{
"someFieldWithHTML": "a > b & c < d"
}`,
},
} {
t.Run(test.name, func(t *testing.T) {
t.Parallel()
dir := t.TempDir()
path := filepath.Join(dir, "snippet_metadata.json")
if err := os.WriteFile(path, []byte(test.input), 0644); err != nil {
t.Fatal(err)
}
if err := test.run(path); err != nil {
t.Fatal(err)
}
got, err := os.ReadFile(path)
if err != nil {
t.Fatal(err)
}
if diff := cmp.Diff(test.want, string(got)); diff != "" {
t.Errorf("mismatch (-want +got):\n%s", diff)
}
})
}
}
Loading