move brotli compression to kubecost Render function

Author: phyrog

cmd/render-kubecost-manifest/main.go

@@ -7,8 +7,11 @@ import (
 )
 
 func main() {
-	out := kubecost.Render(kubecost.KubeCostConfig{
+	out, err := kubecost.Render(kubecost.KubeCostConfig{
 		ApiKey: "my-kubecost-key",
-	})
+	}, true)
+	if err != nil {
+		panic(err)
+	}
 	fmt.Println(string(out))
 }

kubecost/kubecost.go

@@ -1,13 +1,15 @@
 package kubecost
 
 import (
+	"bytes"
 	_ "embed"
 	"fmt"
 	"os"
 
 	yttcmd "carvel.dev/ytt/pkg/cmd/template"
 	yttui "carvel.dev/ytt/pkg/cmd/ui"
 	yttfiles "carvel.dev/ytt/pkg/files"
+	"github.com/andybalholm/brotli"
 )
 
 //go:embed kubecost.yaml
@@ -53,7 +55,7 @@ data:
 `, token)
 }
 
-func Render(config KubeCostConfig) []byte {
+func Render(config KubeCostConfig, compress bool) ([]byte, error) {
 	opts := yttcmd.NewOptions()
 	noopUI := yttui.NewCustomWriterTTY(false, os.Stderr, os.Stderr)
 
@@ -67,13 +69,24 @@ func Render(config KubeCostConfig) []byte {
 
 	output := opts.RunWithFiles(inputs, noopUI)
 	if output.Err != nil {
-		panic(output.Err)
+		return nil, output.Err
 	}
-	outputS, err := output.DocSet.AsBytes()
+	manifest, err := output.DocSet.AsBytes()
 	if err != nil {
-		panic(err)
+		return nil, err
+	}
+	if compress {
+		var buf bytes.Buffer
+		w := brotli.NewWriterV2(&buf, 7)
+		if _, err := w.Write(manifest); err != nil {
+			return nil, err
+		}
+		if err := w.Close(); err != nil {
+			return nil, err
+		}
+		manifest = buf.Bytes()
 	}
-	return outputS
+	return manifest, nil
 }
 
 type noopWriter struct{}

pkg/controller/lifecycle/actuator.go

@@ -5,13 +5,11 @@
 package lifecycle
 
 import (
-	"bytes"
 	"context"
 	_ "embed"
 	"errors"
 	"time"
 
-	"github.com/andybalholm/brotli"
 	"github.com/go-logr/logr"
 
 	"github.com/liquid-reply/gardener-extension-shoot-kubecost/kubecost"
@@ -142,16 +140,11 @@ func getKubeCostConfig(cmData map[string]string) (kubecost.KubeCostConfig, error
 }
 
 func createShootResourceKubeCostInstall(config kubecost.KubeCostConfig) (map[string][]byte, error) {
-	manifest := kubecost.Render(config)
-	var buf bytes.Buffer
-	w := brotli.NewWriterV2(&buf, 7)
-	if _, err := w.Write(manifest); err != nil {
-		return nil, err
-	}
-	if err := w.Close(); err != nil {
+	manifest, err := kubecost.Render(config, true)
+	if err != nil {
 		return nil, err
 	}
 	return map[string][]byte{
-		"kubecost.br": buf.Bytes(),
+		"kubecost.br": manifest,
 	}, nil
 }