From 963612bccaead87d5bbb4b79014d5f9821eeb95e Mon Sep 17 00:00:00 2001
From: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
Date: Fri, 5 Jul 2024 22:08:03 +0300
Subject: [PATCH] chore: redo EncodeString and EncodeBytes using buffer
 interface

Remove the need for additional allocation in case we use `EncodeString` and overall looks nicer.

Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
---
 pkg/machinery/config/container/container.go | 34 ++++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/pkg/machinery/config/container/container.go b/pkg/machinery/config/container/container.go
index 1a75e9b02c..b3d30c2221 100644
--- a/pkg/machinery/config/container/container.go
+++ b/pkg/machinery/config/container/container.go
@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"slices"
+	"strings"
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/siderolabs/gen/xslices"
@@ -203,41 +204,58 @@ func (container *Container) Bytes() ([]byte, error) {
 
 // EncodeString configuration to YAML using the provided options.
 func (container *Container) EncodeString(encoderOptions ...encoder.Option) (string, error) {
-	b, err := container.EncodeBytes(encoderOptions...)
+	var buf strings.Builder
+
+	err := container.encodeToBuf(&buf, encoderOptions...)
 	if err != nil {
 		return "", err
 	}
 
-	return string(b), nil
+	return buf.String(), nil
 }
 
 // EncodeBytes configuration to YAML using the provided options.
 func (container *Container) EncodeBytes(encoderOptions ...encoder.Option) ([]byte, error) {
 	var buf bytes.Buffer
 
+	err := container.encodeToBuf(&buf, encoderOptions...)
+	if err != nil {
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
+}
+
+type buffer interface {
+	Len() int
+	Write(p []byte) (int, error)
+	WriteString(s string) (int, error)
+}
+
+func (container *Container) encodeToBuf(buf buffer, encoderOptions ...encoder.Option) error {
 	if container.v1alpha1Config != nil {
 		b, err := encoder.NewEncoder(container.v1alpha1Config, encoderOptions...).Encode()
 		if err != nil {
-			return nil, err
+			return err
 		}
 
-		buf.Write(b)
+		buf.Write(b) //nolint:errcheck
 	}
 
 	for _, doc := range container.documents {
 		if buf.Len() > 0 {
-			buf.WriteString("---\n")
+			buf.WriteString("---\n") //nolint:errcheck
 		}
 
 		b, err := encoder.NewEncoder(doc, encoderOptions...).Encode()
 		if err != nil {
-			return nil, err
+			return err
 		}
 
-		buf.Write(b)
+		buf.Write(b) //nolint:errcheck
 	}
 
-	return buf.Bytes(), nil
+	return nil
 }
 
 // Validate checks configuration and returns warnings and fatal errors (as multierror).