From 6f0406e98d185c42aab7a0ed2823e994bd9b711e Mon Sep 17 00:00:00 2001 From: Kenneth Jenkins <51246568+kenjenkins@users.noreply.github.com> Date: Thu, 11 Jun 2026 15:54:01 -0700 Subject: [PATCH] sync: query filter should use snake_case Pomerium Enterprise expects the filter key "originator_id" rather than "originatorId", while Pomerium Zero accepts either. --- pomerium/sync_api.go | 12 ++++++------ pomerium/sync_api_test.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pomerium/sync_api.go b/pomerium/sync_api.go index dc41b4ab..2e567729 100644 --- a/pomerium/sync_api.go +++ b/pomerium/sync_api.go @@ -676,8 +676,8 @@ func (r *APIReconciler) findRouteByName( ctx context.Context, name string, ) (existing *configpb.Route, err error) { filter, err := structpb.NewStruct(map[string]any{ - "originatorId": originatorID, - "name": name, + "originator_id": originatorID, + "name": name, }) if err != nil { return nil, fmt.Errorf("internal error - couldn't create ListRoutes filter: %w", err) @@ -813,8 +813,8 @@ func (r *APIReconciler) findPolicyByName( ctx context.Context, name string, ) (existing *configpb.Policy, err error) { filter, err := structpb.NewStruct(map[string]any{ - "originatorId": originatorID, - "name": name, + "originator_id": originatorID, + "name": name, }) if err != nil { return nil, fmt.Errorf("internal error - couldn't create ListPolicies filter: %w", err) @@ -917,8 +917,8 @@ func (r *APIReconciler) findKeyPairByName( ctx context.Context, name string, ) (existing *configpb.KeyPair, err error) { filter, err := structpb.NewStruct(map[string]any{ - "originatorId": originatorID, - "name": name, + "originator_id": originatorID, + "name": name, }) if err != nil { return nil, fmt.Errorf("internal error - couldn't create ListKeyPairs filter: %w", err) diff --git a/pomerium/sync_api_test.go b/pomerium/sync_api_test.go index 35ce2505..2389d3ab 100644 --- a/pomerium/sync_api_test.go +++ b/pomerium/sync_api_test.go @@ -1675,8 +1675,8 @@ func (noopBackendRefChecker) Valid(_ client.Object, _ *gateway_v1.BackendRef) bo func filterByName(t *testing.T, name string) *structpb.Struct { f, err := structpb.NewStruct(map[string]any{ - "originatorId": "ingress-controller", - "name": name, + "originator_id": "ingress-controller", + "name": name, }) require.NoError(t, err) return f