Skip to content

Managed Services General API Fixes #9886

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
akning-ms merged 4 commits into from
Jul 7, 2020
Merged

Managed Services General API Fixes #9886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49b1808
-For stable/2019-09-01 and preview/2020-02-01, added
skayani Jun 18, 2020
b9f5046
Removed extraneous spacing
skayani Jun 18, 2020
b6cf55a
Fixed get marketplace reg def examples to reference MarketplaceRegDef…
skayani Jun 19, 2020
9a93ba5
Added name property to marketplace reg def + fixed examples
skayani Jun 23, 2020
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
15 changes: 7 additions & 8 deletions ...gedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,26 @@
"200": {
"body": {
"properties": {
"description": "Test",
"managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc",
"registrationDefinitionName": "DefinitionName",
"authorizations": [
{
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
}
],
"provisioningState": "Succeeded",
"managedByTenantName": "Test Tenant"
"offerDisplayName": "Marketplace Test Offer",
"publisherDisplayName": "Marketplace Test Publisher",
"planDisplayName": "Test Plan"
},
"plan": {
"name": "addesai-plan",
"name": "test-plan",
"product": "test",
"publisher": "marketplace-test",
"version": "1.0.0"
},
"id": "/subscriptions/0afefe50-734e-4610-8a82-a144ahf49dea/providers/Microsoft.ManagedServices/registrationDefinitions/26c128c2-fefa-4340-9bb1-6e081c90ada2",
"type": "Microsoft.ManagedServices/registrationDefinitions",
"name": "26c128c2-fefa-4340-9bb1-6e081c90ada2"
"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"
}
}
}
Expand Down
15 changes: 7 additions & 8 deletions ...edServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,26 @@
"value": [
{
"properties": {
"description": "Test",
"managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc",
"registrationDefinitionName": "DefinitionName",
"authorizations": [
{
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
}
],
"provisioningState": "Succeeded",
"managedByTenantName": "Test Tenant"
"offerDisplayName": "Marketplace Test Offer",
"publisherDisplayName": "Marketplace Test Publisher",
"planDisplayName": "Test Plan"
},
"plan": {
"name": "addesai-plan",
"name": "test-plan",
"product": "test",
"publisher": "marketplace-test",
"version": "1.0.0"
},
"id": "/subscriptions/0afefe50-734e-4610-8a82-a144ahf49dea/providers/Microsoft.ManagedServices/registrationDefinitions/26c128c2-fefa-4340-9bb1-6e081c90ada2",
"type": "Microsoft.ManagedServices/registrationDefinitions",
"name": "26c128c2-fefa-4340-9bb1-6e081c90ada2"
"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"
}
]
}
Expand Down
73 changes: 71 additions & 2 deletions ...esource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
"200": {
"description": "OK - Returns the details of the marketplace registration definition.",
"schema": {
"$ref": "#/definitions/RegistrationDefinition"
"$ref": "#/definitions/MarketplaceRegistrationDefinition"
}
},
"default": {
Expand Down Expand Up @@ -779,13 +779,82 @@
},
"description": "List of registration assignments."
},
"MarketplaceRegistrationDefinition": {
"properties": {
"properties": {
"description": "Properties of a marketplace registration definition.",
"$ref": "#/definitions/MarketplaceRegistrationDefinitionProperties"
},
"plan": {
"description": "Plan details for the managed services.",
"$ref": "#/definitions/Plan"
},
"id": {
"readOnly": true,
"type": "string",
"description": "Fully qualified path of the marketplace registration definition."
},
"type": {
"readOnly": true,
"type": "string",
"description": "Type of the resource."
},
"name": {
"readOnly": true,
"type": "string",
"description": "Name of the marketplace registration definition."
}
},
"x-ms-azure-resource": true,
"type": "object"
},
"MarketplaceRegistrationDefinitionProperties": {
"properties": {
"managedByTenantId": {
"type": "string",
"description": "Id of the managedBy tenant."
},
"authorizations": {
"type": "array",
"items": {
"$ref": "#/definitions/Authorization"
},
"description": "Authorization tuple containing principal id of the user/security group or service principal and id of the build-in role."
},
"eligibleAuthorizations": {
"type": "array",
"items": {
"$ref": "#/definitions/EligibleAuthorization"
},
"description": "Eligible PIM authorization tuple containing principal id of the user/security group or service principal, id of the built-in role, and just-in-time access policy setting"
},
"offerDisplayName": {
"type": "string",
"description": "The marketplace offer display name."
},
"publisherDisplayName": {
"type": "string",
"description": "The marketplace publisher display name."
},
"planDisplayName": {
"type": "string",
"description": "The marketplace plan display name."
}
},
"required": [
"managedByTenantId",
"authorizations"
],
"type": "object",
"description": "Properties of a marketplace registration definition."
},
"MarketplaceRegistrationDefinitionList": {
"properties": {
"value": {
"type": "array",
"readOnly": true,
"items": {
"$ref": "#/definitions/RegistrationDefinition"
"$ref": "#/definitions/MarketplaceRegistrationDefinition"
},
"description": "List of marketplace registration definitions."
},
Expand Down
15 changes: 7 additions & 8 deletions ...soft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,26 @@
"200": {
"body": {
"properties": {
"description": "Test",
"managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc",
"registrationDefinitionName": "DefinitionName",
"authorizations": [
{
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
}
],
"provisioningState": "Succeeded",
"managedByTenantName": "Test Tenant"
"offerDisplayName": "Marketplace Test Offer",
"publisherDisplayName": "Marketplace Test Publisher",
"planDisplayName": "Test Plan"
},
"plan": {
"name": "addesai-plan",
"name": "test-plan",
"product": "test",
"publisher": "marketplace-test",
"version": "1.0.0"
},
"id": "/subscriptions/0afefe50-734e-4610-8a82-a144ahf49dea/providers/Microsoft.ManagedServices/registrationDefinitions/26c128c2-fefa-4340-9bb1-6e081c90ada2",
"type": "Microsoft.ManagedServices/registrationDefinitions",
"name": "26c128c2-fefa-4340-9bb1-6e081c90ada2"
"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"
}
}
}
Expand Down
15 changes: 7 additions & 8 deletions ...oft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,26 @@
"value": [
{
"properties": {
"description": "Test",
"managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc",
"registrationDefinitionName": "DefinitionName",
"authorizations": [
{
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
}
],
"provisioningState": "Succeeded",
"managedByTenantName": "Test Tenant"
"offerDisplayName": "Marketplace Test Offer",
"publisherDisplayName": "Marketplace Test Publisher",
"planDisplayName": "Test Plan"
},
"plan": {
"name": "addesai-plan",
"name": "test-plan",
"product": "test",
"publisher": "marketplace-test",
"version": "1.0.0"
},
"id": "/subscriptions/0afefe50-734e-4610-8a82-a144ahf49dea/providers/Microsoft.ManagedServices/registrationDefinitions/26c128c2-fefa-4340-9bb1-6e081c90ada2",
"type": "Microsoft.ManagedServices/registrationDefinitions",
"name": "26c128c2-fefa-4340-9bb1-6e081c90ada2"
"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"
}
]
}
Expand Down
66 changes: 64 additions & 2 deletions ...ervices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
"200": {
"description": "OK - Returns the details of the marketplace registration definition.",
"schema": {
"$ref": "#/definitions/RegistrationDefinition"
"$ref": "#/definitions/MarketplaceRegistrationDefinition"
}
},
"default": {
Expand Down Expand Up @@ -765,13 +765,75 @@
},
"description": "List of registration assignments."
},
"MarketplaceRegistrationDefinition": {
"properties": {
"properties": {
"description": "Properties of a marketplace registration definition.",
"$ref": "#/definitions/MarketplaceRegistrationDefinitionProperties"
},
"plan": {
"description": "Plan details for the managed services.",
"$ref": "#/definitions/Plan"
},
"id": {
"readOnly": true,
"type": "string",
"description": "Fully qualified path of the marketplace registration definition."
},
"type": {
"readOnly": true,
"type": "string",
"description": "Type of the resource."
},
"name": {
"readOnly": true,
"type": "string",
"description": "Name of the marketplace registration definition."
}
},
"x-ms-azure-resource": true,
"type": "object"
},
"MarketplaceRegistrationDefinitionProperties": {
"properties": {
"managedByTenantId": {
"type": "string",
"description": "Id of the managedBy tenant."
},
"authorizations": {
"type": "array",
"items": {
"$ref": "#/definitions/Authorization"
},
"description": "Authorization tuple containing principal id of the user/security group or service principal and id of the build-in role."
},
"offerDisplayName": {
"type": "string",
"description": "The marketplace offer display name."
},
"publisherDisplayName": {
"type": "string",
"description": "The marketplace publisher display name."
},
"planDisplayName": {
"type": "string",
"description": "The marketplace plan display name."
}
},
"required": [
"managedByTenantId",
"authorizations"
],
"type": "object",
"description": "Properties of a marketplace registration definition."
},
"MarketplaceRegistrationDefinitionList": {
"properties": {
"value": {
"type": "array",
"readOnly": true,
"items": {
"$ref": "#/definitions/RegistrationDefinition"
"$ref": "#/definitions/MarketplaceRegistrationDefinition"
},
"description": "List of marketplace registration definitions."
},
Expand Down