From 1ef92eb20427bdcd1572f83a057ac157d051aaff Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 30 Nov 2018 23:13:30 +0000 Subject: [PATCH 1/2] Generated from 745775542191ef46134d5818e4ad769160c81256 [Please do not merge] Adding provisionAfterExtensions property for extension sequencing --- packages/@azure/arm-compute/LICENSE.txt | 42 ++--- packages/@azure/arm-compute/README.md | 173 ++++++++---------- .../lib/computeManagementClient.ts | 2 +- .../lib/computeManagementClientContext.ts | 4 +- .../@azure/arm-compute/lib/models/index.ts | 19 +- .../@azure/arm-compute/lib/models/mappers.ts | 37 +++- .../arm-compute/lib/models/parameters.ts | 2 +- .../lib/operations/availabilitySets.ts | 2 +- .../lib/operations/containerServices.ts | 4 +- .../arm-compute/lib/operations/disks.ts | 4 +- .../arm-compute/lib/operations/galleries.ts | 4 +- .../lib/operations/galleryImageVersions.ts | 4 +- .../lib/operations/galleryImages.ts | 4 +- .../arm-compute/lib/operations/images.ts | 4 +- .../lib/operations/logAnalytics.ts | 4 +- .../arm-compute/lib/operations/operations.ts | 2 +- .../lib/operations/resourceSkus.ts | 2 +- .../arm-compute/lib/operations/snapshots.ts | 4 +- .../lib/operations/usageOperations.ts | 2 +- .../virtualMachineExtensionImages.ts | 2 +- .../operations/virtualMachineExtensions.ts | 4 +- .../lib/operations/virtualMachineImages.ts | 2 +- .../operations/virtualMachineRunCommands.ts | 2 +- .../virtualMachineScaleSetExtensions.ts | 4 +- .../virtualMachineScaleSetRollingUpgrades.ts | 4 +- .../operations/virtualMachineScaleSetVMs.ts | 4 +- .../lib/operations/virtualMachineScaleSets.ts | 4 +- .../lib/operations/virtualMachineSizes.ts | 2 +- .../lib/operations/virtualMachines.ts | 4 +- packages/@azure/arm-compute/package.json | 4 +- packages/@azure/arm-compute/rollup.config.js | 6 +- packages/@azure/arm-compute/tsconfig.json | 2 +- 32 files changed, 196 insertions(+), 167 deletions(-) diff --git a/packages/@azure/arm-compute/LICENSE.txt b/packages/@azure/arm-compute/LICENSE.txt index a70e8cf66038..5431ba98b936 100644 --- a/packages/@azure/arm-compute/LICENSE.txt +++ b/packages/@azure/arm-compute/LICENSE.txt @@ -1,21 +1,21 @@ -The MIT License (MIT) - -Copyright (c) 2018 Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +The MIT License (MIT) + +Copyright (c) 2018 Microsoft + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/packages/@azure/arm-compute/README.md b/packages/@azure/arm-compute/README.md index 869b746e589a..4a9e3f7e4b45 100644 --- a/packages/@azure/arm-compute/README.md +++ b/packages/@azure/arm-compute/README.md @@ -1,96 +1,77 @@ -## Azure ComputeManagementClient SDK for JavaScript - -This package contains an isomorphic SDK for ComputeManagementClient. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install - -``` -npm install @azure/arm-compute -``` - -### How to use - -#### nodejs - Authentication, client creation and list operations as an example written in TypeScript. - -##### Install @azure/ms-rest-nodeauth - -``` -npm install @azure/ms-rest-nodeauth -``` - -##### Sample code - -```ts -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; -import { ComputeManagementClient, ComputeManagementModels, ComputeManagementMappers } from "@azure/arm-compute"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new ComputeManagementClient(creds, subscriptionId); - client.operations.list().then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -#### browser - Authentication, client creation and list operations as an example written in JavaScript. - -##### Install @azure/ms-rest-browserauth - -``` -npm install @azure/ms-rest-browserauth -``` - -##### Sample code - -See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - -- index.html -```html - - - - @azure/arm-compute sample - - - - - - - - -``` - -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Azure ComputeManagementClient SDK for JavaScript +This package contains an isomorphic SDK for ComputeManagementClient. + +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript + +## How to Install +``` +npm install @azure/arm-compute +``` + + +## How to use + +### nodejs - Authentication, client creation and list operations as an example written in TypeScript. + +```ts +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; +import { ComputeManagementClient, ComputeManagementModels, ComputeManagementMappers } from "@azure/arm-compute"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new ComputeManagementClient(creds, subscriptionId); + client.operations.list().then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +### browser - Authentication, client creation and list operations as an example written in JavaScript. +See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. + +- index.html +```html + + + + @azure/arm-compute sample + + + + + + + + + +``` + +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-compute/lib/computeManagementClient.ts b/packages/@azure/arm-compute/lib/computeManagementClient.ts index 104bf5b43830..8f852c570d34 100644 --- a/packages/@azure/arm-compute/lib/computeManagementClient.ts +++ b/packages/@azure/arm-compute/lib/computeManagementClient.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; import * as operations from "./operations"; diff --git a/packages/@azure/arm-compute/lib/computeManagementClientContext.ts b/packages/@azure/arm-compute/lib/computeManagementClientContext.ts index 714bc8dbc81e..226d4923b85f 100644 --- a/packages/@azure/arm-compute/lib/computeManagementClientContext.ts +++ b/packages/@azure/arm-compute/lib/computeManagementClientContext.ts @@ -9,8 +9,8 @@ */ import * as Models from "./models"; -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; const packageName = "@azure/arm-compute"; const packageVersion = "0.1.0"; diff --git a/packages/@azure/arm-compute/lib/models/index.ts b/packages/@azure/arm-compute/lib/models/index.ts index 1d3683439842..1d742dc366ed 100644 --- a/packages/@azure/arm-compute/lib/models/index.ts +++ b/packages/@azure/arm-compute/lib/models/index.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { BaseResource, CloudError, AzureServiceClientOptions } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export { BaseResource, CloudError }; @@ -445,6 +445,11 @@ export interface VirtualMachineExtension extends Resource { * machine extension instance view. */ instanceView?: VirtualMachineExtensionInstanceView; + /** + * @member {string[]} [provisionAfterExtensions] Collection of extension + * names after which this extension needs to be provisioned. + */ + provisionAfterExtensions?: string[]; } /** @@ -491,6 +496,11 @@ export interface VirtualMachineExtensionUpdate extends UpdateResource { * settings at all. */ protectedSettings?: any; + /** + * @member {string[]} [provisionAfterExtensions] Collection of extension + * names after which this extension needs to be provisioned. + */ + provisionAfterExtensions?: string[]; } /** @@ -3149,6 +3159,11 @@ export interface VirtualMachineScaleSetExtension extends SubResourceReadOnly { * the server.** */ readonly provisioningState?: string; + /** + * @member {string[]} [provisionAfterExtensions] Collection of extension + * names after which this extension needs to be provisioned. + */ + provisionAfterExtensions?: string[]; } /** diff --git a/packages/@azure/arm-compute/lib/models/mappers.ts b/packages/@azure/arm-compute/lib/models/mappers.ts index e3f6d324002a..052a243ee67e 100644 --- a/packages/@azure/arm-compute/lib/models/mappers.ts +++ b/packages/@azure/arm-compute/lib/models/mappers.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { CloudErrorMapper, BaseResourceMapper } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export const CloudError = CloudErrorMapper; export const BaseResource = BaseResourceMapper; @@ -575,6 +575,17 @@ export const VirtualMachineExtension: msRest.CompositeMapper = { name: "Composite", className: "VirtualMachineExtensionInstanceView" } + }, + provisionAfterExtensions: { + serializedName: "properties.provisionAfterExtensions", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } } } } @@ -628,6 +639,17 @@ export const VirtualMachineExtensionUpdate: msRest.CompositeMapper = { type: { name: "Object" } + }, + provisionAfterExtensions: { + serializedName: "properties.provisionAfterExtensions", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } } } } @@ -3785,6 +3807,17 @@ export const VirtualMachineScaleSetExtension: msRest.CompositeMapper = { type: { name: "String" } + }, + provisionAfterExtensions: { + serializedName: "properties.provisionAfterExtensions", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } } } } diff --git a/packages/@azure/arm-compute/lib/models/parameters.ts b/packages/@azure/arm-compute/lib/models/parameters.ts index 1efec3c6f215..f79efb6514d5 100644 --- a/packages/@azure/arm-compute/lib/models/parameters.ts +++ b/packages/@azure/arm-compute/lib/models/parameters.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; export const acceptLanguage: msRest.OperationParameter = { parameterPath: "acceptLanguage", diff --git a/packages/@azure/arm-compute/lib/operations/availabilitySets.ts b/packages/@azure/arm-compute/lib/operations/availabilitySets.ts index 29ea74283bc3..f702fdb0c8bd 100644 --- a/packages/@azure/arm-compute/lib/operations/availabilitySets.ts +++ b/packages/@azure/arm-compute/lib/operations/availabilitySets.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/availabilitySetsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/containerServices.ts b/packages/@azure/arm-compute/lib/operations/containerServices.ts index fb409253f04a..29963b9d7de5 100644 --- a/packages/@azure/arm-compute/lib/operations/containerServices.ts +++ b/packages/@azure/arm-compute/lib/operations/containerServices.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/containerServicesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/disks.ts b/packages/@azure/arm-compute/lib/operations/disks.ts index 97002da76ce8..035b6edfb23b 100644 --- a/packages/@azure/arm-compute/lib/operations/disks.ts +++ b/packages/@azure/arm-compute/lib/operations/disks.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/disksMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/galleries.ts b/packages/@azure/arm-compute/lib/operations/galleries.ts index 974eb128b68f..2bbd4ca1e6b9 100644 --- a/packages/@azure/arm-compute/lib/operations/galleries.ts +++ b/packages/@azure/arm-compute/lib/operations/galleries.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/galleriesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/galleryImageVersions.ts b/packages/@azure/arm-compute/lib/operations/galleryImageVersions.ts index 7e92617c0e45..5ee114d838f3 100644 --- a/packages/@azure/arm-compute/lib/operations/galleryImageVersions.ts +++ b/packages/@azure/arm-compute/lib/operations/galleryImageVersions.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/galleryImageVersionsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/galleryImages.ts b/packages/@azure/arm-compute/lib/operations/galleryImages.ts index f61ec5fc1cf2..8de9353ec96c 100644 --- a/packages/@azure/arm-compute/lib/operations/galleryImages.ts +++ b/packages/@azure/arm-compute/lib/operations/galleryImages.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/galleryImagesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/images.ts b/packages/@azure/arm-compute/lib/operations/images.ts index 6187e85ab7f9..5e6fbe8d71dc 100644 --- a/packages/@azure/arm-compute/lib/operations/images.ts +++ b/packages/@azure/arm-compute/lib/operations/images.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/imagesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/logAnalytics.ts b/packages/@azure/arm-compute/lib/operations/logAnalytics.ts index 3734f06d68aa..1ce24a0da64d 100644 --- a/packages/@azure/arm-compute/lib/operations/logAnalytics.ts +++ b/packages/@azure/arm-compute/lib/operations/logAnalytics.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/logAnalyticsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/operations.ts b/packages/@azure/arm-compute/lib/operations/operations.ts index 641f050bdd14..575096db9d1f 100644 --- a/packages/@azure/arm-compute/lib/operations/operations.ts +++ b/packages/@azure/arm-compute/lib/operations/operations.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/operationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/resourceSkus.ts b/packages/@azure/arm-compute/lib/operations/resourceSkus.ts index c5118454eadd..d22cc47ff938 100644 --- a/packages/@azure/arm-compute/lib/operations/resourceSkus.ts +++ b/packages/@azure/arm-compute/lib/operations/resourceSkus.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/resourceSkusMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/snapshots.ts b/packages/@azure/arm-compute/lib/operations/snapshots.ts index 5a5e9c9090c2..8e94975cec77 100644 --- a/packages/@azure/arm-compute/lib/operations/snapshots.ts +++ b/packages/@azure/arm-compute/lib/operations/snapshots.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/snapshotsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/usageOperations.ts b/packages/@azure/arm-compute/lib/operations/usageOperations.ts index b6cae3039867..f79ad9f61bc6 100644 --- a/packages/@azure/arm-compute/lib/operations/usageOperations.ts +++ b/packages/@azure/arm-compute/lib/operations/usageOperations.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/usageOperationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineExtensionImages.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineExtensionImages.ts index d429b13e72fe..cc962341d7f7 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineExtensionImages.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineExtensionImages.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineExtensionImagesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineExtensions.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineExtensions.ts index 289e3d3134e9..32f0e80a5d86 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineExtensions.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineExtensions.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineExtensionsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineImages.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineImages.ts index 0d2b8ffd1914..78bb4063341a 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineImages.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineImages.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineImagesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineRunCommands.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineRunCommands.ts index 134182cee58b..f47a7d714d0b 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineRunCommands.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineRunCommands.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineRunCommandsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetExtensions.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetExtensions.ts index ede0b80fda8d..76ce4bd3d834 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetExtensions.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetExtensions.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineScaleSetExtensionsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetRollingUpgrades.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetRollingUpgrades.ts index 77d3e791f36c..2fe9f46e6a65 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetRollingUpgrades.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetRollingUpgrades.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineScaleSetRollingUpgradesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetVMs.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetVMs.ts index a88fe0ec3aa5..e5e10bccf6a9 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetVMs.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSetVMs.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineScaleSetVMsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSets.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSets.ts index 871451f4dcd7..007c9586763a 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSets.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSets.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineScaleSetsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineSizes.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineSizes.ts index a5554fd0825b..cafa76168e26 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineSizes.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineSizes.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachineSizesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachines.ts b/packages/@azure/arm-compute/lib/operations/virtualMachines.ts index 0afa912f29f6..6d2d626b30d4 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachines.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachines.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/virtualMachinesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-compute/package.json b/packages/@azure/arm-compute/package.json index 097cb976f055..d1b3f6e68bf3 100644 --- a/packages/@azure/arm-compute/package.json +++ b/packages/@azure/arm-compute/package.json @@ -4,8 +4,8 @@ "description": "ComputeManagementClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", + "ms-rest-azure-js": "^1.0.181", + "ms-rest-js": "^1.0.460", "tslib": "^1.9.3" }, "keywords": [ diff --git a/packages/@azure/arm-compute/rollup.config.js b/packages/@azure/arm-compute/rollup.config.js index be3dd3556db7..c92f8d73cf6a 100644 --- a/packages/@azure/arm-compute/rollup.config.js +++ b/packages/@azure/arm-compute/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/computeManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/arm-compute.js", format: "umd", name: "Azure.ArmCompute", sourcemap: true, globals: { - "@azure/ms-rest-js": "msRest", - "@azure/ms-rest-azure-js": "msRestAzure" + "ms-rest-js": "msRest", + "ms-rest-azure-js": "msRestAzure" }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/@azure/arm-compute/tsconfig.json b/packages/@azure/arm-compute/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/arm-compute/tsconfig.json +++ b/packages/@azure/arm-compute/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] } From c8d7251e45080fb8d73c7b28d9b43604fa9e3827 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 4 Dec 2018 20:23:34 +0000 Subject: [PATCH 2/2] Generated from a42c17f43e37db2f5149748c57dfbbb9522e1731 Adding provisionAfterExtensions property for extension sequencing --- .../@azure/arm-compute/lib/models/index.ts | 79 ++++++++----------- .../@azure/arm-compute/lib/models/mappers.ts | 22 ------ .../lib/operations/virtualMachineScaleSets.ts | 8 +- .../lib/operations/virtualMachines.ts | 6 +- 4 files changed, 43 insertions(+), 72 deletions(-) diff --git a/packages/@azure/arm-compute/lib/models/index.ts b/packages/@azure/arm-compute/lib/models/index.ts index 1d742dc366ed..8b22fc2ccd20 100644 --- a/packages/@azure/arm-compute/lib/models/index.ts +++ b/packages/@azure/arm-compute/lib/models/index.ts @@ -172,7 +172,7 @@ export interface Resource extends BaseResource { * set are allocated to different nodes to maximize availability. For more * information about availability sets, see [Manage the availability of virtual * machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). - *

For more information on Azure planned maintainance, see [Planned + *

For more information on Azure planned maintenance, see [Planned * maintenance for virtual machines in * Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) *

Currently, a VM can only be added to availability set at creation @@ -445,11 +445,6 @@ export interface VirtualMachineExtension extends Resource { * machine extension instance view. */ instanceView?: VirtualMachineExtensionInstanceView; - /** - * @member {string[]} [provisionAfterExtensions] Collection of extension - * names after which this extension needs to be provisioned. - */ - provisionAfterExtensions?: string[]; } /** @@ -496,11 +491,6 @@ export interface VirtualMachineExtensionUpdate extends UpdateResource { * settings at all. */ protectedSettings?: any; - /** - * @member {string[]} [provisionAfterExtensions] Collection of extension - * names after which this extension needs to be provisioned. - */ - provisionAfterExtensions?: string[]; } /** @@ -652,12 +642,13 @@ export interface Usage { /** * @interface * An interface representing VirtualMachineReimageParameters. - * Paramaters for Reimaging Virtual Machine. Default value for OSDisk : true. + * Parameters for Reimaging Virtual Machine. NOTE: Virtual Machine OS disk will + * always be reimaged * */ export interface VirtualMachineReimageParameters { /** - * @member {boolean} [tempDisk] Specified whether to reimage temp disk. + * @member {boolean} [tempDisk] Specifies whether to reimage temp disk. * Default value: false. */ tempDisk?: boolean; @@ -936,15 +927,15 @@ export interface VirtualHardDisk { /** * @interface * An interface representing DiffDiskSettings. - * Describes the parameters of differencing disk settings that can be be - * specified for operating system disk.

NOTE: The differencing disk - * settings can only be specified for managed disk. + * Describes the parameters of ephemeral disk settings that can be specified + * for operating system disk.

NOTE: The ephemeral disk settings can + * only be specified for managed disk. * */ export interface DiffDiskSettings { /** - * @member {DiffDiskOptions} [option] Specifies the differencing disk - * settings for operating system disk. Possible values include: 'Local' + * @member {DiffDiskOptions} [option] Specifies the ephemeral disk settings + * for operating system disk. Possible values include: 'Local' */ option?: DiffDiskOptions; } @@ -1019,8 +1010,8 @@ export interface OSDisk { */ writeAcceleratorEnabled?: boolean; /** - * @member {DiffDiskSettings} [diffDiskSettings] Specifies the differencing - * Disk Settings for the operating system disk used by the virtual machine. + * @member {DiffDiskSettings} [diffDiskSettings] Specifies the ephemeral Disk + * Settings for the operating system disk used by the virtual machine. */ diffDiskSettings?: DiffDiskSettings; /** @@ -1371,7 +1362,7 @@ export interface VaultCertificate { * LocalMachine account.

For Linux VMs, the certificate file is * placed under the /var/lib/waagent directory, with the file name * .crt for the X509 certificate file and - * .prv for private key. Both of these files are .pem + * .prv for private key. Both of these files are .pem * formatted. */ certificateStore?: string; @@ -1884,7 +1875,7 @@ export interface VirtualMachine extends Resource { * nodes to maximize availability. For more information about availability * sets, see [Manage the availability of virtual * machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). - *

For more information on Azure planned maintainance, see [Planned + *

For more information on Azure planned maintenance, see [Planned * maintenance for virtual machines in * Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) *

Currently, a VM can only be added to availability set at creation @@ -1998,7 +1989,7 @@ export interface VirtualMachineUpdate extends UpdateResource { * nodes to maximize availability. For more information about availability * sets, see [Manage the availability of virtual * machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). - *

For more information on Azure planned maintainance, see [Planned + *

For more information on Azure planned maintenance, see [Planned * maintenance for virtual machines in * Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) *

Currently, a VM can only be added to availability set at creation @@ -2546,9 +2537,9 @@ export interface VirtualMachineScaleSetOSDisk { */ createOption: DiskCreateOptionTypes; /** - * @member {DiffDiskSettings} [diffDiskSettings] Specifies the differencing - * Disk Settings for the operating system disk used by the virtual machine - * scale set. + * @member {DiffDiskSettings} [diffDiskSettings] Specifies the ephemeral disk + * Settings for the operating system disk used by the virtual machine scale + * set. */ diffDiskSettings?: DiffDiskSettings; /** @@ -2738,7 +2729,7 @@ export interface VirtualMachineScaleSetUpdateStorageProfile { export interface ApiEntityReference { /** * @member {string} [id] The ARM resource id in the form of - * /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/... + * /subscriptions/{SubscriptionId}/resourceGroups/{ResourceGroupName}/... */ id?: string; } @@ -3344,7 +3335,7 @@ export interface VirtualMachineScaleSet extends Resource { */ singlePlacementGroup?: boolean; /** - * @member {boolean} [zoneBalance] Whether to force stictly even Virtual + * @member {boolean} [zoneBalance] Whether to force strictly even Virtual * Machine distribution cross x-zones in case there is zone outage. */ zoneBalance?: boolean; @@ -3795,7 +3786,7 @@ export interface UpgradeOperationHistoricalStatusInfoProperties { */ readonly runningStatus?: UpgradeOperationHistoryStatus; /** - * @member {RollingUpgradeProgressInfo} [progress] Counts of the VM's in each + * @member {RollingUpgradeProgressInfo} [progress] Counts of the VMs in each * state. * **NOTE: This property will not be serialized. It can only be populated by * the server.** @@ -4019,7 +4010,7 @@ export interface VirtualMachineScaleSetVM extends Resource { * nodes to maximize availability. For more information about availability * sets, see [Manage the availability of virtual * machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). - *

For more information on Azure planned maintainance, see [Planned + *

For more information on Azure planned maintenance, see [Planned * maintenance for virtual machines in * Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) *

Currently, a VM can only be added to availability set at creation @@ -4193,8 +4184,8 @@ export interface LogAnalyticsInputBase { */ groupByThrottlePolicy?: boolean; /** - * @member {boolean} [groupByOperationName] Group query result by by - * Operation Name. + * @member {boolean} [groupByOperationName] Group query result by Operation + * Name. */ groupByOperationName?: boolean; /** @@ -4453,7 +4444,7 @@ export interface ResourceSkuCosts { /** * @interface * An interface representing ResourceSkuCapabilities. - * Describes The SKU capabilites object. + * Describes The SKU capabilities object. * */ export interface ResourceSkuCapabilities { @@ -4726,7 +4717,7 @@ export interface CreationData { /** * @interface * An interface representing SourceVault. - * The vault id is an Azure Resource Manager Resoure id in the form + * The vault id is an Azure Resource Manager Resource id in the form * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName} * */ @@ -5090,7 +5081,7 @@ export interface GalleryIdentifier { export interface Gallery extends Resource { /** * @member {string} [description] The description of this Shared Image - * Gallery resource. This property is updateable. + * Gallery resource. This property is updatable. */ description?: string; /** @@ -5151,7 +5142,7 @@ export interface ResourceRange { * @interface * An interface representing RecommendedMachineConfiguration. * The properties describe the recommended machine configuration for this Image - * Definition. These properties are updateable. + * Definition. These properties are updatable. * */ export interface RecommendedMachineConfiguration { @@ -5211,7 +5202,7 @@ export interface ImagePurchasePlan { export interface GalleryImage extends Resource { /** * @member {string} [description] The description of this gallery Image - * Definition resource. This property is updateable. + * Definition resource. This property is updatable. */ description?: string; /** @@ -5243,7 +5234,7 @@ export interface GalleryImage extends Resource { /** * @member {Date} [endOfLifeDate] The end of life date of the gallery Image * Definition. This property can be used for decommissioning purposes. This - * property is updateable. + * property is updatable. */ endOfLifeDate?: Date; /** @@ -5282,7 +5273,7 @@ export interface GalleryImage extends Resource { export interface GalleryArtifactPublishingProfileBase { /** * @member {TargetRegion[]} [targetRegions] The target regions where the - * Image Version is going to be replicated to. This property is updateable. + * Image Version is going to be replicated to. This property is updatable. */ targetRegions?: TargetRegion[]; /** @@ -5303,7 +5294,7 @@ export interface GalleryImageVersionPublishingProfile extends GalleryArtifactPub * @member {number} [replicaCount] The number of replicas of the Image * Version to be created per region. This property would take effect for a * region when regionalReplicaCount is not specified. This property is - * updateable. + * updatable. */ replicaCount?: number; /** @@ -5322,7 +5313,7 @@ export interface GalleryImageVersionPublishingProfile extends GalleryArtifactPub /** * @member {Date} [endOfLifeDate] The end of life date of the gallery Image * Version. This property can be used for decommissioning purposes. This - * property is updateable. + * property is updatable. */ endOfLifeDate?: Date; } @@ -5508,7 +5499,7 @@ export interface TargetRegion { name: string; /** * @member {number} [regionalReplicaCount] The number of replicas of the - * Image Version to be created per region. This property is updateable. + * Image Version to be created per region. This property is updatable. */ regionalReplicaCount?: number; } @@ -5606,7 +5597,7 @@ export interface ContainerServiceMasterProfile { */ dnsPrefix: string; /** - * @member {string} [fqdn] FDQN for the master. + * @member {string} [fqdn] FQDN for the master. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ @@ -5653,7 +5644,7 @@ export interface ContainerServiceAgentPoolProfile { */ dnsPrefix: string; /** - * @member {string} [fqdn] FDQN for the agent pool. + * @member {string} [fqdn] FQDN for the agent pool. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ diff --git a/packages/@azure/arm-compute/lib/models/mappers.ts b/packages/@azure/arm-compute/lib/models/mappers.ts index 052a243ee67e..bd863b4de001 100644 --- a/packages/@azure/arm-compute/lib/models/mappers.ts +++ b/packages/@azure/arm-compute/lib/models/mappers.ts @@ -575,17 +575,6 @@ export const VirtualMachineExtension: msRest.CompositeMapper = { name: "Composite", className: "VirtualMachineExtensionInstanceView" } - }, - provisionAfterExtensions: { - serializedName: "properties.provisionAfterExtensions", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } } } } @@ -639,17 +628,6 @@ export const VirtualMachineExtensionUpdate: msRest.CompositeMapper = { type: { name: "Object" } - }, - provisionAfterExtensions: { - serializedName: "properties.provisionAfterExtensions", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } } } } diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSets.ts b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSets.ts index 007c9586763a..34d1ebb35d10 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSets.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachineScaleSets.ts @@ -354,7 +354,9 @@ export class VirtualMachineScaleSets { } /** - * Reimages (upgrade the operating system) one or more virtual machines in a VM scale set. + * Reimages (upgrade the operating system) one or more virtual machines in a VM scale set which + * don't have a ephemeral OS disk, for virtual machines who have a ephemeral OS disk the virtual + * machine is reset to initial state. * @param resourceGroupName The name of the resource group. * @param vmScaleSetName The name of the VM scale set. * @param [options] The optional parameters @@ -633,7 +635,9 @@ export class VirtualMachineScaleSets { } /** - * Reimages (upgrade the operating system) one or more virtual machines in a VM scale set. + * Reimages (upgrade the operating system) one or more virtual machines in a VM scale set which + * don't have a ephemeral OS disk, for virtual machines who have a ephemeral OS disk the virtual + * machine is reset to initial state. * @param resourceGroupName The name of the resource group. * @param vmScaleSetName The name of the VM scale set. * @param [options] The optional parameters diff --git a/packages/@azure/arm-compute/lib/operations/virtualMachines.ts b/packages/@azure/arm-compute/lib/operations/virtualMachines.ts index 6d2d626b30d4..bc38a5820f8b 100644 --- a/packages/@azure/arm-compute/lib/operations/virtualMachines.ts +++ b/packages/@azure/arm-compute/lib/operations/virtualMachines.ts @@ -365,8 +365,7 @@ export class VirtualMachines { } /** - * Reimages (upgrade the operating system) virtual machine. This operation is only supported for - * differencing OS disks. + * Reimages the virtual machine which has an ephemeral OS disk back to its initial state. * @param resourceGroupName The name of the resource group. * @param vmName The name of the virtual machine. * @param [options] The optional parameters @@ -593,8 +592,7 @@ export class VirtualMachines { } /** - * Reimages (upgrade the operating system) virtual machine. This operation is only supported for - * differencing OS disks. + * Reimages the virtual machine which has an ephemeral OS disk back to its initial state. * @param resourceGroupName The name of the resource group. * @param vmName The name of the virtual machine. * @param [options] The optional parameters