Skip to content
Open
Show file tree
Hide file tree
Changes from 11 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
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"Name": "CustomRole Tests Role New",
"Description": "Test role",
"Actions": [],
"NotActions": [],
"DataActions": [
"Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*"
],
"NotDataActions": [
"Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write"
"Permissions": [
{
"Actions": [],
"NotActions": [],
"DataActions": [
"Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*"
],
"NotDataActions": [
"Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write"
]
}
],
"AssignableScopes": ["/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
"Name": "Another Invalid test role",
"Id": "85E460B3-89E9-48BA-9DCD-A8A99D64A674",
"Description": "Test role",
"Actions": [
"Microsoft.Authorization/*/read",
"Microsoft.Support/*"
"Permissions": [
{
"Actions": [
"Microsoft.Authorization/*/read",
"Microsoft.Support/*"
],
"NotActions": []
}
],
"NotActions": [],
"AssignableScopes": ["/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/ResourceGroups"]
}
12 changes: 8 additions & 4 deletions src/Resources/Resources.Test/Resources/NewRoleDefinition.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{
"Name": "CustomRole Tests Role",
"Description": "Test role",
"Actions": [
"Microsoft.Authorization/*/read",
"Microsoft.Support/*"
"Permissions": [
{
"Actions": [
"Microsoft.Authorization/*/read",
"Microsoft.Support/*"
],
"NotActions": []
}
],
"NotActions": [],
"AssignableScopes": ["/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"Name": "CustomRole Permissions Format Test",
"Description": "Test role for new Permissions array format",
"Permissions": [
{
"Actions": [
"Microsoft.Resources/subscriptions/resourceGroups/read",
"Microsoft.Resources/deployments/*"
],
"NotActions": [],
"DataActions": [],
"NotDataActions": []
}
],
"AssignableScopes": ["/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f"]
}
12 changes: 8 additions & 4 deletions src/Resources/Resources.Test/Resources/RoleDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
"Name": "Another tests role",
"Id": "85E460B3-89E9-48BA-9DCD-A8A99D64A674",
"Description": "Test role",
"Actions": [
"Microsoft.Authorization/*/read",
"Microsoft.Support/*"
"Permissions": [
{
"Actions": [
"Microsoft.Authorization/*/read",
"Microsoft.Support/*"
],
"NotActions": []
}
],
"NotActions": [],
"AssignableScopes": ["/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f",
"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/ResourceGroups/rbactest"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ function Test-RaPropertiesValidation
$roleDef = Get-AzRoleDefinition -Name "Reader"
$roleDef.Id = "ff9cd1ab-d763-486f-b253-51a816c92aaf"
$roleDef.Name = "Reader vm For Test"
$roleDef.Actions.Add("Microsoft.ClassicCompute/virtualMachines/restart/action")
$roleDef.Permissions[0].Actions.Add("Microsoft.ClassicCompute/virtualMachines/restart/action")
$roleDef.Description = "Read, monitor and restart virtual machines"
$roleDef.AssignableScopes[0] = '/subscriptions/'+$subscription[0].Id

Expand Down
21 changes: 21 additions & 0 deletions src/Resources/Resources.Test/ScenarioTests/RoleDefinitionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,27 @@ public void RDWithConditionGetScenario()
TestRunner.RunTestScript("Test-RDWithAbacConditionsGet");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void RDNewPermissionsFormatCreate()
{
TestRunner.RunTestScript("Test-RDNewPermissionsFormatCreate");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void RDNewPermissionsFormatUpdate()
{
TestRunner.RunTestScript("Test-RDNewPermissionsFormatUpdate");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void RDNewPermissionsFormatDelete()
{
TestRunner.RunTestScript("Test-RDNewPermissionsFormatDelete");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void RdValidateInputParameters()
Expand Down
Loading
Loading