-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Add new 2021-11-01-preview API to support SystemData and managedByTenantId query filtering #16859
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.
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
Closed
skayani
wants to merge
10
commits into
Azure:main
from
skayani:Microsoft.ManagedServices-2021-11-01-preview
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
dcea8fb
Adds base for updating Microsoft.ManagedServices from version preview…
skayani 4b5fb35
Updates readme
skayani afbea17
Updates API version in new specs and examples
skayani d3d9640
Add systemdata + query filtering
skayani 715df3e
Syntax fix
skayani 85ebb35
Fix examples
skayani ccd2f4a
Remove managedByTenantId filtering examples
skayani a6c5165
Fix references + update examples
skayani 187826d
Validation fixes
skayani 4e88b32
Validation fixes
skayani File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
...oft.ManagedServices/preview/2021-11-01-preview/examples/DeleteRegistrationAssignment.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "parameters": { | ||
| "scope": "subscription/0afefe50-734e-4610-8a82-a144ahf49dea", | ||
| "registrationAssignmentId": "26c128c2-fefa-4340-9bb1-6e081c90ada2", | ||
| "api-version": "2021-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": {}, | ||
| "204": {}, | ||
| "202": {} | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
...oft.ManagedServices/preview/2021-11-01-preview/examples/DeleteRegistrationDefinition.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "parameters": { | ||
| "scope": "subscription/0afefe50-734e-4610-8a82-a144ahf49dea", | ||
| "registrationDefinitionId": "26c128c2-fefa-4340-9bb1-6e081c90ada2", | ||
| "api-version": "2021-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": {}, | ||
| "204": {} | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
...gedServices/preview/2021-11-01-preview/examples/GetMarketplaceRegistrationDefinition.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { | ||
| "parameters": { | ||
| "scope": "subscription/0afefe50-734e-4610-8a82-a144ahf49dea", | ||
| "marketplaceIdentifier": "publisher.product.planName.version", | ||
| "api-version": "2021-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc", | ||
| "authorizations": [ | ||
| { | ||
| "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "Support User", | ||
| "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" | ||
| }, | ||
| { | ||
| "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "User Access Administrator", | ||
| "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", | ||
| "delegatedRoleDefinitionIds": [ | ||
| "b24988ac-6180-42a0-ab88-20f7382dd24c" | ||
| ] | ||
| } | ||
| ], | ||
| "offerDisplayName": "Marketplace Test Offer", | ||
| "publisherDisplayName": "Marketplace Test Publisher", | ||
| "planDisplayName": "Test Plan" | ||
| }, | ||
| "plan": { | ||
| "name": "test-plan", | ||
| "product": "test", | ||
| "publisher": "marketplace-test", | ||
| "version": "1.0.0" | ||
| }, | ||
| "id": "/subscriptions/0afefe50-734e-4610-8a82-a144ahf49dea/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/marketplace-test.test.test-plan.1.0.0", | ||
| "type": "Microsoft.ManagedServices/marketplaceRegistrationDefinitions", | ||
| "name": "marketplace-test.test.test-plan.1.0.0" | ||
| } | ||
| } | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
...review/2021-11-01-preview/examples/GetMarketplaceRegistrationDefinitionAtTenantScope.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { | ||
| "parameters": { | ||
| "marketplaceIdentifier": "publisher.product.planName.version", | ||
| "api-version": "2021-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc", | ||
| "authorizations": [ | ||
| { | ||
| "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "Support User", | ||
| "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" | ||
| }, | ||
| { | ||
| "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "User Access Administrator", | ||
| "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", | ||
| "delegatedRoleDefinitionIds": [ | ||
| "b24988ac-6180-42a0-ab88-20f7382dd24c" | ||
| ] | ||
| } | ||
| ], | ||
| "eligibleAuthorizations": [], | ||
| "offerDisplayName": "Marketplace Test Offer", | ||
| "publisherDisplayName": "Marketplace Test Publisher", | ||
| "planDisplayName": "Test Plan" | ||
| }, | ||
| "plan": { | ||
| "name": "test-plan", | ||
| "product": "test", | ||
| "publisher": "marketplace-test", | ||
| "version": "1.0.0" | ||
| }, | ||
| "id": "/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/marketplace-test.test.test-plan.1.0.0", | ||
| "type": "Microsoft.ManagedServices/marketplaceRegistrationDefinitions", | ||
| "name": "marketplace-test.test.test-plan.1.0.0" | ||
| } | ||
| } | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...edServices/preview/2021-11-01-preview/examples/GetMarketplaceRegistrationDefinitions.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| { | ||
| "parameters": { | ||
| "scope": "subscription/0afefe50-734e-4610-8a82-a144ahf49dea", | ||
| "$filter": "planIdentifier eq 'publisher.offerIdentifier.planName.version'", | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Generally I try to avoid changing existing examples but I guess it wouldn't be a bad idea as we are using GUIDs instead of placeholders |
||
| "api-version": "2021-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "properties": { | ||
| "managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc", | ||
| "authorizations": [ | ||
| { | ||
| "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "Support User", | ||
| "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" | ||
| }, | ||
| { | ||
| "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "User Access Administrator", | ||
| "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", | ||
| "delegatedRoleDefinitionIds": [ | ||
| "b24988ac-6180-42a0-ab88-20f7382dd24c" | ||
| ] | ||
| } | ||
| ], | ||
| "offerDisplayName": "Marketplace Test Offer", | ||
| "publisherDisplayName": "Marketplace Test Publisher", | ||
| "planDisplayName": "Test Plan" | ||
| }, | ||
| "plan": { | ||
| "name": "test-plan", | ||
| "product": "test", | ||
| "publisher": "marketplace-test", | ||
| "version": "1.0.0" | ||
| }, | ||
| "id": "/subscriptions/0afefe50-734e-4610-8a82-a144ahf49dea/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/marketplace-test.test.test-plan.1.0.0", | ||
| "type": "Microsoft.ManagedServices/marketplaceRegistrationDefinitions", | ||
| "name": "marketplace-test.test.test-plan.1.0.0" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
47 changes: 47 additions & 0 deletions
47
...eview/2021-11-01-preview/examples/GetMarketplaceRegistrationDefinitionsAtTenantScope.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| { | ||
| "parameters": { | ||
| "$filter": "planIdentifier eq 'publisher.offerIdentifier.planName.version'", | ||
| "api-version": "2021-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "properties": { | ||
| "managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc", | ||
| "authorizations": [ | ||
| { | ||
| "principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "Support User", | ||
| "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" | ||
| }, | ||
| { | ||
| "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "User Access Administrator", | ||
| "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", | ||
| "delegatedRoleDefinitionIds": [ | ||
| "b24988ac-6180-42a0-ab88-20f7382dd24c" | ||
| ] | ||
| } | ||
| ], | ||
| "eligibleAuthorizations": [], | ||
| "offerDisplayName": "Marketplace Test Offer", | ||
| "publisherDisplayName": "Marketplace Test Publisher", | ||
| "planDisplayName": "Test Plan" | ||
| }, | ||
| "plan": { | ||
| "name": "test-plan", | ||
| "product": "test", | ||
| "publisher": "marketplace-test", | ||
| "version": "1.0.0" | ||
| }, | ||
| "id": "/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/marketplace-test.test.test-plan.1.0.0", | ||
| "type": "Microsoft.ManagedServices/marketplaceRegistrationDefinitions", | ||
| "name": "marketplace-test.test.test-plan.1.0.0" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
...-manager/Microsoft.ManagedServices/preview/2021-11-01-preview/examples/GetOperations.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2021-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "name": "Microsoft.ManagedServices/registrationDefinitions/read", | ||
| "display": { | ||
| "provider": "Microsoft Managed Services", | ||
| "resource": "Managed Services Registration Definition", | ||
| "operation": "List Managed Services Registration Definitions", | ||
| "description": "Retrieves a list of Managed Services registration definitions." | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
83 changes: 83 additions & 0 deletions
83
...rosoft.ManagedServices/preview/2021-11-01-preview/examples/GetRegistrationAssignment.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| { | ||
| "parameters": { | ||
| "scope": "subscription/0afefe50-734e-4610-8a82-a144ahf49dea", | ||
| "registrationAssignmentId": "26c128c2-fefa-4340-9bb1-6e081c90ada2", | ||
| "api-version": "2021-11-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "headers": {}, | ||
| "body": { | ||
| "properties": { | ||
| "registrationDefinitionId": "/subscriptions/0afefe50-734e-4610-8c82-a144aff49dea/providers/Microsoft.ManagedServices/registrationDefinitions/26c128c2-fefa-4340-9bb1-8e081c90ada2", | ||
| "provisioningState": "Succeeded", | ||
| "registrationDefinition": { | ||
| "properties": { | ||
| "description": "Test", | ||
| "managedByTenantId": "83abe5cd-bcc3-441a-bd86-e6a75360cecc", | ||
| "registrationDefinitionName": "DefinitionName", | ||
| "authorizations": [ | ||
| { | ||
| "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "Support User", | ||
| "roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7" | ||
| }, | ||
| { | ||
| "principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc", | ||
| "principalIdDisplayName": "User Access Administrator", | ||
| "roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9", | ||
| "delegatedRoleDefinitionIds": [ | ||
| "b24988ac-6180-42a0-ab88-20f7382dd24c" | ||
| ] | ||
| } | ||
| ], | ||
| "eligibleAuthorizations": [ | ||
| { | ||
| "justInTimeAccessPolicy": { | ||
| "multiFactorAuthProvider": "Azure", | ||
| "maximumActivationDuration": "PT8H" | ||
| }, | ||
| "principalId": "3e0ed8c6-e902-4fc5-863c-e3ddbb2ae2a2", | ||
| "principalIdDisplayName": "Support User", | ||
| "roleDefinitionId": "ae349356-3a1b-4a5e-921d-050484c6347e" | ||
| } | ||
| ], | ||
| "provisioningState": "Succeeded", | ||
| "manageeTenantId": "01c0bcd5-4f47-4e4b-b492-418b7e2a8854", | ||
| "manageeTenantName": "test_test_aad_SbtFhyGiLHPFm", | ||
| "managedByTenantName": "Contoso Corp." | ||
| }, | ||
| "plan": { | ||
| "name": "addesai-plan", | ||
| "product": "test", | ||
| "publisher": "marketplace-test", | ||
| "version": "1.0.0" | ||
| }, | ||
| "id": "/subscriptions/0afefe50-734e-4610-8c82-a144aff49dea/providers/Microsoft.ManagedServices/registrationDefinitions/26c128c2-fefa-4340-9bb1-8e081c90ada2", | ||
| "type": "Microsoft.ManagedServices/registrationDefinitions", | ||
| "name": "26c128c2-fefa-4340-9bb1-8e081c90ada2", | ||
| "systemData": { | ||
| "createdBy": "testuser@outlook.com", | ||
| "createdByType": "User", | ||
| "createdAt": "2021-11-22T19:56:05.0703382Z", | ||
| "lastModifiedBy": "testuser@outlook.com", | ||
| "lastModifiedByType": "User", | ||
| "lastModifiedAt": "2021-11-22T19:56:05.0703382Z" | ||
| } | ||
| } | ||
| }, | ||
| "id": "/subscriptions/0afefe50-734e-4610-8c82-a144aff49dea/providers/Microsoft.ManagedServices/registrationAssignments/484a7d5f-9729-4b87-bc9b-26610985a013", | ||
| "type": "Microsoft.ManagedServices/registrationAssignments", | ||
| "name": "484a7d5f-9729-4b87-bc9b-26610985a013", | ||
| "systemData": { | ||
| "createdBy": "testuser@outlook.com", | ||
| "createdByType": "User", | ||
| "createdAt": "2021-11-22T19:56:05.0703382Z", | ||
| "lastModifiedBy": "testuser@outlook.com", | ||
| "lastModifiedByType": "User", | ||
| "lastModifiedAt": "2021-11-22T19:56:05.0703382Z" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.