Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion adcp/v3/governance_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type Plan struct {
HumanReviewRequired bool `json:"human_review_required,omitempty"`
HumanOverride *HumanOverride `json:"human_override,omitempty"`
CustomPolicies []PolicyEntry `json:"custom_policies,omitempty"`
ApprovedSellers []string `json:"approved_sellers,omitempty"`
ApprovedSellers []string `json:"approved_sellers"` // No omitempty: nil encodes as null (any seller), [] as no seller approved.
Delegations []PlanDelegation `json:"delegations,omitempty"`
Portfolio *PlanPortfolio `json:"portfolio,omitempty"`
Ext map[string]any `json:"ext,omitempty"`
Expand Down
36 changes: 36 additions & 0 deletions adcp/v3/plan_validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,3 +329,39 @@ func TestSyncPlansRequest_RoundTrip(t *testing.T) {
require.Len(t, decoded.Plans, 1)
assert.Empty(t, decoded.Plans[0].Validate())
}

func TestPlan_ApprovedSellers_EmptyIsNotNull(t *testing.T) {
// The schema says null means any seller, so an empty list (no seller
// approved) must not be dropped on encode and read back as unrestricted.
cases := []struct {
name string
sellers []string
want string
}{
{"nil is any seller", nil, `null`},
{"empty is no seller", []string{}, `[]`},
{"listed", []string{"https://seller.example"}, `["https://seller.example"]`},
}
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
p := validPlan()
p.ApprovedSellers = tc.sellers
b, err := json.Marshal(SyncPlansRequest{IdempotencyKey: "req-0000000000000001", Plans: []Plan{p}})
require.NoError(t, err)

var raw struct {
Plans []map[string]json.RawMessage `json:"plans"`
}
require.NoError(t, json.Unmarshal(b, &raw))
require.Len(t, raw.Plans, 1)
require.Contains(t, raw.Plans[0], "approved_sellers")
assert.JSONEq(t, tc.want, string(raw.Plans[0]["approved_sellers"]))

var decoded SyncPlansRequest
require.NoError(t, json.Unmarshal(b, &decoded))
require.Len(t, decoded.Plans, 1)
assert.Equal(t, tc.sellers == nil, decoded.Plans[0].ApprovedSellers == nil)
assert.Equal(t, tc.sellers, decoded.Plans[0].ApprovedSellers)
})
}
}
Loading