Skip to content

chore(policy): consolidate sort integration helpers, add tiebreaker tests, add test cleanup #3403

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
dsm20 merged 15 commits into from
May 4, 2026
Merged

chore(policy): consolidate sort integration helpers, add tiebreaker tests, add test cleanup #3403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1c9548d
consolidate namespace integration helpers
dsm20 Apr 24, 2026
494e30e
consolidate attributes integration test helpers
dsm20 Apr 24, 2026
fa76de0
consolidate kas registry integration test helpers
dsm20 Apr 24, 2026
6d1696b
consolidate kas registry integration helpers
dsm20 Apr 24, 2026
b346496
consolidate kas key integration helpers
dsm20 Apr 24, 2026
338a13a
consolidate registered resources integration helpers
dsm20 Apr 24, 2026
a52b3f5
consolidate obligations integration test helpers
dsm20 Apr 24, 2026
7429fea
consolidate registered resources sort integration test helpers
dsm20 Apr 24, 2026
b61bd88
add test cleanup funcs to integration tests
dsm20 Apr 24, 2026
9c1b964
tiebreaker integration tests
dsm20 Apr 24, 2026
2572580
remove duplicate comment
dsm20 Apr 27, 2026
87e9fc4
fix(integration): force created_at timestamps in tiebreaker tests
dsm20 Apr 27, 2026
03bdd72
update subject mapping sort test helpers to accept prefixes slice
dsm20 Apr 27, 2026
0fdb7bc
fix test cleanup for namespaces and attributes
dsm20 Apr 28, 2026
25cf944
add missing defer cleanup to sort integration tests
dsm20 May 4, 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
93 changes: 61 additions & 32 deletions service/integration/attributes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,8 @@ func (s *AttributesSuite) Test_ListAttributes_OrdersByCreatedAt_Succeeds() {

func (s *AttributesSuite) Test_ListAttributes_SortByName_ASC() {
nsID := s.createSortTestNamespace("sort-name-asc")
ids := s.createNamedSortTestAttributes(nsID, []string{"aaa-sort", "bbb-sort", "ccc-sort"})
ids := s.createSortTestAttributes(nsID, []string{"aaa-sort", "bbb-sort", "ccc-sort"})
defer s.deleteSortTestAttributes(ids)

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Expand All @@ -527,7 +528,8 @@ func (s *AttributesSuite) Test_ListAttributes_SortByName_ASC() {

func (s *AttributesSuite) Test_ListAttributes_SortByName_DESC() {
nsID := s.createSortTestNamespace("sort-name-desc")
ids := s.createNamedSortTestAttributes(nsID, []string{"aaa-sortdesc", "bbb-sortdesc", "ccc-sortdesc"})
ids := s.createSortTestAttributes(nsID, []string{"aaa-sortdesc", "bbb-sortdesc", "ccc-sortdesc"})
defer s.deleteSortTestAttributes(ids)

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Expand All @@ -544,7 +546,8 @@ func (s *AttributesSuite) Test_ListAttributes_SortByName_DESC() {

func (s *AttributesSuite) Test_ListAttributes_SortByCreatedAt_ASC() {
nsID := s.createSortTestNamespace("sort-created-asc")
ids := s.createSortTestAttributes(nsID, "createdasc-attr", 3)
ids := s.createSortTestAttributes(nsID, []string{"createdasc-attr-0", "createdasc-attr-1", "createdasc-attr-2"})
Comment thread
dsm20 marked this conversation as resolved.
defer s.deleteSortTestAttributes(ids)

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Expand All @@ -561,7 +564,8 @@ func (s *AttributesSuite) Test_ListAttributes_SortByCreatedAt_ASC() {

func (s *AttributesSuite) Test_ListAttributes_SortByCreatedAt_DESC() {
nsID := s.createSortTestNamespace("sort-created-desc")
ids := s.createSortTestAttributes(nsID, "createddesc-attr", 3)
ids := s.createSortTestAttributes(nsID, []string{"createddesc-attr-0", "createddesc-attr-1", "createddesc-attr-2"})
defer s.deleteSortTestAttributes(ids)

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Expand All @@ -578,7 +582,8 @@ func (s *AttributesSuite) Test_ListAttributes_SortByCreatedAt_DESC() {

func (s *AttributesSuite) Test_ListAttributes_SortByUpdatedAt_DESC() {
nsID := s.createSortTestNamespace("sort-updated-desc")
ids := s.createSortTestAttributes(nsID, "upd-sort-attr", 3)
ids := s.createSortTestAttributes(nsID, []string{"upd-sort-attr-0", "upd-sort-attr-1", "upd-sort-attr-2"})
defer s.deleteSortTestAttributes(ids)

// Update the first attribute so its updated_at is the most recent
time.Sleep(5 * time.Millisecond)
Expand Down Expand Up @@ -606,7 +611,8 @@ func (s *AttributesSuite) Test_ListAttributes_SortByUpdatedAt_DESC() {

func (s *AttributesSuite) Test_ListAttributes_SortByUpdatedAt_ASC() {
nsID := s.createSortTestNamespace("sort-updated-asc")
ids := s.createSortTestAttributes(nsID, "upd-sort-asc-attr", 3)
ids := s.createSortTestAttributes(nsID, []string{"upd-sort-asc-attr-0", "upd-sort-asc-attr-1", "upd-sort-asc-attr-2"})
defer s.deleteSortTestAttributes(ids)

// Update the last attribute so its updated_at is the most recent
time.Sleep(5 * time.Millisecond)
Expand All @@ -632,9 +638,42 @@ func (s *AttributesSuite) Test_ListAttributes_SortByUpdatedAt_ASC() {
assertIDsInOrder(s.T(), listRsp.GetAttributes(), func(attr *policy.Attribute) string { return attr.GetId() }, ids[0], ids[1], ids[2])
}

func (s *AttributesSuite) Test_ListAttributes_SortTieBreaker_CreatedAtWithIDFallback() {
Comment thread
dsm20 marked this conversation as resolved.
Comment thread
dsm20 marked this conversation as resolved.
nsID := s.createSortTestNamespace("sort-tiebreaker")
suffix := time.Now().UnixNano()
ids := make([]string, 3)
for i := range 3 {
name := fmt.Sprintf("tiebreaker-attr-%d-%d", i, suffix)
created, err := s.db.PolicyClient.CreateAttribute(s.ctx, &attributes.CreateAttributeRequest{
Name: name,
NamespaceId: nsID,
Rule: policy.AttributeRuleTypeEnum_ATTRIBUTE_RULE_TYPE_ENUM_ALL_OF,
})
s.Require().NoError(err)
ids[i] = created.GetId()
}
defer s.deleteSortTestAttributes(ids)

s.Require().NoError(forceCreatedAtTie(s.ctx, s.db, "attribute_definitions", ids))

sorted := slices.Sorted(slices.Values(ids))
Comment thread
dsm20 marked this conversation as resolved.
Comment thread
dsm20 marked this conversation as resolved.

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Sort: []*attributes.AttributesSort{
{Field: attributes.SortAttributesType_SORT_ATTRIBUTES_TYPE_CREATED_AT, Direction: policy.SortDirection_SORT_DIRECTION_ASC},
},
})
s.Require().NoError(err)
s.NotNil(listRsp)

assertIDsInOrder(s.T(), listRsp.GetAttributes(), func(attr *policy.Attribute) string { return attr.GetId() }, sorted[0], sorted[1], sorted[2])
}
Comment thread
dsm20 marked this conversation as resolved.
Comment thread
dsm20 marked this conversation as resolved.

func (s *AttributesSuite) Test_ListAttributes_SortByUnspecifiedField_DefaultsToCreatedAt() {
nsID := s.createSortTestNamespace("sort-unspecified-field")
ids := s.createSortTestAttributes(nsID, "unspecified-field-attr", 3)
ids := s.createSortTestAttributes(nsID, []string{"unspecified-field-attr-0", "unspecified-field-attr-1", "unspecified-field-attr-2"})
defer s.deleteSortTestAttributes(ids)

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Expand All @@ -651,7 +690,8 @@ func (s *AttributesSuite) Test_ListAttributes_SortByUnspecifiedField_DefaultsToC

func (s *AttributesSuite) Test_ListAttributes_SortByUnspecifiedDirection_DefaultsToDESC() {
nsID := s.createSortTestNamespace("sort-unspecified-dir")
ids := s.createSortTestAttributes(nsID, "unspecified-dir-attr", 3)
ids := s.createSortTestAttributes(nsID, []string{"unspecified-dir-attr-0", "unspecified-dir-attr-1", "unspecified-dir-attr-2"})
defer s.deleteSortTestAttributes(ids)

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Expand All @@ -668,7 +708,8 @@ func (s *AttributesSuite) Test_ListAttributes_SortByUnspecifiedDirection_Default

func (s *AttributesSuite) Test_ListAttributes_SortByBothUnspecified_DefaultsToCreatedAtDESC() {
nsID := s.createSortTestNamespace("sort-both-unspecified")
ids := s.createSortTestAttributes(nsID, "both-unspecified-attr", 3)
ids := s.createSortTestAttributes(nsID, []string{"both-unspecified-attr-0", "both-unspecified-attr-1", "both-unspecified-attr-2"})
defer s.deleteSortTestAttributes(ids)

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Expand All @@ -685,7 +726,8 @@ func (s *AttributesSuite) Test_ListAttributes_SortByBothUnspecified_DefaultsToCr

func (s *AttributesSuite) Test_ListAttributes_SortOmitted() {
nsID := s.createSortTestNamespace("sort-omitted")
ids := s.createSortTestAttributes(nsID, "omitted-sort-attr", 3)
ids := s.createSortTestAttributes(nsID, []string{"omitted-sort-attr-0", "omitted-sort-attr-1", "omitted-sort-attr-2"})
defer s.deleteSortTestAttributes(ids)

listRsp, err := s.db.PolicyClient.ListAttributes(s.ctx, &attributes.ListAttributesRequest{
Namespace: nsID,
Expand Down Expand Up @@ -1849,15 +1891,15 @@ func (s *AttributesSuite) createSortTestNamespace(label string) string {
return ns.GetId()
}

// createSortTestAttributes creates count attributes in the given namespace with 5ms gaps for distinct timestamps.
// Returns the attribute IDs in creation order.
func (s *AttributesSuite) createSortTestAttributes(nsID string, label string, count int) []string { //nolint:unparam // count is parameterized for reuse across endpoint test files
ids := make([]string, count)
for i := range count {
// createSortTestAttributes creates attributes in the given namespace with the given prefixes,
// adding 5ms gaps between creations for distinct timestamps. Returns the attribute IDs in creation order.
func (s *AttributesSuite) createSortTestAttributes(nsID string, prefixes []string) []string {
ids := make([]string, len(prefixes))
for i, prefix := range prefixes {
if i > 0 {
time.Sleep(5 * time.Millisecond)
}
name := fmt.Sprintf("%s-%d-%d", label, i, time.Now().UnixNano())
name := fmt.Sprintf("%s-%d", prefix, time.Now().UnixNano())
created, err := s.db.PolicyClient.CreateAttribute(s.ctx, &attributes.CreateAttributeRequest{
Name: name,
NamespaceId: nsID,
Expand All @@ -1869,22 +1911,9 @@ func (s *AttributesSuite) createSortTestAttributes(nsID string, label string, co
return ids
}

// createNamedSortTestAttributes creates attributes with specific name prefixes for name-sort testing.
// Returns the attribute IDs in the same order as the prefixes.
func (s *AttributesSuite) createNamedSortTestAttributes(nsID string, prefixes []string) []string {
suffix := time.Now().UnixNano()
ids := make([]string, len(prefixes))
for i, prefix := range prefixes {
name := fmt.Sprintf("%s-%d", prefix, suffix)
created, err := s.db.PolicyClient.CreateAttribute(s.ctx, &attributes.CreateAttributeRequest{
Name: name,
NamespaceId: nsID,
Rule: policy.AttributeRuleTypeEnum_ATTRIBUTE_RULE_TYPE_ENUM_ALL_OF,
})
s.Require().NoError(err)
ids[i] = created.GetId()
}
return ids
// deleteSortTestAttributes deactivates attributes created by sort tests.
func (s *AttributesSuite) deleteSortTestAttributes(ids []string) {
s.Require().NoError(forceDeleteRows(s.ctx, s.db, "attribute_definitions", ids))
}
Comment thread
dsm20 marked this conversation as resolved.

func (s *AttributesSuite) getAttributeFixtures() map[string]fixtures.FixtureDataAttribute {
Expand Down
Loading
Loading