Skip to content

Commit 52ef1ce

Browse files
authored
sync: query filter should use snake_case (#1442)
Pomerium Enterprise expects the filter key "originator_id" rather than "originatorId", while Pomerium Zero accepts either, so switch to snake case.
1 parent 6b39d9a commit 52ef1ce

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

pomerium/sync_api.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -676,8 +676,8 @@ func (r *APIReconciler) findRouteByName(
676676
ctx context.Context, name string,
677677
) (existing *configpb.Route, err error) {
678678
filter, err := structpb.NewStruct(map[string]any{
679-
"originatorId": originatorID,
680-
"name": name,
679+
"originator_id": originatorID,
680+
"name": name,
681681
})
682682
if err != nil {
683683
return nil, fmt.Errorf("internal error - couldn't create ListRoutes filter: %w", err)
@@ -813,8 +813,8 @@ func (r *APIReconciler) findPolicyByName(
813813
ctx context.Context, name string,
814814
) (existing *configpb.Policy, err error) {
815815
filter, err := structpb.NewStruct(map[string]any{
816-
"originatorId": originatorID,
817-
"name": name,
816+
"originator_id": originatorID,
817+
"name": name,
818818
})
819819
if err != nil {
820820
return nil, fmt.Errorf("internal error - couldn't create ListPolicies filter: %w", err)
@@ -917,8 +917,8 @@ func (r *APIReconciler) findKeyPairByName(
917917
ctx context.Context, name string,
918918
) (existing *configpb.KeyPair, err error) {
919919
filter, err := structpb.NewStruct(map[string]any{
920-
"originatorId": originatorID,
921-
"name": name,
920+
"originator_id": originatorID,
921+
"name": name,
922922
})
923923
if err != nil {
924924
return nil, fmt.Errorf("internal error - couldn't create ListKeyPairs filter: %w", err)

pomerium/sync_api_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,8 +1675,8 @@ func (noopBackendRefChecker) Valid(_ client.Object, _ *gateway_v1.BackendRef) bo
16751675

16761676
func filterByName(t *testing.T, name string) *structpb.Struct {
16771677
f, err := structpb.NewStruct(map[string]any{
1678-
"originatorId": "ingress-controller",
1679-
"name": name,
1678+
"originator_id": "ingress-controller",
1679+
"name": name,
16801680
})
16811681
require.NoError(t, err)
16821682
return f

0 commit comments

Comments
 (0)