Skip to content

Commit 48ef7a0

Browse files
ms-premphovsepm
ms-premp
authored and
hovsepm
committed
Fixing examples and adding missed properties (#4053)
* Fixing examples and adding missed properties * Incorporating review comments
1 parent 338c407 commit 48ef7a0

27 files changed

+667
-107
lines changed

‎run‎

Whitespace-only changes.

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-05-31/costmanagement.json‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,37 @@
772772
},
773773
"x-ms-pageable": {
774774
"nextLinkName": null
775+
}
776+
}
777+
},
778+
"/providers/Microsoft.CostManagement/operations": {
779+
"get": {
780+
"tags": [
781+
"Operations"
782+
],
783+
"operationId": "Operations_List",
784+
"description": "Lists all of the available consumption REST API operations.",
785+
"parameters": [
786+
{
787+
"$ref": "#/parameters/apiVersionParameter"
788+
}
789+
],
790+
"responses": {
791+
"200": {
792+
"description": "OK. The request has succeeded.",
793+
"schema": {
794+
"$ref": "#/definitions/OperationListResult"
795+
}
796+
},
797+
"default": {
798+
"description": "Error response describing why the operation failed.",
799+
"schema": {
800+
"$ref": "#/definitions/ErrorResponse"
801+
}
802+
}
803+
},
804+
"x-ms-pageable": {
805+
"nextLinkName": "nextLink"
775806
}
776807
}
777808
}
@@ -1335,6 +1366,55 @@
13351366
"type": "string"
13361367
}
13371368
}
1369+
},
1370+
"OperationListResult": {
1371+
"description": "Result of listing cost management operations. It contains a list of operations and a URL link to get the next set of results.",
1372+
"properties": {
1373+
"value": {
1374+
"description": "List of cost management operations supported by the Microsoft.CostManagement resource provider.",
1375+
"type": "array",
1376+
"readOnly": true,
1377+
"items": {
1378+
"$ref": "#/definitions/Operation"
1379+
}
1380+
},
1381+
"nextLink": {
1382+
"description": "URL to get the next set of operation list results if there are any.",
1383+
"type": "string",
1384+
"readOnly": true
1385+
}
1386+
}
1387+
},
1388+
"Operation": {
1389+
"description": "A Cost management REST API operation.",
1390+
"type": "object",
1391+
"properties": {
1392+
"name": {
1393+
"description": "Operation name: {provider}/{resource}/{operation}.",
1394+
"type": "string",
1395+
"readOnly": true
1396+
},
1397+
"display": {
1398+
"description": "The object that represents the operation.",
1399+
"properties": {
1400+
"provider": {
1401+
"description": "Service provider: Microsoft.CostManagement.",
1402+
"type": "string",
1403+
"readOnly": true
1404+
},
1405+
"resource": {
1406+
"description": "Resource on which the operation is performed: Dimensions, Query.",
1407+
"type": "string",
1408+
"readOnly": true
1409+
},
1410+
"operation": {
1411+
"description": "Operation type: Read, write, delete, etc.",
1412+
"type": "string",
1413+
"readOnly": true
1414+
}
1415+
}
1416+
}
1417+
}
13381418
}
13391419
},
13401420
"parameters": {

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-05-31/examples/BillingAccountDimensionsListExpandAndTop.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"api-version": "2018-05-31",
44
"billingAccountId": "100",
55
"$expand": "properties/data",
6-
"$top": "5"
6+
"$top": 5
77
},
88
"responses": {
99
"200": {

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-05-31/examples/BillingAccountDimensionsListWithFilter.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"api-version": "2018-05-31",
44
"billingAccountId": "100",
55
"$expand": "properties/data",
6-
"$top": "5",
6+
"$top": 5,
77
"$filter": "properties/category eq 'instanceId'"
88
},
99
"responses": {
@@ -16,10 +16,10 @@
1616
"type": "microsoft.consumption/dimensions",
1717
"properties": {
1818
"data": [
19-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/urphealthaccount",
20-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/srphytenaccount",
19+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/urphealthaccount",
20+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/srphytenaccount",
2121
"/subscriptions/67e24f6b-1ec2-4c90-993a-dc2d25b00b6c/resourcegroups/defaultresourcegroup-eus/providers/microsoft.operationalinsights/workspaces/defaultworkspace-67e24f6b-1ec2-4c90-993a-dc2d25b00b6c-eus",
22-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/rg-sql-ha/providers/microsoft.compute/virtualmachines/sql-4qqp1",
22+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg-sql-ha/providers/microsoft.compute/virtualmachines/sql-4qqp1",
2323
"/subscriptions/a98d6dc5-eb8f-46cf-8938-f1fb08f03706/resourcegroups/databricks-rg-testwsp-xijmsdubneexm/providers/microsoft.compute/disks/488cdb42bf74474a98075415be3f806c-containerrootvolume"
2424
],
2525
"total": 1409,

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-05-31/examples/ResourceGroupDimensionsList.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"parameters": {
33
"api-version": "2018-05-31",
4-
"subscriptionId": "39ae8bea-c3fd-4e24-8936-7c34974326ce",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
55
"resourceGroupName": "system.orlando",
66
"$expand": "properties/data",
7-
"$top": "5"
7+
"$top": 5
88
},
99
"responses": {
1010
"200": {
1111
"body": {
1212
"value": [
1313
{
14-
"id": "subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourceGroups/system.orlando/providers/microsoft.consumption/dimensions_ResourceType_2018-05-01_2018-05-31_5",
14+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/system.orlando/providers/microsoft.consumption/dimensions_ResourceType_2018-05-01_2018-05-31_5",
1515
"name": "dimensions_ResourceType_2018-05-01_2018-05-31_5",
1616
"type": "microsoft.consumption/dimensions",
1717
"properties": {
@@ -25,16 +25,16 @@
2525
}
2626
},
2727
{
28-
"id": "subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourceGroups/system.orlando/providers/microsoft.consumption/dimensions_InstanceId_2018-05-01_2018-05-31_5",
28+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/system.orlando/providers/microsoft.consumption/dimensions_InstanceId_2018-05-01_2018-05-31_5",
2929
"name": "dimensions_InstanceId_2018-05-01_2018-05-31_5",
3030
"type": "microsoft.consumption/dimensions",
3131
"properties": {
3232
"data": [
33-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/authprod",
34-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/systemevents",
35-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/armadminprod",
36-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/srphytenaccount",
37-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/publicsystemportal"
33+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/authprod",
34+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/systemevents",
35+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/armadminprod",
36+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/srphytenaccount",
37+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/publicsystemportal"
3838
],
3939
"total": 27,
4040
"category": "InstanceId",

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-05-31/examples/ResourceGroupQuery.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parameters": {
33
"api-version": "2018-05-31",
4-
"subscriptionId": "55312978-ba1b-415c-9304-c4b9c43c0481",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
55
"resourceGroupName": "ScreenSharingTest-peer",
66
"parameters":{
77
"type": "Usage",
@@ -60,7 +60,7 @@
6060
"body": {
6161
"value": [
6262
{
63-
"id": "subscriptions/55312978-ba1b-415c-9304-c4b9c43c0481/resourcegroups/ScreenSharingTest-peer/providers/Microsoft.CostManagement/Query/9af9459d-441d-4055-9ed0-83d4c4a363fb",
63+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/ScreenSharingTest-peer/providers/Microsoft.CostManagement/Query/9af9459d-441d-4055-9ed0-83d4c4a363fb",
6464
"name": "9af9459d-441d-4055-9ed0-83d4c4a363fb",
6565
"type": "microsoft.costmanagement/Query",
6666
"properties": {

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-05-31/examples/SubscriptionDimensionsList.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"parameters": {
33
"api-version": "2018-05-31",
4-
"subscriptionId": "39ae8bea-c3fd-4e24-8936-7c34974326ce",
5-
"$top": "5",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"$top": 5,
66
"$expand": "properties/data"
77
},
88
"responses": {
99
"200": {
1010
"body": {
1111
"value": [
1212
{
13-
"id": "subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/providers/Microsoft.Consumption/dimensions_ResourceGroup_2018-05-01_2018-05-31_5",
13+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/dimensions_ResourceGroup_2018-05-01_2018-05-31_5",
1414
"name": "dimensions_ResourceGroup_2018-05-01_2018-05-31_5",
1515
"type": "microsoft.consumption/dimensions",
1616
"properties": {
@@ -28,7 +28,7 @@
2828
}
2929
},
3030
{
31-
"id": "subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/providers/Microsoft.Consumption/dimensions_ResourceType_2018-05-01_2018-05-31_5",
31+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/dimensions_ResourceType_2018-05-01_2018-05-31_5",
3232
"name": "dimensions_ResourceType_2018-05-01_2018-05-31_5",
3333
"type": "microsoft.consumption/dimensions",
3434
"properties": {

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-05-31/examples/SubscriptionQuery.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parameters": {
33
"api-version": "2018-05-31",
4-
"subscriptionId": "55312978-ba1b-415c-9304-c6b9c43c0481",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
55
"parameters":{
66
"type": "Usage",
77
"timeframe": "MonthToDate",
@@ -59,7 +59,7 @@
5959
"body": {
6060
"value": [
6161
{
62-
"id": "subscriptions/55312978-ba1b-415c-9304-c6b9c43c0481/providers/Microsoft.CostManagement/Query/55312978-ba1b-415c-9304-c6b9c43c0481",
62+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.CostManagement/Query/00000000-0000-0000-0000-000000000000",
6363
"name": "55312978-ba1b-415c-9304-cfd9c43c0481",
6464
"type": "microsoft.costmanagement/Query",
6565
"properties": {

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-08-31/costmanagement.json‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,9 @@
517517
"x-ms-examples": {
518518
"SubscriptionQuery": {
519519
"$ref": "./examples/SubscriptionQuery.json"
520+
},
521+
"SubscriptionQueryGrouping": {
522+
"$ref": "./examples/SubscriptionQueryGrouping.json"
520523
}
521524
},
522525
"parameters": [
@@ -568,6 +571,9 @@
568571
"x-ms-examples": {
569572
"ResourceGroupQuery": {
570573
"$ref": "./examples/ResourceGroupQuery.json"
574+
},
575+
"ResourceGroupQueryGrouping": {
576+
"$ref": "./examples/ResourceGroupQueryGrouping.json"
571577
}
572578
},
573579
"parameters": [
@@ -622,6 +628,9 @@
622628
"x-ms-examples": {
623629
"BillingAccountQuery": {
624630
"$ref": "./examples/BillingAccountQuery.json"
631+
},
632+
"BillingAccountQueryGrouping": {
633+
"$ref": "./examples/BillingAccountQueryGrouping.json"
625634
}
626635
},
627636
"parameters": [
@@ -673,6 +682,9 @@
673682
"x-ms-examples": {
674683
"EnrollmentAccountQuery": {
675684
"$ref": "./examples/EnrollmentAccountQuery.json"
685+
},
686+
"EnrollmentAccountQueryGrouping": {
687+
"$ref": "./examples/EnrollmentAccountQueryGrouping.json"
676688
}
677689
},
678690
"parameters": [
@@ -727,6 +739,9 @@
727739
"x-ms-examples": {
728740
"DepartmentQuery": {
729741
"$ref": "./examples/DepartmentQuery.json"
742+
},
743+
"DepartmentQueryGrouping": {
744+
"$ref": "./examples/DepartmentQueryGrouping.json"
730745
}
731746
},
732747
"parameters": [
@@ -779,8 +794,11 @@
779794
"url": "https://docs.microsoft.com/en-us/rest/api/costmanagement/"
780795
},
781796
"x-ms-examples": {
782-
"ManagmentGroupQuery": {
797+
"ManagementGroupQuery": {
783798
"$ref": "./examples/ManagementGroupQuery.json"
799+
},
800+
"ManagementGroupQueryGrouping": {
801+
"$ref": "./examples/ManagementGroupQueryGrouping.json"
784802
}
785803
},
786804
"parameters": [
@@ -1002,6 +1020,13 @@
10021020
},
10031021
"maxItems": 2
10041022
},
1023+
"sorting": {
1024+
"description": "Array of order by expression to use in the report.",
1025+
"type": "array",
1026+
"items": {
1027+
"$ref": "#/definitions/ReportConfigSorting"
1028+
}
1029+
},
10051030
"filter": {
10061031
"type": "object",
10071032
"description": "Has filter expression to use in the report.",
@@ -1044,11 +1069,31 @@
10441069
"name",
10451070
"function"
10461071
]
1072+
},
1073+
"ReportConfigSorting": {
1074+
"description": "The order by expression to be used in the report.",
1075+
"properties": {
1076+
"direction": {
1077+
"description": "Direction of sort.",
1078+
"type": "string",
1079+
"enum": [
1080+
"Ascending",
1081+
"Descending"
1082+
]
1083+
},
1084+
"name": {
1085+
"description": "The name of the column to sort.",
1086+
"type": "string"
1087+
}
1088+
},
1089+
"required": [
1090+
"name"
1091+
]
10471092
},
10481093
"ReportConfigGrouping": {
10491094
"description": "The group by expression to be used in the report.",
10501095
"properties": {
1051-
"columnType": {
1096+
"type": {
10521097
"description": "Has type of the column to group.",
10531098
"$ref": "#/definitions/ReportConfigColumnType"
10541099
},
@@ -1058,7 +1103,7 @@
10581103
}
10591104
},
10601105
"required": [
1061-
"columnType",
1106+
"type",
10621107
"name"
10631108
]
10641109
},

‎specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2018-08-31/examples/BillingAccountDimensionsListWithFilter.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"type": "microsoft.consumption/dimensions",
1717
"properties": {
1818
"data": [
19-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/urphealthaccount",
20-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/srphytenaccount",
19+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/urphealthaccount",
20+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/srphytenaccount",
2121
"/subscriptions/67e24f6b-1ec2-4c90-993a-dc2d25b00b6c/resourcegroups/defaultresourcegroup-eus/providers/microsoft.operationalinsights/workspaces/defaultworkspace-67e24f6b-1ec2-4c90-993a-dc2d25b00b6c-eus",
22-
"/subscriptions/39ae8bea-c3fd-4e24-8936-7c34974326ce/resourcegroups/rg-sql-ha/providers/microsoft.compute/virtualmachines/sql-4qqp1",
22+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg-sql-ha/providers/microsoft.compute/virtualmachines/sql-4qqp1",
2323
"/subscriptions/a98d6dc5-eb8f-46cf-8938-f1fb08f03706/resourcegroups/databricks-rg-testwsp-xijmsdubneexm/providers/microsoft.compute/disks/488cdb42bf74474a98075415be3f806c-containerrootvolume"
2424
],
2525
"total": 1409,

0 commit comments

Comments
 (0)