diff --git a/packages/@azure/arm-hdinsight/lib/hDInsightManagementClientContext.ts b/packages/@azure/arm-hdinsight/lib/hDInsightManagementClientContext.ts index 1e8735107ed5..0b55e14e02d3 100644 --- a/packages/@azure/arm-hdinsight/lib/hDInsightManagementClientContext.ts +++ b/packages/@azure/arm-hdinsight/lib/hDInsightManagementClientContext.ts @@ -13,7 +13,7 @@ import * as msRest from "ms-rest-js"; import * as msRestAzure from "ms-rest-azure-js"; const packageName = "@azure/arm-hdinsight"; -const packageVersion = "1.0.0-preview"; +const packageVersion = "0.1.0"; export class HDInsightManagementClientContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; @@ -38,6 +38,11 @@ export class HDInsightManagementClientContext extends msRestAzure.AzureServiceCl if (!options) { options = {}; } + if(!options.userAgent) { + const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); + options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; + } + super(credentials, options); this.apiVersion = '2018-06-01-preview'; @@ -48,7 +53,6 @@ export class HDInsightManagementClientContext extends msRestAzure.AzureServiceCl this.credentials = credentials; this.subscriptionId = subscriptionId; - this.addUserAgentInfo(`${packageName}/${packageVersion}`); if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } diff --git a/packages/@azure/arm-hdinsight/lib/models/applicationsMappers.ts b/packages/@azure/arm-hdinsight/lib/models/applicationsMappers.ts index 348d56ccccca..80b8ad1c15b6 100644 --- a/packages/@azure/arm-hdinsight/lib/models/applicationsMappers.ts +++ b/packages/@azure/arm-hdinsight/lib/models/applicationsMappers.ts @@ -39,6 +39,7 @@ export { SecurityProfile, QuotaInfo, ConnectivityEndpoint, + DiskEncryptionProperties, ClusterIdentity, ClusterIdentityUserAssignedIdentitiesValue } from "../models/mappers"; diff --git a/packages/@azure/arm-hdinsight/lib/models/clustersMappers.ts b/packages/@azure/arm-hdinsight/lib/models/clustersMappers.ts index a165226bb116..37d2d8261d48 100644 --- a/packages/@azure/arm-hdinsight/lib/models/clustersMappers.ts +++ b/packages/@azure/arm-hdinsight/lib/models/clustersMappers.ts @@ -25,6 +25,7 @@ export { ScriptAction, StorageProfile, StorageAccount, + DiskEncryptionProperties, ClusterIdentity, ClusterIdentityUserAssignedIdentitiesValue, Cluster, @@ -39,6 +40,7 @@ export { ClusterPatchParameters, ClusterListResult, ClusterResizeParameters, + ClusterDiskEncryptionParameters, ExecuteScriptActionParameters, RuntimeScriptAction, RuntimeScriptActionDetail, diff --git a/packages/@azure/arm-hdinsight/lib/models/index.ts b/packages/@azure/arm-hdinsight/lib/models/index.ts index 2134515b5642..e78c1379a528 100644 --- a/packages/@azure/arm-hdinsight/lib/models/index.ts +++ b/packages/@azure/arm-hdinsight/lib/models/index.ts @@ -337,6 +337,41 @@ export interface StorageProfile { storageaccounts?: StorageAccount[]; } +/** + * @interface + * An interface representing DiskEncryptionProperties. + * The disk encryption properties + * + */ +export interface DiskEncryptionProperties { + /** + * @member {string} [vaultUri] Base key vault URI where the customers key is + * located eg. https://myvault.vault.azure.net + */ + vaultUri?: string; + /** + * @member {string} [keyName] Key name that is used for enabling disk + * encryption. + */ + keyName?: string; + /** + * @member {string} [keyVersion] Specific key version that is used for + * enabling disk encryption. + */ + keyVersion?: string; + /** + * @member {JsonWebKeyEncryptionAlgorithm} [encryptionAlgorithm] Algorithm + * identifier for encryption, default RSA-OAEP. Possible values include: + * 'RSA-OAEP', 'RSA-OAEP-256', 'RSA1_5' + */ + encryptionAlgorithm?: JsonWebKeyEncryptionAlgorithm; + /** + * @member {string} [msiResourceId] Resource ID of Managed Identity that is + * used to access the key vault. + */ + msiResourceId?: string; +} + /** * @interface * An interface representing ClusterCreateProperties. @@ -374,6 +409,11 @@ export interface ClusterCreateProperties { * @member {StorageProfile} [storageProfile] The storage profile. */ storageProfile?: StorageProfile; + /** + * @member {DiskEncryptionProperties} [diskEncryptionProperties] The disk + * encryption properties. + */ + diskEncryptionProperties?: DiskEncryptionProperties; } /** @@ -589,6 +629,11 @@ export interface ClusterGetProperties { * connectivity endpoints. */ connectivityEndpoints?: ConnectivityEndpoint[]; + /** + * @member {DiskEncryptionProperties} [diskEncryptionProperties] The disk + * encryption properties. + */ + diskEncryptionProperties?: DiskEncryptionProperties; } /** @@ -846,6 +891,30 @@ export interface ClusterResizeParameters { targetInstanceCount?: number; } +/** + * @interface + * An interface representing ClusterDiskEncryptionParameters. + * The Disk Encryption Cluster request parameters. + * + */ +export interface ClusterDiskEncryptionParameters { + /** + * @member {string} [vaultUri] Base key vault URI where the customers key is + * located eg. https://myvault.vault.azure.net + */ + vaultUri?: string; + /** + * @member {string} [keyName] Key name that is used for enabling disk + * encryption. + */ + keyName?: string; + /** + * @member {string} [keyVersion] Specific key version that is used for + * enabling disk encryption. + */ + keyVersion?: string; +} + /** * @interface * An interface representing OperationResource. @@ -917,12 +986,6 @@ export interface ApplicationGetHttpsEndpoint { * @member {number} [publicPort] The public port to connect to. */ publicPort?: number; - /** - * @property Describes unknown properties. The value of an unknown property - * MUST be of type "string". Due to valid TS constraints we have modeled this - * as a union of `string | any`. - */ - [property: string]: string | any; } /** @@ -1011,11 +1074,6 @@ export interface ApplicationProperties { * the server.** */ readonly marketplaceIdentifier?: string; - /** - * @member {string} [additionalProperties] The additional properties for - * application. - */ - additionalProperties?: string; } /** @@ -1328,9 +1386,7 @@ export interface OperationListResult extends Array { * @readonly * @enum {string} */ -export enum DirectoryType { - ActiveDirectory = 'ActiveDirectory', -} +export type DirectoryType = 'ActiveDirectory'; /** * Defines values for OSType. @@ -1338,10 +1394,7 @@ export enum DirectoryType { * @readonly * @enum {string} */ -export enum OSType { - Windows = 'Windows', - Linux = 'Linux', -} +export type OSType = 'Windows' | 'Linux'; /** * Defines values for Tier. @@ -1349,39 +1402,32 @@ export enum OSType { * @readonly * @enum {string} */ -export enum Tier { - Standard = 'Standard', - Premium = 'Premium', -} +export type Tier = 'Standard' | 'Premium'; + +/** + * Defines values for JsonWebKeyEncryptionAlgorithm. + * Possible values include: 'RSA-OAEP', 'RSA-OAEP-256', 'RSA1_5' + * @readonly + * @enum {string} + */ +export type JsonWebKeyEncryptionAlgorithm = 'RSA-OAEP' | 'RSA-OAEP-256' | 'RSA1_5'; /** * Defines values for ResourceIdentityType. - * Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, - * UserAssigned', 'None' + * Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', + * 'None' * @readonly * @enum {string} */ -export enum ResourceIdentityType { - SystemAssigned = 'SystemAssigned', - UserAssigned = 'UserAssigned', - SystemAssignedUserAssigned = 'SystemAssigned, UserAssigned', - None = 'None', -} +export type ResourceIdentityType = 'SystemAssigned' | 'UserAssigned' | 'SystemAssigned, UserAssigned' | 'None'; /** * Defines values for HDInsightClusterProvisioningState. - * Possible values include: 'InProgress', 'Failed', 'Succeeded', 'Canceled', - * 'Deleting' + * Possible values include: 'InProgress', 'Failed', 'Succeeded', 'Canceled', 'Deleting' * @readonly * @enum {string} */ -export enum HDInsightClusterProvisioningState { - InProgress = 'InProgress', - Failed = 'Failed', - Succeeded = 'Succeeded', - Canceled = 'Canceled', - Deleting = 'Deleting', -} +export type HDInsightClusterProvisioningState = 'InProgress' | 'Failed' | 'Succeeded' | 'Canceled' | 'Deleting'; /** * Defines values for AsyncOperationState. @@ -1389,11 +1435,7 @@ export enum HDInsightClusterProvisioningState { * @readonly * @enum {string} */ -export enum AsyncOperationState { - InProgress = 'InProgress', - Succeeded = 'Succeeded', - Failed = 'Failed', -} +export type AsyncOperationState = 'InProgress' | 'Succeeded' | 'Failed'; /** * Contains response data for the create operation. diff --git a/packages/@azure/arm-hdinsight/lib/models/mappers.ts b/packages/@azure/arm-hdinsight/lib/models/mappers.ts index 092970d6df6b..017d9b8bef5d 100644 --- a/packages/@azure/arm-hdinsight/lib/models/mappers.ts +++ b/packages/@azure/arm-hdinsight/lib/models/mappers.ts @@ -470,6 +470,46 @@ export const StorageProfile: msRest.CompositeMapper = { } }; +export const DiskEncryptionProperties: msRest.CompositeMapper = { + serializedName: "DiskEncryptionProperties", + type: { + name: "Composite", + className: "DiskEncryptionProperties", + modelProperties: { + vaultUri: { + serializedName: "vaultUri", + type: { + name: "String" + } + }, + keyName: { + serializedName: "keyName", + type: { + name: "String" + } + }, + keyVersion: { + serializedName: "keyVersion", + type: { + name: "String" + } + }, + encryptionAlgorithm: { + serializedName: "encryptionAlgorithm", + type: { + name: "String" + } + }, + msiResourceId: { + serializedName: "msiResourceId", + type: { + name: "String" + } + } + } + } +}; + export const ClusterCreateProperties: msRest.CompositeMapper = { serializedName: "ClusterCreateProperties", type: { @@ -529,6 +569,13 @@ export const ClusterCreateProperties: msRest.CompositeMapper = { name: "Composite", className: "StorageProfile" } + }, + diskEncryptionProperties: { + serializedName: "diskEncryptionProperties", + type: { + name: "Composite", + className: "DiskEncryptionProperties" + } } } } @@ -850,6 +897,13 @@ export const ClusterGetProperties: msRest.CompositeMapper = { } } } + }, + diskEncryptionProperties: { + serializedName: "diskEncryptionProperties", + type: { + name: "Composite", + className: "DiskEncryptionProperties" + } } } } @@ -1188,6 +1242,34 @@ export const ClusterResizeParameters: msRest.CompositeMapper = { } }; +export const ClusterDiskEncryptionParameters: msRest.CompositeMapper = { + serializedName: "ClusterDiskEncryptionParameters", + type: { + name: "Composite", + className: "ClusterDiskEncryptionParameters", + modelProperties: { + vaultUri: { + serializedName: "vaultUri", + type: { + name: "String" + } + }, + keyName: { + serializedName: "keyName", + type: { + name: "String" + } + }, + keyVersion: { + serializedName: "keyVersion", + type: { + name: "String" + } + } + } + } +}; + export const OperationResource: msRest.CompositeMapper = { serializedName: "OperationResource", type: { @@ -1284,11 +1366,6 @@ export const ApplicationGetHttpsEndpoint: msRest.CompositeMapper = { name: "Number" } } - }, - additionalProperties: { - type: { - name: "String" - } } } }; @@ -1365,12 +1442,7 @@ export const ApplicationProperties: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "ApplicationGetHttpsEndpoint", - additionalProperties: { - type: { - name: "String" - } - } + className: "ApplicationGetHttpsEndpoint" } } } @@ -1432,12 +1504,6 @@ export const ApplicationProperties: msRest.CompositeMapper = { type: { name: "String" } - }, - additionalProperties: { - serializedName: "additionalProperties", - type: { - name: "String" - } } } } diff --git a/packages/@azure/arm-hdinsight/lib/operations/applications.ts b/packages/@azure/arm-hdinsight/lib/operations/applications.ts index ef2fe328b4f3..0425e3792096 100644 --- a/packages/@azure/arm-hdinsight/lib/operations/applications.ts +++ b/packages/@azure/arm-hdinsight/lib/operations/applications.ts @@ -48,7 +48,7 @@ export class Applications { * @param callback The callback */ listByCluster(resourceGroupName: string, clusterName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByCluster(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByCluster(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -83,7 +83,7 @@ export class Applications { * @param callback The callback */ get(resourceGroupName: string, clusterName: string, applicationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, clusterName: string, applicationName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, clusterName: string, applicationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -182,7 +182,7 @@ export class Applications { * @param callback The callback */ listByClusterNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByClusterNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByClusterNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-hdinsight/lib/operations/clusters.ts b/packages/@azure/arm-hdinsight/lib/operations/clusters.ts index 5dcb3dc7a09c..a014fb265524 100644 --- a/packages/@azure/arm-hdinsight/lib/operations/clusters.ts +++ b/packages/@azure/arm-hdinsight/lib/operations/clusters.ts @@ -64,7 +64,7 @@ export class Clusters { * @param callback The callback */ update(resourceGroupName: string, clusterName: string, parameters: Models.ClusterPatchParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - update(resourceGroupName: string, clusterName: string, parameters: Models.ClusterPatchParameters, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + update(resourceGroupName: string, clusterName: string, parameters: Models.ClusterPatchParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -109,7 +109,7 @@ export class Clusters { * @param callback The callback */ get(resourceGroupName: string, clusterName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -138,7 +138,7 @@ export class Clusters { * @param callback The callback */ listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -176,7 +176,7 @@ export class Clusters { * @param callback The callback */ list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -185,6 +185,19 @@ export class Clusters { callback) as Promise; } + /** + * Rotate disk encryption key of the specified HDInsight cluster. + * @param resourceGroupName The name of the resource group. + * @param clusterName The name of the cluster. + * @param parameters The parameters for the disk encryption operation. + * @param [options] The optional parameters + * @returns Promise + */ + rotateDiskEncryptionKey(resourceGroupName: string, clusterName: string, parameters: Models.ClusterDiskEncryptionParameters, options?: msRest.RequestOptionsBase): Promise { + return this.beginRotateDiskEncryptionKey(resourceGroupName,clusterName,parameters,options) + .then(lroPoller => lroPoller.pollUntilFinished()); + } + /** * Executes script actions on the specified HDInsight cluster. * @param resourceGroupName The name of the resource group. @@ -256,6 +269,26 @@ export class Clusters { options); } + /** + * Rotate disk encryption key of the specified HDInsight cluster. + * @param resourceGroupName The name of the resource group. + * @param clusterName The name of the cluster. + * @param parameters The parameters for the disk encryption operation. + * @param [options] The optional parameters + * @returns Promise + */ + beginRotateDiskEncryptionKey(resourceGroupName: string, clusterName: string, parameters: Models.ClusterDiskEncryptionParameters, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( + { + resourceGroupName, + clusterName, + parameters, + options + }, + beginRotateDiskEncryptionKeyOperationSpec, + options); + } + /** * Executes script actions on the specified HDInsight cluster. * @param resourceGroupName The name of the resource group. @@ -294,7 +327,7 @@ export class Clusters { * @param callback The callback */ listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -322,7 +355,7 @@ export class Clusters { * @param callback The callback */ listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -527,6 +560,37 @@ const beginResizeOperationSpec: msRest.OperationSpec = { serializer }; +const beginRotateDiskEncryptionKeyOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/rotatediskencryptionkey", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.clusterName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + requestBody: { + parameterPath: "parameters", + mapper: { + ...Mappers.ClusterDiskEncryptionParameters, + required: true + } + }, + responses: { + 200: {}, + 202: {}, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + const beginExecuteScriptActionsOperationSpec: msRest.OperationSpec = { httpMethod: "POST", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/executeScriptActions", diff --git a/packages/@azure/arm-hdinsight/lib/operations/configurations.ts b/packages/@azure/arm-hdinsight/lib/operations/configurations.ts index 3cd5b0c8888a..4ecaec387d61 100644 --- a/packages/@azure/arm-hdinsight/lib/operations/configurations.ts +++ b/packages/@azure/arm-hdinsight/lib/operations/configurations.ts @@ -65,7 +65,7 @@ export class Configurations { * @param callback The callback */ get(resourceGroupName: string, clusterName: string, configurationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<{ [propertyName: string]: string }>): void; - get(resourceGroupName: string, clusterName: string, configurationName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<{ [propertyName: string]: string }>): Promise { + get(resourceGroupName: string, clusterName: string, configurationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<{ [propertyName: string]: string }>, callback?: msRest.ServiceCallback<{ [propertyName: string]: string }>): Promise { return this.client.sendOperationRequest( { resourceGroupName, diff --git a/packages/@azure/arm-hdinsight/lib/operations/extensions.ts b/packages/@azure/arm-hdinsight/lib/operations/extensions.ts index c48e7f27864b..0a82df3216ec 100644 --- a/packages/@azure/arm-hdinsight/lib/operations/extensions.ts +++ b/packages/@azure/arm-hdinsight/lib/operations/extensions.ts @@ -61,7 +61,7 @@ export class Extensions { * @param callback The callback */ getMonitoringStatus(resourceGroupName: string, clusterName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getMonitoringStatus(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getMonitoringStatus(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -122,7 +122,7 @@ export class Extensions { * @param callback The callback */ get(resourceGroupName: string, clusterName: string, extensionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, clusterName: string, extensionName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, clusterName: string, extensionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, diff --git a/packages/@azure/arm-hdinsight/lib/operations/locations.ts b/packages/@azure/arm-hdinsight/lib/operations/locations.ts index 6188754952d1..5968bf2860ba 100644 --- a/packages/@azure/arm-hdinsight/lib/operations/locations.ts +++ b/packages/@azure/arm-hdinsight/lib/operations/locations.ts @@ -44,7 +44,7 @@ export class Locations { * @param callback The callback */ listUsages(location: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listUsages(location: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listUsages(location: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { location, diff --git a/packages/@azure/arm-hdinsight/lib/operations/operations.ts b/packages/@azure/arm-hdinsight/lib/operations/operations.ts index 027333446006..597175173ed1 100644 --- a/packages/@azure/arm-hdinsight/lib/operations/operations.ts +++ b/packages/@azure/arm-hdinsight/lib/operations/operations.ts @@ -41,7 +41,7 @@ export class Operations { * @param callback The callback */ list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -68,7 +68,7 @@ export class Operations { * @param callback The callback */ listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-hdinsight/lib/operations/scriptActions.ts b/packages/@azure/arm-hdinsight/lib/operations/scriptActions.ts index ed225185897b..1beda746b394 100644 --- a/packages/@azure/arm-hdinsight/lib/operations/scriptActions.ts +++ b/packages/@azure/arm-hdinsight/lib/operations/scriptActions.ts @@ -50,7 +50,7 @@ export class ScriptActions { * @param callback The callback */ deleteMethod(resourceGroupName: string, clusterName: string, scriptName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(resourceGroupName: string, clusterName: string, scriptName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(resourceGroupName: string, clusterName: string, scriptName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -83,7 +83,7 @@ export class ScriptActions { * @param callback The callback */ listByCluster(resourceGroupName: string, clusterName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByCluster(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByCluster(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -118,7 +118,7 @@ export class ScriptActions { * @param callback The callback */ getExecutionDetail(resourceGroupName: string, clusterName: string, scriptExecutionId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getExecutionDetail(resourceGroupName: string, clusterName: string, scriptExecutionId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getExecutionDetail(resourceGroupName: string, clusterName: string, scriptExecutionId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -148,7 +148,7 @@ export class ScriptActions { * @param callback The callback */ listByClusterNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByClusterNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByClusterNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-hdinsight/lib/operations/scriptExecutionHistory.ts b/packages/@azure/arm-hdinsight/lib/operations/scriptExecutionHistory.ts index 478a864e80dc..64858ea4b376 100644 --- a/packages/@azure/arm-hdinsight/lib/operations/scriptExecutionHistory.ts +++ b/packages/@azure/arm-hdinsight/lib/operations/scriptExecutionHistory.ts @@ -47,7 +47,7 @@ export class ScriptExecutionHistory { * @param callback The callback */ listByCluster(resourceGroupName: string, clusterName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByCluster(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByCluster(resourceGroupName: string, clusterName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -82,7 +82,7 @@ export class ScriptExecutionHistory { * @param callback The callback */ promote(resourceGroupName: string, clusterName: string, scriptExecutionId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - promote(resourceGroupName: string, clusterName: string, scriptExecutionId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + promote(resourceGroupName: string, clusterName: string, scriptExecutionId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -112,7 +112,7 @@ export class ScriptExecutionHistory { * @param callback The callback */ listByClusterNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByClusterNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByClusterNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-hdinsight/package.json b/packages/@azure/arm-hdinsight/package.json index 41e3bb491b31..13722ecbe389 100644 --- a/packages/@azure/arm-hdinsight/package.json +++ b/packages/@azure/arm-hdinsight/package.json @@ -4,8 +4,8 @@ "description": "HDInsightManagementClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "ms-rest-azure-js": "^1.0.176", - "ms-rest-js": "^1.0.455", + "ms-rest-azure-js": "^1.0.181", + "ms-rest-js": "^1.0.460", "tslib": "^1.9.3" }, "keywords": [ @@ -52,4 +52,4 @@ "prepack": "npm install && npm run build" }, "sideEffects": false -} \ No newline at end of file +}