[Hub Generated] Review request for Microsoft.CostManagement to add ve…

…rsion stable/2019-01-01 (#5612) * Remove management group scope for exports as we do not support it * Add scope parameter * syntax error fix * updated examples with scope param and fixed syntax error * fix scope param by removing '/' slash * fix sorting params * remove the direction param * fix direction param name and add missing example
Azure · Apr 12, 2019 · 6161229 · 6161229
1 parent 47618f6
commit 6161229
Show file tree

Hide file tree

Showing 51 changed files with 117 additions and 44 deletions.
diff --git a/...anagement/resource-manager/Microsoft.CostManagement/stable/2019-01-01/costmanagement.json b/...anagement/resource-manager/Microsoft.CostManagement/stable/2019-01-01/costmanagement.json
@@ -161,6 +161,9 @@
           },
           "ResourceGroupQuery": {
             "$ref": "./examples/ResourceGroupQuery.json"
+          },
+            "ResourceGroupQueryGrouping": {
+            "$ref": "./examples/ResourceGroupQueryGrouping.json"
           },
           "BillingAccountQuery": {
             "$ref": "./examples/BillingAccountQuery.json"
@@ -252,7 +255,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -300,7 +303,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -352,7 +355,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -419,7 +422,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -470,7 +473,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -521,7 +524,7 @@
         },
         "parameters": [
           {
-            "$ref": "#/parameters/scopeQueryParameter"
+            "$ref": "#/parameters/scopeExportsParameter"
           },
           {
             "$ref": "#/parameters/apiVersionParameter"
@@ -1344,7 +1347,16 @@
       "in": "path",
       "required": true,
       "type": "string",
-      "description": "The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope and '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope..",
+      "description": "The scope associated with query operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope and '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope..",
+      "x-ms-parameter-location": "method",
+      "x-ms-skip-url-encoding": true
+    },
+    "scopeExportsParameter": {
+      "name": "scope",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "The scope associated with export operations. This includes '/subscriptions/{subscriptionId}' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope and '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope.",
       "x-ms-parameter-location": "method",
       "x-ms-skip-url-encoding": true
     },

diff --git a/...ger/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsList.json b/...ger/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsList.json
@@ -1,7 +1,8 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
-    "billingAccountId": "100"
+    "billingAccountId": "100",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100"
   },
   "responses": {
     "200": {

diff --git a/...t.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListExpandAndTop.json b/...t.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListExpandAndTop.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "billingAccountId": "100",
     "$expand": "properties/data",
-    "$top": 5
+    "$top": 5,
+    "scope": "providers/Microsoft.Billing/billingAccounts/100"
   },
   "responses": {
     "200": {

diff --git a/...oft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListWithFilter.json b/...oft.CostManagement/stable/2019-01-01/examples/BillingAccountDimensionsListWithFilter.json
@@ -4,7 +4,8 @@
     "billingAccountId": "100",
     "$expand": "properties/data",
     "$top": 5,
-    "$filter": "properties/category eq 'resourceId'"
+    "$filter": "properties/category eq 'resourceId'",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100"
   },
   "responses": {
     "200": {

diff --git a/...urce-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQuery.json b/...urce-manager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQuery.json
@@ -2,6 +2,7 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
+    "scope": "providers/Microsoft.Billing/billingAccounts/70664866",
     "parameters":{
       "type": "Usage",
       "timeframe": "MonthToDate",

diff --git a/...ager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQueryGrouping.json b/...ager/Microsoft.CostManagement/stable/2019-01-01/examples/BillingAccountQueryGrouping.json
@@ -2,6 +2,7 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
+    "scope": "providers/Microsoft.Billing/billingAccounts/70664866",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",

diff --git a/...manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsList.json b/...manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsList.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "100",
-    "departmentId": "123"
+    "departmentId": "123",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123"
   },
   "responses": {
     "200": {

diff --git a/...osoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListExpandAndTop.json b/...osoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListExpandAndTop.json
@@ -4,7 +4,8 @@
     "billingAccountId": "100",
     "departmentId": "123",
     "$expand": "properties/data",
-    "$top": 5
+    "$top": 5,
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123"
   },
   "responses": {
     "200": {

diff --git a/...crosoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListWithFilter.json b/...crosoft.CostManagement/stable/2019-01-01/examples/DepartmentDimensionsListWithFilter.json
@@ -5,7 +5,8 @@
     "departmentId": "123",
     "$expand": "properties/data",
     "$top": 5,
-    "$filter": "properties/category eq 'resourceId'"
+    "$filter": "properties/category eq 'resourceId'",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123"
   },
   "responses": {
     "200": {

diff --git a/...resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQuery.json b/...resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQuery.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
     "departmentId": "123",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123",
     "parameters":{
       "type": "Usage",
       "timeframe": "MonthToDate",

diff --git a/...-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQueryGrouping.json b/...-manager/Microsoft.CostManagement/stable/2019-01-01/examples/DepartmentQueryGrouping.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
     "departmentId": "123",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/departments/123",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",

diff --git a/.../Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsList.json b/.../Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsList.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "100",
-    "enrollmentAccountId": "456"
+    "enrollmentAccountId": "456",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456"
   },
   "responses": {
     "200": {

diff --git a/...ostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListExpandAndTop.json b/...ostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListExpandAndTop.json
@@ -4,7 +4,8 @@
     "billingAccountId": "100",
     "enrollmentAccountId": "456",
     "$expand": "properties/data",
-    "$top": 5
+    "$top": 5,
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456"
   },
   "responses": {
     "200": {

diff --git a/....CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListWithFilter.json b/....CostManagement/stable/2019-01-01/examples/EnrollmentAccountDimensionsListWithFilter.json
@@ -5,7 +5,8 @@
     "enrollmentAccountId": "456",
     "$expand": "properties/data",
     "$top": 5,
-    "$filter": "properties/category eq 'resourceId'"
+    "$filter": "properties/category eq 'resourceId'",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456"
   },
   "responses": {
     "200": {

diff --git a/...e-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQuery.json b/...e-manager/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQuery.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
     "enrollmentAccountId": "456",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456",
     "parameters": {
       "type": "Usage",
       "timeframe": "MonthToDate",

diff --git a/...r/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQueryGrouping.json b/...r/Microsoft.CostManagement/stable/2019-01-01/examples/EnrollmentAccountQueryGrouping.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "70664866",
     "enrollmentAccountId": "456",
+    "scope": "providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456",
     "parameters":{
         "type": "Usage",
         "timeframe": "TheLastMonth",

diff --git a/...nagement/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/Export.json b/...nagement/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/Export.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "MYDEVTESTRG",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000"
   },
   "responses": {
     "200": {

diff --git a/...e-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByBillingAccount.json b/...e-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByBillingAccount.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "123456",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccount-Id}"
   },
   "responses": {
     "200": {

diff --git a/...ource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByDepartment.json b/...ource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByDepartment.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "departmentId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}"
   },
   "responses": {
     "200": {

diff --git a/...anager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByEnrollmentAccount.json b/...anager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportByEnrollmentAccount.json
@@ -1,8 +1,11 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "enrollmentAccountId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "id": "providers/Microsoft.Billing/billingAccounts/12/enrollmentAccounts/1234/providers/Microsoft.CostManagement/exports/TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}"
   },
   "responses": {
     "200": {

diff --git a/...rce-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdate.json b/...rce-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdate.json
@@ -4,6 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "MYDEVTESTRG",
     "exportName": "TestExport",
+    "scope": "subscriptions/00000000-0000-0000-0000-000000000000",
     "parameters": {
       "properties": {
         "schedule":{

diff --git a/...osoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByBillingAccount.json b/...osoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByBillingAccount.json
@@ -3,6 +3,7 @@
     "api-version": "2019-01-01",
     "billingAccountId": "123456",
     "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}",
     "parameters": {
       "properties": {
         "schedule":{

diff --git a/...Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByDepartment.json b/...Microsoft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByDepartment.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "departmentId": "1234",
     "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments",
     "parameters": {
       "properties": {
         "schedule":{

diff --git a/...ft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByEnrollmentAccount.json b/...ft.CostManagement/stable/2019-01-01/examples/ExportCreateOrUpdateByEnrollmentAccount.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "enrollmentAccountId": "1234",
     "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}",
     "parameters": {
       "properties": {
         "schedule":{

diff --git a/...nt/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDelete.json b/...nt/resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDelete.json
@@ -3,7 +3,8 @@
     "api-version": "2019-01-01",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "MYDEVTESTRG",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "subscriptions/{subscriptionId}"
   },
   "responses": {
     "200": {

diff --git a/...ger/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByBillingAccount.json b/...ger/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByBillingAccount.json
@@ -2,7 +2,8 @@
   "parameters": {
     "api-version": "2019-01-01",
     "billingAccountId": "123456",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}"
   },
   "responses": {
     "200": {

diff --git a/...manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByDepartment.json b/...manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByDepartment.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "123456",
     "departmentId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}"
   },
   "responses": {
     "200": {

diff --git a/.../Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByEnrollmentAccount.json b/.../Microsoft.CostManagement/stable/2019-01-01/examples/ExportDeleteByEnrollmentAccount.json
@@ -1,8 +1,10 @@
 {
   "parameters": {
     "api-version": "2019-01-01",
+    "billingAccountId": "100",
     "enrollmentAccountId": "1234",
-    "exportName": "TestExport"
+    "exportName": "TestExport",
+    "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}"
   },
   "responses": {
     "200": {

diff --git a/...resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecution.json b/...resource-manager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecution.json
@@ -3,7 +3,8 @@
       "api-version": "2019-01-01",
       "subscriptionId": "00000000-0000-0000-0000-000000000000",
       "resourceGroupName": "MYDEVTESTRG",
-      "exportName": "TestExport"
+      "exportName": "TestExport",
+      "scope": "subscriptions/{subscriptionId}"
     },
     "responses": {
       "200": {

diff --git a/.../Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByBillingAccount.json b/.../Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByBillingAccount.json
@@ -2,7 +2,8 @@
     "parameters": {
       "api-version": "2019-01-01",
       "billingAccountId": "123456",
-      "exportName": "TestExport"
+      "exportName": "TestExport",
+      "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}"
     },
     "responses": {
       "200": {

diff --git a/...ager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByDepartment.json b/...ager/Microsoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByDepartment.json
@@ -1,8 +1,10 @@
 {
     "parameters": {
       "api-version": "2019-01-01",
+      "billingAccountId": "100",
       "departmentId": "1234",
-      "exportName": "TestExport"
+      "exportName": "TestExport",
+      "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}"
     },
     "responses": {
       "200": {

diff --git a/...crosoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByEnrollmentAccount.json b/...crosoft.CostManagement/stable/2019-01-01/examples/ExportExecutionByEnrollmentAccount.json
@@ -1,8 +1,10 @@
 {
     "parameters": {
       "api-version": "2019-01-01",
+      "billingAccountId": "100",
       "enrollmentAccountId": "1234",
-      "exportName": "TestExport"
+      "exportName": "TestExport",
+      "scope": "providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}"
     },
     "responses": {
       "200": {