Skip to content

feat(policy)!: add namespaced actions schema and namespace-aware action queries #3154

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
elizabethhealy merged 7 commits into from
Mar 13, 2026
Merged

feat(policy)!: add namespaced actions schema and namespace-aware action queries #3154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c9a92e
add namespaced actions schema and queries
elizabethhealy Mar 12, 2026
3e2c917
remove accidental file commit
elizabethhealy Mar 12, 2026
f4442c7
linting
elizabethhealy Mar 12, 2026
01a1db2
fix tests, take suggestions
elizabethhealy Mar 12, 2026
ee21d90
take suggestion
elizabethhealy Mar 12, 2026
52700dc
suggestion on error
elizabethhealy Mar 12, 2026
b8b1264
resolve RR action names within resource namespace
elizabethhealy Mar 12, 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
209 changes: 196 additions & 13 deletions service/integration/actions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (s *ActionsSuite) Test_ListActions_NoPagination_Succeeds() {
fixtureCustomAction1 := s.f.GetCustomActionKey("custom_action_1")
fixtureCustomAction2 := s.f.GetCustomActionKey("other_special_action")

list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{})
list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{NamespaceId: s.defaultNamespaceID()})
s.NotNil(list)
s.Require().NoError(err)

Expand Down Expand Up @@ -88,7 +88,8 @@ func (s *ActionsSuite) Test_ListActions_OrdersByCreatedAt_Succeeds() {
create := func(i int) string {
name := fmt.Sprintf("order-test-action-%d-%d", i, suffix)
created, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: name,
Name: name,
NamespaceId: s.defaultNamespaceID(),
})
s.Require().NoError(err)
s.Require().NotNil(created)
Expand All @@ -101,21 +102,22 @@ func (s *ActionsSuite) Test_ListActions_OrdersByCreatedAt_Succeeds() {
time.Sleep(5 * time.Millisecond)
thirdID := create(3)

list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{})
list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{NamespaceId: s.defaultNamespaceID()})
s.Require().NoError(err)
s.NotNil(list)

assertIDsInDescendingOrder(s.T(), list.GetActionsCustom(), func(a *policy.Action) string { return a.GetId() }, thirdID, secondID, firstID)
}

func (s *ActionsSuite) Test_ListActions_Pagination_Succeeds() {
list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{})
list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{NamespaceId: s.defaultNamespaceID()})
s.NotNil(list)
s.Require().NoError(err)
total := list.GetPagination().GetTotal()

higherOffsetThanListCount := total + 1
list, err = s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{
NamespaceId: s.defaultNamespaceID(),
Pagination: &policy.PageRequest{
Offset: higherOffsetThanListCount,
},
Expand All @@ -126,6 +128,7 @@ func (s *ActionsSuite) Test_ListActions_Pagination_Succeeds() {
s.Equal(higherOffsetThanListCount, list.GetPagination().GetCurrentOffset())

list, err = s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{
NamespaceId: s.defaultNamespaceID(),
Pagination: &policy.PageRequest{
Offset: 0,
Limit: total - 1,
Expand All @@ -140,6 +143,7 @@ func (s *ActionsSuite) Test_ListActions_Pagination_Succeeds() {

func (s *ActionsSuite) Test_ListActions_LimitLargerThanConfigured_Fails() {
list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{
NamespaceId: s.defaultNamespaceID(),
Pagination: &policy.PageRequest{
Limit: s.db.LimitMax + 1,
},
Expand All @@ -149,6 +153,64 @@ func (s *ActionsSuite) Test_ListActions_LimitLargerThanConfigured_Fails() {
s.Require().ErrorIs(err, db.ErrListLimitTooLarge)
}

func (s *ActionsSuite) Test_ListActions_FiltersCustomActionsByNamespace_Succeeds() {
name := fmt.Sprintf("scoped-list-action-%d", time.Now().UnixNano())

first, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: name,
NamespaceId: s.defaultNamespaceID(),
})
s.Require().NoError(err)

second, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: name,
NamespaceId: s.otherNamespaceID(),
})
s.Require().NoError(err)

list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{NamespaceId: s.defaultNamespaceID()})
s.Require().NoError(err)

foundFirst := false
foundSecond := false
for _, action := range list.GetActionsCustom() {
if action.GetId() == first.GetId() {
foundFirst = true
s.Equal(s.defaultNamespaceID(), action.GetNamespace().GetId())
}
if action.GetId() == second.GetId() {
foundSecond = true
}
}

s.True(foundFirst)
s.False(foundSecond)
}

func (s *ActionsSuite) Test_ListActions_LegacyCustomAction_NamespaceProjection_Succeeds() {
legacy := s.f.GetCustomActionKey("custom_action_1")
assertLegacyProjected := func(list *actions.ListActionsResponse) {
s.T().Helper()
found := false
for _, action := range list.GetActionsCustom() {
if action.GetId() == legacy.ID {
found = true
s.Equal(s.defaultNamespaceID(), action.GetNamespace().GetId())
s.Equal(s.defaultNamespaceFQN(), action.GetNamespace().GetFqn())
}
}
s.True(found)
}

listByID, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{NamespaceId: s.defaultNamespaceID()})
s.Require().NoError(err)
assertLegacyProjected(listByID)

listByFQN, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{NamespaceFqn: s.defaultNamespaceFQN()})
s.Require().NoError(err)
assertLegacyProjected(listByFQN)
}

func (s *ActionsSuite) Test_GetAction_Id_Succeeds() {
fixtureCustomAction1 := s.f.GetCustomActionKey("custom_action_1")
actionRead := s.f.GetStandardAction(policydb.ActionRead.String())
Expand Down Expand Up @@ -184,6 +246,7 @@ func (s *ActionsSuite) Test_GetAction_Name_Succeeds() {
Identifier: &actions.GetActionRequest_Name{
Name: customAction.Name,
},
NamespaceId: s.defaultNamespaceID(),
})
s.NotNil(action)
s.Require().NoError(err)
Expand All @@ -195,6 +258,7 @@ func (s *ActionsSuite) Test_GetAction_Name_Succeeds() {
Identifier: &actions.GetActionRequest_Name{
Name: actionCreate.GetName(),
},
NamespaceId: s.defaultNamespaceID(),
})
s.NotNil(action)
s.Require().NoError(err)
Expand All @@ -203,6 +267,97 @@ func (s *ActionsSuite) Test_GetAction_Name_Succeeds() {
s.NotNil(action.GetMetadata())
}

func (s *ActionsSuite) Test_GetAction_Name_ResolvesByNamespace_Succeeds() {
name := fmt.Sprintf("scoped-get-action-%d", time.Now().UnixNano())

inDefaultNs, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: name,
NamespaceId: s.defaultNamespaceID(),
})
s.Require().NoError(err)

inOtherNs, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: name,
NamespaceId: s.otherNamespaceID(),
})
s.Require().NoError(err)

gotDefault, err := s.db.PolicyClient.GetAction(s.ctx, &actions.GetActionRequest{
Identifier: &actions.GetActionRequest_Name{Name: name},
NamespaceId: s.defaultNamespaceID(),
})
s.Require().NoError(err)
s.Equal(inDefaultNs.GetId(), gotDefault.GetId())
s.Equal(s.defaultNamespaceID(), gotDefault.GetNamespace().GetId())

gotOther, err := s.db.PolicyClient.GetAction(s.ctx, &actions.GetActionRequest{
Identifier: &actions.GetActionRequest_Name{Name: name},
NamespaceId: s.otherNamespaceID(),
})
s.Require().NoError(err)
s.Equal(inOtherNs.GetId(), gotOther.GetId())
s.Equal(s.otherNamespaceID(), gotOther.GetNamespace().GetId())
}

func (s *ActionsSuite) Test_GetAction_Name_LegacyCustomAction_Succeeds() {
legacy := s.f.GetCustomActionKey("other_special_action")
assertLegacyGet := func(action *policy.Action) {
s.T().Helper()
s.Equal(legacy.ID, action.GetId())
s.Equal(s.defaultNamespaceID(), action.GetNamespace().GetId())
s.Equal(s.defaultNamespaceFQN(), action.GetNamespace().GetFqn())
}

byID, err := s.db.PolicyClient.GetAction(s.ctx, &actions.GetActionRequest{
Identifier: &actions.GetActionRequest_Name{Name: legacy.Name},
NamespaceId: s.defaultNamespaceID(),
})
s.Require().NoError(err)
assertLegacyGet(byID)

byFQN, err := s.db.PolicyClient.GetAction(s.ctx, &actions.GetActionRequest{
Identifier: &actions.GetActionRequest_Name{Name: legacy.Name},
NamespaceFqn: s.defaultNamespaceFQN(),
})
s.Require().NoError(err)
assertLegacyGet(byFQN)
}

func (s *ActionsSuite) Test_CreateListGetAction_WithNamespaceFQN_Succeeds() {
name := fmt.Sprintf("fqn-scoped-action-%d", time.Now().UnixNano())

created, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: name,
NamespaceFqn: s.otherNamespaceFQN(),
})
s.Require().NoError(err)
s.Equal(name, created.GetName())
s.Equal(s.otherNamespaceID(), created.GetNamespace().GetId())
s.Equal(s.otherNamespaceFQN(), created.GetNamespace().GetFqn())

list, err := s.db.PolicyClient.ListActions(s.ctx, &actions.ListActionsRequest{NamespaceFqn: s.otherNamespaceFQN()})
s.Require().NoError(err)

found := false
for _, action := range list.GetActionsCustom() {
if action.GetId() == created.GetId() {
found = true
s.Equal(s.otherNamespaceID(), action.GetNamespace().GetId())
s.Equal(s.otherNamespaceFQN(), action.GetNamespace().GetFqn())
}
}
s.True(found)

got, err := s.db.PolicyClient.GetAction(s.ctx, &actions.GetActionRequest{
Identifier: &actions.GetActionRequest_Name{Name: name},
NamespaceFqn: s.otherNamespaceFQN(),
})
s.Require().NoError(err)
s.Equal(created.GetId(), got.GetId())
s.Equal(s.otherNamespaceID(), got.GetNamespace().GetId())
s.Equal(s.otherNamespaceFQN(), got.GetNamespace().GetFqn())
}

func (s *ActionsSuite) Test_GetAction_NonExistent_Fails() {
action, err := s.db.PolicyClient.GetAction(s.ctx, &actions.GetActionRequest{
Identifier: &actions.GetActionRequest_Id{
Expand All @@ -217,6 +372,7 @@ func (s *ActionsSuite) Test_GetAction_NonExistent_Fails() {
Identifier: &actions.GetActionRequest_Name{
Name: "totally_unknown_action",
},
NamespaceId: s.defaultNamespaceID(),
})
s.Nil(action)
s.Require().Error(err)
Expand All @@ -226,7 +382,8 @@ func (s *ActionsSuite) Test_GetAction_NonExistent_Fails() {
func (s *ActionsSuite) Test_CreateAction_Succeeds() {
newName := "new_custom_action_createaction"
action, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: newName,
Name: newName,
NamespaceId: s.defaultNamespaceID(),
Metadata: &common.MetadataMutable{
Labels: map[string]string{
"label1": "value1",
Expand All @@ -244,11 +401,17 @@ func (s *ActionsSuite) Test_CreateAction_Succeeds() {
}

func (s *ActionsSuite) Test_CreateAction_Conflict_Fails() {
fixtureCustomAction := s.f.GetCustomActionKey("custom_action_1")
name := fmt.Sprintf("create-conflict-action-%d", time.Now().UnixNano())
_, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: name,
NamespaceId: s.defaultNamespaceID(),
})
s.Require().NoError(err)

action, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: fixtureCustomAction.Name,
},
)
Name: name,
NamespaceId: s.defaultNamespaceID(),
})
s.Nil(action)
s.Require().Error(err)
s.Require().ErrorIs(err, db.ErrUniqueConstraintViolation)
Expand All @@ -257,7 +420,8 @@ func (s *ActionsSuite) Test_CreateAction_Conflict_Fails() {
func (s *ActionsSuite) Test_CreateAction_NormalizesToLowerCase() {
newName := "New_Custom_Action_CreateAction_UPPER"
action, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: newName,
Name: newName,
NamespaceId: s.defaultNamespaceID(),
},
)
s.NotNil(action)
Expand All @@ -267,7 +431,8 @@ func (s *ActionsSuite) Test_CreateAction_NormalizesToLowerCase() {

func (s *ActionsSuite) Test_UpdateAction_Succeeds() {
newAction, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: "new_custom_action_updateaction",
Name: "new_custom_action_updateaction",
NamespaceId: s.defaultNamespaceID(),
Metadata: &common.MetadataMutable{
Labels: map[string]string{
"original": "original_value",
Expand Down Expand Up @@ -306,7 +471,8 @@ func (s *ActionsSuite) Test_UpdateAction_Succeeds() {

func (s *ActionsSuite) Test_UpdateAction_NormalizesToLowerCase() {
newAction, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: "testing_update_action_casing",
Name: "testing_update_action_casing",
NamespaceId: s.defaultNamespaceID(),
})
s.NotNil(newAction)
s.Require().NoError(err)
Expand Down Expand Up @@ -355,7 +521,8 @@ func (s *ActionsSuite) Test_UpdateAction_NonExistent_Fails() {

func (s *ActionsSuite) Test_DeleteAction_Succeeds() {
created, err := s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: "new_custom_action_deleteaction",
Name: "new_custom_action_deleteaction",
NamespaceId: s.defaultNamespaceID(),
})
s.NotNil(created)
s.Require().NoError(err)
Expand Down Expand Up @@ -398,6 +565,22 @@ func (s *ActionsSuite) Test_DeleteAction_StandardAction_Fails() {
s.Contains(err.Error(), actionRead.GetName())
}

func (s *ActionsSuite) defaultNamespaceID() string {
return s.f.GetNamespaceKey("example.com").ID
}

func (s *ActionsSuite) otherNamespaceID() string {
return s.f.GetNamespaceKey("example.net").ID
}

func (s *ActionsSuite) defaultNamespaceFQN() string {
return "https://" + s.f.GetNamespaceKey("example.com").Name
}

func (s *ActionsSuite) otherNamespaceFQN() string {
return "https://" + s.f.GetNamespaceKey("example.net").Name
}

func TestActionsSuite(t *testing.T) {
if testing.Short() {
t.Skip("skipping actions integration tests")
Expand Down
3 changes: 2 additions & 1 deletion service/integration/obligation_triggers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ func (s *ObligationTriggersSuite) SetupSuite() {

// Create an action
s.action, err = s.db.PolicyClient.CreateAction(s.ctx, &actions.CreateActionRequest{
Name: actionName,
Name: actionName,
NamespaceId: s.namespace.GetId(),
})
s.Require().NoError(err)

Expand Down
Loading
Loading