Skip to content

fix: Expand number of entries included in ConvertAzureRoleEligibilityScheduleInstanceToRel relationships (BED-6391) #2935

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

Open
dcairnsspecterops wants to merge 4 commits into
base: main
Choose a base branch
from
+3 −6
Open

fix: Expand number of entries included in ConvertAzureRoleEligibilityScheduleInstanceToRel relationships (BED-6391) #2935

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3419494
remove check for root directory from ConvertAzureRoleEligibilitySche…
dcairnsspecterops Jun 29, 2026
8918ecc
add test confirming that non-slash directory scope ids are no longer…
dcairnsspecterops Jun 29, 2026
b159ca2
add explanatory comment for test update
dcairnsspecterops Jun 29, 2026
198a8bf
run prepare-for-codereview
dcairnsspecterops Jun 29, 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
6 changes: 1 addition & 5 deletions packages/go/ein/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1957,11 +1957,7 @@ func ConvertAzureRoleEligibilityScheduleInstanceToRel(instance models.RoleEligib
id := strings.ToUpper(fmt.Sprintf("%s@%s", instance.RoleDefinitionId, instance.TenantId))

relationships := make([]IngestibleRelationship, 0)
//If the scope is not the directory, we are going to skip creating the edges for now until later work is done
//This isn't necessarily the best spot for this, but it works and it makes testing simple, since none of our azure convertors are exported
if instance.DirectoryScopeId != "/" {
return relationships
}

relationships = append(relationships, NewIngestibleRelationship(
IngestibleEndpoint{
Value: strings.ToUpper(instance.PrincipalId),
Expand Down
30 changes: 30 additions & 0 deletions packages/go/ein/azure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,36 @@ func TestConvertAzureRoleEligibilityScheduleInstanceToRel(t *testing.T) {
require.Equal(t, expectedRel.RelType, azure.AZRoleEligible)
require.Equal(t, expectedRel.Source.Value, strings.ToUpper(testData.PrincipalId))

testData = models.RoleEligibilityScheduleInstance{
Id: "lAPpYvVpN0KRkAEhdxReELKn6QMIlSROgkgWZy9fE3c-1-e",
RoleDefinitionId: "62e90394-69f5-4237-9190-012177145e10",
PrincipalId: "03e9a7b2-9508-4e24-8248-16672f5f1377",
DirectoryScopeId: "/",
StartDateTime: "2024-01-04T01:22:36.867Z",
TenantId: "6c12b0b0-b2cc-4a73-8252-0b94bfca2145",
}

expectedRels = ein.ConvertAzureRoleEligibilityScheduleInstanceToRel(testData)
require.Len(t, expectedRels, 1)
}

func TestNonRootDirectoryScopeIdConvertAzureRoleEligibilityScheduleInstanceToRel(t *testing.T) {
testData := models.RoleEligibilityScheduleInstance{
Id: "lAPpYvVpN0KRkAEhdxReELKn6QMIlSROgkgWZy9fE3c-1-e",
RoleDefinitionId: "62e90394-69f5-4237-9190-012177145e10",
PrincipalId: "03e9a7b2-9508-4e24-8248-16672f5f1377",
DirectoryScopeId: "abc123",
StartDateTime: "2024-01-04T01:22:36.867Z",
TenantId: "6c12b0b0-b2cc-4a73-8252-0b94bfca2145",
}

expectedRels := ein.ConvertAzureRoleEligibilityScheduleInstanceToRel(testData)
require.Len(t, expectedRels, 1)
expectedRel := expectedRels[0]
require.Equal(t, expectedRel.Target.Value, strings.ToUpper(fmt.Sprintf("%s@%s", testData.RoleDefinitionId, testData.TenantId)))
require.Equal(t, expectedRel.RelType, azure.AZRoleEligible)
require.Equal(t, expectedRel.Source.Value, strings.ToUpper(testData.PrincipalId))

Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
testData = models.RoleEligibilityScheduleInstance{
Id: "lAPpYvVpN0KRkAEhdxReELKn6QMIlSROgkgWZy9fE3c-1-e",
RoleDefinitionId: "62e90394-69f5-4237-9190-012177145e10",
Expand Down
Loading