Skip to content

refactor: avoid json marshal protojson unmarshal roundtrip #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phisco merged 2 commits into from
Feb 20, 2026
+10 −27
Merged

refactor: avoid json marshal protojson unmarshal roundtrip #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8da24cf
refactor: avoid json marshal protojson unmarshal roundtrip
tenstad Feb 18, 2026
b36e026
refactor: move any conversions into verifyAndSortExtras
tenstad Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 10 additions & 27 deletions fn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ package main

import (
"context"
"encoding/json"
"reflect"
"sort"

"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/structpb"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

"github.com/crossplane/crossplane-runtime/v2/pkg/errors"
"github.com/crossplane/crossplane-runtime/v2/pkg/fieldpath"
Expand Down Expand Up @@ -88,25 +85,9 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1.RunFunctionRequest)
return rsp, nil
}

// For now cheaply convert to JSON for serializing.
//
// TODO(reedjosh): look into resources.AsStruct or simlar since unsturctured k8s objects are already almost json.
// structpb.NewList(v []interface{}) should create an array like.
// Combining this and similar structures from the structpb lib should should be done to create
// a map[string][object] container into which the found extra resources can be dumped.
//
// The found extra resources should then be directly marhsal-able via:
// obj := &unstructured.Unstructured{}
// obj.MarshalJSON()
b, err := json.Marshal(verifiedExtras)
if err != nil {
response.Fatal(rsp, errors.Errorf("cannot marshal %T: %w", verifiedExtras, err))
return rsp, nil
}
s := &structpb.Struct{}
err = protojson.Unmarshal(b, s)
s, err := structpb.NewStruct(verifiedExtras)
if err != nil {
response.Fatal(rsp, errors.Errorf("cannot unmarshal %T into %T: %w", extraResources, s, err))
response.Fatal(rsp, errors.Wrapf(err, "cannot create new Struct from extra resources output"))
return rsp, nil
}
response.SetContextKey(rsp, FunctionContextKeyExtraResources, structpb.NewStructValue(s))
Expand Down Expand Up @@ -171,8 +152,8 @@ func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1.Require

// Verify Min/Max and sort extra resources by field path within a single kind.
func verifyAndSortExtras(in *v1beta1.Input, extraResources map[string][]resource.Required, //nolint:gocyclo // TODO(reedjosh): refactor
) (cleanedExtras map[string][]unstructured.Unstructured, err error) {
cleanedExtras = make(map[string][]unstructured.Unstructured)
) (map[string]any, error) {
cleanedExtras := make(map[string]any)
for _, extraResource := range in.Spec.ExtraResources {
extraResName := extraResource.Into
resources, ok := extraResources[extraResName]
Expand All @@ -190,7 +171,6 @@ func verifyAndSortExtras(in *v1beta1.Input, extraResources map[string][]resource
if len(resources) > 1 {
return nil, errors.Errorf("expected exactly one extra resource %q, got %d", extraResName, len(resources))
}
cleanedExtras[extraResName] = append(cleanedExtras[extraResName], *resources[0].Resource)

case v1beta1.ResourceSourceTypeSelector:
selector := extraResource.Selector
Expand All @@ -203,10 +183,13 @@ func verifyAndSortExtras(in *v1beta1.Input, extraResources map[string][]resource
if selector.MaxMatch != nil && uint64(len(resources)) > *selector.MaxMatch {
resources = resources[:*selector.MaxMatch]
}
for _, r := range resources {
cleanedExtras[extraResName] = append(cleanedExtras[extraResName], *r.Resource)
}
}

objects := make([]any, 0, len(resources))
for _, r := range resources {
objects = append(objects, r.Resource.Object)
}
cleanedExtras[extraResName] = objects
}
return cleanedExtras, nil
}
Expand Down
Loading