diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json index d85e52a4f545..be0edc4cc58e 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinition.json @@ -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" } } } diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json index 59623715d529..b511ed1128fd 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitions.json @@ -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" } ] } diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json index b3a19710450b..4c0da88970ae 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json @@ -444,7 +444,7 @@ "200": { "description": "OK - Returns the details of the marketplace registration definition.", "schema": { - "$ref": "#/definitions/RegistrationDefinition" + "$ref": "#/definitions/MarketplaceRegistrationDefinition" } }, "default": { @@ -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." }, diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json index a8d48818f2a0..7d81dfc342fb 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinition.json @@ -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" } } } diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json index 39127fd4a5d3..bd2d422e11eb 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitions.json @@ -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" } ] } diff --git a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json index e51fa6947178..308312c1b835 100644 --- a/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json +++ b/specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json @@ -444,7 +444,7 @@ "200": { "description": "OK - Returns the details of the marketplace registration definition.", "schema": { - "$ref": "#/definitions/RegistrationDefinition" + "$ref": "#/definitions/MarketplaceRegistrationDefinition" } }, "default": { @@ -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." },