Merge pull request Azure#187 from Azure/restapi_auto_consumption/reso…

…urce-manager Regenerate arm-consumption
HarshaNalluru · Oct 15, 2018 · 1d8c662 · 1d8c662
2 parents 70d8723 + 872cf6b
commit 1d8c662
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 5 deletions.
diff --git a/packages/@azure/arm-consumption/dist/arm-consumption.js b/packages/@azure/arm-consumption/dist/arm-consumption.js
diff --git a/packages/@azure/arm-consumption/dist/arm-consumption.js.map b/packages/@azure/arm-consumption/dist/arm-consumption.js.map
diff --git a/packages/@azure/arm-consumption/dist/arm-consumption.min.js b/packages/@azure/arm-consumption/dist/arm-consumption.min.js
diff --git a/packages/@azure/arm-consumption/dist/arm-consumption.min.js.map b/packages/@azure/arm-consumption/dist/arm-consumption.min.js.map
diff --git a/packages/@azure/arm-consumption/lib/consumptionManagementClientContext.ts b/packages/@azure/arm-consumption/lib/consumptionManagementClientContext.ts
@@ -46,7 +46,7 @@ export class ConsumptionManagementClientContext extends msRestAzure.AzureService
     }
     super(credentials, options);
 
-    this.apiVersion = '2018-08-31';
+    this.apiVersion = '2018-10-01';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";

diff --git a/packages/@azure/arm-consumption/lib/models/index.ts b/packages/@azure/arm-consumption/lib/models/index.ts
@@ -1306,6 +1306,16 @@ export interface ManagementGroupAggregatedCostResult extends Resource {
    * management group
    */
   children?: ManagementGroupAggregatedCostResult[];
+  /**
+   * @member {string[]} [includedSubscriptions] List of subscription Guids
+   * included in the calculation of aggregated cost
+   */
+  includedSubscriptions?: string[];
+  /**
+   * @member {string[]} [excludedSubscriptions] List of subscription Guids
+   * excluded from the calculation of aggregated cost
+   */
+  excludedSubscriptions?: string[];
 }
 
 /**

diff --git a/packages/@azure/arm-consumption/lib/models/mappers.ts b/packages/@azure/arm-consumption/lib/models/mappers.ts
@@ -1546,6 +1546,28 @@ export const ManagementGroupAggregatedCostResult: msRest.CompositeMapper = {
             }
           }
         }
+      },
+      includedSubscriptions: {
+        serializedName: "properties.includedSubscriptions",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      excludedSubscriptions: {
+        serializedName: "properties.excludedSubscriptions",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
       }
     }
   }