[Maintenance] Allow GRPC Marshal Opts (#1841)

Author: ajanikow

CHANGELOG.md

@@ -6,6 +6,7 @@
 - (Feature) (Platform) Generate GRPC Gateway Code
 - (Feature) (Platform) Identity Endpoint
 - (Feature) (Platform) Authz V1 Types
+- (Maintenance) Allow GRPC Marshal Opts
 
 ## [1.2.46](https://github.com/arangodb/kube-arangodb/tree/1.2.46) (2025-02-24)
 - (Bugfix) Clean Phase change properly during upgrade

pkg/deployment/resources/gateway/gateway_config_destination_static.go

@@ -24,6 +24,8 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"google.golang.org/protobuf/encoding/protojson"
+
 	"github.com/arangodb/kube-arangodb/pkg/util"
 )
 
@@ -32,7 +34,7 @@ type ConfigDestinationStaticInterface interface {
 	StaticResponse() ([]byte, uint32, error)
 }
 
-type ConfigDestinationStaticMarshaller[T any] func(in T) ([]byte, error)
+type ConfigDestinationStaticMarshaller[T any] func(in T, opts ...util.Mod[protojson.MarshalOptions]) ([]byte, error)
 
 type ConfigDestinationStatic[T any] struct {
 	Code *uint32 `json:"insecure,omitempty"`

pkg/util/grpc/marshal.go

@@ -28,19 +28,23 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/util"
 )
 
-func Marshal[T proto.Message](in T) ([]byte, error) {
-	data, err := protojson.MarshalOptions{
+func Marshal[T proto.Message](in T, opts ...util.Mod[protojson.MarshalOptions]) ([]byte, error) {
+	options := protojson.MarshalOptions{
 		UseProtoNames: true,
-	}.Marshal(in)
+	}
+
+	util.ApplyMods(&options, opts...)
+
+	data, err := options.Marshal(in)
 	if err != nil {
 		return nil, err
 	}
 
 	return data, err
 }
 
-func MarshalYAML[T proto.Message](in T) ([]byte, error) {
-	data, err := Marshal[T](in)
+func MarshalYAML[T proto.Message](in T, opts ...util.Mod[protojson.MarshalOptions]) ([]byte, error) {
+	data, err := Marshal[T](in, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -49,13 +53,17 @@ func MarshalYAML[T proto.Message](in T) ([]byte, error) {
 	return data, err
 }
 
-func Unmarshal[T proto.Message](data []byte) (T, error) {
+func Unmarshal[T proto.Message](data []byte, opts ...util.Mod[protojson.UnmarshalOptions]) (T, error) {
 	v, err := util.DeepType[T]()
 	if err != nil {
 		return util.Default[T](), err
 	}
 
-	if err := (protojson.UnmarshalOptions{}).Unmarshal(data, v); err != nil {
+	options := protojson.UnmarshalOptions{}
+
+	util.ApplyMods(&options, opts...)
+
+	if err := options.Unmarshal(data, v); err != nil {
 		return util.Default[T](), err
 	}