github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-20 20:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take in an io.Reader instead of file path (#885)

Browse Source 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
This commit is contained in:
John Olheiser
2022-04-19 03:40:48 -05:00
committed by GitHub
parent 3a3282cde2
commit 67d76248a3
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shared/yml/yml.go
View File

@@ -3,7 +3,7 @@ package yml
import (
"encoding/json"
"fmt"
"os"
"io"
"strconv"
"gopkg.in/yaml.v3"
@@ -59,6 +59,7 @@ func toJSON(node *yaml.Node) (interface{}, error) {
return nil, fmt.Errorf("do not support yaml node kind '%v'", node.Kind)
}
// ToJSON converts YAML bytes to JSON
func ToJSON(data []byte) ([]byte, error) {
m := &yaml.Node{}
if err := yaml.Unmarshal(data, m); err != nil {
@@ -72,8 +73,9 @@ func ToJSON(data []byte) ([]byte, error) {
return json.Marshal(d)
}
func LoadYmlFileAsJSON(path string) (j []byte, err error) {
data, err := os.ReadFile(path)
// LoadYmlReaderAsJSON reads from an io.Reader containing YAML and converts it to JSON
func LoadYmlReaderAsJSON(r io.Reader) (j []byte, err error) {
data, err := io.ReadAll(r)
if err != nil {
return nil, err
}