Skip to content

Commit

Permalink
CodeGen from PR 12493 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
[Fix broken S360 Issues][HDInsight] Fix S360 issues batch2 (Azure#12493)

* Add networkProperties and clusterId

* Add display.description and properties of operation.
Fix DeletionOperationResponse linting error
Add privateIPAddress in ConnectivityEndpoints and
ApplicationGetEndpoints

* Fix model validation error: update example

Co-authored-by: Zhenyu Zhou <zhezhou@microsoft.com>
  • Loading branch information
SDKAuto and Zhenyu Zhou committed Jan 20, 2021
1 parent 332847c commit a98934a
Show file tree
Hide file tree
Showing 12 changed files with 617 additions and 8 deletions.
2 changes: 1 addition & 1 deletion sdk/hdinsight/arm-hdinsight/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 Microsoft
Copyright (c) 2021 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class HDInsightManagementClientContext extends msRestAzure.AzureServiceCl
if (!options) {
options = {};
}
if (!options.userAgent) {
if(!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}
Expand All @@ -52,10 +52,10 @@ export class HDInsightManagementClientContext extends msRestAzure.AzureServiceCl
this.credentials = credentials;
this.subscriptionId = subscriptionId;

if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
}
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
}
}
Expand Down
3 changes: 3 additions & 0 deletions sdk/hdinsight/arm-hdinsight/src/models/applicationsMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export {
EncryptionInTransitProperties,
ErrorResponse,
Errors,
ExcludedServicesConfig,
HardwareProfile,
KafkaRestProperties,
LinuxOperatingSystemProfile,
Expand All @@ -48,6 +49,8 @@ export {
SecurityProfile,
SshProfile,
SshPublicKey,
StorageAccount,
StorageProfile,
TrackedResource,
VirtualNetworkProfile
} from "../models/mappers";
1 change: 1 addition & 0 deletions sdk/hdinsight/arm-hdinsight/src/models/clustersMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export {
EncryptionInTransitProperties,
ErrorResponse,
Errors,
ExcludedServicesConfig,
ExecuteScriptActionParameters,
GatewaySettings,
HardwareProfile,
Expand Down
227 changes: 224 additions & 3 deletions sdk/hdinsight/arm-hdinsight/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,10 @@ export interface Role {
* The list of script actions on the role.
*/
scriptActions?: ScriptAction[];
/**
* Indicates whether encrypt the data disks.
*/
encryptDataDisks?: boolean;
}

/**
Expand Down Expand Up @@ -392,6 +396,20 @@ export interface StorageProfile {
storageaccounts?: StorageAccount[];
}

/**
* The configuration that services will be excluded when creating cluster.
*/
export interface ExcludedServicesConfig {
/**
* The config id of excluded services.
*/
excludedServicesConfigId?: string;
/**
* The list of excluded services.
*/
excludedServicesList?: string;
}

/**
* The network properties.
*/
Expand Down Expand Up @@ -536,6 +554,10 @@ export interface ClusterIdentityUserAssignedIdentitiesValue {
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly clientId?: string;
/**
* The tenant id of user assigned identity.
*/
tenantId?: string;
}

/**
Expand Down Expand Up @@ -644,6 +666,10 @@ export interface ConnectivityEndpoint {
* The port to connect to.
*/
port?: number;
/**
* The private ip address of the endpoint.
*/
privateIPAddress?: string;
}

/**
Expand All @@ -654,6 +680,10 @@ export interface ClusterGetProperties {
* The version of the cluster.
*/
clusterVersion?: string;
/**
* The hdp version of the cluster.
*/
clusterHdpVersion?: string;
/**
* The type of operating system. Possible values include: 'Windows', 'Linux'
*/
Expand Down Expand Up @@ -715,10 +745,18 @@ export interface ClusterGetProperties {
* The encryption-in-transit properties.
*/
encryptionInTransitProperties?: EncryptionInTransitProperties;
/**
* The storage profile.
*/
storageProfile?: StorageProfile;
/**
* The minimal supported tls version.
*/
minSupportedTlsVersion?: string;
/**
* The excluded services config.
*/
excludedServicesConfig?: ExcludedServicesConfig;
/**
* The network properties.
*/
Expand Down Expand Up @@ -1060,6 +1098,10 @@ export interface ApplicationGetEndpoint {
* The public port to connect to.
*/
publicPort?: number;
/**
* The private ip address of the endpoint.
*/
privateIPAddress?: string;
}

/**
Expand Down Expand Up @@ -1338,7 +1380,7 @@ export interface UsagesListResult {
export interface VmSizeCompatibilityFilterV2 {
/**
* The filtering mode. Effectively this can enabling or disabling the VM sizes in a particular
* set. Possible values include: 'Exclude', 'Include'
* set. Possible values include: 'Exclude', 'Include', 'Recommend', 'Default'
*/
filterMode?: FilterMode;
/**
Expand Down Expand Up @@ -1367,6 +1409,52 @@ export interface VmSizeCompatibilityFilterV2 {
vmSizes?: string[];
}

/**
* The vm size property
*/
export interface VmSizeProperty {
/**
* The vm size name.
*/
name?: string;
/**
* The number of cores that the vm size has.
*/
cores?: number;
/**
* The data disk storage tier of the vm size.
*/
dataDiskStorageTier?: string;
/**
* The label of the vm size.
*/
label?: string;
/**
* The max data disk count of the vm size.
*/
maxDataDiskCount?: number;
/**
* The memory whose unit is MB of the vm size.
*/
memoryInMb?: number;
/**
* This indicates this vm size is supported by virtual machines or not
*/
supportedByVirtualMachines?: boolean;
/**
* The indicates this vm size is supported by web worker roles or not
*/
supportedByWebWorkerRoles?: boolean;
/**
* The virtual machine resource disk size whose unit is MB of the vm size.
*/
virtualMachineResourceDiskSizeInMb?: number;
/**
* The web worker resource disk size whose unit is MB of the vm size.
*/
webWorkerResourceDiskSizeInMb?: number;
}

/**
* The billing meters.
*/
Expand Down Expand Up @@ -1430,11 +1518,20 @@ export interface BillingResponseListResult {
* The virtual machine sizes to include or exclude.
*/
vmSizes?: string[];
/**
* The vm sizes which enable encryption at host.
*/
vmSizesWithEncryptionAtHost?: string[];
/**
* The virtual machine filtering mode. Effectively this can enabling or disabling the virtual
* machine sizes in a particular set.
*/
vmSizeFilters?: VmSizeCompatibilityFilterV2[];
/**
* The vm size properties.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly vmSizeProperties?: VmSizeProperty[];
/**
* The billing and managed disk billing resources for a region.
*/
Expand Down Expand Up @@ -1535,6 +1632,126 @@ export interface OperationDisplay {
* The operation type: read, write, delete, etc.
*/
operation?: string;
/**
* Localized friendly description for the operation
*/
description?: string;
}

/**
* The definition of Dimension.
*/
export interface Dimension {
/**
* The name of the dimension.
*/
name?: string;
/**
* The display name of the dimension.
*/
displayName?: string;
/**
* The display name of the dimension.
*/
internalName?: string;
/**
* The flag indicates whether the metric will be exported for shoebox or not.
*/
toBeExportedForShoebox?: boolean;
}

/**
* The details of metric specifications.
*/
export interface MetricSpecifications {
/**
* The name of the metric specification.
*/
name?: string;
/**
* The display name of the metric specification.
*/
displayName?: string;
/**
* The display description of the metric specification.
*/
displayDescription?: string;
/**
* The unit of the metric specification.
*/
unit?: string;
/**
* The aggregation type of the metric specification.
*/
aggregationType?: string;
/**
* The supported aggregation types of the metric specification.
*/
supportedAggregationTypes?: string[];
/**
* The supported time grain types of the metric specification.
*/
supportedTimeGrainTypes?: string[];
/**
* The flag indicates whether enable regional mdm account or not.
*/
enableRegionalMdmAccount?: boolean;
/**
* The source mdm account.
*/
sourceMdmAccount?: string;
/**
* The source mdm namespace.
*/
sourceMdmNamespace?: string;
/**
* The metric filter pattern.
*/
metricFilterPattern?: string;
/**
* The flag indicates whether filling gap with zero.
*/
fillGapWithZero?: boolean;
/**
* The category of the metric.
*/
category?: string;
/**
* The override name of resource id dimension name.
*/
resourceIdDimensionNameOverride?: string;
/**
* The flag indicates whether the metric is internal or not.
*/
isInternal?: boolean;
/**
* The override name of delegate metric.
*/
delegateMetricNameOverride?: string;
/**
* The dimensions of the metric specification.
*/
dimensions?: Dimension[];
}

/**
* The specification of the service.
*/
export interface ServiceSpecification {
/**
* The metric specifications.
*/
metricSpecifications?: MetricSpecifications[];
}

/**
* The details of operation.
*/
export interface OperationProperties {
/**
* The specification of the service.
*/
serviceSpecification?: ServiceSpecification;
}

/**
Expand All @@ -1549,6 +1766,10 @@ export interface Operation {
* The object that represents the operation.
*/
display?: OperationDisplay;
/**
* The operation properties.
*/
properties?: OperationProperties;
}

/**
Expand Down Expand Up @@ -1726,11 +1947,11 @@ export type AsyncOperationState = 'InProgress' | 'Succeeded' | 'Failed';

/**
* Defines values for FilterMode.
* Possible values include: 'Exclude', 'Include'
* Possible values include: 'Exclude', 'Include', 'Recommend', 'Default'
* @readonly
* @enum {string}
*/
export type FilterMode = 'Exclude' | 'Include';
export type FilterMode = 'Exclude' | 'Include' | 'Recommend' | 'Default';

/**
* Contains response data for the create operation.
Expand Down
1 change: 1 addition & 0 deletions sdk/hdinsight/arm-hdinsight/src/models/locationsMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ export {
VersionSpec,
VmSizeCompatibilityFilter,
VmSizeCompatibilityFilterV2,
VmSizeProperty,
VmSizesCapability
} from "../models/mappers";
Loading

0 comments on commit a98934a

Please sign in to comment.