Skip to content

Commit 752afc0

Browse files
authored
Merge pull request #2181 from norio-nomura/write-file-not-apply-permission-to-existing-file
Use `(*os.File).Write()` instead of `os.WriteFile()`
2 parents 6ba3a91 + 00ea934 commit 752afc0

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

pkg/editutil/editutil.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ func OpenEditor(content []byte, hdr string) ([]byte, error) {
6363
}
6464
tmpYAMLPath := tmpYAMLFile.Name()
6565
defer os.RemoveAll(tmpYAMLPath)
66-
if err := os.WriteFile(tmpYAMLPath,
67-
append([]byte(hdr), content...),
68-
0o600); err != nil {
66+
if _, err := tmpYAMLFile.Write(append([]byte(hdr), content...)); err != nil {
67+
return nil, err
68+
}
69+
if err := tmpYAMLFile.Close(); err != nil {
6970
return nil, err
7071
}
7172

pkg/yqutil/yqutil.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ func EvaluateExpression(expression string, content []byte) ([]byte, error) {
2020
}
2121
tmpYAMLPath := tmpYAMLFile.Name()
2222
defer os.RemoveAll(tmpYAMLPath)
23-
err = os.WriteFile(tmpYAMLPath, content, 0o600)
23+
_, err = tmpYAMLFile.Write(content)
2424
if err != nil {
2525
return nil, err
2626
}
27+
if err = tmpYAMLFile.Close(); err != nil {
28+
return nil, err
29+
}
2730

2831
memory := logging.NewMemoryBackend(0)
2932
backend := logging.AddModuleLevel(memory)

0 commit comments

Comments
 (0)