From 1a1b2b6a6ce4063831d35623e6d1938abf49f75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 2 Dec 2025 13:56:00 +0100 Subject: [PATCH] Add indent when marshalling YAML in update-rules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On-behalf-of: @SAP marko.mudrinic@sap.com Signed-off-by: Marko Mudrinić --- cmd/update-rules/main.go | 11 ++++++++--- go.mod | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/update-rules/main.go b/cmd/update-rules/main.go index 980ac191..f2cf9685 100644 --- a/cmd/update-rules/main.go +++ b/cmd/update-rules/main.go @@ -17,13 +17,14 @@ limitations under the License. package main import ( + "bytes" "flag" "fmt" "os" "path/filepath" "github.com/golang/glog" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "k8s.io/publishing-bot/cmd/publishing-bot/config" ) @@ -96,10 +97,14 @@ func main() { glog.Fatalf("update failed, found invalid rules after update: %v", err) } - data, err := yaml.Marshal(rules) - if err != nil { + var buf bytes.Buffer + enc := yaml.NewEncoder(&buf) + enc.SetIndent(2) + if err := enc.Encode(rules); err != nil { glog.Fatalf("error marshaling rules %v", err) } + _ = enc.Close() + data := buf.Bytes() if o.out != "" { err = exportRules(o.out, data) diff --git a/go.mod b/go.mod index 1cb13c8d..68710713 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( golang.org/x/oauth2 v0.31.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 ) require (