yamlutil: Export 2-space encoder and refactor encoding package to use

This commit is contained in:
Aaron Friel 2022-12-09 20:49:28 -08:00
parent 7d8e2f6e90
commit a74886120d
3 changed files with 50 additions and 22 deletions
sdk/go/common
encoding
util/yamlutil

View File

@ -105,16 +105,7 @@ func (m *yamlMarshaler) Marshal(v interface{}) ([]byte, error) {
}
}
// use a 2 space indent:
var b bytes.Buffer
yamlEncoder := yaml.NewEncoder(&b)
yamlEncoder.SetIndent(2)
err := yamlEncoder.Encode(v)
if err != nil {
return nil, fmt.Errorf("error marshaling value %#v: %w", v, err)
}
return b.Bytes(), nil
return yamlutil.YamlEncode(v)
}
func (m *yamlMarshaler) Unmarshal(data []byte, v interface{}) error {

View File

@ -1,9 +1,20 @@
// Copyright 2016-2022, Pulumi Corporation.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package yamlutil
import (
"bytes"
"fmt"
"gopkg.in/yaml.v3"
)
@ -36,15 +47,7 @@ func Edit(original []byte, new interface{}) ([]byte, error) {
return nil, err
}
var b bytes.Buffer
yamlEncoder := yaml.NewEncoder(&b)
yamlEncoder.SetIndent(2)
err = yamlEncoder.Encode(&newValue)
if err != nil {
return nil, fmt.Errorf("error editing value %#v: %w", newValue, err)
}
return b.Bytes(), nil
return YamlEncode(&newValue)
}
func editNodes(original, new *yaml.Node) (yaml.Node, error) {

View File

@ -0,0 +1,34 @@
// Copyright 2016-2022, Pulumi Corporation.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package yamlutil
import (
"bytes"
"fmt"
yaml "gopkg.in/yaml.v3"
)
// Encodes a value using a two space indentation.
func YamlEncode(v interface{}) ([]byte, error) {
var b bytes.Buffer
yamlEncoder := yaml.NewEncoder(&b)
yamlEncoder.SetIndent(2)
err := yamlEncoder.Encode(v)
if err != nil {
return nil, fmt.Errorf("error marshaling value %#v: %w", v, err)
}
return b.Bytes(), nil
}