diff --git a/packages/@azure/arm-batch/LICENSE.txt b/packages/@azure/arm-batch/LICENSE.txt index a70e8cf66038..8f3d856145c5 100644 --- a/packages/@azure/arm-batch/LICENSE.txt +++ b/packages/@azure/arm-batch/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) 2019 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-batch/README.md b/packages/@azure/arm-batch/README.md index 7b91cb429c22..e4b78e6c11a9 100644 --- a/packages/@azure/arm-batch/README.md +++ b/packages/@azure/arm-batch/README.md @@ -1,103 +1,100 @@ -## Azure BatchManagementClient SDK for JavaScript - -This package contains an isomorphic SDK for BatchManagementClient. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install - -``` -npm install @azure/arm-batch -``` - -### How to use - -#### nodejs - Authentication, client creation and get batchAccount 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 { BatchManagementClient, BatchManagementModels, BatchManagementMappers } from "@azure/arm-batch"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new BatchManagementClient(creds, subscriptionId); - const resourceGroupName = "testresourceGroupName"; - const accountName = "testaccountName"; - client.batchAccount.get(resourceGroupName, accountName).then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -#### browser - Authentication, client creation and get batchAccount 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-batch sample - - - - - - - - -``` - -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) - - -![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fpackages%2F%40azure%2Farm-batch%2FREADME.png) +## Azure BatchManagementClient SDK for JavaScript + +This package contains an isomorphic SDK for BatchManagementClient. + +### Currently supported environments + +- Node.js version 6.x.x or higher +- Browser JavaScript + +### How to Install + +```bash +npm install @azure/arm-batch +``` + +### How to use + +#### nodejs - Authentication, client creation and get batchAccount as an example written in TypeScript. + +##### Install @azure/ms-rest-nodeauth + +```bash +npm install @azure/ms-rest-nodeauth +``` + +##### Sample code + +```typescript +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 { BatchManagementClient, BatchManagementModels, BatchManagementMappers } from "@azure/arm-batch"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new BatchManagementClient(creds, subscriptionId); + const resourceGroupName = "testresourceGroupName"; + const accountName = "testaccountName"; + client.batchAccount.get(resourceGroupName, accountName).then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +#### browser - Authentication, client creation and get batchAccount as an example written in JavaScript. + +##### Install @azure/ms-rest-browserauth + +```bash +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-batch sample + + + + + + + + +``` + +## Related projects + +- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-batch/lib/batchManagementClientContext.ts b/packages/@azure/arm-batch/lib/batchManagementClientContext.ts index 0116fb7ba18f..4fc3db50e532 100644 --- a/packages/@azure/arm-batch/lib/batchManagementClientContext.ts +++ b/packages/@azure/arm-batch/lib/batchManagementClientContext.ts @@ -13,7 +13,7 @@ import * as msRest from "@azure/ms-rest-js"; import * as msRestAzure from "@azure/ms-rest-azure-js"; const packageName = "@azure/arm-batch"; -const packageVersion = "0.1.0"; +const packageVersion = "4.0.0"; export class BatchManagementClientContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; @@ -45,7 +45,7 @@ export class BatchManagementClientContext extends msRestAzure.AzureServiceClient super(credentials, options); - this.apiVersion = '2017-09-01'; + this.apiVersion = '2019-04-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; diff --git a/packages/@azure/arm-batch/lib/models/applicationOperationsMappers.ts b/packages/@azure/arm-batch/lib/models/applicationOperationsMappers.ts index 97048ac844f6..7d7712089cdf 100644 --- a/packages/@azure/arm-batch/lib/models/applicationOperationsMappers.ts +++ b/packages/@azure/arm-batch/lib/models/applicationOperationsMappers.ts @@ -9,11 +9,53 @@ */ export { - ApplicationCreateParameters, Application, - ApplicationPackage, + ProxyResource, + BaseResource, CloudError, - ApplicationUpdateParameters, - ListApplicationsResult + ListApplicationsResult, + ApplicationPackage, + Resource, + Certificate, + DeleteCertificateError, + CertificateCreateOrUpdateParameters, + Pool, + DeploymentConfiguration, + CloudServiceConfiguration, + VirtualMachineConfiguration, + ImageReference, + WindowsConfiguration, + DataDisk, + ContainerConfiguration, + ContainerRegistry, + ScaleSettings, + FixedScaleSettings, + AutoScaleSettings, + AutoScaleRun, + AutoScaleRunError, + NetworkConfiguration, + PoolEndpointConfiguration, + InboundNatPool, + NetworkSecurityGroupRule, + TaskSchedulingPolicy, + UserAccount, + LinuxUserConfiguration, + WindowsUserConfiguration, + MetadataItem, + StartTask, + ResourceFile, + EnvironmentSetting, + UserIdentity, + AutoUserSpecification, + TaskContainerSettings, + CertificateReference, + ApplicationPackageReference, + ResizeOperationStatus, + ResizeError, + BatchAccount, + KeyVaultReference, + AutoStorageProperties, + AutoStorageBaseProperties, + VirtualMachineFamilyCoreQuota } from "../models/mappers"; diff --git a/packages/@azure/arm-batch/lib/models/applicationPackageOperationsMappers.ts b/packages/@azure/arm-batch/lib/models/applicationPackageOperationsMappers.ts index eae5abb1fca9..c74e4f3a8c75 100644 --- a/packages/@azure/arm-batch/lib/models/applicationPackageOperationsMappers.ts +++ b/packages/@azure/arm-batch/lib/models/applicationPackageOperationsMappers.ts @@ -10,7 +10,53 @@ export { ActivateApplicationPackageParameters, + ApplicationPackage, + ProxyResource, + BaseResource, CloudError, - ApplicationPackage + ListApplicationPackagesResult, + Application, + Resource, + Certificate, + DeleteCertificateError, + CertificateCreateOrUpdateParameters, + Pool, + DeploymentConfiguration, + CloudServiceConfiguration, + VirtualMachineConfiguration, + ImageReference, + WindowsConfiguration, + DataDisk, + ContainerConfiguration, + ContainerRegistry, + ScaleSettings, + FixedScaleSettings, + AutoScaleSettings, + AutoScaleRun, + AutoScaleRunError, + NetworkConfiguration, + PoolEndpointConfiguration, + InboundNatPool, + NetworkSecurityGroupRule, + TaskSchedulingPolicy, + UserAccount, + LinuxUserConfiguration, + WindowsUserConfiguration, + MetadataItem, + StartTask, + ResourceFile, + EnvironmentSetting, + UserIdentity, + AutoUserSpecification, + TaskContainerSettings, + CertificateReference, + ApplicationPackageReference, + ResizeOperationStatus, + ResizeError, + BatchAccount, + KeyVaultReference, + AutoStorageProperties, + AutoStorageBaseProperties, + VirtualMachineFamilyCoreQuota } from "../models/mappers"; diff --git a/packages/@azure/arm-batch/lib/models/batchAccountOperationsMappers.ts b/packages/@azure/arm-batch/lib/models/batchAccountOperationsMappers.ts index b864b899da67..cbcae31536ad 100644 --- a/packages/@azure/arm-batch/lib/models/batchAccountOperationsMappers.ts +++ b/packages/@azure/arm-batch/lib/models/batchAccountOperationsMappers.ts @@ -16,6 +16,7 @@ export { Resource, BaseResource, AutoStorageProperties, + VirtualMachineFamilyCoreQuota, BatchAccountCreateHeaders, CloudError, BatchAccountUpdateParameters, @@ -32,9 +33,10 @@ export { CloudServiceConfiguration, VirtualMachineConfiguration, ImageReference, - OSDisk, WindowsConfiguration, DataDisk, + ContainerConfiguration, + ContainerRegistry, ScaleSettings, FixedScaleSettings, AutoScaleSettings, @@ -47,15 +49,19 @@ export { TaskSchedulingPolicy, UserAccount, LinuxUserConfiguration, + WindowsUserConfiguration, MetadataItem, StartTask, ResourceFile, EnvironmentSetting, UserIdentity, AutoUserSpecification, + TaskContainerSettings, CertificateReference, ApplicationPackageReference, ResizeOperationStatus, - ResizeError + ResizeError, + Application, + ApplicationPackage } from "../models/mappers"; diff --git a/packages/@azure/arm-batch/lib/models/certificateOperationsMappers.ts b/packages/@azure/arm-batch/lib/models/certificateOperationsMappers.ts index d6bdab0a770e..30548b4b44f3 100644 --- a/packages/@azure/arm-batch/lib/models/certificateOperationsMappers.ts +++ b/packages/@azure/arm-batch/lib/models/certificateOperationsMappers.ts @@ -21,15 +21,18 @@ export { CertificateDeleteHeaders, CertificateGetHeaders, CertificateCancelDeletionHeaders, + Application, + ApplicationPackage, Resource, Pool, DeploymentConfiguration, CloudServiceConfiguration, VirtualMachineConfiguration, ImageReference, - OSDisk, WindowsConfiguration, DataDisk, + ContainerConfiguration, + ContainerRegistry, ScaleSettings, FixedScaleSettings, AutoScaleSettings, @@ -42,12 +45,14 @@ export { TaskSchedulingPolicy, UserAccount, LinuxUserConfiguration, + WindowsUserConfiguration, MetadataItem, StartTask, ResourceFile, EnvironmentSetting, UserIdentity, AutoUserSpecification, + TaskContainerSettings, CertificateReference, ApplicationPackageReference, ResizeOperationStatus, @@ -55,6 +60,7 @@ export { BatchAccount, KeyVaultReference, AutoStorageProperties, - AutoStorageBaseProperties + AutoStorageBaseProperties, + VirtualMachineFamilyCoreQuota } from "../models/mappers"; diff --git a/packages/@azure/arm-batch/lib/models/index.ts b/packages/@azure/arm-batch/lib/models/index.ts index ca1259a449ac..b6ec641765e8 100644 --- a/packages/@azure/arm-batch/lib/models/index.ts +++ b/packages/@azure/arm-batch/lib/models/index.ts @@ -101,6 +101,28 @@ export interface AutoStorageProperties extends AutoStorageBaseProperties { lastKeySync: Date; } +/** + * @interface + * An interface representing VirtualMachineFamilyCoreQuota. + * A VM Family and its associated core quota for the Batch account. + * + */ +export interface VirtualMachineFamilyCoreQuota { + /** + * @member {string} [name] The Virtual Machine family name. + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly name?: string; + /** + * @member {number} [coreQuota] The core quota for the VM family for the + * Batch account. + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly coreQuota?: number; +} + /** * @interface * An interface representing Resource. @@ -186,26 +208,50 @@ export interface BatchAccount extends Resource { */ readonly autoStorage?: AutoStorageProperties; /** - * @member {number} [dedicatedCoreQuota] The dedicated core quota for this + * @member {number} [dedicatedCoreQuota] The dedicated core quota for the * Batch account. **NOTE: This property will not be serialized. It can only * be populated by the server.** */ readonly dedicatedCoreQuota?: number; /** * @member {number} [lowPriorityCoreQuota] The low-priority core quota for - * this Batch account. **NOTE: This property will not be serialized. It can + * the Batch account. **NOTE: This property will not be serialized. It can * only be populated by the server.** */ readonly lowPriorityCoreQuota?: number; /** - * @member {number} [poolQuota] The pool quota for this Batch account. + * @member {VirtualMachineFamilyCoreQuota[]} [dedicatedCoreQuotaPerVMFamily] + * A list of the dedicated core quota per Virtual Machine family for the + * Batch account. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ + readonly dedicatedCoreQuotaPerVMFamily?: VirtualMachineFamilyCoreQuota[]; + /** + * @member {boolean} [dedicatedCoreQuotaPerVMFamilyEnforced] A value + * indicating whether the core quota for the Batch Account is enforced per + * Virtual Machine family or not. Batch is transitioning its core quota + * system for dedicated cores to be enforced per Virtual Machine family. + * During this transitionary phase, the dedicated core quota per Virtual + * Machine family may not yet be enforced. If this flag is false, dedicated + * core quota is enforced via the old dedicatedCoreQuota property on the + * account and does not consider Virtual Machine family. If this flag is + * true, dedicated core quota is enforced via the + * dedicatedCoreQuotaPerVMFamily property on the account, and the old + * dedicatedCoreQuota does not apply. + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly dedicatedCoreQuotaPerVMFamilyEnforced?: boolean; + /** + * @member {number} [poolQuota] The pool quota for the Batch account. **NOTE: + * This property will not be serialized. It can only be populated by the + * server.** + */ readonly poolQuota?: number; /** * @member {number} [activeJobAndJobScheduleQuota] The active job and job - * schedule quota for this Batch account. **NOTE: This property will not be + * schedule quota for the Batch account. **NOTE: This property will not be * serialized. It can only be populated by the server.** */ readonly activeJobAndJobScheduleQuota?: number; @@ -287,77 +333,37 @@ export interface ActivateApplicationPackageParameters { /** * @interface - * An interface representing ApplicationCreateParameters. - * Parameters for adding an Application. - * - */ -export interface ApplicationCreateParameters { - /** - * @member {boolean} [allowUpdates] A value indicating whether packages - * within the application may be overwritten using the same version string. - */ - allowUpdates?: boolean; - /** - * @member {string} [displayName] The display name for the application. - */ - displayName?: string; -} - -/** - * @interface - * An interface representing ApplicationPackage. - * An application package which represents a particular version of an - * application. + * An interface representing ProxyResource. + * A definition of an Azure resource. * + * @extends BaseResource */ -export interface ApplicationPackage { +export interface ProxyResource extends BaseResource { /** - * @member {string} [id] The ID of the application. + * @member {string} [id] The ID of the resource. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ readonly id?: string; /** - * @member {string} [version] The version of the application package. - * **NOTE: This property will not be serialized. It can only be populated by - * the server.** - */ - readonly version?: string; - /** - * @member {PackageState} [state] The current state of the application - * package. Possible values include: 'Pending', 'Active', 'Unmapped' - * **NOTE: This property will not be serialized. It can only be populated by - * the server.** - */ - readonly state?: PackageState; - /** - * @member {string} [format] The format of the application package, if the - * package is active. - * **NOTE: This property will not be serialized. It can only be populated by - * the server.** - */ - readonly format?: string; - /** - * @member {string} [storageUrl] The URL for the application package in Azure - * Storage. + * @member {string} [name] The name of the resource. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ - readonly storageUrl?: string; + readonly name?: string; /** - * @member {Date} [storageUrlExpiry] The UTC time at which the Azure Storage - * URL will expire. + * @member {string} [type] The type of the resource. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ - readonly storageUrlExpiry?: Date; + readonly type?: string; /** - * @member {Date} [lastActivationTime] The time at which the package was last - * activated, if the package is active. + * @member {string} [etag] The ETag of the resource, used for concurrency + * statements. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ - readonly lastActivationTime?: Date; + readonly etag?: string; } /** @@ -365,22 +371,13 @@ export interface ApplicationPackage { * An interface representing Application. * Contains information about an application in a Batch account. * + * @extends ProxyResource */ -export interface Application { - /** - * @member {string} [id] A string that uniquely identifies the application - * within the account. - */ - id?: string; +export interface Application extends ProxyResource { /** * @member {string} [displayName] The display name for the application. */ displayName?: string; - /** - * @member {ApplicationPackage[]} [packages] The list of packages under this - * application. - */ - packages?: ApplicationPackage[]; /** * @member {boolean} [allowUpdates] A value indicating whether packages * within the application may be overwritten using the same version string. @@ -388,83 +385,72 @@ export interface Application { allowUpdates?: boolean; /** * @member {string} [defaultVersion] The package to use if a client requests - * the application but does not specify a version. + * the application but does not specify a version. This property can only be + * set to the name of an existing package. */ defaultVersion?: string; } /** * @interface - * An interface representing ApplicationUpdateParameters. - * Parameters for an update application request. + * An interface representing ApplicationPackage. + * An application package which represents a particular version of an + * application. * + * @extends ProxyResource */ -export interface ApplicationUpdateParameters { - /** - * @member {boolean} [allowUpdates] A value indicating whether packages - * within the application may be overwritten using the same version string. - */ - allowUpdates?: boolean; +export interface ApplicationPackage extends ProxyResource { /** - * @member {string} [defaultVersion] The package to use if a client requests - * the application but does not specify a version. - */ - defaultVersion?: string; - /** - * @member {string} [displayName] The display name for the application. + * @member {PackageState} [state] The current state of the application + * package. Possible values include: 'Pending', 'Active' + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** */ - displayName?: string; -} - -/** - * @interface - * An interface representing BatchLocationQuota. - * Quotas associated with a Batch region for a particular subscription. - * - */ -export interface BatchLocationQuota { + readonly state?: PackageState; /** - * @member {number} [accountQuota] The number of Batch accounts that may be - * created under the subscription in the specified region. + * @member {string} [format] The format of the application package, if the + * package is active. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ - readonly accountQuota?: number; -} - -/** - * @interface - * An interface representing ProxyResource. - * A definition of an Azure resource. - * - * @extends BaseResource - */ -export interface ProxyResource extends BaseResource { + readonly format?: string; /** - * @member {string} [id] The ID of the resource. + * @member {string} [storageUrl] The URL for the application package in Azure + * Storage. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ - readonly id?: string; + readonly storageUrl?: string; /** - * @member {string} [name] The name of the resource. + * @member {Date} [storageUrlExpiry] The UTC time at which the Azure Storage + * URL will expire. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ - readonly name?: string; + readonly storageUrlExpiry?: Date; /** - * @member {string} [type] The type of the resource. + * @member {Date} [lastActivationTime] The time at which the package was last + * activated, if the package is active. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ - readonly type?: string; + readonly lastActivationTime?: Date; +} + +/** + * @interface + * An interface representing BatchLocationQuota. + * Quotas associated with a Batch region for a particular subscription. + * + */ +export interface BatchLocationQuota { /** - * @member {string} [etag] The ETag of the resource, used for concurrency - * statements. + * @member {number} [accountQuota] The number of Batch accounts that may be + * created under the subscription in the specified region. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ - readonly etag?: string; + readonly accountQuota?: number; } /** @@ -547,20 +533,8 @@ export interface Certificate extends ProxyResource { format?: CertificateFormat; /** * @member {CertificateProvisioningState} [provisioningState] The provisioned - * state of the resource. Values are: - * - * Succeeded - The certificate is available for use in pools. - * Deleting - The user has requested that the certificate be deleted, but the - * delete operation has not yet completed. You may not reference the - * certificate when creating or updating pools. - * Failed - The user requested that the certificate be deleted, but there are - * pools that still have references to the certificate, or it is still - * installed on one or more compute nodes. (The latter can occur if the - * certificate has been removed from the pool, but the node has not yet - * restarted. Nodes refresh their certificates only when they restart.) You - * may use the cancel certificate delete operation to cancel the delete, or - * the delete certificate operation to retry the delete. Possible values - * include: 'Succeeded', 'Deleting', 'Failed' + * state of the resource. Possible values include: 'Succeeded', 'Deleting', + * 'Failed' * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ @@ -658,22 +632,11 @@ export interface CloudServiceConfiguration { */ osFamily: string; /** - * @member {string} [targetOSVersion] The Azure Guest OS version to be - * installed on the virtual machines in the pool. The default value is * - * which specifies the latest operating system version for the specified OS - * family. + * @member {string} [osVersion] The Azure Guest OS version to be installed on + * the virtual machines in the pool. The default value is * which specifies + * the latest operating system version for the specified OS family. */ - targetOSVersion?: string; - /** - * @member {string} [currentOSVersion] The Azure Guest OS Version currently - * installed on the virtual machines in the pool. This may differ from - * targetOSVersion if the pool state is Upgrading. In this case some virtual - * machines may be on the targetOSVersion and some may be on the - * currentOSVersion during the upgrade process. Once all virtual machines - * have upgraded, currentOSVersion is updated to be the same as - * targetOSVersion. - */ - currentOSVersion?: string; + osVersion?: string; } /** @@ -722,23 +685,6 @@ export interface ImageReference { id?: string; } -/** - * @interface - * An interface representing OSDisk. - * @summary Settings for the operating system disk of the virtual machine. - * - */ -export interface OSDisk { - /** - * @member {CachingType} [caching] The type of caching to be enabled for the - * data disks. none - The caching mode for the disk is not enabled. readOnly - * - The caching mode for the disk is read only. readWrite - The caching mode - * for the disk is read and write. Default value is none. Possible values - * include: 'None', 'ReadOnly', 'ReadWrite' - */ - caching?: CachingType; -} - /** * @interface * An interface representing WindowsConfiguration. @@ -799,6 +745,51 @@ export interface DataDisk { storageAccountType?: StorageAccountType; } +/** + * @interface + * An interface representing ContainerRegistry. + * @summary A private container registry. + * + */ +export interface ContainerRegistry { + /** + * @member {string} [registryServer] The registry URL. If omitted, the + * default is "docker.io". + */ + registryServer?: string; + /** + * @member {string} userName The user name to log into the registry server. + */ + userName: string; + /** + * @member {string} password The password to log into the registry server. + */ + password: string; +} + +/** + * @interface + * An interface representing ContainerConfiguration. + * @summary The configuration for container-enabled pools. + * + */ +export interface ContainerConfiguration { + /** + * @member {string[]} [containerImageNames] The collection of container image + * names. This is the full image reference, as would be specified to "docker + * pull". An image will be sourced from the default Docker registry unless + * the image is fully qualified with an alternative registry. + */ + containerImageNames?: string[]; + /** + * @member {ContainerRegistry[]} [containerRegistries] Additional private + * registries from which containers can be pulled. If any images must be + * downloaded from a private registry which requires credentials, then those + * credentials must be provided here. + */ + containerRegistries?: ContainerRegistry[]; +} + /** * @interface * An interface representing VirtualMachineConfiguration. @@ -812,11 +803,6 @@ export interface VirtualMachineConfiguration { * Machines Marketplace Image or the custom Virtual Machine Image to use. */ imageReference: ImageReference; - /** - * @member {OSDisk} [osDisk] Settings for the operating system disk of the - * Virtual Machine. - */ - osDisk?: OSDisk; /** * @member {string} nodeAgentSkuId The SKU of the Batch node agent to be * provisioned on compute nodes in the pool. The Batch node agent is a @@ -852,6 +838,14 @@ export interface VirtualMachineConfiguration { * Windows_Client - The on-premises license is for Windows Client. */ licenseType?: string; + /** + * @member {ContainerConfiguration} [containerConfiguration] The container + * configuration for the pool. If specified, setup is performed on each node + * in the pool to allow tasks to run in containers. All regular tasks and job + * manager tasks run on this pool must specify the containerSettings + * property, and all other tasks may specify it. + */ + containerConfiguration?: ContainerConfiguration; } /** @@ -1214,6 +1208,22 @@ export interface LinuxUserConfiguration { sshPrivateKey?: string; } +/** + * @interface + * An interface representing WindowsUserConfiguration. + * @summary Properties used to create a user account on a Windows node. + * + */ +export interface WindowsUserConfiguration { + /** + * @member {LoginMode} [loginMode] Login mode for user. Specifies login mode + * for the user. The default value for VirtualMachineConfiguration pools is + * interactive mode and for CloudServiceConfiguration pools is batch mode. + * Possible values include: 'Batch', 'Interactive' + */ + loginMode?: LoginMode; +} + /** * @interface * An interface representing UserAccount. @@ -1244,6 +1254,13 @@ export interface UserAccount { * created with the default options. */ linuxUserConfiguration?: LinuxUserConfiguration; + /** + * @member {WindowsUserConfiguration} [windowsUserConfiguration] The + * Windows-specific user configuration for the user account. This property + * can only be specified if the user is on a Windows pool. If not specified + * and on a Windows pool, the user is created with the default options. + */ + windowsUserConfiguration?: WindowsUserConfiguration; } /** @@ -1269,24 +1286,63 @@ export interface MetadataItem { /** * @interface * An interface representing ResourceFile. - * @summary A file to be downloaded from Azure blob storage to a compute node. + * @summary A single file or multiple files to be downloaded to a compute node. * */ export interface ResourceFile { /** - * @member {string} blobSource The URL of the file within Azure Blob Storage. - * This URL must be readable using anonymous access; that is, the Batch - * service does not present any credentials when downloading the blob. There - * are two ways to get such a URL for a blob in Azure storage: include a - * Shared Access Signature (SAS) granting read permissions on the blob, or + * @member {string} [autoStorageContainerName] The storage container name in + * the auto storage account. The autoStorageContainerName, + * storageContainerUrl and httpUrl properties are mutually exclusive and one + * of them must be specified. + */ + autoStorageContainerName?: string; + /** + * @member {string} [storageContainerUrl] The URL of the blob container + * within Azure Blob Storage. The autoStorageContainerName, + * storageContainerUrl and httpUrl properties are mutually exclusive and one + * of them must be specified. This URL must be readable and listable using + * anonymous access; that is, the Batch service does not present any + * credentials when downloading the blob. There are two ways to get such a + * URL for a blob in Azure storage: include a Shared Access Signature (SAS) + * granting read and list permissions on the blob, or set the ACL for the + * blob or its container to allow public access. + */ + storageContainerUrl?: string; + /** + * @member {string} [httpUrl] The URL of the file to download. The + * autoStorageContainerName, storageContainerUrl and httpUrl properties are + * mutually exclusive and one of them must be specified. If the URL is Azure + * Blob Storage, it must be readable using anonymous access; that is, the + * Batch service does not present any credentials when downloading the blob. + * There are two ways to get such a URL for a blob in Azure storage: include + * a Shared Access Signature (SAS) granting read permissions on the blob, or * set the ACL for the blob or its container to allow public access. */ - blobSource: string; + httpUrl?: string; /** - * @member {string} filePath The location on the compute node to which to - * download the file, relative to the task's working directory. + * @member {string} [blobPrefix] The blob prefix to use when downloading + * blobs from an Azure Storage container. Only the blobs whose names begin + * with the specified prefix will be downloaded. The property is valid only + * when autoStorageContainerName or storageContainerUrl is used. This prefix + * can be a partial filename or a subdirectory. If a prefix is not specified, + * all the files in the container will be downloaded. */ - filePath: string; + blobPrefix?: string; + /** + * @member {string} [filePath] The location on the compute node to which to + * download the file, relative to the task's working directory. If the + * httpUrl property is specified, the filePath is required and describes the + * path which the file will be downloaded to, including the filename. + * Otherwise, if the autoStorageContainerName or storageContainerUrl property + * is specified, filePath is optional and is the directory to download the + * files to. In the case where filePath is used as a directory, any directory + * structure already associated with the input data will be retained in full + * and appended to the specified filePath directory. The specified relative + * path cannot break out of the task's working directory (for example by + * using '..'). + */ + filePath?: string; /** * @member {string} [fileMode] The file permission mode attribute in octal * format. This property applies only to files being downloaded to Linux @@ -1324,11 +1380,8 @@ export interface EnvironmentSetting { */ export interface AutoUserSpecification { /** - * @member {AutoUserScope} [scope] The scope for the auto user. pool - - * specifies that the task runs as the common auto user account which is - * created on every node in a pool. task - specifies that the service should - * create a new user for the task. The default value is task. Possible values - * include: 'Task', 'Pool' + * @member {AutoUserScope} [scope] The scope for the auto user. The default + * value is task. Possible values include: 'Task', 'Pool' */ scope?: AutoUserScope; /** @@ -1364,6 +1417,35 @@ export interface UserIdentity { autoUser?: AutoUserSpecification; } +/** + * @interface + * An interface representing TaskContainerSettings. + * @summary The container settings for a task. + * + */ +export interface TaskContainerSettings { + /** + * @member {string} [containerRunOptions] Additional options to the container + * create command. These additional options are supplied as arguments to the + * "docker create" command, in addition to those controlled by the Batch + * Service. + */ + containerRunOptions?: string; + /** + * @member {string} imageName The image to use to create the container in + * which the task will run. This is the full image reference, as would be + * specified to "docker pull". If no tag is provided as part of the image + * name, the tag ":latest" is used as a default. + */ + imageName: string; + /** + * @member {ContainerRegistry} [registry] The private registry which contains + * the container image. This setting can be omitted if was already provided + * at pool creation. + */ + registry?: ContainerRegistry; +} + /** * @interface * An interface representing StartTask. @@ -1424,6 +1506,15 @@ export interface StartTask { * tasks will continue to be scheduled on the node. The default is false. */ waitForSuccess?: boolean; + /** + * @member {TaskContainerSettings} [containerSettings] The settings for the + * container under which the start task runs. When this is specified, all + * directories recursively below the AZ_BATCH_NODE_ROOT_DIR (the root of + * Azure Batch directories on the node) are mapped into the container, all + * task environment variables are mapped into the container, and the task + * command line is executed in the container. + */ + containerSettings?: TaskContainerSettings; } /** @@ -1467,14 +1558,6 @@ export interface CertificateReference { /** * @member {CertificateVisibility[]} [visibility] Which user accounts on the * compute node should have access to the private data of the certificate. - * Values are: - * - * starttask - The user account under which the start task is run. - * task - The accounts under which job tasks are run. - * remoteuser - The accounts under which users remotely access the node. - * - * You can specify more than one visibility in this collection. The default - * is all accounts. */ visibility?: CertificateVisibility[]; } @@ -1605,13 +1688,7 @@ export interface Pool extends ProxyResource { readonly creationTime?: Date; /** * @member {PoolProvisioningState} [provisioningState] The current state of - * the pool. Values are: - * - * Succeeded - The pool is available to run tasks subject to the availability - * of compute nodes. - * Deleting - The user has requested that the pool be deleted, but the delete - * operation has not yet completed. Possible values include: 'Succeeded', - * 'Deleting' + * the pool. Possible values include: 'Succeeded', 'Deleting' * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ @@ -1624,16 +1701,6 @@ export interface Pool extends ProxyResource { readonly provisioningStateTransitionTime?: Date; /** * @member {AllocationState} [allocationState] Whether the pool is resizing. - * Values are: - * - * Steady - The pool is not resizing. There are no changes to the number of - * nodes in the pool in progress. A pool enters this state when it is created - * and when no operations are being performed on the pool to change the - * number of dedicated nodes. - * Resizing - The pool is resizing; that is, compute nodes are being added to - * or removed from the pool. - * Stopping - The pool was resizing, but the user has requested that the - * resize be stopped, but the stop request has not yet been completed. * Possible values include: 'Steady', 'Resizing', 'Stopping' * **NOTE: This property will not be serialized. It can only be populated by * the server.** @@ -1873,6 +1940,21 @@ export interface CheckNameAvailabilityResult { readonly message?: string; } +/** + * @interface + * An interface representing ApplicationPackageListOptionalParams. + * Optional Parameters. + * + * @extends RequestOptionsBase + */ +export interface ApplicationPackageListOptionalParams extends msRest.RequestOptionsBase { + /** + * @member {number} [maxresults] The maximum number of items to return in the + * response. + */ + maxresults?: number; +} + /** * @interface * An interface representing ApplicationCreateOptionalParams. @@ -1882,10 +1964,9 @@ export interface CheckNameAvailabilityResult { */ export interface ApplicationCreateOptionalParams extends msRest.RequestOptionsBase { /** - * @member {ApplicationCreateParameters} [parameters] The parameters for the - * request. + * @member {Application} [parameters] The parameters for the request. */ - parameters?: ApplicationCreateParameters; + parameters?: Application; } /** @@ -2341,6 +2422,20 @@ export interface BatchAccountListResult extends Array { nextLink?: string; } +/** + * @interface + * An interface representing the ListApplicationPackagesResult. + * The result of performing list application packages. + * + * @extends Array + */ +export interface ListApplicationPackagesResult extends Array { + /** + * @member {string} [nextLink] The URL to get the next set of results. + */ + nextLink?: string; +} + /** * @interface * An interface representing the ListApplicationsResult. @@ -2424,11 +2519,11 @@ export type AccountKeyType = 'Primary' | 'Secondary'; /** * Defines values for PackageState. - * Possible values include: 'Pending', 'Active', 'Unmapped' + * Possible values include: 'Pending', 'Active' * @readonly * @enum {string} */ -export type PackageState = 'Pending' | 'Active' | 'Unmapped'; +export type PackageState = 'Pending' | 'Active'; /** * Defines values for CertificateFormat. @@ -2526,6 +2621,14 @@ export type ComputeNodeFillType = 'Spread' | 'Pack'; */ export type ElevationLevel = 'NonAdmin' | 'Admin'; +/** + * Defines values for LoginMode. + * Possible values include: 'Batch', 'Interactive' + * @readonly + * @enum {string} + */ +export type LoginMode = 'Batch' | 'Interactive'; + /** * Defines values for AutoUserScope. * Possible values include: 'Task', 'Pool' @@ -2748,6 +2851,25 @@ export type BatchAccountListByResourceGroupNextResponse = BatchAccountListResult }; }; +/** + * Contains response data for the activate operation. + */ +export type ApplicationPackageActivateResponse = ApplicationPackage & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + /** + * The response body as parsed JSON or XML + */ + parsedBody: ApplicationPackage; + }; +}; + /** * Contains response data for the create operation. */ @@ -2786,6 +2908,44 @@ export type ApplicationPackageGetResponse = ApplicationPackage & { }; }; +/** + * Contains response data for the list operation. + */ +export type ApplicationPackageListResponse = ListApplicationPackagesResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + /** + * The response body as parsed JSON or XML + */ + parsedBody: ListApplicationPackagesResult; + }; +}; + +/** + * Contains response data for the listNext operation. + */ +export type ApplicationPackageListNextResponse = ListApplicationPackagesResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + /** + * The response body as parsed JSON or XML + */ + parsedBody: ListApplicationPackagesResult; + }; +}; + /** * Contains response data for the create operation. */ @@ -2824,6 +2984,25 @@ export type ApplicationGetResponse = Application & { }; }; +/** + * Contains response data for the update operation. + */ +export type ApplicationUpdateResponse = Application & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + /** + * The response body as parsed JSON or XML + */ + parsedBody: Application; + }; +}; + /** * Contains response data for the list operation. */ diff --git a/packages/@azure/arm-batch/lib/models/mappers.ts b/packages/@azure/arm-batch/lib/models/mappers.ts index 7698eb57ba77..00eb01d38331 100644 --- a/packages/@azure/arm-batch/lib/models/mappers.ts +++ b/packages/@azure/arm-batch/lib/models/mappers.ts @@ -125,6 +125,32 @@ export const AutoStorageProperties: msRest.CompositeMapper = { } }; +export const VirtualMachineFamilyCoreQuota: msRest.CompositeMapper = { + serializedName: "VirtualMachineFamilyCoreQuota", + type: { + name: "Composite", + className: "VirtualMachineFamilyCoreQuota", + modelProperties: { + name: { + nullable: false, + readOnly: true, + serializedName: "name", + type: { + name: "String" + } + }, + coreQuota: { + nullable: false, + readOnly: true, + serializedName: "coreQuota", + type: { + name: "Number" + } + } + } + } +}; + export const Resource: msRest.CompositeMapper = { serializedName: "Resource", type: { @@ -248,6 +274,28 @@ export const BatchAccount: msRest.CompositeMapper = { name: "Number" } }, + dedicatedCoreQuotaPerVMFamily: { + nullable: true, + readOnly: true, + serializedName: "properties.dedicatedCoreQuotaPerVMFamily", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "VirtualMachineFamilyCoreQuota" + } + } + } + }, + dedicatedCoreQuotaPerVMFamilyEnforced: { + nullable: false, + readOnly: true, + serializedName: "properties.dedicatedCoreQuotaPerVMFamilyEnforced", + type: { + name: "Boolean" + } + }, poolQuota: { nullable: false, readOnly: true, @@ -365,33 +413,11 @@ export const ActivateApplicationPackageParameters: msRest.CompositeMapper = { } }; -export const ApplicationCreateParameters: msRest.CompositeMapper = { - serializedName: "ApplicationCreateParameters", - type: { - name: "Composite", - className: "ApplicationCreateParameters", - modelProperties: { - allowUpdates: { - serializedName: "allowUpdates", - type: { - name: "Boolean" - } - }, - displayName: { - serializedName: "displayName", - type: { - name: "String" - } - } - } - } -}; - -export const ApplicationPackage: msRest.CompositeMapper = { - serializedName: "ApplicationPackage", +export const ProxyResource: msRest.CompositeMapper = { + serializedName: "ProxyResource", type: { name: "Composite", - className: "ApplicationPackage", + className: "ProxyResource", modelProperties: { id: { readOnly: true, @@ -400,52 +426,26 @@ export const ApplicationPackage: msRest.CompositeMapper = { name: "String" } }, - version: { + name: { readOnly: true, - serializedName: "version", + serializedName: "name", type: { name: "String" } }, - state: { - readOnly: true, - serializedName: "state", - type: { - name: "Enum", - allowedValues: [ - "Pending", - "Active", - "Unmapped" - ] - } - }, - format: { + type: { readOnly: true, - serializedName: "format", + serializedName: "type", type: { name: "String" } }, - storageUrl: { + etag: { readOnly: true, - serializedName: "storageUrl", + serializedName: "etag", type: { name: "String" } - }, - storageUrlExpiry: { - readOnly: true, - serializedName: "storageUrlExpiry", - type: { - name: "DateTime" - } - }, - lastActivationTime: { - readOnly: true, - serializedName: "lastActivationTime", - type: { - name: "DateTime" - } } } } @@ -457,38 +457,21 @@ export const Application: msRest.CompositeMapper = { name: "Composite", className: "Application", modelProperties: { - id: { - serializedName: "id", - type: { - name: "String" - } - }, + ...ProxyResource.type.modelProperties, displayName: { - serializedName: "displayName", + serializedName: "properties.displayName", type: { name: "String" } }, - packages: { - serializedName: "packages", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "ApplicationPackage" - } - } - } - }, allowUpdates: { - serializedName: "allowUpdates", + serializedName: "properties.allowUpdates", type: { name: "Boolean" } }, defaultVersion: { - serializedName: "defaultVersion", + serializedName: "properties.defaultVersion", type: { name: "String" } @@ -497,29 +480,51 @@ export const Application: msRest.CompositeMapper = { } }; -export const ApplicationUpdateParameters: msRest.CompositeMapper = { - serializedName: "ApplicationUpdateParameters", +export const ApplicationPackage: msRest.CompositeMapper = { + serializedName: "ApplicationPackage", type: { name: "Composite", - className: "ApplicationUpdateParameters", + className: "ApplicationPackage", modelProperties: { - allowUpdates: { - serializedName: "allowUpdates", + ...ProxyResource.type.modelProperties, + state: { + readOnly: true, + serializedName: "properties.state", type: { - name: "Boolean" + name: "Enum", + allowedValues: [ + "Pending", + "Active" + ] } }, - defaultVersion: { - serializedName: "defaultVersion", + format: { + readOnly: true, + serializedName: "properties.format", type: { name: "String" } }, - displayName: { - serializedName: "displayName", + storageUrl: { + readOnly: true, + serializedName: "properties.storageUrl", type: { name: "String" } + }, + storageUrlExpiry: { + readOnly: true, + serializedName: "properties.storageUrlExpiry", + type: { + name: "DateTime" + } + }, + lastActivationTime: { + readOnly: true, + serializedName: "properties.lastActivationTime", + type: { + name: "DateTime" + } } } } @@ -542,44 +547,6 @@ export const BatchLocationQuota: msRest.CompositeMapper = { } }; -export const ProxyResource: msRest.CompositeMapper = { - serializedName: "ProxyResource", - type: { - name: "Composite", - className: "ProxyResource", - modelProperties: { - id: { - readOnly: true, - serializedName: "id", - type: { - name: "String" - } - }, - name: { - readOnly: true, - serializedName: "name", - type: { - name: "String" - } - }, - type: { - readOnly: true, - serializedName: "type", - type: { - name: "String" - } - }, - etag: { - readOnly: true, - serializedName: "etag", - type: { - name: "String" - } - } - } - } -}; - export const CertificateBaseProperties: msRest.CompositeMapper = { serializedName: "CertificateBaseProperties", type: { @@ -804,14 +771,8 @@ export const CloudServiceConfiguration: msRest.CompositeMapper = { name: "String" } }, - targetOSVersion: { - serializedName: "targetOSVersion", - type: { - name: "String" - } - }, - currentOSVersion: { - serializedName: "currentOSVersion", + osVersion: { + serializedName: "osVersion", type: { name: "String" } @@ -860,27 +821,6 @@ export const ImageReference: msRest.CompositeMapper = { } }; -export const OSDisk: msRest.CompositeMapper = { - serializedName: "OSDisk", - type: { - name: "Composite", - className: "OSDisk", - modelProperties: { - caching: { - serializedName: "caching", - type: { - name: "Enum", - allowedValues: [ - "None", - "ReadOnly", - "ReadWrite" - ] - } - } - } - } -}; - export const WindowsConfiguration: msRest.CompositeMapper = { serializedName: "WindowsConfiguration", type: { @@ -942,6 +882,78 @@ export const DataDisk: msRest.CompositeMapper = { } }; +export const ContainerRegistry: msRest.CompositeMapper = { + serializedName: "ContainerRegistry", + type: { + name: "Composite", + className: "ContainerRegistry", + modelProperties: { + registryServer: { + serializedName: "registryServer", + type: { + name: "String" + } + }, + userName: { + required: true, + serializedName: "username", + type: { + name: "String" + } + }, + password: { + required: true, + serializedName: "password", + type: { + name: "String" + } + } + } + } +}; + +export const ContainerConfiguration: msRest.CompositeMapper = { + serializedName: "ContainerConfiguration", + type: { + name: "Composite", + className: "ContainerConfiguration", + modelProperties: { + type: { + required: true, + isConstant: true, + serializedName: "type", + defaultValue: 'DockerCompatible', + type: { + name: "String" + } + }, + containerImageNames: { + serializedName: "containerImageNames", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + containerRegistries: { + serializedName: "containerRegistries", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ContainerRegistry" + } + } + } + } + } + } +}; + export const VirtualMachineConfiguration: msRest.CompositeMapper = { serializedName: "VirtualMachineConfiguration", type: { @@ -956,13 +968,6 @@ export const VirtualMachineConfiguration: msRest.CompositeMapper = { className: "ImageReference" } }, - osDisk: { - serializedName: "osDisk", - type: { - name: "Composite", - className: "OSDisk" - } - }, nodeAgentSkuId: { required: true, serializedName: "nodeAgentSkuId", @@ -994,6 +999,13 @@ export const VirtualMachineConfiguration: msRest.CompositeMapper = { type: { name: "String" } + }, + containerConfiguration: { + serializedName: "containerConfiguration", + type: { + name: "Composite", + className: "ContainerConfiguration" + } } } } @@ -1367,6 +1379,26 @@ export const LinuxUserConfiguration: msRest.CompositeMapper = { } }; +export const WindowsUserConfiguration: msRest.CompositeMapper = { + serializedName: "WindowsUserConfiguration", + type: { + name: "Composite", + className: "WindowsUserConfiguration", + modelProperties: { + loginMode: { + serializedName: "loginMode", + type: { + name: "Enum", + allowedValues: [ + "Batch", + "Interactive" + ] + } + } + } + } +}; + export const UserAccount: msRest.CompositeMapper = { serializedName: "UserAccount", type: { @@ -1403,6 +1435,13 @@ export const UserAccount: msRest.CompositeMapper = { name: "Composite", className: "LinuxUserConfiguration" } + }, + windowsUserConfiguration: { + serializedName: "windowsUserConfiguration", + type: { + name: "Composite", + className: "WindowsUserConfiguration" + } } } } @@ -1438,15 +1477,31 @@ export const ResourceFile: msRest.CompositeMapper = { name: "Composite", className: "ResourceFile", modelProperties: { - blobSource: { - required: true, - serializedName: "blobSource", + autoStorageContainerName: { + serializedName: "autoStorageContainerName", + type: { + name: "String" + } + }, + storageContainerUrl: { + serializedName: "storageContainerUrl", + type: { + name: "String" + } + }, + httpUrl: { + serializedName: "httpUrl", + type: { + name: "String" + } + }, + blobPrefix: { + serializedName: "blobPrefix", type: { name: "String" } }, filePath: { - required: true, serializedName: "filePath", type: { name: "String" @@ -1538,6 +1593,36 @@ export const UserIdentity: msRest.CompositeMapper = { } }; +export const TaskContainerSettings: msRest.CompositeMapper = { + serializedName: "TaskContainerSettings", + type: { + name: "Composite", + className: "TaskContainerSettings", + modelProperties: { + containerRunOptions: { + serializedName: "containerRunOptions", + type: { + name: "String" + } + }, + imageName: { + required: true, + serializedName: "imageName", + type: { + name: "String" + } + }, + registry: { + serializedName: "registry", + type: { + name: "Composite", + className: "ContainerRegistry" + } + } + } + } +}; + export const StartTask: msRest.CompositeMapper = { serializedName: "StartTask", type: { @@ -1592,6 +1677,13 @@ export const StartTask: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + containerSettings: { + serializedName: "containerSettings", + type: { + name: "Composite", + className: "TaskContainerSettings" + } } } } @@ -2367,6 +2459,34 @@ export const BatchAccountListResult: msRest.CompositeMapper = { } }; +export const ListApplicationPackagesResult: msRest.CompositeMapper = { + serializedName: "ListApplicationPackagesResult", + type: { + name: "Composite", + className: "ListApplicationPackagesResult", + modelProperties: { + value: { + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ApplicationPackage" + } + } + } + }, + nextLink: { + serializedName: "nextLink", + type: { + name: "String" + } + } + } + } +}; + export const ListApplicationsResult: msRest.CompositeMapper = { serializedName: "ListApplicationsResult", type: { diff --git a/packages/@azure/arm-batch/lib/models/parameters.ts b/packages/@azure/arm-batch/lib/models/parameters.ts index 6c72e7bf6552..ca0a27c5f404 100644 --- a/packages/@azure/arm-batch/lib/models/parameters.ts +++ b/packages/@azure/arm-batch/lib/models/parameters.ts @@ -45,11 +45,16 @@ export const apiVersion: msRest.OperationQueryParameter = { } } }; -export const applicationId: msRest.OperationURLParameter = { - parameterPath: "applicationId", +export const applicationName: msRest.OperationURLParameter = { + parameterPath: "applicationName", mapper: { required: true, - serializedName: "applicationId", + serializedName: "applicationName", + constraints: { + MaxLength: 64, + MinLength: 1, + Pattern: /^[a-zA-Z0-9_-]+$/ + }, type: { name: "String" } @@ -186,11 +191,16 @@ export const subscriptionId: msRest.OperationURLParameter = { } } }; -export const version: msRest.OperationURLParameter = { - parameterPath: "version", +export const versionName: msRest.OperationURLParameter = { + parameterPath: "versionName", mapper: { required: true, - serializedName: "version", + serializedName: "versionName", + constraints: { + MaxLength: 64, + MinLength: 1, + Pattern: /^[a-zA-Z0-9_-][a-zA-Z0-9_.-]*$/ + }, type: { name: "String" } diff --git a/packages/@azure/arm-batch/lib/models/poolOperationsMappers.ts b/packages/@azure/arm-batch/lib/models/poolOperationsMappers.ts index 08c626ddd96d..49afc6116e56 100644 --- a/packages/@azure/arm-batch/lib/models/poolOperationsMappers.ts +++ b/packages/@azure/arm-batch/lib/models/poolOperationsMappers.ts @@ -17,9 +17,10 @@ export { CloudServiceConfiguration, VirtualMachineConfiguration, ImageReference, - OSDisk, WindowsConfiguration, DataDisk, + ContainerConfiguration, + ContainerRegistry, ScaleSettings, FixedScaleSettings, AutoScaleSettings, @@ -32,12 +33,14 @@ export { TaskSchedulingPolicy, UserAccount, LinuxUserConfiguration, + WindowsUserConfiguration, MetadataItem, StartTask, ResourceFile, EnvironmentSetting, UserIdentity, AutoUserSpecification, + TaskContainerSettings, CertificateReference, ApplicationPackageReference, ResizeOperationStatus, @@ -49,6 +52,8 @@ export { PoolGetHeaders, PoolDisableAutoScaleHeaders, PoolStopResizeHeaders, + Application, + ApplicationPackage, Resource, Certificate, DeleteCertificateError, @@ -56,6 +61,7 @@ export { BatchAccount, KeyVaultReference, AutoStorageProperties, - AutoStorageBaseProperties + AutoStorageBaseProperties, + VirtualMachineFamilyCoreQuota } from "../models/mappers"; diff --git a/packages/@azure/arm-batch/lib/operations/applicationOperations.ts b/packages/@azure/arm-batch/lib/operations/applicationOperations.ts index 9a9a538c61a9..266b6fd533ce 100644 --- a/packages/@azure/arm-batch/lib/operations/applicationOperations.ts +++ b/packages/@azure/arm-batch/lib/operations/applicationOperations.ts @@ -30,32 +30,32 @@ export class ApplicationOperations { * Adds an application to the specified Batch account. * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param [options] The optional parameters * @returns Promise */ - create(resourceGroupName: string, accountName: string, applicationId: string, options?: Models.ApplicationCreateOptionalParams): Promise; + create(resourceGroupName: string, accountName: string, applicationName: string, options?: Models.ApplicationCreateOptionalParams): Promise; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param callback The callback */ - create(resourceGroupName: string, accountName: string, applicationId: string, callback: msRest.ServiceCallback): void; + create(resourceGroupName: string, accountName: string, applicationName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param options The optional parameters * @param callback The callback */ - create(resourceGroupName: string, accountName: string, applicationId: string, options: Models.ApplicationCreateOptionalParams, callback: msRest.ServiceCallback): void; - create(resourceGroupName: string, accountName: string, applicationId: string, options?: Models.ApplicationCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + create(resourceGroupName: string, accountName: string, applicationName: string, options: Models.ApplicationCreateOptionalParams, callback: msRest.ServiceCallback): void; + create(resourceGroupName: string, accountName: string, applicationName: string, options?: Models.ApplicationCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - applicationId, + applicationName, options }, createOperationSpec, @@ -66,32 +66,32 @@ export class ApplicationOperations { * Deletes an application. * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param [options] The optional parameters * @returns Promise */ - deleteMethod(resourceGroupName: string, accountName: string, applicationId: string, options?: msRest.RequestOptionsBase): Promise; + deleteMethod(resourceGroupName: string, accountName: string, applicationName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param callback The callback */ - deleteMethod(resourceGroupName: string, accountName: string, applicationId: string, callback: msRest.ServiceCallback): void; + deleteMethod(resourceGroupName: string, accountName: string, applicationName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param options The optional parameters * @param callback The callback */ - deleteMethod(resourceGroupName: string, accountName: string, applicationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(resourceGroupName: string, accountName: string, applicationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + deleteMethod(resourceGroupName: string, accountName: string, applicationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + deleteMethod(resourceGroupName: string, accountName: string, applicationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - applicationId, + applicationName, options }, deleteMethodOperationSpec, @@ -102,32 +102,32 @@ export class ApplicationOperations { * Gets information about the specified application. * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param [options] The optional parameters * @returns Promise */ - get(resourceGroupName: string, accountName: string, applicationId: string, options?: msRest.RequestOptionsBase): Promise; + get(resourceGroupName: string, accountName: string, applicationName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param callback The callback */ - get(resourceGroupName: string, accountName: string, applicationId: string, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, accountName: string, applicationName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param options The optional parameters * @param callback The callback */ - get(resourceGroupName: string, accountName: string, applicationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, accountName: string, applicationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, accountName: string, applicationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, accountName: string, applicationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - applicationId, + applicationName, options }, getOperationSpec, @@ -138,40 +138,40 @@ export class ApplicationOperations { * Updates settings for the specified application. * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param parameters The parameters for the request. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - update(resourceGroupName: string, accountName: string, applicationId: string, parameters: Models.ApplicationUpdateParameters, options?: msRest.RequestOptionsBase): Promise; + update(resourceGroupName: string, accountName: string, applicationName: string, parameters: Models.Application, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param parameters The parameters for the request. * @param callback The callback */ - update(resourceGroupName: string, accountName: string, applicationId: string, parameters: Models.ApplicationUpdateParameters, callback: msRest.ServiceCallback): void; + update(resourceGroupName: string, accountName: string, applicationName: string, parameters: Models.Application, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. + * @param applicationName The name of the application. This must be unique within the account. * @param parameters The parameters for the request. * @param options The optional parameters * @param callback The callback */ - update(resourceGroupName: string, accountName: string, applicationId: string, parameters: Models.ApplicationUpdateParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - update(resourceGroupName: string, accountName: string, applicationId: string, parameters: Models.ApplicationUpdateParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + update(resourceGroupName: string, accountName: string, applicationName: string, parameters: Models.Application, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + update(resourceGroupName: string, accountName: string, applicationName: string, parameters: Models.Application, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - applicationId, + applicationName, parameters, options }, updateOperationSpec, - callback); + callback) as Promise; } /** @@ -239,11 +239,11 @@ export class ApplicationOperations { const serializer = new msRest.Serializer(Mappers); const createOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}", urlParameters: [ Parameters.resourceGroupName, Parameters.accountName, - Parameters.applicationId, + Parameters.applicationName, Parameters.subscriptionId ], queryParameters: [ @@ -257,10 +257,10 @@ const createOperationSpec: msRest.OperationSpec = { "options", "parameters" ], - mapper: Mappers.ApplicationCreateParameters + mapper: Mappers.Application }, responses: { - 201: { + 200: { bodyMapper: Mappers.Application }, default: { @@ -272,11 +272,11 @@ const createOperationSpec: msRest.OperationSpec = { const deleteMethodOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}", urlParameters: [ Parameters.resourceGroupName, Parameters.accountName, - Parameters.applicationId, + Parameters.applicationName, Parameters.subscriptionId ], queryParameters: [ @@ -286,6 +286,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { Parameters.acceptLanguage ], responses: { + 200: {}, 204: {}, default: { bodyMapper: Mappers.CloudError @@ -296,11 +297,11 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}", urlParameters: [ Parameters.resourceGroupName, Parameters.accountName, - Parameters.applicationId, + Parameters.applicationName, Parameters.subscriptionId ], queryParameters: [ @@ -322,11 +323,11 @@ const getOperationSpec: msRest.OperationSpec = { const updateOperationSpec: msRest.OperationSpec = { httpMethod: "PATCH", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}", urlParameters: [ Parameters.resourceGroupName, Parameters.accountName, - Parameters.applicationId, + Parameters.applicationName, Parameters.subscriptionId ], queryParameters: [ @@ -338,12 +339,14 @@ const updateOperationSpec: msRest.OperationSpec = { requestBody: { parameterPath: "parameters", mapper: { - ...Mappers.ApplicationUpdateParameters, + ...Mappers.Application, required: true } }, responses: { - 204: {}, + 200: { + bodyMapper: Mappers.Application + }, default: { bodyMapper: Mappers.CloudError } diff --git a/packages/@azure/arm-batch/lib/operations/applicationPackageOperations.ts b/packages/@azure/arm-batch/lib/operations/applicationPackageOperations.ts index 2e24b21cebcd..9ec0b70e3c1e 100644 --- a/packages/@azure/arm-batch/lib/operations/applicationPackageOperations.ts +++ b/packages/@azure/arm-batch/lib/operations/applicationPackageOperations.ts @@ -30,80 +30,80 @@ export class ApplicationPackageOperations { * Activates the specified application package. * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application to activate. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param format The format of the application package binary file. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - activate(resourceGroupName: string, accountName: string, applicationId: string, version: string, format: string, options?: msRest.RequestOptionsBase): Promise; + activate(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, format: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application to activate. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param format The format of the application package binary file. * @param callback The callback */ - activate(resourceGroupName: string, accountName: string, applicationId: string, version: string, format: string, callback: msRest.ServiceCallback): void; + activate(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, format: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application to activate. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param format The format of the application package binary file. * @param options The optional parameters * @param callback The callback */ - activate(resourceGroupName: string, accountName: string, applicationId: string, version: string, format: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - activate(resourceGroupName: string, accountName: string, applicationId: string, version: string, format: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + activate(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, format: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + activate(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, format: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - applicationId, - version, + applicationName, + versionName, format, options }, activateOperationSpec, - callback); + callback) as Promise; } /** * Creates an application package record. * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param [options] The optional parameters * @returns Promise */ - create(resourceGroupName: string, accountName: string, applicationId: string, version: string, options?: msRest.RequestOptionsBase): Promise; + create(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param callback The callback */ - create(resourceGroupName: string, accountName: string, applicationId: string, version: string, callback: msRest.ServiceCallback): void; + create(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param options The optional parameters * @param callback The callback */ - create(resourceGroupName: string, accountName: string, applicationId: string, version: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(resourceGroupName: string, accountName: string, applicationId: string, version: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + create(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + create(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - applicationId, - version, + applicationName, + versionName, options }, createOperationSpec, @@ -114,36 +114,36 @@ export class ApplicationPackageOperations { * Deletes an application package record and its associated binary file. * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application to delete. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param [options] The optional parameters * @returns Promise */ - deleteMethod(resourceGroupName: string, accountName: string, applicationId: string, version: string, options?: msRest.RequestOptionsBase): Promise; + deleteMethod(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application to delete. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param callback The callback */ - deleteMethod(resourceGroupName: string, accountName: string, applicationId: string, version: string, callback: msRest.ServiceCallback): void; + deleteMethod(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application to delete. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param options The optional parameters * @param callback The callback */ - deleteMethod(resourceGroupName: string, accountName: string, applicationId: string, version: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(resourceGroupName: string, accountName: string, applicationId: string, version: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + deleteMethod(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + deleteMethod(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - applicationId, - version, + applicationName, + versionName, options }, deleteMethodOperationSpec, @@ -154,53 +154,117 @@ export class ApplicationPackageOperations { * Gets information about the specified application package. * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param [options] The optional parameters * @returns Promise */ - get(resourceGroupName: string, accountName: string, applicationId: string, version: string, options?: msRest.RequestOptionsBase): Promise; + get(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param callback The callback */ - get(resourceGroupName: string, accountName: string, applicationId: string, version: string, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the Batch account. * @param accountName The name of the Batch account. - * @param applicationId The ID of the application. - * @param version The version of the application. + * @param applicationName The name of the application. This must be unique within the account. + * @param versionName The version of the application. * @param options The optional parameters * @param callback The callback */ - get(resourceGroupName: string, accountName: string, applicationId: string, version: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, accountName: string, applicationId: string, version: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, accountName: string, applicationName: string, versionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - applicationId, - version, + applicationName, + versionName, options }, getOperationSpec, callback) as Promise; } + + /** + * Lists all of the application packages in the specified application. + * @param resourceGroupName The name of the resource group that contains the Batch account. + * @param accountName The name of the Batch account. + * @param applicationName The name of the application. This must be unique within the account. + * @param [options] The optional parameters + * @returns Promise + */ + list(resourceGroupName: string, accountName: string, applicationName: string, options?: Models.ApplicationPackageListOptionalParams): Promise; + /** + * @param resourceGroupName The name of the resource group that contains the Batch account. + * @param accountName The name of the Batch account. + * @param applicationName The name of the application. This must be unique within the account. + * @param callback The callback + */ + list(resourceGroupName: string, accountName: string, applicationName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group that contains the Batch account. + * @param accountName The name of the Batch account. + * @param applicationName The name of the application. This must be unique within the account. + * @param options The optional parameters + * @param callback The callback + */ + list(resourceGroupName: string, accountName: string, applicationName: string, options: Models.ApplicationPackageListOptionalParams, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, accountName: string, applicationName: string, options?: Models.ApplicationPackageListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + accountName, + applicationName, + options + }, + listOperationSpec, + callback) as Promise; + } + + /** + * Lists all of the application packages in the specified application. + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param [options] The optional parameters + * @returns Promise + */ + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param callback The callback + */ + listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param options The optional parameters + * @param callback The callback + */ + listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + nextPageLink, + options + }, + listNextOperationSpec, + callback) as Promise; + } } // Operation Specifications const serializer = new msRest.Serializer(Mappers); const activateOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}/versions/{version}/activate", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}/versions/{versionName}/activate", urlParameters: [ Parameters.resourceGroupName, Parameters.accountName, - Parameters.applicationId, - Parameters.version, + Parameters.applicationName, + Parameters.versionName, Parameters.subscriptionId ], queryParameters: [ @@ -219,7 +283,9 @@ const activateOperationSpec: msRest.OperationSpec = { } }, responses: { - 204: {}, + 200: { + bodyMapper: Mappers.ApplicationPackage + }, default: { bodyMapper: Mappers.CloudError } @@ -229,12 +295,12 @@ const activateOperationSpec: msRest.OperationSpec = { const createOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}/versions/{version}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}/versions/{versionName}", urlParameters: [ Parameters.resourceGroupName, Parameters.accountName, - Parameters.applicationId, - Parameters.version, + Parameters.applicationName, + Parameters.versionName, Parameters.subscriptionId ], queryParameters: [ @@ -243,8 +309,15 @@ const createOperationSpec: msRest.OperationSpec = { headerParameters: [ Parameters.acceptLanguage ], + requestBody: { + parameterPath: [ + "options", + "parameters" + ], + mapper: Mappers.ApplicationPackage + }, responses: { - 201: { + 200: { bodyMapper: Mappers.ApplicationPackage }, default: { @@ -256,12 +329,12 @@ const createOperationSpec: msRest.OperationSpec = { const deleteMethodOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}/versions/{version}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}/versions/{versionName}", urlParameters: [ Parameters.resourceGroupName, Parameters.accountName, - Parameters.applicationId, - Parameters.version, + Parameters.applicationName, + Parameters.versionName, Parameters.subscriptionId ], queryParameters: [ @@ -271,6 +344,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { Parameters.acceptLanguage ], responses: { + 200: {}, 204: {}, default: { bodyMapper: Mappers.CloudError @@ -281,12 +355,12 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}/versions/{version}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}/versions/{versionName}", urlParameters: [ Parameters.resourceGroupName, Parameters.accountName, - Parameters.applicationId, - Parameters.version, + Parameters.applicationName, + Parameters.versionName, Parameters.subscriptionId ], queryParameters: [ @@ -305,3 +379,51 @@ const getOperationSpec: msRest.OperationSpec = { }, serializer }; + +const listOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationName}/versions", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.accountName, + Parameters.applicationName, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.maxresults, + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.ListApplicationPackagesResult + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const listNextOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + baseUrl: "https://management.azure.com", + path: "{nextLink}", + urlParameters: [ + Parameters.nextPageLink + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.ListApplicationPackagesResult + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; diff --git a/packages/@azure/arm-batch/package.json b/packages/@azure/arm-batch/package.json index 90b9cb739182..22368c8c5b85 100644 --- a/packages/@azure/arm-batch/package.json +++ b/packages/@azure/arm-batch/package.json @@ -4,8 +4,8 @@ "description": "BatchManagementClient Library with typescript type definitions for node.js and browser.", "version": "4.0.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", + "@azure/ms-rest-azure-js": "^1.2.0", + "@azure/ms-rest-js": "^1.2.0", "tslib": "^1.9.3" }, "keywords": [ @@ -23,6 +23,7 @@ "typescript": "^3.1.1", "rollup": "^0.66.2", "rollup-plugin-node-resolve": "^3.4.0", + "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.4.9" }, "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/arm-batch", @@ -51,6 +52,5 @@ "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/arm-batch.js.map'\" -o ./dist/arm-batch.min.js ./dist/arm-batch.js", "prepack": "npm install && npm run build" }, - "sideEffects": false, - "authPublish": true + "sideEffects": false } diff --git a/packages/@azure/arm-batch/rollup.config.js b/packages/@azure/arm-batch/rollup.config.js index 75e829947f0f..4f56ed985df8 100644 --- a/packages/@azure/arm-batch/rollup.config.js +++ b/packages/@azure/arm-batch/rollup.config.js @@ -1,10 +1,16 @@ +import rollup from "rollup"; import nodeResolve from "rollup-plugin-node-resolve"; +import sourcemaps from "rollup-plugin-sourcemaps"; + /** - * @type {import('rollup').RollupFileOptions} + * @type {rollup.RollupFileOptions} */ const config = { - input: './esm/batchManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + input: "./esm/batchManagementClient.js", + external: [ + "@azure/ms-rest-js", + "@azure/ms-rest-azure-js" + ], output: { file: "./dist/arm-batch.js", format: "umd", @@ -16,16 +22,16 @@ const config = { }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Licensed under the MIT License. See License.txt in the project root for license information. * * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is - * regenerated. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */` }, plugins: [ - nodeResolve({ module: true }) + nodeResolve({ module: true }), + sourcemaps() ] }; + export default config;