Skip to content
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

update roledefinition filters #4102

Merged
merged 5 commits into from
Mar 10, 2018
Merged

update roledefinition filters #4102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9522ab1
update tests to include type filter for roledefinitions
darshanhs90 Mar 2, 2018
ed5911f
update version
darshanhs90 Mar 2, 2018
597a5b6
fix merge conflicts
darshanhs90 Mar 6, 2018
b943f00
Merge branch 'psSdkJson6' of https://github.com/Azure/azure-sdk-for-n…
darshanhs90 Mar 9, 2018
fa32a77
rerecord tests
darshanhs90 Mar 10, 2018
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
14 changes: 7 additions & 7 deletions ...on.Tests/SessionRecords/Authorization.Tests.BasicTests/ClassicAdministratorListTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"6857078f-1ab6-4b6f-aa04-f0b28fdc14ff"
"dd92333f-bad5-4a4d-843f-335bf5d8d25a"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.25009.03",
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.6.0.0"
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.8.0.0"
]
},
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"properties\": {\r\n \"emailAddress\": \"test2@rbacCliTest.onmicrosoft.com\",\r\n \"role\": \"ServiceAdministrator;AccountAdministrator\"\r\n },\r\n \"id\": \"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/providers/Microsoft.Authorization/classicAdministrators/10030000930A2D88\",\r\n \"type\": \"Microsoft.Authorization/classicAdministrators\",\r\n \"name\": \"10030000930A2D88\"\r\n },\r\n {\r\n \"properties\": {\r\n \"emailAddress\": \"stefmil@microsoft.com\",\r\n \"role\": \"CoAdministrator\"\r\n },\r\n \"id\": \"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/providers/Microsoft.Authorization/classicAdministrators/1003BFFD801C213F\",\r\n \"type\": \"Microsoft.Authorization/classicAdministrators\",\r\n \"name\": \"1003BFFD801C213F\"\r\n }\r\n ]\r\n}",
Expand All @@ -29,7 +29,7 @@
"no-cache"
],
"Date": [
"Fri, 16 Feb 2018 01:45:32 GMT"
"Sat, 10 Mar 2018 00:21:05 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -42,16 +42,16 @@
"Accept-Encoding"
],
"x-ms-request-id": [
"centralus:3e828980-77ef-4aec-9c03-20c701ba31c4"
"westus2:f566efec-5462-4aae-97d0-f1b3635d87b7"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"14999"
"14978"
],
"x-ms-correlation-request-id": [
"f9b7892e-7679-407c-9eb5-3a90c99d6bed"
"dff26a77-9fe6-49de-a0e3-f50c1e65d99e"
],
"x-ms-routing-request-id": [
"CENTRALUSEUAP:20180216T014532Z:f9b7892e-7679-407c-9eb5-3a90c99d6bed"
"WESTUS2:20180310T002106Z:dff26a77-9fe6-49de-a0e3-f50c1e65d99e"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
Expand Down
16 changes: 8 additions & 8 deletions .../Authorization.Tests.BasicTests/GetProviderOperationsMetadataListWithInvalidProvider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"b53963e0-035e-409b-b040-ad30ecd7bb6f"
"647c6af1-b4bc-4678-9dcf-61c06d391bd7"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.25009.03",
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.6.0.0"
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.8.0.0"
]
},
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ProviderNotFound\",\r\n \"message\": \"Provider 'InvalidProvider' not found.\"\r\n }\r\n}",
Expand All @@ -32,19 +32,19 @@
"no-cache"
],
"Date": [
"Fri, 16 Feb 2018 01:47:35 GMT"
"Sat, 10 Mar 2018 00:22:48 GMT"
],
"Pragma": [
"no-cache"
],
"Server": [
"Microsoft-IIS/8.5"
"Microsoft-IIS/10.0"
],
"Set-Cookie": [
"x-ms-gateway-slice=productionb; path=/; secure; HttpOnly"
],
"x-ms-request-id": [
"08147079-1166-4f76-8078-fafb0db47285"
"860504f1-1dc1-4078-840d-77fee2c70776"
],
"X-Content-Type-Options": [
"nosniff"
Expand All @@ -56,13 +56,13 @@
"ASP.NET"
],
"x-ms-ratelimit-remaining-tenant-reads": [
"14977"
"14999"
],
"x-ms-correlation-request-id": [
"d415584c-aab7-4457-8cb2-f977cd3da1d2"
"85135bd6-e157-4d12-a640-b9691f03f5cd"
],
"x-ms-routing-request-id": [
"CENTRALUSEUAP:20180216T014736Z:d415584c-aab7-4457-8cb2-f977cd3da1d2"
"WESTUS2:20180310T002249Z:85135bd6-e157-4d12-a640-b9691f03f5cd"
]
},
"StatusCode": 404
Expand Down
36 changes: 18 additions & 18 deletions ...SessionRecords/Authorization.Tests.BasicTests/ProviderOperationsMetadataListGetTests.json
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions .../Authorization.Tests.BasicTests/ProviderOperationsMetadataListWithDataActionGetTests.json
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions ...ests/SessionRecords/Authorization.Tests.BasicTests/RoleAssignmentAtScopeAndAboveTest.json
View file
Open in desktop

Large diffs are not rendered by default.

196 changes: 98 additions & 98 deletions ...rization.Tests/SessionRecords/Authorization.Tests.BasicTests/RoleAssignmentByIdTests.json
View file
Open in desktop

Large diffs are not rendered by default.

142 changes: 71 additions & 71 deletions ...n.Tests/SessionRecords/Authorization.Tests.BasicTests/RoleAssignmentListByFilterTest.json
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions ...n.Tests/SessionRecords/Authorization.Tests.BasicTests/RoleAssignmentListForScopeTest.json
View file
Open in desktop

Large diffs are not rendered by default.

118 changes: 59 additions & 59 deletions ...ionRecords/Authorization.Tests.BasicTests/RoleAssignmentListWithAssignedToFilterTest.json
View file
Open in desktop

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions ...Tests/SessionRecords/Authorization.Tests.BasicTests/RoleAssignmentsCreateDeleteTests.json
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions ...tion.Tests/SessionRecords/Authorization.Tests.BasicTests/RoleAssignmentsListGetTests.json
View file
Open in desktop

Large diffs are not rendered by default.

286 changes: 143 additions & 143 deletions ...zation.Tests/SessionRecords/Authorization.Tests.BasicTests/RoleDefinitionCreateTests.json
View file
Open in desktop

Large diffs are not rendered by default.

69 changes: 40 additions & 29 deletions ...essionRecords/Authorization.Tests.BasicTests/RoleDefinitionCreateWithDataActionTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"Entries": [
{
"RequestUri": "//subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/resourcegroups/AzureAuthzSDK/providers/Microsoft.Authorization/roleDefinitions/cda83334-4d61-4063-ae71-691276b945d2?api-version=2018-01-01-preview",
"EncodedRequestUri": "Ly9zdWJzY3JpcHRpb25zLzQwMDRhOWZkLWQ1OGUtNDhkYy1hZWIyLTRhNGFlYzU4NjA2Zi9yZXNvdXJjZWdyb3Vwcy9BenVyZUF1dGh6U0RLL3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9yb2xlRGVmaW5pdGlvbnMvY2RhODMzMzQtNGQ2MS00MDYzLWFlNzEtNjkxMjc2Yjk0NWQyP2FwaS12ZXJzaW9uPTIwMTgtMDEtMDEtcHJldmlldw==",
"RequestUri": "//subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/resourcegroups/AzureAuthzSDK/providers/Microsoft.Authorization/roleDefinitions/7eff8108-f915-4d1a-bf01-4f88c7be348a?api-version=2018-01-01-preview",
"EncodedRequestUri": "Ly9zdWJzY3JpcHRpb25zLzQwMDRhOWZkLWQ1OGUtNDhkYy1hZWIyLTRhNGFlYzU4NjA2Zi9yZXNvdXJjZWdyb3Vwcy9BenVyZUF1dGh6U0RLL3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9yb2xlRGVmaW5pdGlvbnMvN2VmZjgxMDgtZjkxNS00ZDFhLWJmMDEtNGY4OGM3YmUzNDhhP2FwaS12ZXJzaW9uPTIwMTgtMDEtMDEtcHJldmlldw==",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"properties\": {\r\n \"roleName\": \"NewRoleName_cda83334-4d61-4063-ae71-691276b945d2\",\r\n \"description\": \"New Test Custom Role\",\r\n \"permissions\": [\r\n {\r\n \"dataActions\": [\r\n \"Microsoft.Storage/*/Read\"\r\n ]\r\n }\r\n ],\r\n \"assignableScopes\": [\r\n \"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/resourcegroups/AzureAuthzSDK\"\r\n ]\r\n }\r\n}",
"RequestBody": "{\r\n \"properties\": {\r\n \"roleName\": \"NewRoleName_7eff8108-f915-4d1a-bf01-4f88c7be348a\",\r\n \"description\": \"New Test Custom Role\",\r\n \"permissions\": [\r\n {\r\n \"dataActions\": [\r\n \"Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*\"\r\n ]\r\n }\r\n ],\r\n \"assignableScopes\": [\r\n \"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/resourcegroups/AzureAuthzSDK\"\r\n ]\r\n }\r\n}",
"RequestHeaders": {
"Content-Type": [
"application/json; charset=utf-8"
],
"Content-Length": [
"388"
"429"
],
"x-ms-client-request-id": [
"03f7b797-c363-4e2a-8902-caf7f5242866"
"cccd4fe6-6535-4aea-9fb3-10dd60560733"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.25009.03",
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.6.0.0"
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.8.0.0"
]
},
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"InvalidDataActionOrNotDataAction\",\r\n \"message\": \"The resouce provider referenced in the action has not published its operations.\"\r\n }\r\n}",
"ResponseBody": "{\r\n \"properties\": {\r\n \"roleName\": \"NewRoleName_7eff8108-f915-4d1a-bf01-4f88c7be348a\",\r\n \"type\": \"CustomRole\",\r\n \"description\": \"New Test Custom Role\",\r\n \"assignableScopes\": [\r\n \"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/resourcegroups/AzureAuthzSDK\"\r\n ],\r\n \"permissions\": [\r\n {\r\n \"actions\": [],\r\n \"notActions\": [],\r\n \"dataActions\": [\r\n \"Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*\"\r\n ],\r\n \"notDataActions\": []\r\n }\r\n ],\r\n \"createdOn\": \"2018-03-10T00:26:28.0194536Z\",\r\n \"updatedOn\": \"2018-03-10T00:26:28.0194536Z\",\r\n \"createdBy\": \"f2dc21ac-702a-4bde-a4ce-146edf751d81\",\r\n \"updatedBy\": \"f2dc21ac-702a-4bde-a4ce-146edf751d81\"\r\n },\r\n \"id\": \"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/providers/Microsoft.Authorization/roleDefinitions/7eff8108-f915-4d1a-bf01-4f88c7be348a\",\r\n \"type\": \"Microsoft.Authorization/roleDefinitions\",\r\n \"name\": \"7eff8108-f915-4d1a-bf01-4f88c7be348a\"\r\n}",
"ResponseHeaders": {
"Content-Length": [
"145"
"819"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -38,19 +38,22 @@
"no-cache"
],
"Date": [
"Thu, 15 Feb 2018 20:09:08 GMT"
"Sat, 10 Mar 2018 00:26:29 GMT"
],
"Pragma": [
"no-cache"
],
"Server": [
"Microsoft-IIS/8.5"
"Microsoft-IIS/10.0"
],
"Set-Cookie": [
"x-ms-gateway-slice=productionb; path=/; secure; HttpOnly"
],
"x-ms-request-charge": [
"2"
],
"x-ms-request-id": [
"e6df4380-342a-491a-8775-49fa3a793c60"
"52705a2b-886f-4c7a-b96e-e9822471d450"
],
"X-Content-Type-Options": [
"nosniff"
Expand All @@ -62,59 +65,68 @@
"ASP.NET"
],
"x-ms-ratelimit-remaining-subscription-writes": [
"1188"
"1199"
],
"x-ms-correlation-request-id": [
"f64eafef-1259-4da4-98a7-3a93d17e6e8c"
"9d85cf25-af79-4b01-8430-76183f733027"
],
"x-ms-routing-request-id": [
"CENTRALUSEUAP:20180215T200908Z:f64eafef-1259-4da4-98a7-3a93d17e6e8c"
"WESTUS2:20180310T002629Z:9d85cf25-af79-4b01-8430-76183f733027"
]
},
"StatusCode": 400
"StatusCode": 201
},
{
"RequestUri": "//subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/resourcegroups/AzureAuthzSDK/providers/Microsoft.Authorization/roleDefinitions/cda83334-4d61-4063-ae71-691276b945d2?api-version=2018-01-01-preview",
"EncodedRequestUri": "Ly9zdWJzY3JpcHRpb25zLzQwMDRhOWZkLWQ1OGUtNDhkYy1hZWIyLTRhNGFlYzU4NjA2Zi9yZXNvdXJjZWdyb3Vwcy9BenVyZUF1dGh6U0RLL3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9yb2xlRGVmaW5pdGlvbnMvY2RhODMzMzQtNGQ2MS00MDYzLWFlNzEtNjkxMjc2Yjk0NWQyP2FwaS12ZXJzaW9uPTIwMTgtMDEtMDEtcHJldmlldw==",
"RequestUri": "//subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/resourcegroups/AzureAuthzSDK/providers/Microsoft.Authorization/roleDefinitions/7eff8108-f915-4d1a-bf01-4f88c7be348a?api-version=2018-01-01-preview",
"EncodedRequestUri": "Ly9zdWJzY3JpcHRpb25zLzQwMDRhOWZkLWQ1OGUtNDhkYy1hZWIyLTRhNGFlYzU4NjA2Zi9yZXNvdXJjZWdyb3Vwcy9BenVyZUF1dGh6U0RLL3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9yb2xlRGVmaW5pdGlvbnMvN2VmZjgxMDgtZjkxNS00ZDFhLWJmMDEtNGY4OGM3YmUzNDhhP2FwaS12ZXJzaW9uPTIwMTgtMDEtMDEtcHJldmlldw==",
"RequestMethod": "DELETE",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"031a7698-1783-4053-bd35-0d11abbb748a"
"96ada0a6-672a-44ef-b833-d2df96cefc6c"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.25009.03",
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.6.0.0"
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.8.0.0"
]
},
"ResponseBody": "",
"ResponseBody": "{\r\n \"properties\": {\r\n \"roleName\": \"NewRoleName_7eff8108-f915-4d1a-bf01-4f88c7be348a\",\r\n \"type\": \"CustomRole\",\r\n \"description\": \"New Test Custom Role\",\r\n \"assignableScopes\": [\r\n \"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/resourcegroups/AzureAuthzSDK\"\r\n ],\r\n \"permissions\": [\r\n {\r\n \"actions\": [],\r\n \"notActions\": [],\r\n \"dataActions\": [\r\n \"Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*\"\r\n ],\r\n \"notDataActions\": []\r\n }\r\n ],\r\n \"createdOn\": \"2018-03-10T00:26:28.0194536Z\",\r\n \"updatedOn\": \"2018-03-10T00:26:28.0194536Z\",\r\n \"createdBy\": \"f2dc21ac-702a-4bde-a4ce-146edf751d81\",\r\n \"updatedBy\": \"f2dc21ac-702a-4bde-a4ce-146edf751d81\"\r\n },\r\n \"id\": \"/subscriptions/4004a9fd-d58e-48dc-aeb2-4a4aec58606f/providers/Microsoft.Authorization/roleDefinitions/7eff8108-f915-4d1a-bf01-4f88c7be348a\",\r\n \"type\": \"Microsoft.Authorization/roleDefinitions\",\r\n \"name\": \"7eff8108-f915-4d1a-bf01-4f88c7be348a\"\r\n}",
"ResponseHeaders": {
"Content-Type": [
"application/json; charset=utf-8"
],
"Expires": [
"-1"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Thu, 15 Feb 2018 20:09:09 GMT"
"Sat, 10 Mar 2018 00:26:30 GMT"
],
"Pragma": [
"no-cache"
],
"Transfer-Encoding": [
"chunked"
],
"Server": [
"Microsoft-IIS/8.5"
"Microsoft-IIS/10.0"
],
"Set-Cookie": [
"x-ms-gateway-slice=productionb; path=/; secure; HttpOnly"
],
"Vary": [
"Accept-Encoding"
],
"x-ms-request-charge": [
"1"
],
"x-ms-request-id": [
"bf243120-1b8b-4a56-8498-e8aed6ddd153"
"0d18b076-5505-4478-8cb8-49a2a5e14205"
],
"X-Content-Type-Options": [
"nosniff"
Expand All @@ -126,22 +138,21 @@
"ASP.NET"
],
"x-ms-ratelimit-remaining-subscription-writes": [
"1187"
"1198"
],
"x-ms-correlation-request-id": [
"d5317131-c81c-4046-ac4e-52887be9ef62"
"513b8c5f-7442-4a96-8480-ae934454f784"
],
"x-ms-routing-request-id": [
"CENTRALUSEUAP:20180215T200909Z:d5317131-c81c-4046-ac4e-52887be9ef62"
"WESTUS2:20180310T002631Z:513b8c5f-7442-4a96-8480-ae934454f784"
]
},
"StatusCode": 204
"StatusCode": 200
}
],
"Names": {},
"Variables": {
"SubscriptionId": "4004a9fd-d58e-48dc-aeb2-4a4aec58606f",
"RoleDefinition1": "cda83334-4d61-4063-ae71-691276b945d2",
"RoleDefinition2": "002d584d-aad4-4eff-ac01-f7f6936512bf"
"RoleDefinition1": "7eff8108-f915-4d1a-bf01-4f88c7be348a"
}
}
Loading