Skip to content

Commit d606d4b

Browse files
skayaniskayani
authored
Remove scope from marketplace registration definitions operations (#12397)
* Remove scope from marketplace registration definitions operations * Swagger fixes * Changed operation ids * Validation fixes * Unique x-ms-example names * Name fix for examples * Removed sub from example responses * Added empty eligibleAuths to 2020-02-01-preview MRD examples
1 parent 2f29e93 commit d606d4b

File tree

6 files changed

+328
-0
lines changed

6 files changed

+328
-0
lines changed

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitionAtTenantScope.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"parameters": {
3+
"marketplaceIdentifier": "publisher.product.planName.version",
4+
"api-version": "2020-02-01-preview"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"properties": {
10+
"managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc",
11+
"authorizations": [
12+
{
13+
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
14+
"principalIdDisplayName": "Support User",
15+
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
16+
},
17+
{
18+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
19+
"principalIdDisplayName": "User Access Administrator",
20+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
21+
"delegatedRoleDefinitionIds": [
22+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
23+
]
24+
}
25+
],
26+
"eligibleAuthorizations": [],
27+
"offerDisplayName": "Marketplace Test Offer",
28+
"publisherDisplayName": "Marketplace Test Publisher",
29+
"planDisplayName": "Test Plan"
30+
},
31+
"plan": {
32+
"name": "test-plan",
33+
"product": "test",
34+
"publisher": "marketplace-test",
35+
"version": "1.0.0"
36+
},
37+
"id": "/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/marketplace-test.test.test-plan.1.0.0",
38+
"type": "Microsoft.ManagedServices/marketplaceRegistrationDefinitions",
39+
"name": "marketplace-test.test.test-plan.1.0.0"
40+
}
41+
}
42+
}
43+
}

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/examples/GetMarketplaceRegistrationDefinitionsAtTenantScope.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"parameters": {
3+
"$filter": "planIdentifier eq 'publisher.offerIdentifier.planName.version'",
4+
"api-version": "2020-02-01-preview"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"value": [
10+
{
11+
"properties": {
12+
"managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc",
13+
"authorizations": [
14+
{
15+
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
16+
"principalIdDisplayName": "Support User",
17+
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
18+
},
19+
{
20+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
21+
"principalIdDisplayName": "User Access Administrator",
22+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
23+
"delegatedRoleDefinitionIds": [
24+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
25+
]
26+
}
27+
],
28+
"eligibleAuthorizations": [],
29+
"offerDisplayName": "Marketplace Test Offer",
30+
"publisherDisplayName": "Marketplace Test Publisher",
31+
"planDisplayName": "Test Plan"
32+
},
33+
"plan": {
34+
"name": "test-plan",
35+
"product": "test",
36+
"publisher": "marketplace-test",
37+
"version": "1.0.0"
38+
},
39+
"id": "/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/marketplace-test.test.test-plan.1.0.0",
40+
"type": "Microsoft.ManagedServices/marketplaceRegistrationDefinitions",
41+
"name": "marketplace-test.test.test-plan.1.0.0"
42+
}
43+
]
44+
}
45+
}
46+
}
47+
}

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/preview/2020-02-01-preview/managedservices.json‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,45 @@
422422
}
423423
}
424424
},
425+
"/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions": {
426+
"get": {
427+
"tags": [
428+
"MarketplaceRegistrationDefinitions"
429+
],
430+
"operationId": "MarketplaceRegistrationDefinitionsWithoutScope_List",
431+
"description": "Gets a list of the marketplace registration definitions for the marketplace identifier.",
432+
"parameters": [
433+
{
434+
"$ref": "#/parameters/Filter"
435+
},
436+
{
437+
"$ref": "#/parameters/ApiVersionParameter"
438+
}
439+
],
440+
"responses": {
441+
"200": {
442+
"description": "OK - Returns a list of the marketplace registration definitions.",
443+
"schema": {
444+
"$ref": "#/definitions/MarketplaceRegistrationDefinitionList"
445+
}
446+
},
447+
"default": {
448+
"description": "Error response describing why the operation failed.",
449+
"schema": {
450+
"$ref": "#/definitions/ErrorResponse"
451+
}
452+
}
453+
},
454+
"x-ms-pageable": {
455+
"nextLinkName": "nextLink"
456+
},
457+
"x-ms-examples": {
458+
"Get Marketplace Registration Definitions At Tenant Scope": {
459+
"$ref": "./examples/GetMarketplaceRegistrationDefinitionsAtTenantScope.json"
460+
}
461+
}
462+
}
463+
},
425464
"/{scope}/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/{marketplaceIdentifier}": {
426465
"get": {
427466
"tags": [
@@ -461,6 +500,42 @@
461500
}
462501
}
463502
},
503+
"/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/{marketplaceIdentifier}": {
504+
"get": {
505+
"tags": [
506+
"MarketplaceRegistrationDefinitions"
507+
],
508+
"operationId": "MarketplaceRegistrationDefinitionsWithoutScope_Get",
509+
"description": "Get the marketplace registration definition for the marketplace identifier.",
510+
"parameters": [
511+
{
512+
"$ref": "#/parameters/MarketplaceIdentifier"
513+
},
514+
{
515+
"$ref": "#/parameters/ApiVersionParameter"
516+
}
517+
],
518+
"responses": {
519+
"200": {
520+
"description": "OK - Returns the details of the marketplace registration definition.",
521+
"schema": {
522+
"$ref": "#/definitions/MarketplaceRegistrationDefinition"
523+
}
524+
},
525+
"default": {
526+
"description": "Error response describing why the operation failed.",
527+
"schema": {
528+
"$ref": "#/definitions/ErrorResponse"
529+
}
530+
}
531+
},
532+
"x-ms-examples": {
533+
"Get Marketplace Registration Definition At Tenant Scope": {
534+
"$ref": "./examples/GetMarketplaceRegistrationDefinitionAtTenantScope.json"
535+
}
536+
}
537+
}
538+
},
464539
"/providers/Microsoft.ManagedServices/operations": {
465540
"get": {
466541
"tags": [

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitionAtTenantScope.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"parameters": {
3+
"marketplaceIdentifier": "publisher.product.planName.version",
4+
"api-version": "2019-09-01"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"properties": {
10+
"managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc",
11+
"authorizations": [
12+
{
13+
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
14+
"principalIdDisplayName": "Support User",
15+
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
16+
},
17+
{
18+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
19+
"principalIdDisplayName": "User Access Administrator",
20+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
21+
"delegatedRoleDefinitionIds": [
22+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
23+
]
24+
}
25+
],
26+
"offerDisplayName": "Marketplace Test Offer",
27+
"publisherDisplayName": "Marketplace Test Publisher",
28+
"planDisplayName": "Test Plan"
29+
},
30+
"plan": {
31+
"name": "test-plan",
32+
"product": "test",
33+
"publisher": "marketplace-test",
34+
"version": "1.0.0"
35+
},
36+
"id": "/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/marketplace-test.test.test-plan.1.0.0",
37+
"type": "Microsoft.ManagedServices/marketplaceRegistrationDefinitions",
38+
"name": "marketplace-test.test.test-plan.1.0.0"
39+
}
40+
}
41+
}
42+
}

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/examples/GetMarketplaceRegistrationDefinitionsAtTenantScope.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"parameters": {
3+
"$filter": "planIdentifier eq 'publisher.offerIdentifier.planName.version'",
4+
"api-version": "2019-09-01"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"value": [
10+
{
11+
"properties": {
12+
"managedByTenantId": "83ace5cd-bcc3-441a-hd86-e6a75360cecc",
13+
"authorizations": [
14+
{
15+
"principalId": "f98g86a2-4cc4-4e6d-ad47-b3e80a1bcdfc",
16+
"principalIdDisplayName": "Support User",
17+
"roleDefinitionId": "acdd72a7-3385-48ef-bd42-f606fba81ae7"
18+
},
19+
{
20+
"principalId": "f98d86a2-4cc4-4e9d-ad47-b3e80a1bcdfc",
21+
"principalIdDisplayName": "User Access Administrator",
22+
"roleDefinitionId": "18d7d88d-d35e-4fb5-a5c3-7773c20a72d9",
23+
"delegatedRoleDefinitionIds": [
24+
"b24988ac-6180-42a0-ab88-20f7382dd24c"
25+
]
26+
}
27+
],
28+
"offerDisplayName": "Marketplace Test Offer",
29+
"publisherDisplayName": "Marketplace Test Publisher",
30+
"planDisplayName": "Test Plan"
31+
},
32+
"plan": {
33+
"name": "test-plan",
34+
"product": "test",
35+
"publisher": "marketplace-test",
36+
"version": "1.0.0"
37+
},
38+
"id": "/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/marketplace-test.test.test-plan.1.0.0",
39+
"type": "Microsoft.ManagedServices/marketplaceRegistrationDefinitions",
40+
"name": "marketplace-test.test.test-plan.1.0.0"
41+
}
42+
]
43+
}
44+
}
45+
}
46+
}

‎specification/managedservices/resource-manager/Microsoft.ManagedServices/stable/2019-09-01/managedservices.json‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,45 @@
422422
}
423423
}
424424
},
425+
"/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions": {
426+
"get": {
427+
"tags": [
428+
"MarketplaceRegistrationDefinitions"
429+
],
430+
"operationId": "MarketplaceRegistrationDefinitionsWithoutScope_List",
431+
"description": "Gets a list of the marketplace registration definitions for the marketplace identifier.",
432+
"parameters": [
433+
{
434+
"$ref": "#/parameters/Filter"
435+
},
436+
{
437+
"$ref": "#/parameters/ApiVersionParameter"
438+
}
439+
],
440+
"responses": {
441+
"200": {
442+
"description": "OK - Returns a list of the marketplace registration definitions.",
443+
"schema": {
444+
"$ref": "#/definitions/MarketplaceRegistrationDefinitionList"
445+
}
446+
},
447+
"default": {
448+
"description": "Error response describing why the operation failed.",
449+
"schema": {
450+
"$ref": "#/definitions/ErrorResponse"
451+
}
452+
}
453+
},
454+
"x-ms-pageable": {
455+
"nextLinkName": "nextLink"
456+
},
457+
"x-ms-examples": {
458+
"Get Marketplace Registration Definitions At Tenant Scope": {
459+
"$ref": "./examples/GetMarketplaceRegistrationDefinitionsAtTenantScope.json"
460+
}
461+
}
462+
}
463+
},
425464
"/{scope}/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/{marketplaceIdentifier}": {
426465
"get": {
427466
"tags": [
@@ -461,6 +500,42 @@
461500
}
462501
}
463502
},
503+
"/providers/Microsoft.ManagedServices/marketplaceRegistrationDefinitions/{marketplaceIdentifier}": {
504+
"get": {
505+
"tags": [
506+
"MarketplaceRegistrationDefinitions"
507+
],
508+
"operationId": "MarketplaceRegistrationDefinitionsWithoutScope_Get",
509+
"description": "Get the marketplace registration definition for the marketplace identifier.",
510+
"parameters": [
511+
{
512+
"$ref": "#/parameters/MarketplaceIdentifier"
513+
},
514+
{
515+
"$ref": "#/parameters/ApiVersionParameter"
516+
}
517+
],
518+
"responses": {
519+
"200": {
520+
"description": "OK - Returns the details of the marketplace registration definition.",
521+
"schema": {
522+
"$ref": "#/definitions/MarketplaceRegistrationDefinition"
523+
}
524+
},
525+
"default": {
526+
"description": "Error response describing why the operation failed.",
527+
"schema": {
528+
"$ref": "#/definitions/ErrorResponse"
529+
}
530+
}
531+
},
532+
"x-ms-examples": {
533+
"Get Marketplace Registration Definition At Tenant Scope": {
534+
"$ref": "./examples/GetMarketplaceRegistrationDefinitionAtTenantScope.json"
535+
}
536+
}
537+
}
538+
},
464539
"/providers/Microsoft.ManagedServices/operations": {
465540
"get": {
466541
"tags": [

0 commit comments

Comments
 (0)