Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR hdinsight/resource-manager] [HDInsight] - Support KV URL #475

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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';
Expand All @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export {
SecurityProfile,
QuotaInfo,
ConnectivityEndpoint,
DiskEncryptionProperties,
ClusterIdentity,
ClusterIdentityUserAssignedIdentitiesValue
} from "../models/mappers";
Expand Down
2 changes: 2 additions & 0 deletions packages/@azure/arm-hdinsight/lib/models/clustersMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export {
ScriptAction,
StorageProfile,
StorageAccount,
DiskEncryptionProperties,
ClusterIdentity,
ClusterIdentityUserAssignedIdentitiesValue,
Cluster,
Expand All @@ -39,6 +40,7 @@ export {
ClusterPatchParameters,
ClusterListResult,
ClusterResizeParameters,
ClusterDiskEncryptionParameters,
ExecuteScriptActionParameters,
RuntimeScriptAction,
RuntimeScriptActionDetail,
Expand Down
130 changes: 86 additions & 44 deletions packages/@azure/arm-hdinsight/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -374,6 +409,11 @@ export interface ClusterCreateProperties {
* @member {StorageProfile} [storageProfile] The storage profile.
*/
storageProfile?: StorageProfile;
/**
* @member {DiskEncryptionProperties} [diskEncryptionProperties] The disk
* encryption properties.
*/
diskEncryptionProperties?: DiskEncryptionProperties;
}

/**
Expand Down Expand Up @@ -589,6 +629,11 @@ export interface ClusterGetProperties {
* connectivity endpoints.
*/
connectivityEndpoints?: ConnectivityEndpoint[];
/**
* @member {DiskEncryptionProperties} [diskEncryptionProperties] The disk
* encryption properties.
*/
diskEncryptionProperties?: DiskEncryptionProperties;
}

/**
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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;
}

/**
Expand Down Expand Up @@ -1011,11 +1074,6 @@ export interface ApplicationProperties {
* the server.**
*/
readonly marketplaceIdentifier?: string;
/**
* @member {string} [additionalProperties] The additional properties for
* application.
*/
additionalProperties?: string;
}

/**
Expand Down Expand Up @@ -1328,72 +1386,56 @@ export interface OperationListResult extends Array<Operation> {
* @readonly
* @enum {string}
*/
export enum DirectoryType {
ActiveDirectory = 'ActiveDirectory',
}
export type DirectoryType = 'ActiveDirectory';

/**
* Defines values for OSType.
* Possible values include: 'Windows', 'Linux'
* @readonly
* @enum {string}
*/
export enum OSType {
Windows = 'Windows',
Linux = 'Linux',
}
export type OSType = 'Windows' | 'Linux';

/**
* Defines values for Tier.
* Possible values include: 'Standard', 'Premium'
* @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.
* Possible values include: 'InProgress', 'Succeeded', 'Failed'
* @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.
Expand Down
Loading