From 2db09fe123a4d84fa6bd231ef4eef7de17c9d29d Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 12 Nov 2018 09:56:08 -0800 Subject: [PATCH 1/5] Generated from 84624804865be53090660f859760f153de313691 (#470) merged from master --- .../lib/models/allowedConnectionsMappers.ts | 19 + .../@azure/arm-security/lib/models/index.ts | 448 ++++++++++-------- .../@azure/arm-security/lib/models/mappers.ts | 162 +++++++ .../arm-security/lib/models/parameters.ts | 10 + .../operations/advancedThreatProtection.ts | 4 +- .../arm-security/lib/operations/alerts.ts | 24 +- .../lib/operations/allowedConnections.ts | 288 +++++++++++ .../operations/autoProvisioningSettings.ts | 8 +- .../lib/operations/compliances.ts | 6 +- .../operations/discoveredSecuritySolutions.ts | 10 +- .../operations/externalSecuritySolutions.ts | 10 +- .../arm-security/lib/operations/index.ts | 1 + .../informationProtectionPolicies.ts | 8 +- .../operations/jitNetworkAccessPolicies.ts | 24 +- .../arm-security/lib/operations/locations.ts | 6 +- .../arm-security/lib/operations/operations.ts | 4 +- .../arm-security/lib/operations/pricings.ts | 16 +- .../lib/operations/securityContacts.ts | 12 +- .../arm-security/lib/operations/settings.ts | 8 +- .../arm-security/lib/operations/tasks.ts | 20 +- .../arm-security/lib/operations/topology.ts | 10 +- .../lib/operations/workspaceSettings.ts | 12 +- .../@azure/arm-security/lib/securityCenter.ts | 2 + .../arm-security/lib/securityCenterContext.ts | 8 +- packages/@azure/arm-security/package.json | 6 +- 25 files changed, 825 insertions(+), 301 deletions(-) create mode 100644 packages/@azure/arm-security/lib/models/allowedConnectionsMappers.ts create mode 100644 packages/@azure/arm-security/lib/operations/allowedConnections.ts diff --git a/packages/@azure/arm-security/lib/models/allowedConnectionsMappers.ts b/packages/@azure/arm-security/lib/models/allowedConnectionsMappers.ts new file mode 100644 index 000000000000..d8a8951a7057 --- /dev/null +++ b/packages/@azure/arm-security/lib/models/allowedConnectionsMappers.ts @@ -0,0 +1,19 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * 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. + */ + +export { + discriminators, + AllowedConnectionsList, + AllowedConnectionsResource, + ConnectableResource, + ConnectedResource, + CloudError +} from "../models/mappers"; + diff --git a/packages/@azure/arm-security/lib/models/index.ts b/packages/@azure/arm-security/lib/models/index.ts index 9381b7c73d71..78a3b7ecb605 100644 --- a/packages/@azure/arm-security/lib/models/index.ts +++ b/packages/@azure/arm-security/lib/models/index.ts @@ -1438,6 +1438,111 @@ export interface AadConnectivityState1 { connectivityState?: AadConnectivityState; } +/** + * @interface + * An interface representing ConnectedResource. + * Describes properties of a connected resource + * + */ +export interface ConnectedResource { + /** + * @member {string} [connectedResourceId] The Azure resource id of the + * connected resource + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly connectedResourceId?: string; + /** + * @member {string} [tcpPorts] The allowed tcp ports + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly tcpPorts?: string; + /** + * @member {string} [udpPorts] The allowed udp ports + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly udpPorts?: string; +} + +/** + * @interface + * An interface representing ConnectableResource. + * Describes the allowed inbound and outbound traffic of an Azure resource + * + */ +export interface ConnectableResource { + /** + * @member {string} [id] The Azure resource id + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly id?: string; + /** + * @member {ConnectedResource[]} [inboundConnectedResources] The list of + * Azure resources that the resource has inbound allowed connection from + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly inboundConnectedResources?: ConnectedResource[]; + /** + * @member {ConnectedResource[]} [outboundConnectedResources] The list of + * Azure resources that the resource has outbound allowed connection to + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly outboundConnectedResources?: ConnectedResource[]; +} + +/** + * @interface + * An interface representing AllowedConnectionsResource. + * The resource whose properties describes the allowed traffic between Azure + * resources + * + */ +export interface AllowedConnectionsResource { + /** + * @member {string} [id] Resource Id + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly id?: string; + /** + * @member {string} [name] Resource name + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly name?: string; + /** + * @member {string} [type] Resource type + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly type?: string; + /** + * @member {string} [location] Location where the resource is stored + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly location?: string; + /** + * @member {Date} [calculatedDateTime] The UTC time on which the allowed + * connections resource was calculated + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly calculatedDateTime?: Date; + /** + * @member {ConnectableResource[]} [connectableResources] List of connectable + * resources + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly connectableResources?: ConnectableResource[]; +} + /** * @interface * An interface representing TasksListOptionalParams. @@ -1813,343 +1918,181 @@ export interface TopologyList extends Array { readonly nextLink?: string; } +/** + * @interface + * An interface representing the AllowedConnectionsList. + * List of all possible traffic between Azure resources + * + * @extends Array + */ +export interface AllowedConnectionsList extends Array { + /** + * @member {string} [nextLink] The URI to fetch the next page. + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly nextLink?: string; +} + /** * Defines values for AlertNotifications. * Possible values include: 'On', 'Off' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AlertNotifications = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AlertNotifications { - /** - * Get notifications on new alerts - */ - On = 'On', - /** - * Don't get notifications on new alerts - */ - Off = 'Off', -} +export type AlertNotifications = 'On' | 'Off'; /** * Defines values for AlertsToAdmins. * Possible values include: 'On', 'Off' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AlertsToAdmins = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AlertsToAdmins { - /** - * Send notification on new alerts to the subscription's admins - */ - On = 'On', - /** - * Don't send notification on new alerts to the subscription's admins - */ - Off = 'Off', -} +export type AlertsToAdmins = 'On' | 'Off'; /** * Defines values for PricingTier. * Possible values include: 'Free', 'Standard' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: PricingTier = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum PricingTier { - /** - * Get free Azure security center experience with basic security features - */ - Free = 'Free', - /** - * Get the standard Azure security center experience with advanced security - * features - */ - Standard = 'Standard', -} +export type PricingTier = 'Free' | 'Standard'; /** * Defines values for AutoProvision. * Possible values include: 'On', 'Off' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AutoProvision = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AutoProvision { - /** - * Install missing security agent on VMs automatically - */ - On = 'On', - /** - * Do not install security agent on the VMs automatically - */ - Off = 'Off', -} +export type AutoProvision = 'On' | 'Off'; /** * Defines values for SettingKind. * Possible values include: 'DataExportSetting' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: SettingKind = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum SettingKind { - DataExportSetting = 'DataExportSetting', -} +export type SettingKind = 'DataExportSetting'; /** * Defines values for SecurityFamily. * Possible values include: 'Waf', 'Ngfw', 'SaasWaf', 'Va' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: SecurityFamily = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum SecurityFamily { - Waf = 'Waf', - Ngfw = 'Ngfw', - SaasWaf = 'SaasWaf', - Va = 'Va', -} +export type SecurityFamily = 'Waf' | 'Ngfw' | 'SaasWaf' | 'Va'; /** * Defines values for Protocol. * Possible values include: 'TCP', 'UDP', 'All' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: Protocol = "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum Protocol { - TCP = 'TCP', - UDP = 'UDP', - All = '*', -} +export type Protocol = 'TCP' | 'UDP' | '*'; /** * Defines values for Status. * Possible values include: 'Revoked', 'Initiated' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: Status = "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum Status { - Revoked = 'Revoked', - Initiated = 'Initiated', -} +export type Status = 'Revoked' | 'Initiated'; /** * Defines values for StatusReason. * Possible values include: 'Expired', 'UserRequested', 'NewerRequestInitiated' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: StatusReason = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum StatusReason { - Expired = 'Expired', - UserRequested = 'UserRequested', - NewerRequestInitiated = 'NewerRequestInitiated', -} +export type StatusReason = 'Expired' | 'UserRequested' | 'NewerRequestInitiated'; /** * Defines values for AadConnectivityState. * Possible values include: 'Discovered', 'NotLicensed', 'Connected' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AadConnectivityState = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AadConnectivityState { - Discovered = 'Discovered', - NotLicensed = 'NotLicensed', - Connected = 'Connected', -} +export type AadConnectivityState = 'Discovered' | 'NotLicensed' | 'Connected'; /** * Defines values for ExternalSecuritySolutionKind. * Possible values include: 'CEF', 'ATA', 'AAD' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: ExternalSecuritySolutionKind = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum ExternalSecuritySolutionKind { - CEF = 'CEF', - ATA = 'ATA', - AAD = 'AAD', -} +export type ExternalSecuritySolutionKind = 'CEF' | 'ATA' | 'AAD'; + +/** + * Defines values for ConnectionType. + * Possible values include: 'Internal', 'External' + * @readonly + * @enum {string} + */ +export type ConnectionType = 'Internal' | 'External'; /** * Defines values for SettingName. * Possible values include: 'MCAS', 'WDATP' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: SettingName = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum SettingName { - MCAS = 'MCAS', - WDATP = 'WDATP', -} +export type SettingName = 'MCAS' | 'WDATP'; /** * Defines values for SettingName1. * Possible values include: 'MCAS', 'WDATP' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: SettingName1 = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum SettingName1 { - MCAS = 'MCAS', - WDATP = 'WDATP', -} +export type SettingName1 = 'MCAS' | 'WDATP'; /** * Defines values for InformationProtectionPolicyName. * Possible values include: 'effective', 'custom' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: InformationProtectionPolicyName = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum InformationProtectionPolicyName { - Effective = 'effective', - Custom = 'custom', -} +export type InformationProtectionPolicyName = 'effective' | 'custom'; /** * Defines values for InformationProtectionPolicyName1. * Possible values include: 'effective', 'custom' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: InformationProtectionPolicyName1 = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum InformationProtectionPolicyName1 { - Effective = 'effective', - Custom = 'custom', -} +export type InformationProtectionPolicyName1 = 'effective' | 'custom'; /** * Defines values for TaskUpdateActionType. * Possible values include: 'Activate', 'Dismiss', 'Start', 'Resolve', 'Close' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: TaskUpdateActionType = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum TaskUpdateActionType { - Activate = 'Activate', - Dismiss = 'Dismiss', - Start = 'Start', - Resolve = 'Resolve', - Close = 'Close', -} +export type TaskUpdateActionType = 'Activate' | 'Dismiss' | 'Start' | 'Resolve' | 'Close'; /** * Defines values for TaskUpdateActionType1. * Possible values include: 'Activate', 'Dismiss', 'Start', 'Resolve', 'Close' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: TaskUpdateActionType1 = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum TaskUpdateActionType1 { - Activate = 'Activate', - Dismiss = 'Dismiss', - Start = 'Start', - Resolve = 'Resolve', - Close = 'Close', -} +export type TaskUpdateActionType1 = 'Activate' | 'Dismiss' | 'Start' | 'Resolve' | 'Close'; /** * Defines values for AlertUpdateActionType. * Possible values include: 'Dismiss', 'Reactivate' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AlertUpdateActionType = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AlertUpdateActionType { - Dismiss = 'Dismiss', - Reactivate = 'Reactivate', -} +export type AlertUpdateActionType = 'Dismiss' | 'Reactivate'; /** * Defines values for AlertUpdateActionType1. * Possible values include: 'Dismiss', 'Reactivate' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AlertUpdateActionType1 = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AlertUpdateActionType1 { - Dismiss = 'Dismiss', - Reactivate = 'Reactivate', -} +export type AlertUpdateActionType1 = 'Dismiss' | 'Reactivate'; /** * Contains response data for the list operation. @@ -3746,3 +3689,98 @@ export type TopologyListByHomeRegionNextResponse = TopologyList & { parsedBody: TopologyList; }; }; + +/** + * Contains response data for the list operation. + */ +export type AllowedConnectionsListResponse = AllowedConnectionsList & { + /** + * 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: AllowedConnectionsList; + }; +}; + +/** + * Contains response data for the listByHomeRegion operation. + */ +export type AllowedConnectionsListByHomeRegionResponse = AllowedConnectionsList & { + /** + * 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: AllowedConnectionsList; + }; +}; + +/** + * Contains response data for the get operation. + */ +export type AllowedConnectionsGetResponse = AllowedConnectionsResource & { + /** + * 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: AllowedConnectionsResource; + }; +}; + +/** + * Contains response data for the listNext operation. + */ +export type AllowedConnectionsListNextResponse = AllowedConnectionsList & { + /** + * 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: AllowedConnectionsList; + }; +}; + +/** + * Contains response data for the listByHomeRegionNext operation. + */ +export type AllowedConnectionsListByHomeRegionNextResponse = AllowedConnectionsList & { + /** + * 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: AllowedConnectionsList; + }; +}; diff --git a/packages/@azure/arm-security/lib/models/mappers.ts b/packages/@azure/arm-security/lib/models/mappers.ts index 085717255d8b..40229399b748 100644 --- a/packages/@azure/arm-security/lib/models/mappers.ts +++ b/packages/@azure/arm-security/lib/models/mappers.ts @@ -1750,6 +1750,138 @@ export const AadConnectivityState1: msRest.CompositeMapper = { } }; +export const ConnectedResource: msRest.CompositeMapper = { + serializedName: "ConnectedResource", + type: { + name: "Composite", + className: "ConnectedResource", + modelProperties: { + connectedResourceId: { + readOnly: true, + serializedName: "connectedResourceId", + type: { + name: "String" + } + }, + tcpPorts: { + readOnly: true, + serializedName: "tcpPorts", + type: { + name: "String" + } + }, + udpPorts: { + readOnly: true, + serializedName: "udpPorts", + type: { + name: "String" + } + } + } + } +}; + +export const ConnectableResource: msRest.CompositeMapper = { + serializedName: "ConnectableResource", + type: { + name: "Composite", + className: "ConnectableResource", + modelProperties: { + id: { + readOnly: true, + serializedName: "id", + type: { + name: "String" + } + }, + inboundConnectedResources: { + readOnly: true, + serializedName: "inboundConnectedResources", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ConnectedResource" + } + } + } + }, + outboundConnectedResources: { + readOnly: true, + serializedName: "outboundConnectedResources", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ConnectedResource" + } + } + } + } + } + } +}; + +export const AllowedConnectionsResource: msRest.CompositeMapper = { + serializedName: "AllowedConnectionsResource", + type: { + name: "Composite", + className: "AllowedConnectionsResource", + 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" + } + }, + location: { + readOnly: true, + serializedName: "location", + type: { + name: "String" + } + }, + calculatedDateTime: { + readOnly: true, + serializedName: "properties.calculatedDateTime", + type: { + name: "DateTime" + } + }, + connectableResources: { + readOnly: true, + serializedName: "properties.connectableResources", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ConnectableResource" + } + } + } + } + } + } +}; + export const PricingList: msRest.CompositeMapper = { serializedName: "PricingList", type: { @@ -2201,6 +2333,36 @@ export const TopologyList: msRest.CompositeMapper = { } }; +export const AllowedConnectionsList: msRest.CompositeMapper = { + serializedName: "AllowedConnectionsList", + type: { + name: "Composite", + className: "AllowedConnectionsList", + modelProperties: { + value: { + readOnly: true, + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "AllowedConnectionsResource" + } + } + } + }, + nextLink: { + readOnly: true, + serializedName: "nextLink", + type: { + name: "String" + } + } + } + } +}; + export const discriminators = { 'Setting' : Setting, 'Setting.DataExportSetting' : DataExportSetting, diff --git a/packages/@azure/arm-security/lib/models/parameters.ts b/packages/@azure/arm-security/lib/models/parameters.ts index e29af8ef13fa..c82a9dc84bd2 100644 --- a/packages/@azure/arm-security/lib/models/parameters.ts +++ b/packages/@azure/arm-security/lib/models/parameters.ts @@ -84,6 +84,16 @@ export const complianceName: msRest.OperationURLParameter = { } } }; +export const connectionType: msRest.OperationURLParameter = { + parameterPath: "connectionType", + mapper: { + required: true, + serializedName: "connectionType", + type: { + name: "String" + } + } +}; export const discoveredSecuritySolutionName: msRest.OperationURLParameter = { parameterPath: "discoveredSecuritySolutionName", mapper: { diff --git a/packages/@azure/arm-security/lib/operations/advancedThreatProtection.ts b/packages/@azure/arm-security/lib/operations/advancedThreatProtection.ts index 22ae552991d1..0ed82debd211 100644 --- a/packages/@azure/arm-security/lib/operations/advancedThreatProtection.ts +++ b/packages/@azure/arm-security/lib/operations/advancedThreatProtection.ts @@ -44,7 +44,7 @@ export class AdvancedThreatProtection { * @param callback The callback */ get(resourceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceId, @@ -75,7 +75,7 @@ export class AdvancedThreatProtection { * @param callback The callback */ create(resourceId: string, advancedThreatProtectionSetting: Models.AdvancedThreatProtectionSetting, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(resourceId: string, advancedThreatProtectionSetting: Models.AdvancedThreatProtectionSetting, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + create(resourceId: string, advancedThreatProtectionSetting: Models.AdvancedThreatProtectionSetting, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceId, diff --git a/packages/@azure/arm-security/lib/operations/alerts.ts b/packages/@azure/arm-security/lib/operations/alerts.ts index b8122cff7717..93e42d71cbce 100644 --- a/packages/@azure/arm-security/lib/operations/alerts.ts +++ b/packages/@azure/arm-security/lib/operations/alerts.ts @@ -41,7 +41,7 @@ export class Alerts { * @param callback The callback */ list(options: Models.AlertsListOptionalParams, callback: msRest.ServiceCallback): void; - list(options?: Models.AlertsListOptionalParams, callback?: msRest.ServiceCallback): Promise { + list(options?: Models.AlertsListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -71,7 +71,7 @@ export class Alerts { * @param callback The callback */ listByResourceGroup(resourceGroupName: string, options: Models.AlertsListByResourceGroupOptionalParams, callback: msRest.ServiceCallback): void; - listByResourceGroup(resourceGroupName: string, options?: Models.AlertsListByResourceGroupOptionalParams, callback?: msRest.ServiceCallback): Promise { + listByResourceGroup(resourceGroupName: string, options?: Models.AlertsListByResourceGroupOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -97,7 +97,7 @@ export class Alerts { * @param callback The callback */ listSubscriptionLevelAlertsByRegion(options: Models.AlertsListSubscriptionLevelAlertsByRegionOptionalParams, callback: msRest.ServiceCallback): void; - listSubscriptionLevelAlertsByRegion(options?: Models.AlertsListSubscriptionLevelAlertsByRegionOptionalParams, callback?: msRest.ServiceCallback): Promise { + listSubscriptionLevelAlertsByRegion(options?: Models.AlertsListSubscriptionLevelAlertsByRegionOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -128,7 +128,7 @@ export class Alerts { * @param callback The callback */ listResourceGroupLevelAlertsByRegion(resourceGroupName: string, options: Models.AlertsListResourceGroupLevelAlertsByRegionOptionalParams, callback: msRest.ServiceCallback): void; - listResourceGroupLevelAlertsByRegion(resourceGroupName: string, options?: Models.AlertsListResourceGroupLevelAlertsByRegionOptionalParams, callback?: msRest.ServiceCallback): Promise { + listResourceGroupLevelAlertsByRegion(resourceGroupName: string, options?: Models.AlertsListResourceGroupLevelAlertsByRegionOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -156,7 +156,7 @@ export class Alerts { * @param callback The callback */ getSubscriptionLevelAlert(alertName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getSubscriptionLevelAlert(alertName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getSubscriptionLevelAlert(alertName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { alertName, @@ -190,7 +190,7 @@ export class Alerts { * @param callback The callback */ getResourceGroupLevelAlerts(alertName: string, resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getResourceGroupLevelAlerts(alertName: string, resourceGroupName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getResourceGroupLevelAlerts(alertName: string, resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { alertName, @@ -225,7 +225,7 @@ export class Alerts { * @param callback The callback */ updateSubscriptionLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateSubscriptionLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateSubscriptionLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { alertName, @@ -266,7 +266,7 @@ export class Alerts { * @param callback The callback */ updateResourceGroupLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType1, resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateResourceGroupLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType1, resourceGroupName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateResourceGroupLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType1, resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { alertName, @@ -296,7 +296,7 @@ export class Alerts { * @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, @@ -324,7 +324,7 @@ export class Alerts { * @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, @@ -353,7 +353,7 @@ export class Alerts { * @param callback The callback */ listSubscriptionLevelAlertsByRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listSubscriptionLevelAlertsByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listSubscriptionLevelAlertsByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -382,7 +382,7 @@ export class Alerts { * @param callback The callback */ listResourceGroupLevelAlertsByRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listResourceGroupLevelAlertsByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listResourceGroupLevelAlertsByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/allowedConnections.ts b/packages/@azure/arm-security/lib/operations/allowedConnections.ts new file mode 100644 index 000000000000..2c88ee2f1e4d --- /dev/null +++ b/packages/@azure/arm-security/lib/operations/allowedConnections.ts @@ -0,0 +1,288 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * 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. + */ + +import * as msRest from "ms-rest-js"; +import * as Models from "../models"; +import * as Mappers from "../models/allowedConnectionsMappers"; +import * as Parameters from "../models/parameters"; +import { SecurityCenterContext } from "../securityCenterContext"; + +/** Class representing a AllowedConnections. */ +export class AllowedConnections { + private readonly client: SecurityCenterContext; + + /** + * Create a AllowedConnections. + * @param {SecurityCenterContext} client Reference to the service client. + */ + constructor(client: SecurityCenterContext) { + this.client = client; + } + + /** + * Gets the list of all possible traffic between resources for the subscription + * @param [options] The optional parameters + * @returns Promise + */ + list(options?: msRest.RequestOptionsBase): Promise; + /** + * @param callback The callback + */ + list(callback: msRest.ServiceCallback): void; + /** + * @param options The optional parameters + * @param callback The callback + */ + list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + options + }, + listOperationSpec, + callback) as Promise; + } + + /** + * Gets the list of all possible traffic between resources for the subscription and location. + * @param [options] The optional parameters + * @returns Promise + */ + listByHomeRegion(options?: msRest.RequestOptionsBase): Promise; + /** + * @param callback The callback + */ + listByHomeRegion(callback: msRest.ServiceCallback): void; + /** + * @param options The optional parameters + * @param callback The callback + */ + listByHomeRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByHomeRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + options + }, + listByHomeRegionOperationSpec, + callback) as Promise; + } + + /** + * Gets the list of all possible traffic between resources for the subscription and location, based + * on connection type. + * @param resourceGroupName The name of the resource group within the user's subscription. The name + * is case insensitive. + * @param connectionType The type of allowed connections (Internal, External). Possible values + * include: 'Internal', 'External' + * @param [options] The optional parameters + * @returns Promise + */ + get(resourceGroupName: string, connectionType: Models.ConnectionType, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group within the user's subscription. The name + * is case insensitive. + * @param connectionType The type of allowed connections (Internal, External). Possible values + * include: 'Internal', 'External' + * @param callback The callback + */ + get(resourceGroupName: string, connectionType: Models.ConnectionType, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group within the user's subscription. The name + * is case insensitive. + * @param connectionType The type of allowed connections (Internal, External). Possible values + * include: 'Internal', 'External' + * @param options The optional parameters + * @param callback The callback + */ + get(resourceGroupName: string, connectionType: Models.ConnectionType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, connectionType: Models.ConnectionType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + connectionType, + options + }, + getOperationSpec, + callback) as Promise; + } + + /** + * Gets the list of all possible traffic between resources for the subscription + * @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; + } + + /** + * Gets the list of all possible traffic between resources for the subscription and location. + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param [options] The optional parameters + * @returns Promise + */ + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param callback The callback + */ + listByHomeRegionNext(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 + */ + listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + nextPageLink, + options + }, + listByHomeRegionNextOperationSpec, + callback) as Promise; + } +} + +// Operation Specifications +const serializer = new msRest.Serializer(Mappers); +const listOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/providers/Microsoft.Security/allowedConnections", + urlParameters: [ + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion1 + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AllowedConnectionsList + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const listByHomeRegionOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections", + urlParameters: [ + Parameters.subscriptionId, + Parameters.ascLocation + ], + queryParameters: [ + Parameters.apiVersion1 + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AllowedConnectionsList + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const getOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections/{connectionType}", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.ascLocation, + Parameters.connectionType + ], + queryParameters: [ + Parameters.apiVersion1 + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AllowedConnectionsResource + }, + 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.AllowedConnectionsList + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const listByHomeRegionNextOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + baseUrl: "https://management.azure.com", + path: "{nextLink}", + urlParameters: [ + Parameters.nextPageLink + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AllowedConnectionsList + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; diff --git a/packages/@azure/arm-security/lib/operations/autoProvisioningSettings.ts b/packages/@azure/arm-security/lib/operations/autoProvisioningSettings.ts index c1982d1738fe..7c0d4a92e18f 100644 --- a/packages/@azure/arm-security/lib/operations/autoProvisioningSettings.ts +++ b/packages/@azure/arm-security/lib/operations/autoProvisioningSettings.ts @@ -41,7 +41,7 @@ export class AutoProvisioningSettings { * @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 AutoProvisioningSettings { * @param callback The callback */ get(settingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(settingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(settingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { settingName, @@ -99,7 +99,7 @@ export class AutoProvisioningSettings { * @param callback The callback */ create(settingName: string, setting: Models.AutoProvisioningSetting, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(settingName: string, setting: Models.AutoProvisioningSetting, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + create(settingName: string, setting: Models.AutoProvisioningSetting, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { settingName, @@ -128,7 +128,7 @@ export class AutoProvisioningSettings { * @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-security/lib/operations/compliances.ts b/packages/@azure/arm-security/lib/operations/compliances.ts index 66ad2842a7e9..ef0f6407f21a 100644 --- a/packages/@azure/arm-security/lib/operations/compliances.ts +++ b/packages/@azure/arm-security/lib/operations/compliances.ts @@ -50,7 +50,7 @@ export class Compliances { * @param callback The callback */ list(scope: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(scope: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + list(scope: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -87,7 +87,7 @@ export class Compliances { * @param callback The callback */ get(scope: string, complianceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(scope: string, complianceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(scope: string, complianceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -116,7 +116,7 @@ export class Compliances { * @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-security/lib/operations/discoveredSecuritySolutions.ts b/packages/@azure/arm-security/lib/operations/discoveredSecuritySolutions.ts index af7edf1e8b88..293a8c48a169 100644 --- a/packages/@azure/arm-security/lib/operations/discoveredSecuritySolutions.ts +++ b/packages/@azure/arm-security/lib/operations/discoveredSecuritySolutions.ts @@ -41,7 +41,7 @@ export class DiscoveredSecuritySolutions { * @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 @@ -65,7 +65,7 @@ export class DiscoveredSecuritySolutions { * @param callback The callback */ listByHomeRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegion(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -98,7 +98,7 @@ export class DiscoveredSecuritySolutions { * @param callback The callback */ get(resourceGroupName: string, discoveredSecuritySolutionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, discoveredSecuritySolutionName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, discoveredSecuritySolutionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -127,7 +127,7 @@ export class DiscoveredSecuritySolutions { * @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, @@ -155,7 +155,7 @@ export class DiscoveredSecuritySolutions { * @param callback The callback */ listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/externalSecuritySolutions.ts b/packages/@azure/arm-security/lib/operations/externalSecuritySolutions.ts index 6941fb194139..098c85e4e0de 100644 --- a/packages/@azure/arm-security/lib/operations/externalSecuritySolutions.ts +++ b/packages/@azure/arm-security/lib/operations/externalSecuritySolutions.ts @@ -41,7 +41,7 @@ export class ExternalSecuritySolutions { * @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 @@ -65,7 +65,7 @@ export class ExternalSecuritySolutions { * @param callback The callback */ listByHomeRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegion(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -98,7 +98,7 @@ export class ExternalSecuritySolutions { * @param callback The callback */ get(resourceGroupName: string, externalSecuritySolutionsName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, externalSecuritySolutionsName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, externalSecuritySolutionsName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -127,7 +127,7 @@ export class ExternalSecuritySolutions { * @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, @@ -155,7 +155,7 @@ export class ExternalSecuritySolutions { * @param callback The callback */ listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/index.ts b/packages/@azure/arm-security/lib/operations/index.ts index c1a747614647..dd820149dfa7 100644 --- a/packages/@azure/arm-security/lib/operations/index.ts +++ b/packages/@azure/arm-security/lib/operations/index.ts @@ -24,3 +24,4 @@ export * from "./discoveredSecuritySolutions"; export * from "./jitNetworkAccessPolicies"; export * from "./externalSecuritySolutions"; export * from "./topology"; +export * from "./allowedConnections"; diff --git a/packages/@azure/arm-security/lib/operations/informationProtectionPolicies.ts b/packages/@azure/arm-security/lib/operations/informationProtectionPolicies.ts index 66afcd508670..140759ccc73b 100644 --- a/packages/@azure/arm-security/lib/operations/informationProtectionPolicies.ts +++ b/packages/@azure/arm-security/lib/operations/informationProtectionPolicies.ts @@ -56,7 +56,7 @@ export class InformationProtectionPolicies { * @param callback The callback */ get(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -97,7 +97,7 @@ export class InformationProtectionPolicies { * @param callback The callback */ createOrUpdate(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName1, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - createOrUpdate(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName1, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + createOrUpdate(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName1, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -132,7 +132,7 @@ export class InformationProtectionPolicies { * @param callback The callback */ list(scope: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(scope: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + list(scope: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -160,7 +160,7 @@ export class InformationProtectionPolicies { * @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-security/lib/operations/jitNetworkAccessPolicies.ts b/packages/@azure/arm-security/lib/operations/jitNetworkAccessPolicies.ts index 47c5a34c7718..f37baabf017a 100644 --- a/packages/@azure/arm-security/lib/operations/jitNetworkAccessPolicies.ts +++ b/packages/@azure/arm-security/lib/operations/jitNetworkAccessPolicies.ts @@ -41,7 +41,7 @@ export class JitNetworkAccessPolicies { * @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 @@ -66,7 +66,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ listByRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByRegion(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -97,7 +97,7 @@ export class JitNetworkAccessPolicies { * @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, @@ -129,7 +129,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ listByResourceGroupAndRegion(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupAndRegion(resourceGroupName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByResourceGroupAndRegion(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -164,7 +164,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ get(resourceGroupName: string, jitNetworkAccessPolicyName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, jitNetworkAccessPolicyName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, jitNetworkAccessPolicyName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -202,7 +202,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ createOrUpdate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicy, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - createOrUpdate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicy, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + createOrUpdate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicy, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -238,7 +238,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ deleteMethod(resourceGroupName: string, jitNetworkAccessPolicyName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(resourceGroupName: string, jitNetworkAccessPolicyName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(resourceGroupName: string, jitNetworkAccessPolicyName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -276,7 +276,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ initiate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicyInitiateRequest, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - initiate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicyInitiateRequest, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + initiate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicyInitiateRequest, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -306,7 +306,7 @@ export class JitNetworkAccessPolicies { * @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, @@ -335,7 +335,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ listByRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -364,7 +364,7 @@ export class JitNetworkAccessPolicies { * @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, @@ -393,7 +393,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ listByResourceGroupAndRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupAndRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByResourceGroupAndRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/locations.ts b/packages/@azure/arm-security/lib/operations/locations.ts index 65941639937b..ac9186be5c5f 100644 --- a/packages/@azure/arm-security/lib/operations/locations.ts +++ b/packages/@azure/arm-security/lib/operations/locations.ts @@ -43,7 +43,7 @@ export class Locations { * @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 @@ -67,7 +67,7 @@ export class Locations { * @param callback The callback */ get(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -96,7 +96,7 @@ export class Locations { * @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-security/lib/operations/operations.ts b/packages/@azure/arm-security/lib/operations/operations.ts index 4e4b4c8ac880..bcc646936806 100644 --- a/packages/@azure/arm-security/lib/operations/operations.ts +++ b/packages/@azure/arm-security/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-security/lib/operations/pricings.ts b/packages/@azure/arm-security/lib/operations/pricings.ts index d312e2b9b9c9..79d78ddfe8ff 100644 --- a/packages/@azure/arm-security/lib/operations/pricings.ts +++ b/packages/@azure/arm-security/lib/operations/pricings.ts @@ -41,7 +41,7 @@ export class Pricings { * @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 @@ -71,7 +71,7 @@ export class Pricings { * @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, @@ -100,7 +100,7 @@ export class Pricings { * @param callback The callback */ getSubscriptionPricing(pricingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getSubscriptionPricing(pricingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getSubscriptionPricing(pricingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { pricingName, @@ -131,7 +131,7 @@ export class Pricings { * @param callback The callback */ updateSubscriptionPricing(pricingName: string, pricing: Models.Pricing, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateSubscriptionPricing(pricingName: string, pricing: Models.Pricing, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateSubscriptionPricing(pricingName: string, pricing: Models.Pricing, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { pricingName, @@ -166,7 +166,7 @@ export class Pricings { * @param callback The callback */ getResourceGroupPricing(resourceGroupName: string, pricingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getResourceGroupPricing(resourceGroupName: string, pricingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getResourceGroupPricing(resourceGroupName: string, pricingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -204,7 +204,7 @@ export class Pricings { * @param callback The callback */ createOrUpdateResourceGroupPricing(resourceGroupName: string, pricingName: string, pricing: Models.Pricing, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - createOrUpdateResourceGroupPricing(resourceGroupName: string, pricingName: string, pricing: Models.Pricing, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + createOrUpdateResourceGroupPricing(resourceGroupName: string, pricingName: string, pricing: Models.Pricing, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -234,7 +234,7 @@ export class Pricings { * @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, @@ -262,7 +262,7 @@ export class Pricings { * @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, diff --git a/packages/@azure/arm-security/lib/operations/securityContacts.ts b/packages/@azure/arm-security/lib/operations/securityContacts.ts index 6ca92cca8560..3874df2da328 100644 --- a/packages/@azure/arm-security/lib/operations/securityContacts.ts +++ b/packages/@azure/arm-security/lib/operations/securityContacts.ts @@ -41,7 +41,7 @@ export class SecurityContacts { * @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 SecurityContacts { * @param callback The callback */ get(securityContactName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(securityContactName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(securityContactName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { securityContactName, @@ -99,7 +99,7 @@ export class SecurityContacts { * @param callback The callback */ create(securityContactName: string, securityContact: Models.SecurityContact, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(securityContactName: string, securityContact: Models.SecurityContact, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + create(securityContactName: string, securityContact: Models.SecurityContact, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { securityContactName, @@ -128,7 +128,7 @@ export class SecurityContacts { * @param callback The callback */ deleteMethod(securityContactName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(securityContactName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(securityContactName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { securityContactName, @@ -159,7 +159,7 @@ export class SecurityContacts { * @param callback The callback */ update(securityContactName: string, securityContact: Models.SecurityContact, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - update(securityContactName: string, securityContact: Models.SecurityContact, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + update(securityContactName: string, securityContact: Models.SecurityContact, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { securityContactName, @@ -188,7 +188,7 @@ export class SecurityContacts { * @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-security/lib/operations/settings.ts b/packages/@azure/arm-security/lib/operations/settings.ts index 1e4fb07d3150..50f5b84a9826 100644 --- a/packages/@azure/arm-security/lib/operations/settings.ts +++ b/packages/@azure/arm-security/lib/operations/settings.ts @@ -41,7 +41,7 @@ export class Settings { * @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 Settings { * @param callback The callback */ get(settingName: Models.SettingName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(settingName: Models.SettingName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(settingName: Models.SettingName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { settingName, @@ -99,7 +99,7 @@ export class Settings { * @param callback The callback */ update(settingName: Models.SettingName1, setting: Models.SettingUnion, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - update(settingName: Models.SettingName1, setting: Models.SettingUnion, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + update(settingName: Models.SettingName1, setting: Models.SettingUnion, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { settingName, @@ -128,7 +128,7 @@ export class Settings { * @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-security/lib/operations/tasks.ts b/packages/@azure/arm-security/lib/operations/tasks.ts index 5da96f0c436c..0601a9e586cd 100644 --- a/packages/@azure/arm-security/lib/operations/tasks.ts +++ b/packages/@azure/arm-security/lib/operations/tasks.ts @@ -41,7 +41,7 @@ export class Tasks { * @param callback The callback */ list(options: Models.TasksListOptionalParams, callback: msRest.ServiceCallback): void; - list(options?: Models.TasksListOptionalParams, callback?: msRest.ServiceCallback): Promise { + list(options?: Models.TasksListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -65,7 +65,7 @@ export class Tasks { * @param callback The callback */ listByHomeRegion(options: Models.TasksListByHomeRegionOptionalParams, callback: msRest.ServiceCallback): void; - listByHomeRegion(options?: Models.TasksListByHomeRegionOptionalParams, callback?: msRest.ServiceCallback): Promise { + listByHomeRegion(options?: Models.TasksListByHomeRegionOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -92,7 +92,7 @@ export class Tasks { * @param callback The callback */ getSubscriptionLevelTask(taskName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getSubscriptionLevelTask(taskName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getSubscriptionLevelTask(taskName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { taskName, @@ -126,7 +126,7 @@ export class Tasks { * @param callback The callback */ updateSubscriptionLevelTaskState(taskName: string, taskUpdateActionType: Models.TaskUpdateActionType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateSubscriptionLevelTaskState(taskName: string, taskUpdateActionType: Models.TaskUpdateActionType, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateSubscriptionLevelTaskState(taskName: string, taskUpdateActionType: Models.TaskUpdateActionType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { taskName, @@ -158,7 +158,7 @@ export class Tasks { * @param callback The callback */ listByResourceGroup(resourceGroupName: string, options: Models.TasksListByResourceGroupOptionalParams, callback: msRest.ServiceCallback): void; - listByResourceGroup(resourceGroupName: string, options?: Models.TasksListByResourceGroupOptionalParams, callback?: msRest.ServiceCallback): Promise { + listByResourceGroup(resourceGroupName: string, options?: Models.TasksListByResourceGroupOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -192,7 +192,7 @@ export class Tasks { * @param callback The callback */ getResourceGroupLevelTask(resourceGroupName: string, taskName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getResourceGroupLevelTask(resourceGroupName: string, taskName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getResourceGroupLevelTask(resourceGroupName: string, taskName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -233,7 +233,7 @@ export class Tasks { * @param callback The callback */ updateResourceGroupLevelTaskState(resourceGroupName: string, taskName: string, taskUpdateActionType: Models.TaskUpdateActionType1, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateResourceGroupLevelTaskState(resourceGroupName: string, taskName: string, taskUpdateActionType: Models.TaskUpdateActionType1, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateResourceGroupLevelTaskState(resourceGroupName: string, taskName: string, taskUpdateActionType: Models.TaskUpdateActionType1, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -263,7 +263,7 @@ export class Tasks { * @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, @@ -291,7 +291,7 @@ export class Tasks { * @param callback The callback */ listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -319,7 +319,7 @@ export class Tasks { * @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, diff --git a/packages/@azure/arm-security/lib/operations/topology.ts b/packages/@azure/arm-security/lib/operations/topology.ts index f1b36b658acc..5eed9ef73698 100644 --- a/packages/@azure/arm-security/lib/operations/topology.ts +++ b/packages/@azure/arm-security/lib/operations/topology.ts @@ -41,7 +41,7 @@ export class Topology { * @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 @@ -65,7 +65,7 @@ export class Topology { * @param callback The callback */ listByHomeRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegion(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -98,7 +98,7 @@ export class Topology { * @param callback The callback */ get(resourceGroupName: string, topologyResourceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, topologyResourceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, topologyResourceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -127,7 +127,7 @@ export class Topology { * @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, @@ -155,7 +155,7 @@ export class Topology { * @param callback The callback */ listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/workspaceSettings.ts b/packages/@azure/arm-security/lib/operations/workspaceSettings.ts index 956d87b6e7d1..3edeaa7ee145 100644 --- a/packages/@azure/arm-security/lib/operations/workspaceSettings.ts +++ b/packages/@azure/arm-security/lib/operations/workspaceSettings.ts @@ -41,7 +41,7 @@ export class WorkspaceSettings { * @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 WorkspaceSettings { * @param callback The callback */ get(workspaceSettingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(workspaceSettingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(workspaceSettingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { workspaceSettingName, @@ -99,7 +99,7 @@ export class WorkspaceSettings { * @param callback The callback */ create(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + create(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { workspaceSettingName, @@ -131,7 +131,7 @@ export class WorkspaceSettings { * @param callback The callback */ update(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - update(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + update(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { workspaceSettingName, @@ -161,7 +161,7 @@ export class WorkspaceSettings { * @param callback The callback */ deleteMethod(workspaceSettingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(workspaceSettingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(workspaceSettingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { workspaceSettingName, @@ -189,7 +189,7 @@ export class WorkspaceSettings { * @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-security/lib/securityCenter.ts b/packages/@azure/arm-security/lib/securityCenter.ts index 89aa4ac6b283..5a690b9c21c3 100644 --- a/packages/@azure/arm-security/lib/securityCenter.ts +++ b/packages/@azure/arm-security/lib/securityCenter.ts @@ -33,6 +33,7 @@ class SecurityCenter extends SecurityCenterContext { jitNetworkAccessPolicies: operations.JitNetworkAccessPolicies; externalSecuritySolutions: operations.ExternalSecuritySolutions; topology: operations.Topology; + allowedConnections: operations.AllowedConnections; /** * Initializes a new instance of the SecurityCenter class. @@ -60,6 +61,7 @@ class SecurityCenter extends SecurityCenterContext { this.jitNetworkAccessPolicies = new operations.JitNetworkAccessPolicies(this); this.externalSecuritySolutions = new operations.ExternalSecuritySolutions(this); this.topology = new operations.Topology(this); + this.allowedConnections = new operations.AllowedConnections(this); } } diff --git a/packages/@azure/arm-security/lib/securityCenterContext.ts b/packages/@azure/arm-security/lib/securityCenterContext.ts index 887ba2fe2fd3..7a8c6c1b6dfb 100644 --- a/packages/@azure/arm-security/lib/securityCenterContext.ts +++ b/packages/@azure/arm-security/lib/securityCenterContext.ts @@ -13,7 +13,7 @@ import * as msRest from "ms-rest-js"; import * as msRestAzure from "ms-rest-azure-js"; const packageName = "@azure/arm-security"; -const packageVersion = "1.0.0-preview"; +const packageVersion = "0.1.0"; export class SecurityCenterContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; @@ -42,6 +42,11 @@ export class SecurityCenterContext extends msRestAzure.AzureServiceClient { if (!options) { options = {}; } + if(!options.userAgent) { + const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); + options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; + } + super(credentials, options); this.acceptLanguage = 'en-US'; @@ -52,7 +57,6 @@ export class SecurityCenterContext extends msRestAzure.AzureServiceClient { this.subscriptionId = subscriptionId; this.ascLocation = ascLocation; - this.addUserAgentInfo(`${packageName}/${packageVersion}`); if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } diff --git a/packages/@azure/arm-security/package.json b/packages/@azure/arm-security/package.json index dacc3d8e9f57..05865f123e09 100644 --- a/packages/@azure/arm-security/package.json +++ b/packages/@azure/arm-security/package.json @@ -4,8 +4,8 @@ "description": "SecurityCenter 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 +} From 7ba03a05213298c19d77b162e893640a819acbe6 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 12 Nov 2018 10:36:20 -0800 Subject: [PATCH 2/5] [AutoPR security/resource-manager] Remove security contact phone field mandatory fields (#427) * Generated from 3f99e72342d5d4f194ff74c8c553657530955783 Remove security contact phone field mandatory fields * Generated from e94d9f5b16a429a3f1d2270a981be7218f06fd36 Update security contact examples - refactored - second iteration --- packages/@azure/arm-security/lib/models/index.ts | 4 ++-- packages/@azure/arm-security/lib/models/mappers.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/@azure/arm-security/lib/models/index.ts b/packages/@azure/arm-security/lib/models/index.ts index 78a3b7ecb605..491aee7cc5ab 100644 --- a/packages/@azure/arm-security/lib/models/index.ts +++ b/packages/@azure/arm-security/lib/models/index.ts @@ -68,9 +68,9 @@ export interface SecurityContact extends Resource { */ email: string; /** - * @member {string} phone The phone number of this security contact + * @member {string} [phone] The phone number of this security contact */ - phone: string; + phone?: string; /** * @member {AlertNotifications} alertNotifications Whether to send security * alerts notifications to the security contact. Possible values include: diff --git a/packages/@azure/arm-security/lib/models/mappers.ts b/packages/@azure/arm-security/lib/models/mappers.ts index 40229399b748..898a47ac8882 100644 --- a/packages/@azure/arm-security/lib/models/mappers.ts +++ b/packages/@azure/arm-security/lib/models/mappers.ts @@ -76,7 +76,6 @@ export const SecurityContact: msRest.CompositeMapper = { } }, phone: { - required: true, serializedName: "properties.phone", type: { name: "String" From c400e79f488227b9ff921e57ec64bc1dc4f82786 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 12 Nov 2018 10:42:27 -0800 Subject: [PATCH 3/5] [AutoPR] network/resource-manager (#469) * Generated from 52981377b86caf85843799cd4294ec9101af0dcf (#467) Make NIC VM readOnly * Regenerated "@azure/arm-network" SDK. --- .../@azure/arm-network/lib/models/index.ts | 694 +++++++----------- .../@azure/arm-network/lib/models/mappers.ts | 79 +- .../lib/models/networkWatchersMappers.ts | 1 - .../arm-network/lib/models/parameters.ts | 2 +- .../lib/networkManagementClient.ts | 4 +- .../arm-network/lib/operations/index.ts | 2 +- .../lib/operations/virtualNetworks.ts | 4 - packages/@azure/arm-network/package.json | 2 +- packages/@azure/arm-network/tsconfig.json | 2 +- 9 files changed, 306 insertions(+), 484 deletions(-) diff --git a/packages/@azure/arm-network/lib/models/index.ts b/packages/@azure/arm-network/lib/models/index.ts index dff26c7edf22..1c85e49607b6 100644 --- a/packages/@azure/arm-network/lib/models/index.ts +++ b/packages/@azure/arm-network/lib/models/index.ts @@ -361,8 +361,10 @@ export interface NetworkInterfaceDnsSettings { export interface NetworkInterface extends Resource { /** * @member {SubResource} [virtualMachine] The reference of a virtual machine. + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** */ - virtualMachine?: SubResource; + readonly virtualMachine?: SubResource; /** * @member {NetworkSecurityGroup} [networkSecurityGroup] The reference of the * NetworkSecurityGroup resource. @@ -6304,25 +6306,6 @@ export interface RetentionPolicyParameters { enabled?: boolean; } -/** - * @interface - * An interface representing FlowLogFormatParameters. - * Parameters that define the flow log format. - * - */ -export interface FlowLogFormatParameters { - /** - * @member {FlowLogFormatType} [type] The file type of flow log. Possible - * values include: 'JSON' - */ - type?: FlowLogFormatType; - /** - * @member {number} [version] The version (revision) of the flow log. Default - * value: 0 . - */ - version?: number; -} - /** * @interface * An interface representing FlowLogStatusParameters. @@ -6361,11 +6344,6 @@ export interface TrafficAnalyticsConfigurationProperties { * @member {string} workspaceResourceId Resource Id of the attached workspace */ workspaceResourceId: string; - /** - * @member {number} [trafficAnalyticsInterval] The interval in minutes which - * would decide how frequently TA service should do flow analytics - */ - trafficAnalyticsInterval?: number; } /** @@ -6408,10 +6386,6 @@ export interface FlowLogInformation { * @member {RetentionPolicyParameters} [retentionPolicy] */ retentionPolicy?: RetentionPolicyParameters; - /** - * @member {FlowLogFormatParameters} [format] - */ - format?: FlowLogFormatParameters; /** * @member {TrafficAnalyticsProperties} [flowAnalyticsConfiguration] */ @@ -10548,22 +10522,6 @@ export interface LoadBalancerOutboundRuleListResult extends Array readonly nextLink?: string; } -/** - * @interface - * An interface representing the NetworkInterfaceListResult. - * Response for the ListNetworkInterface API service call. - * - * @extends Array - */ -export interface LoadBalancerOutboundRuleListResult extends Array { - /** - * @member {string} [nextLink] The URL to get the next set of results. - * **NOTE: This property will not be serialized. It can only be populated by - * the server.** - */ - readonly nextLink?: string; -} - /** * @interface * An interface representing the NetworkInterfaceListResult. @@ -10935,6 +10893,20 @@ export interface VirtualNetworkPeeringListResult extends Array + */ +export interface VirtualNetworkTapListResult extends Array { + /** + * @member {string} [nextLink] The URL to get the next set of results. + */ + nextLink?: string; +} + /** * @interface * An interface representing the VirtualNetworkGatewayListResult. @@ -10999,20 +10971,6 @@ export interface LocalNetworkGatewayListResult extends Array - */ -export interface VirtualNetworkTapListResult extends Array { - /** - * @member {string} [nextLink] The URL to get the next set of results. - */ - nextLink?: string; -} - /** * @interface * An interface representing the ListVirtualWANsResult. @@ -11302,22 +11260,6 @@ export type ApplicationGatewaySslCipherSuite = 'TLS_ECDHE_RSA_WITH_AES_256_CBC_S */ export type ApplicationGatewayCustomErrorStatusCode = 'HttpStatus403' | 'HttpStatus502'; -/** - * Defines values for ApplicationGatewayCustomErrorStatusCode. - * Possible values include: 'HttpStatus403', 'HttpStatus502' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: ApplicationGatewayCustomErrorStatusCode = - * "someUnknownValueThatWillStillBeValid"; - * @readonly - * @enum {string} - */ -export enum ApplicationGatewayCustomErrorStatusCode { - HttpStatus403 = 'HttpStatus403', - HttpStatus502 = 'HttpStatus502', -} - /** * Defines values for ApplicationGatewayRequestRoutingRuleType. * Possible values include: 'Basic', 'PathBasedRouting' @@ -11494,54 +11436,6 @@ export type ExpressRouteLinkAdminState = 'Enabled' | 'Disabled'; */ export type ExpressRoutePortsEncapsulation = 'Dot1Q' | 'QinQ'; -/** - * Defines values for ExpressRouteLinkConnectorType. - * Possible values include: 'LC', 'SC' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: ExpressRouteLinkConnectorType = - * "someUnknownValueThatWillStillBeValid"; - * @readonly - * @enum {string} - */ -export enum ExpressRouteLinkConnectorType { - LC = 'LC', - SC = 'SC', -} - -/** - * Defines values for ExpressRouteLinkAdminState. - * Possible values include: 'Enabled', 'Disabled' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: ExpressRouteLinkAdminState = - * "someUnknownValueThatWillStillBeValid"; - * @readonly - * @enum {string} - */ -export enum ExpressRouteLinkAdminState { - Enabled = 'Enabled', - Disabled = 'Disabled', -} - -/** - * Defines values for ExpressRoutePortsEncapsulation. - * Possible values include: 'Dot1Q', 'QinQ' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: ExpressRoutePortsEncapsulation = - * "someUnknownValueThatWillStillBeValid"; - * @readonly - * @enum {string} - */ -export enum ExpressRoutePortsEncapsulation { - Dot1Q = 'Dot1Q', - QinQ = 'QinQ', -} - /** * Defines values for LoadBalancerSkuName. * Possible values include: 'Basic', 'Standard' @@ -11656,21 +11550,6 @@ export type PcStatus = 'NotStarted' | 'Running' | 'Stopped' | 'Error' | 'Unknown */ export type PcError = 'InternalError' | 'AgentStopped' | 'CaptureFailed' | 'LocalFileFailed' | 'StorageFailed'; -/** - * Defines values for FlowLogFormatType. - * Possible values include: 'JSON' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: FlowLogFormatType = - * "someUnknownValueThatWillStillBeValid"; - * @readonly - * @enum {string} - */ -export enum FlowLogFormatType { - JSON = 'JSON', -} - /** * Defines values for Protocol. * Possible values include: 'Tcp', 'Http', 'Https', 'Icmp' @@ -11752,23 +11631,6 @@ export type EvaluationState = 'NotStarted' | 'InProgress' | 'Completed'; */ export type VerbosityLevel = 'Normal' | 'Minimum' | 'Full'; -/** - * Defines values for VerbosityLevel. - * Possible values include: 'Normal', 'Minimum', 'Full' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: VerbosityLevel = - * "someUnknownValueThatWillStillBeValid"; - * @readonly - * @enum {string} - */ -export enum VerbosityLevel { - Normal = 'Normal', - Minimum = 'Minimum', - Full = 'Full', -} - /** * Defines values for PublicIPPrefixSkuName. * Possible values include: 'Standard' @@ -14322,7 +14184,7 @@ export type ExpressRouteLinksListNextResponse = ExpressRouteLinkListResult & { /** * Contains response data for the get operation. */ -export type ExpressRoutePortsLocationsListResponse = ExpressRoutePortsLocationListResult & { +export type InterfaceEndpointsGetResponse = InterfaceEndpoint & { /** * The underlying HTTP response. */ @@ -14334,14 +14196,14 @@ export type ExpressRoutePortsLocationsListResponse = ExpressRoutePortsLocationLi /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePortsLocationListResult; + parsedBody: InterfaceEndpoint; }; }; /** - * Contains response data for the get operation. + * Contains response data for the createOrUpdate operation. */ -export type ExpressRoutePortsLocationsGetResponse = ExpressRoutePortsLocation & { +export type InterfaceEndpointsCreateOrUpdateResponse = InterfaceEndpoint & { /** * The underlying HTTP response. */ @@ -14353,14 +14215,14 @@ export type ExpressRoutePortsLocationsGetResponse = ExpressRoutePortsLocation & /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePortsLocation; + parsedBody: InterfaceEndpoint; }; }; /** - * Contains response data for the listNext operation. + * Contains response data for the list operation. */ -export type ExpressRoutePortsLocationsListNextResponse = ExpressRoutePortsLocationListResult & { +export type InterfaceEndpointsListResponse = InterfaceEndpointListResult & { /** * The underlying HTTP response. */ @@ -14372,14 +14234,14 @@ export type ExpressRoutePortsLocationsListNextResponse = ExpressRoutePortsLocati /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePortsLocationListResult; + parsedBody: InterfaceEndpointListResult; }; }; /** - * Contains response data for the get operation. + * Contains response data for the listBySubscription operation. */ -export type ExpressRoutePortsGetResponse = ExpressRoutePort & { +export type InterfaceEndpointsListBySubscriptionResponse = InterfaceEndpointListResult & { /** * The underlying HTTP response. */ @@ -14391,14 +14253,14 @@ export type ExpressRoutePortsGetResponse = ExpressRoutePort & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePort; + parsedBody: InterfaceEndpointListResult; }; }; /** - * Contains response data for the createOrUpdate operation. + * Contains response data for the beginCreateOrUpdate operation. */ -export type ExpressRoutePortsCreateOrUpdateResponse = ExpressRoutePort & { +export type InterfaceEndpointsBeginCreateOrUpdateResponse = InterfaceEndpoint & { /** * The underlying HTTP response. */ @@ -14410,14 +14272,14 @@ export type ExpressRoutePortsCreateOrUpdateResponse = ExpressRoutePort & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePort; + parsedBody: InterfaceEndpoint; }; }; /** - * Contains response data for the updateTags operation. + * Contains response data for the listNext operation. */ -export type ExpressRoutePortsUpdateTagsResponse = ExpressRoutePort & { +export type InterfaceEndpointsListNextResponse = InterfaceEndpointListResult & { /** * The underlying HTTP response. */ @@ -14429,14 +14291,14 @@ export type ExpressRoutePortsUpdateTagsResponse = ExpressRoutePort & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePort; + parsedBody: InterfaceEndpointListResult; }; }; /** - * Contains response data for the listByResourceGroup operation. + * Contains response data for the listBySubscriptionNext operation. */ -export type ExpressRoutePortsListByResourceGroupResponse = ExpressRoutePortListResult & { +export type InterfaceEndpointsListBySubscriptionNextResponse = InterfaceEndpointListResult & { /** * The underlying HTTP response. */ @@ -14448,14 +14310,14 @@ export type ExpressRoutePortsListByResourceGroupResponse = ExpressRoutePortListR /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePortListResult; + parsedBody: InterfaceEndpointListResult; }; }; /** - * Contains response data for the list operation. + * Contains response data for the get operation. */ -export type ExpressRoutePortsListResponse = ExpressRoutePortListResult & { +export type LoadBalancersGetResponse = LoadBalancer & { /** * The underlying HTTP response. */ @@ -14467,14 +14329,14 @@ export type ExpressRoutePortsListResponse = ExpressRoutePortListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePortListResult; + parsedBody: LoadBalancer; }; }; /** - * Contains response data for the beginCreateOrUpdate operation. + * Contains response data for the createOrUpdate operation. */ -export type ExpressRoutePortsBeginCreateOrUpdateResponse = ExpressRoutePort & { +export type LoadBalancersCreateOrUpdateResponse = LoadBalancer & { /** * The underlying HTTP response. */ @@ -14486,14 +14348,14 @@ export type ExpressRoutePortsBeginCreateOrUpdateResponse = ExpressRoutePort & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePort; + parsedBody: LoadBalancer; }; }; /** - * Contains response data for the beginUpdateTags operation. + * Contains response data for the updateTags operation. */ -export type ExpressRoutePortsBeginUpdateTagsResponse = ExpressRoutePort & { +export type LoadBalancersUpdateTagsResponse = LoadBalancer & { /** * The underlying HTTP response. */ @@ -14505,14 +14367,14 @@ export type ExpressRoutePortsBeginUpdateTagsResponse = ExpressRoutePort & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePort; + parsedBody: LoadBalancer; }; }; /** - * Contains response data for the listByResourceGroupNext operation. + * Contains response data for the listAll operation. */ -export type ExpressRoutePortsListByResourceGroupNextResponse = ExpressRoutePortListResult & { +export type LoadBalancersListAllResponse = LoadBalancerListResult & { /** * The underlying HTTP response. */ @@ -14524,14 +14386,14 @@ export type ExpressRoutePortsListByResourceGroupNextResponse = ExpressRoutePortL /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePortListResult; + parsedBody: LoadBalancerListResult; }; }; /** - * Contains response data for the listNext operation. + * Contains response data for the list operation. */ -export type ExpressRoutePortsListNextResponse = ExpressRoutePortListResult & { +export type LoadBalancersListResponse = LoadBalancerListResult & { /** * The underlying HTTP response. */ @@ -14543,14 +14405,14 @@ export type ExpressRoutePortsListNextResponse = ExpressRoutePortListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRoutePortListResult; + parsedBody: LoadBalancerListResult; }; }; /** - * Contains response data for the get operation. + * Contains response data for the beginCreateOrUpdate operation. */ -export type ExpressRouteLinksGetResponse = ExpressRouteLink & { +export type LoadBalancersBeginCreateOrUpdateResponse = LoadBalancer & { /** * The underlying HTTP response. */ @@ -14562,14 +14424,14 @@ export type ExpressRouteLinksGetResponse = ExpressRouteLink & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRouteLink; + parsedBody: LoadBalancer; }; }; /** - * Contains response data for the list operation. + * Contains response data for the beginUpdateTags operation. */ -export type ExpressRouteLinksListResponse = ExpressRouteLinkListResult & { +export type LoadBalancersBeginUpdateTagsResponse = LoadBalancer & { /** * The underlying HTTP response. */ @@ -14581,14 +14443,14 @@ export type ExpressRouteLinksListResponse = ExpressRouteLinkListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRouteLinkListResult; + parsedBody: LoadBalancer; }; }; /** - * Contains response data for the listNext operation. + * Contains response data for the listAllNext operation. */ -export type ExpressRouteLinksListNextResponse = ExpressRouteLinkListResult & { +export type LoadBalancersListAllNextResponse = LoadBalancerListResult & { /** * The underlying HTTP response. */ @@ -14600,14 +14462,14 @@ export type ExpressRouteLinksListNextResponse = ExpressRouteLinkListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: ExpressRouteLinkListResult; + parsedBody: LoadBalancerListResult; }; }; /** - * Contains response data for the get operation. + * Contains response data for the listNext operation. */ -export type InterfaceEndpointsGetResponse = InterfaceEndpoint & { +export type LoadBalancersListNextResponse = LoadBalancerListResult & { /** * The underlying HTTP response. */ @@ -14619,14 +14481,14 @@ export type InterfaceEndpointsGetResponse = InterfaceEndpoint & { /** * The response body as parsed JSON or XML */ - parsedBody: InterfaceEndpoint; + parsedBody: LoadBalancerListResult; }; }; /** - * Contains response data for the createOrUpdate operation. + * Contains response data for the list operation. */ -export type InterfaceEndpointsCreateOrUpdateResponse = InterfaceEndpoint & { +export type LoadBalancerBackendAddressPoolsListResponse = LoadBalancerBackendAddressPoolListResult & { /** * The underlying HTTP response. */ @@ -14638,14 +14500,14 @@ export type InterfaceEndpointsCreateOrUpdateResponse = InterfaceEndpoint & { /** * The response body as parsed JSON or XML */ - parsedBody: InterfaceEndpoint; + parsedBody: LoadBalancerBackendAddressPoolListResult; }; }; /** - * Contains response data for the list operation. + * Contains response data for the get operation. */ -export type InterfaceEndpointsListResponse = InterfaceEndpointListResult & { +export type LoadBalancerBackendAddressPoolsGetResponse = BackendAddressPool & { /** * The underlying HTTP response. */ @@ -14657,14 +14519,14 @@ export type InterfaceEndpointsListResponse = InterfaceEndpointListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: InterfaceEndpointListResult; + parsedBody: BackendAddressPool; }; }; /** - * Contains response data for the listBySubscription operation. + * Contains response data for the listNext operation. */ -export type InterfaceEndpointsListBySubscriptionResponse = InterfaceEndpointListResult & { +export type LoadBalancerBackendAddressPoolsListNextResponse = LoadBalancerBackendAddressPoolListResult & { /** * The underlying HTTP response. */ @@ -14676,14 +14538,14 @@ export type InterfaceEndpointsListBySubscriptionResponse = InterfaceEndpointList /** * The response body as parsed JSON or XML */ - parsedBody: InterfaceEndpointListResult; + parsedBody: LoadBalancerBackendAddressPoolListResult; }; }; /** - * Contains response data for the beginCreateOrUpdate operation. + * Contains response data for the list operation. */ -export type InterfaceEndpointsBeginCreateOrUpdateResponse = InterfaceEndpoint & { +export type LoadBalancerFrontendIPConfigurationsListResponse = LoadBalancerFrontendIPConfigurationListResult & { /** * The underlying HTTP response. */ @@ -14695,14 +14557,14 @@ export type InterfaceEndpointsBeginCreateOrUpdateResponse = InterfaceEndpoint & /** * The response body as parsed JSON or XML */ - parsedBody: InterfaceEndpoint; + parsedBody: LoadBalancerFrontendIPConfigurationListResult; }; }; /** - * Contains response data for the listNext operation. + * Contains response data for the get operation. */ -export type InterfaceEndpointsListNextResponse = InterfaceEndpointListResult & { +export type LoadBalancerFrontendIPConfigurationsGetResponse = FrontendIPConfiguration & { /** * The underlying HTTP response. */ @@ -14714,14 +14576,14 @@ export type InterfaceEndpointsListNextResponse = InterfaceEndpointListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: InterfaceEndpointListResult; + parsedBody: FrontendIPConfiguration; }; }; /** - * Contains response data for the listBySubscriptionNext operation. + * Contains response data for the listNext operation. */ -export type InterfaceEndpointsListBySubscriptionNextResponse = InterfaceEndpointListResult & { +export type LoadBalancerFrontendIPConfigurationsListNextResponse = LoadBalancerFrontendIPConfigurationListResult & { /** * The underlying HTTP response. */ @@ -14733,14 +14595,14 @@ export type InterfaceEndpointsListBySubscriptionNextResponse = InterfaceEndpoint /** * The response body as parsed JSON or XML */ - parsedBody: InterfaceEndpointListResult; + parsedBody: LoadBalancerFrontendIPConfigurationListResult; }; }; /** - * Contains response data for the get operation. + * Contains response data for the list operation. */ -export type LoadBalancersGetResponse = LoadBalancer & { +export type InboundNatRulesListResponse = InboundNatRuleListResult & { /** * The underlying HTTP response. */ @@ -14752,14 +14614,14 @@ export type LoadBalancersGetResponse = LoadBalancer & { /** * The response body as parsed JSON or XML */ - parsedBody: LoadBalancer; + parsedBody: InboundNatRuleListResult; }; }; /** - * Contains response data for the createOrUpdate operation. + * Contains response data for the get operation. */ -export type LoadBalancersCreateOrUpdateResponse = LoadBalancer & { +export type InboundNatRulesGetResponse = InboundNatRule & { /** * The underlying HTTP response. */ @@ -14771,14 +14633,14 @@ export type LoadBalancersCreateOrUpdateResponse = LoadBalancer & { /** * The response body as parsed JSON or XML */ - parsedBody: LoadBalancer; + parsedBody: InboundNatRule; }; }; /** - * Contains response data for the updateTags operation. + * Contains response data for the createOrUpdate operation. */ -export type LoadBalancersUpdateTagsResponse = LoadBalancer & { +export type InboundNatRulesCreateOrUpdateResponse = InboundNatRule & { /** * The underlying HTTP response. */ @@ -14790,14 +14652,14 @@ export type LoadBalancersUpdateTagsResponse = LoadBalancer & { /** * The response body as parsed JSON or XML */ - parsedBody: LoadBalancer; + parsedBody: InboundNatRule; }; }; /** - * Contains response data for the listAll operation. + * Contains response data for the beginCreateOrUpdate operation. */ -export type LoadBalancersListAllResponse = LoadBalancerListResult & { +export type InboundNatRulesBeginCreateOrUpdateResponse = InboundNatRule & { /** * The underlying HTTP response. */ @@ -14809,14 +14671,14 @@ export type LoadBalancersListAllResponse = LoadBalancerListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: LoadBalancerListResult; + parsedBody: InboundNatRule; }; }; /** - * Contains response data for the list operation. + * Contains response data for the listNext operation. */ -export type LoadBalancersListResponse = LoadBalancerListResult & { +export type InboundNatRulesListNextResponse = InboundNatRuleListResult & { /** * The underlying HTTP response. */ @@ -14828,14 +14690,14 @@ export type LoadBalancersListResponse = LoadBalancerListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: LoadBalancerListResult; + parsedBody: InboundNatRuleListResult; }; }; /** - * Contains response data for the beginCreateOrUpdate operation. + * Contains response data for the list operation. */ -export type LoadBalancersBeginCreateOrUpdateResponse = LoadBalancer & { +export type LoadBalancerLoadBalancingRulesListResponse = LoadBalancerLoadBalancingRuleListResult & { /** * The underlying HTTP response. */ @@ -14847,14 +14709,14 @@ export type LoadBalancersBeginCreateOrUpdateResponse = LoadBalancer & { /** * The response body as parsed JSON or XML */ - parsedBody: LoadBalancer; + parsedBody: LoadBalancerLoadBalancingRuleListResult; }; }; /** - * Contains response data for the beginUpdateTags operation. + * Contains response data for the get operation. */ -export type LoadBalancersBeginUpdateTagsResponse = LoadBalancer & { +export type LoadBalancerLoadBalancingRulesGetResponse = LoadBalancingRule & { /** * The underlying HTTP response. */ @@ -14866,14 +14728,14 @@ export type LoadBalancersBeginUpdateTagsResponse = LoadBalancer & { /** * The response body as parsed JSON or XML */ - parsedBody: LoadBalancer; + parsedBody: LoadBalancingRule; }; }; /** - * Contains response data for the listAllNext operation. + * Contains response data for the listNext operation. */ -export type LoadBalancersListAllNextResponse = LoadBalancerListResult & { +export type LoadBalancerLoadBalancingRulesListNextResponse = LoadBalancerLoadBalancingRuleListResult & { /** * The underlying HTTP response. */ @@ -14885,12 +14747,12 @@ export type LoadBalancersListAllNextResponse = LoadBalancerListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: LoadBalancerListResult; + parsedBody: LoadBalancerLoadBalancingRuleListResult; }; }; /** - * Contains response data for the listNext operation. + * Contains response data for the list operation. */ export type LoadBalancerOutboundRulesListResponse = LoadBalancerOutboundRuleListResult & { /** @@ -18651,6 +18513,177 @@ export type VirtualNetworkPeeringsListNextResponse = VirtualNetworkPeeringListRe }; }; +/** + * Contains response data for the get operation. + */ +export type VirtualNetworkTapsGetResponse = VirtualNetworkTap & { + /** + * 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: VirtualNetworkTap; + }; +}; + +/** + * Contains response data for the createOrUpdate operation. + */ +export type VirtualNetworkTapsCreateOrUpdateResponse = VirtualNetworkTap & { + /** + * 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: VirtualNetworkTap; + }; +}; + +/** + * Contains response data for the updateTags operation. + */ +export type VirtualNetworkTapsUpdateTagsResponse = VirtualNetworkTap & { + /** + * 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: VirtualNetworkTap; + }; +}; + +/** + * Contains response data for the listAll operation. + */ +export type VirtualNetworkTapsListAllResponse = VirtualNetworkTapListResult & { + /** + * 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: VirtualNetworkTapListResult; + }; +}; + +/** + * Contains response data for the listByResourceGroup operation. + */ +export type VirtualNetworkTapsListByResourceGroupResponse = VirtualNetworkTapListResult & { + /** + * 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: VirtualNetworkTapListResult; + }; +}; + +/** + * Contains response data for the beginCreateOrUpdate operation. + */ +export type VirtualNetworkTapsBeginCreateOrUpdateResponse = VirtualNetworkTap & { + /** + * 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: VirtualNetworkTap; + }; +}; + +/** + * Contains response data for the beginUpdateTags operation. + */ +export type VirtualNetworkTapsBeginUpdateTagsResponse = VirtualNetworkTap & { + /** + * 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: VirtualNetworkTap; + }; +}; + +/** + * Contains response data for the listAllNext operation. + */ +export type VirtualNetworkTapsListAllNextResponse = VirtualNetworkTapListResult & { + /** + * 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: VirtualNetworkTapListResult; + }; +}; + +/** + * Contains response data for the listByResourceGroupNext operation. + */ +export type VirtualNetworkTapsListByResourceGroupNextResponse = VirtualNetworkTapListResult & { + /** + * 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: VirtualNetworkTapListResult; + }; +}; + /** * Contains response data for the createOrUpdate operation. */ @@ -19595,177 +19628,6 @@ export type LocalNetworkGatewaysListNextResponse = LocalNetworkGatewayListResult }; }; -/** - * Contains response data for the get operation. - */ -export type VirtualNetworkTapsGetResponse = VirtualNetworkTap & { - /** - * 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: VirtualNetworkTap; - }; -}; - -/** - * Contains response data for the createOrUpdate operation. - */ -export type VirtualNetworkTapsCreateOrUpdateResponse = VirtualNetworkTap & { - /** - * 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: VirtualNetworkTap; - }; -}; - -/** - * Contains response data for the updateTags operation. - */ -export type VirtualNetworkTapsUpdateTagsResponse = VirtualNetworkTap & { - /** - * 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: VirtualNetworkTap; - }; -}; - -/** - * Contains response data for the listAll operation. - */ -export type VirtualNetworkTapsListAllResponse = VirtualNetworkTapListResult & { - /** - * 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: VirtualNetworkTapListResult; - }; -}; - -/** - * Contains response data for the listByResourceGroup operation. - */ -export type VirtualNetworkTapsListByResourceGroupResponse = VirtualNetworkTapListResult & { - /** - * 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: VirtualNetworkTapListResult; - }; -}; - -/** - * Contains response data for the beginCreateOrUpdate operation. - */ -export type VirtualNetworkTapsBeginCreateOrUpdateResponse = VirtualNetworkTap & { - /** - * 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: VirtualNetworkTap; - }; -}; - -/** - * Contains response data for the beginUpdateTags operation. - */ -export type VirtualNetworkTapsBeginUpdateTagsResponse = VirtualNetworkTap & { - /** - * 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: VirtualNetworkTap; - }; -}; - -/** - * Contains response data for the listAllNext operation. - */ -export type VirtualNetworkTapsListAllNextResponse = VirtualNetworkTapListResult & { - /** - * 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: VirtualNetworkTapListResult; - }; -}; - -/** - * Contains response data for the listByResourceGroupNext operation. - */ -export type VirtualNetworkTapsListByResourceGroupNextResponse = VirtualNetworkTapListResult & { - /** - * 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: VirtualNetworkTapListResult; - }; -}; - /** * Contains response data for the get operation. */ diff --git a/packages/@azure/arm-network/lib/models/mappers.ts b/packages/@azure/arm-network/lib/models/mappers.ts index f15d14066c43..5aff60a095d2 100644 --- a/packages/@azure/arm-network/lib/models/mappers.ts +++ b/packages/@azure/arm-network/lib/models/mappers.ts @@ -445,6 +445,7 @@ export const NetworkInterface: msRest.CompositeMapper = { modelProperties: { ...Resource.type.modelProperties, virtualMachine: { + readOnly: true, serializedName: "properties.virtualMachine", type: { name: "Composite", @@ -8411,29 +8412,6 @@ export const RetentionPolicyParameters: msRest.CompositeMapper = { } }; -export const FlowLogFormatParameters: msRest.CompositeMapper = { - serializedName: "FlowLogFormatParameters", - type: { - name: "Composite", - className: "FlowLogFormatParameters", - modelProperties: { - type: { - serializedName: "type", - type: { - name: "String" - } - }, - version: { - serializedName: "version", - defaultValue: 0, - type: { - name: "Number" - } - } - } - } -}; - export const FlowLogStatusParameters: msRest.CompositeMapper = { serializedName: "FlowLogStatusParameters", type: { @@ -8484,12 +8462,6 @@ export const TrafficAnalyticsConfigurationProperties: msRest.CompositeMapper = { type: { name: "String" } - }, - trafficAnalyticsInterval: { - serializedName: "trafficAnalyticsInterval", - type: { - name: "Number" - } } } } @@ -8547,13 +8519,6 @@ export const FlowLogInformation: msRest.CompositeMapper = { className: "RetentionPolicyParameters" } }, - format: { - serializedName: "properties.format", - type: { - name: "Composite", - className: "FlowLogFormatParameters" - } - }, flowAnalyticsConfiguration: { serializedName: "flowAnalyticsConfiguration", type: { @@ -14505,11 +14470,11 @@ export const VirtualNetworkPeeringListResult: msRest.CompositeMapper = { } }; -export const VirtualNetworkGatewayListResult: msRest.CompositeMapper = { - serializedName: "VirtualNetworkGatewayListResult", +export const VirtualNetworkTapListResult: msRest.CompositeMapper = { + serializedName: "VirtualNetworkTapListResult", type: { name: "Composite", - className: "VirtualNetworkGatewayListResult", + className: "VirtualNetworkTapListResult", modelProperties: { value: { serializedName: "", @@ -14518,13 +14483,12 @@ export const VirtualNetworkGatewayListResult: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "VirtualNetworkGateway" + className: "VirtualNetworkTap" } } } }, nextLink: { - readOnly: true, serializedName: "nextLink", type: { name: "String" @@ -14534,11 +14498,11 @@ export const VirtualNetworkGatewayListResult: msRest.CompositeMapper = { } }; -export const VirtualNetworkGatewayListConnectionsResult: msRest.CompositeMapper = { - serializedName: "VirtualNetworkGatewayListConnectionsResult", +export const VirtualNetworkGatewayListResult: msRest.CompositeMapper = { + serializedName: "VirtualNetworkGatewayListResult", type: { name: "Composite", - className: "VirtualNetworkGatewayListConnectionsResult", + className: "VirtualNetworkGatewayListResult", modelProperties: { value: { serializedName: "", @@ -14547,7 +14511,7 @@ export const VirtualNetworkGatewayListConnectionsResult: msRest.CompositeMapper element: { type: { name: "Composite", - className: "VirtualNetworkGatewayConnectionListEntity" + className: "VirtualNetworkGateway" } } } @@ -14563,11 +14527,11 @@ export const VirtualNetworkGatewayListConnectionsResult: msRest.CompositeMapper } }; -export const VirtualNetworkGatewayConnectionListResult: msRest.CompositeMapper = { - serializedName: "VirtualNetworkGatewayConnectionListResult", +export const VirtualNetworkGatewayListConnectionsResult: msRest.CompositeMapper = { + serializedName: "VirtualNetworkGatewayListConnectionsResult", type: { name: "Composite", - className: "VirtualNetworkGatewayConnectionListResult", + className: "VirtualNetworkGatewayListConnectionsResult", modelProperties: { value: { serializedName: "", @@ -14576,7 +14540,7 @@ export const VirtualNetworkGatewayConnectionListResult: msRest.CompositeMapper = element: { type: { name: "Composite", - className: "VirtualNetworkGatewayConnection" + className: "VirtualNetworkGatewayConnectionListEntity" } } } @@ -14592,11 +14556,11 @@ export const VirtualNetworkGatewayConnectionListResult: msRest.CompositeMapper = } }; -export const LocalNetworkGatewayListResult: msRest.CompositeMapper = { - serializedName: "LocalNetworkGatewayListResult", +export const VirtualNetworkGatewayConnectionListResult: msRest.CompositeMapper = { + serializedName: "VirtualNetworkGatewayConnectionListResult", type: { name: "Composite", - className: "LocalNetworkGatewayListResult", + className: "VirtualNetworkGatewayConnectionListResult", modelProperties: { value: { serializedName: "", @@ -14605,7 +14569,7 @@ export const LocalNetworkGatewayListResult: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "LocalNetworkGateway" + className: "VirtualNetworkGatewayConnection" } } } @@ -14621,11 +14585,11 @@ export const LocalNetworkGatewayListResult: msRest.CompositeMapper = { } }; -export const VirtualNetworkTapListResult: msRest.CompositeMapper = { - serializedName: "VirtualNetworkTapListResult", +export const LocalNetworkGatewayListResult: msRest.CompositeMapper = { + serializedName: "LocalNetworkGatewayListResult", type: { name: "Composite", - className: "VirtualNetworkTapListResult", + className: "LocalNetworkGatewayListResult", modelProperties: { value: { serializedName: "", @@ -14634,12 +14598,13 @@ export const VirtualNetworkTapListResult: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "VirtualNetworkTap" + className: "LocalNetworkGateway" } } } }, nextLink: { + readOnly: true, serializedName: "nextLink", type: { name: "String" diff --git a/packages/@azure/arm-network/lib/models/networkWatchersMappers.ts b/packages/@azure/arm-network/lib/models/networkWatchersMappers.ts index f99f3d075550..e231e7a36d4d 100644 --- a/packages/@azure/arm-network/lib/models/networkWatchersMappers.ts +++ b/packages/@azure/arm-network/lib/models/networkWatchersMappers.ts @@ -41,7 +41,6 @@ export { QueryTroubleshootingParameters, FlowLogInformation, RetentionPolicyParameters, - FlowLogFormatParameters, TrafficAnalyticsProperties, TrafficAnalyticsConfigurationProperties, FlowLogStatusParameters, diff --git a/packages/@azure/arm-network/lib/models/parameters.ts b/packages/@azure/arm-network/lib/models/parameters.ts index b2d589da6872..f74182279047 100644 --- a/packages/@azure/arm-network/lib/models/parameters.ts +++ b/packages/@azure/arm-network/lib/models/parameters.ts @@ -26,7 +26,7 @@ export const apiVersion0: msRest.OperationQueryParameter = { required: true, isConstant: true, serializedName: "api-version", - defaultValue: '2018-10-01', + defaultValue: '2018-08-01', type: { name: "String" } diff --git a/packages/@azure/arm-network/lib/networkManagementClient.ts b/packages/@azure/arm-network/lib/networkManagementClient.ts index eea29bd25dea..809fe9c840ef 100644 --- a/packages/@azure/arm-network/lib/networkManagementClient.ts +++ b/packages/@azure/arm-network/lib/networkManagementClient.ts @@ -72,10 +72,10 @@ class NetworkManagementClient extends NetworkManagementClientContext { virtualNetworks: operations.VirtualNetworks; subnets: operations.Subnets; virtualNetworkPeerings: operations.VirtualNetworkPeerings; + virtualNetworkTaps: operations.VirtualNetworkTaps; virtualNetworkGateways: operations.VirtualNetworkGateways; virtualNetworkGatewayConnections: operations.VirtualNetworkGatewayConnections; localNetworkGateways: operations.LocalNetworkGateways; - virtualNetworkTaps: operations.VirtualNetworkTaps; virtualWans: operations.VirtualWans; vpnSites: operations.VpnSites; vpnSitesConfiguration: operations.VpnSitesConfiguration; @@ -149,10 +149,10 @@ class NetworkManagementClient extends NetworkManagementClientContext { this.virtualNetworks = new operations.VirtualNetworks(this); this.subnets = new operations.Subnets(this); this.virtualNetworkPeerings = new operations.VirtualNetworkPeerings(this); + this.virtualNetworkTaps = new operations.VirtualNetworkTaps(this); this.virtualNetworkGateways = new operations.VirtualNetworkGateways(this); this.virtualNetworkGatewayConnections = new operations.VirtualNetworkGatewayConnections(this); this.localNetworkGateways = new operations.LocalNetworkGateways(this); - this.virtualNetworkTaps = new operations.VirtualNetworkTaps(this); this.virtualWans = new operations.VirtualWans(this); this.vpnSites = new operations.VpnSites(this); this.vpnSitesConfiguration = new operations.VpnSitesConfiguration(this); diff --git a/packages/@azure/arm-network/lib/operations/index.ts b/packages/@azure/arm-network/lib/operations/index.ts index 988917538cb2..aac883cb909b 100644 --- a/packages/@azure/arm-network/lib/operations/index.ts +++ b/packages/@azure/arm-network/lib/operations/index.ts @@ -62,10 +62,10 @@ export * from "./usages"; export * from "./virtualNetworks"; export * from "./subnets"; export * from "./virtualNetworkPeerings"; +export * from "./virtualNetworkTaps"; export * from "./virtualNetworkGateways"; export * from "./virtualNetworkGatewayConnections"; export * from "./localNetworkGateways"; -export * from "./virtualNetworkTaps"; export * from "./virtualWans"; export * from "./vpnSites"; export * from "./vpnSitesConfiguration"; diff --git a/packages/@azure/arm-network/lib/operations/virtualNetworks.ts b/packages/@azure/arm-network/lib/operations/virtualNetworks.ts index 092ca5bb68cc..4601f03e1785 100644 --- a/packages/@azure/arm-network/lib/operations/virtualNetworks.ts +++ b/packages/@azure/arm-network/lib/operations/virtualNetworks.ts @@ -151,7 +151,6 @@ export class VirtualNetworks { /** * Checks whether a private IP address is available for use. - * @param ipAddress The private IP address to be verified. * @param resourceGroupName The name of the resource group. * @param virtualNetworkName The name of the virtual network. * @param ipAddress The private IP address to be verified. @@ -160,7 +159,6 @@ export class VirtualNetworks { */ checkIPAddressAvailability(resourceGroupName: string, virtualNetworkName: string, ipAddress: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param ipAddress The private IP address to be verified. * @param resourceGroupName The name of the resource group. * @param virtualNetworkName The name of the virtual network. * @param ipAddress The private IP address to be verified. @@ -168,7 +166,6 @@ export class VirtualNetworks { */ checkIPAddressAvailability(resourceGroupName: string, virtualNetworkName: string, ipAddress: string, callback: msRest.ServiceCallback): void; /** - * @param ipAddress The private IP address to be verified. * @param resourceGroupName The name of the resource group. * @param virtualNetworkName The name of the virtual network. * @param ipAddress The private IP address to be verified. @@ -179,7 +176,6 @@ export class VirtualNetworks { checkIPAddressAvailability(resourceGroupName: string, virtualNetworkName: string, ipAddress: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { - ipAddress, resourceGroupName, virtualNetworkName, ipAddress, diff --git a/packages/@azure/arm-network/package.json b/packages/@azure/arm-network/package.json index 2a1f71d2eb5e..7d9576131bd5 100644 --- a/packages/@azure/arm-network/package.json +++ b/packages/@azure/arm-network/package.json @@ -5,7 +5,7 @@ "version": "0.1.0", "dependencies": { "ms-rest-azure-js": "^1.0.181", - "ms-rest-js": "^1.0.461", + "ms-rest-js": "^1.0.462", "tslib": "^1.9.3" }, "keywords": [ diff --git a/packages/@azure/arm-network/tsconfig.json b/packages/@azure/arm-network/tsconfig.json index f32d1664f320..51ea90961ce5 100644 --- a/packages/@azure/arm-network/tsconfig.json +++ b/packages/@azure/arm-network/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*"], + "include": ["./lib/**/*.ts"], "exclude": ["node_modules"] } From 9a6c0d98c098d4dd87141e73ed125a6988e45165 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 12 Nov 2018 10:43:14 -0800 Subject: [PATCH 4/5] [AutoPR] cognitiveservices/data-plane/Face (#461) * Regenerated "@azure/arm-cognitiveservices" SDK. * Generated from c6f7fc714e3befa12ae571daf6a0781a6456406c (#460) Split Python conf in it's own file * Regenerated "@azure/cognitiveservices-face" SDK. --- README.md | 15 +- .../@azure/arm-cognitiveservices/LICENSE.txt | 42 ++--- .../@azure/arm-cognitiveservices/README.md | 162 +++++++++--------- .../@azure/cognitiveservices-face/README.md | 55 +++--- .../lib/faceClientContext.ts | 7 +- .../lib/models/index.ts | 88 ++-------- .../lib/operations/face.ts | 14 +- .../lib/operations/faceListOperations.ts | 16 +- .../lib/operations/largeFaceListOperations.ts | 26 +-- .../operations/largePersonGroupOperations.ts | 14 +- .../lib/operations/largePersonGroupPerson.ts | 20 +-- .../lib/operations/personGroupOperations.ts | 14 +- .../lib/operations/personGroupPerson.ts | 20 +-- .../cognitiveservices-face/package.json | 17 +- packages/@azure/graph/README.md | 8 +- 15 files changed, 242 insertions(+), 276 deletions(-) diff --git a/README.md b/README.md index 5baa9e250818..7bd0339d0788 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,18 @@ [![Build Status](https://dev.azure.com/azure-public/adx/_apis/build/status/public.Azure.azure-sdk-for-js)](https://dev.azure.com/azure-public/adx/_build/latest?definitionId=2) -This project provides a Javascript package that makes it easy to consume and manage +This project provides an isomorphic Javascript package with TypeScript definitions that makes it easy to consume and manage Microsoft Azure Services. It supports SDKs for: -- ARM services (packages with the naming convention of `azure-arm-`) -- data plane of some Azure services (packages with the naming convention of `azure-`). +- ARM services (control plane) (packages with the naming convention of `@azure/arm-`) +- data plane of some Azure services (packages with the naming convention of `@azure/`). ## Documentation Documentation of the supported SDKs can be found here: - https://docs.microsoft.com/en-us/javascript/azure - This website primarily provides SDK documentation for - - ARM based services (`azure-arm-`) - - data plane SDKs like `azure-batch`, `azure-graph`, etc. + - ARM based services (`@azure/arm-`) + - data plane SDKs like `@azure/batch`, `@azure/graph`, etc. ## Authentication - For Node.js-based authentication, look at [ms-rest-nodeauth](https://npmjs.com/package/ms-rest-nodeauth). @@ -28,9 +28,8 @@ Documentation of the supported SDKs can be found here: ## License -This project is licensed under MIT and Apache-2.0. -- "MIT" license is usually used for the client libraries generated using [Autorest](https://github.com/Azure/Autorest) that are targeting ARM (V2 version of Azure REST API). The license can be found in "LICENSE.MIT.txt" file in this repository. -- "Apache-2.0" license is usually used for the client libraries generated using an internal code generator that are targeting ASM (V1 version of Azure REST API). The license can be found in "LICENSE.Apache.txt" file in this repository. +This project is licensed under MIT. +- "MIT" license is usually used for the client libraries generated using [Autorest.TypeScript](https://github.com/azure/autorest.typescript) that are targeting ARM (V2 version of Azure REST API). The license can be found in "LICENSE.MIT.txt" file in this repository. ## Contribute diff --git a/packages/@azure/arm-cognitiveservices/LICENSE.txt b/packages/@azure/arm-cognitiveservices/LICENSE.txt index 5431ba98b936..a70e8cf66038 100644 --- a/packages/@azure/arm-cognitiveservices/LICENSE.txt +++ b/packages/@azure/arm-cognitiveservices/LICENSE.txt @@ -1,21 +1,21 @@ -The MIT License (MIT) - -Copyright (c) 2018 Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +The MIT License (MIT) + +Copyright (c) 2018 Microsoft + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/packages/@azure/arm-cognitiveservices/README.md b/packages/@azure/arm-cognitiveservices/README.md index b6df42c0c189..673041a38710 100644 --- a/packages/@azure/arm-cognitiveservices/README.md +++ b/packages/@azure/arm-cognitiveservices/README.md @@ -1,81 +1,81 @@ -# Azure CognitiveServicesManagementClient SDK for JavaScript -This package contains an isomorphic SDK for CognitiveServicesManagementClient. - -## Currently supported environments -- Node.js version 6.x.x or higher -- Browser JavaScript - -## How to Install -``` -npm install @azure/arm-cognitiveservices -``` - - -## How to use - -### nodejs - Authentication, client creation and getProperties accounts as an example written in TypeScript. - -```ts -import * as msRest from "ms-rest-js"; -import * as msRestAzure from "ms-rest-azure-js"; -import * as msRestNodeAuth from "ms-rest-nodeauth"; -import { CognitiveServicesManagementClient, CognitiveServicesManagementModels, CognitiveServicesManagementMappers } from "@azure/arm-cognitiveservices"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new CognitiveServicesManagementClient(creds, subscriptionId); - const resourceGroupName = "testresourceGroupName"; - const accountName = "testaccountName"; - client.accounts.getProperties(resourceGroupName, accountName).then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -### browser - Authentication, client creation and getProperties accounts as an example written in JavaScript. -See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - -- index.html -```html - - - - @azure/arm-cognitiveservices sample - - - - - - - - - -``` - -# Related projects - - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Azure CognitiveServicesManagementClient SDK for JavaScript +This package contains an isomorphic SDK for CognitiveServicesManagementClient. + +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript + +## How to Install +``` +npm install @azure/arm-cognitiveservices +``` + + +## How to use + +### nodejs - Authentication, client creation and getProperties accounts as an example written in TypeScript. + +```ts +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; +import { CognitiveServicesManagementClient, CognitiveServicesManagementModels, CognitiveServicesManagementMappers } from "@azure/arm-cognitiveservices"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new CognitiveServicesManagementClient(creds, subscriptionId); + const resourceGroupName = "testresourceGroupName"; + const accountName = "testaccountName"; + client.accounts.getProperties(resourceGroupName, accountName).then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +### browser - Authentication, client creation and getProperties accounts as an example written in JavaScript. +See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. + +- index.html +```html + + + + @azure/arm-cognitiveservices sample + + + + + + + + + +``` + +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/cognitiveservices-face/README.md b/packages/@azure/cognitiveservices-face/README.md index d6c866babab6..e3044e1dd5ae 100644 --- a/packages/@azure/cognitiveservices-face/README.md +++ b/packages/@azure/cognitiveservices-face/README.md @@ -20,18 +20,19 @@ npm install @azure/cognitiveservices-face ```ts import * as msRest from "ms-rest-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; import { FaceClient, FaceModels, FaceMappers } from "@azure/cognitiveservices-face"; const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; -const token = ""; -const creds = new msRest.TokenCredentials(token); -const client = new FaceClient(creds, subscriptionId); -const personGroupId = "testpersonGroupId"; -const start = "teststart"; -const top = 1; -client.personGroupPerson.list(personGroupId, start, top).then((result) => { - console.log("The result is:"); - console.log(result); +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new FaceClient(creds, subscriptionId); + const personGroupId = "testpersonGroupId"; + const start = "teststart"; + const top = 1; + client.personGroupPerson.list(personGroupId, start, top).then((result) => { + console.log("The result is:"); + console.log(result); + }); }).catch((err) => { console.error(err); }); @@ -45,21 +46,31 @@ client.personGroupPerson.list(personGroupId, start, top).then((result) => { @azure/cognitiveservices-face sample - - + + + diff --git a/packages/@azure/cognitiveservices-face/lib/faceClientContext.ts b/packages/@azure/cognitiveservices-face/lib/faceClientContext.ts index 5a0f7221da02..d1a69d729ebd 100644 --- a/packages/@azure/cognitiveservices-face/lib/faceClientContext.ts +++ b/packages/@azure/cognitiveservices-face/lib/faceClientContext.ts @@ -11,7 +11,7 @@ import * as msRest from "ms-rest-js"; const packageName = "@azure/cognitiveservices-face"; -const packageVersion = "1.0.0"; +const packageVersion = "0.1.0"; export class FaceClientContext extends msRest.ServiceClient { endpoint: string; @@ -35,6 +35,10 @@ export class FaceClientContext extends msRest.ServiceClient { if (!options) { options = {}; } + if(!options.userAgent) { + const defaultUserAgent = msRest.getDefaultUserAgentValue(); + options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; + } super(credentials, options); @@ -43,6 +47,5 @@ export class FaceClientContext extends msRest.ServiceClient { this.endpoint = endpoint; this.credentials = credentials; - this.addUserAgentInfo(`${packageName}/${packageVersion}`); } } diff --git a/packages/@azure/cognitiveservices-face/lib/models/index.ts b/packages/@azure/cognitiveservices-face/lib/models/index.ts index edb81419a647..2152fe73a11c 100644 --- a/packages/@azure/cognitiveservices-face/lib/models/index.ts +++ b/packages/@azure/cognitiveservices-face/lib/models/index.ts @@ -1740,43 +1740,23 @@ export interface LargeFaceListAddFaceFromStreamOptionalParams extends msRest.Req * @readonly * @enum {string} */ -export enum Gender { - Male = 'male', - Female = 'female', - Genderless = 'genderless', -} +export type Gender = 'male' | 'female' | 'genderless'; /** * Defines values for GlassesType. - * Possible values include: 'noGlasses', 'readingGlasses', 'sunglasses', - * 'swimmingGoggles' + * Possible values include: 'noGlasses', 'readingGlasses', 'sunglasses', 'swimmingGoggles' * @readonly * @enum {string} */ -export enum GlassesType { - NoGlasses = 'noGlasses', - ReadingGlasses = 'readingGlasses', - Sunglasses = 'sunglasses', - SwimmingGoggles = 'swimmingGoggles', -} +export type GlassesType = 'noGlasses' | 'readingGlasses' | 'sunglasses' | 'swimmingGoggles'; /** * Defines values for HairColorType. - * Possible values include: 'unknown', 'white', 'gray', 'blond', 'brown', - * 'red', 'black', 'other' + * Possible values include: 'unknown', 'white', 'gray', 'blond', 'brown', 'red', 'black', 'other' * @readonly * @enum {string} */ -export enum HairColorType { - Unknown = 'unknown', - White = 'white', - Gray = 'gray', - Blond = 'blond', - Brown = 'brown', - Red = 'red', - Black = 'black', - Other = 'other', -} +export type HairColorType = 'unknown' | 'white' | 'gray' | 'blond' | 'brown' | 'red' | 'black' | 'other'; /** * Defines values for AccessoryType. @@ -1784,11 +1764,7 @@ export enum HairColorType { * @readonly * @enum {string} */ -export enum AccessoryType { - HeadWear = 'headWear', - Glasses = 'glasses', - Mask = 'mask', -} +export type AccessoryType = 'headWear' | 'glasses' | 'mask'; /** * Defines values for BlurLevel. @@ -1796,11 +1772,7 @@ export enum AccessoryType { * @readonly * @enum {string} */ -export enum BlurLevel { - Low = 'Low', - Medium = 'Medium', - High = 'High', -} +export type BlurLevel = 'Low' | 'Medium' | 'High'; /** * Defines values for ExposureLevel. @@ -1808,11 +1780,7 @@ export enum BlurLevel { * @readonly * @enum {string} */ -export enum ExposureLevel { - UnderExposure = 'UnderExposure', - GoodExposure = 'GoodExposure', - OverExposure = 'OverExposure', -} +export type ExposureLevel = 'UnderExposure' | 'GoodExposure' | 'OverExposure'; /** * Defines values for NoiseLevel. @@ -1820,11 +1788,7 @@ export enum ExposureLevel { * @readonly * @enum {string} */ -export enum NoiseLevel { - Low = 'Low', - Medium = 'Medium', - High = 'High', -} +export type NoiseLevel = 'Low' | 'Medium' | 'High'; /** * Defines values for FindSimilarMatchMode. @@ -1832,10 +1796,7 @@ export enum NoiseLevel { * @readonly * @enum {string} */ -export enum FindSimilarMatchMode { - MatchPerson = 'matchPerson', - MatchFace = 'matchFace', -} +export type FindSimilarMatchMode = 'matchPerson' | 'matchFace'; /** * Defines values for TrainingStatusType. @@ -1843,37 +1804,16 @@ export enum FindSimilarMatchMode { * @readonly * @enum {string} */ -export enum TrainingStatusType { - Nonstarted = 'nonstarted', - Running = 'running', - Succeeded = 'succeeded', - Failed = 'failed', -} +export type TrainingStatusType = 'nonstarted' | 'running' | 'succeeded' | 'failed'; /** * Defines values for FaceAttributeType. - * Possible values include: 'age', 'gender', 'headPose', 'smile', 'facialHair', - * 'glasses', 'emotion', 'hair', 'makeup', 'occlusion', 'accessories', 'blur', - * 'exposure', 'noise' + * Possible values include: 'age', 'gender', 'headPose', 'smile', 'facialHair', 'glasses', + * 'emotion', 'hair', 'makeup', 'occlusion', 'accessories', 'blur', 'exposure', 'noise' * @readonly * @enum {string} */ -export enum FaceAttributeType { - Age = 'age', - Gender = 'gender', - HeadPose = 'headPose', - Smile = 'smile', - FacialHair = 'facialHair', - Glasses = 'glasses', - Emotion = 'emotion', - Hair = 'hair', - Makeup = 'makeup', - Occlusion = 'occlusion', - Accessories = 'accessories', - Blur = 'blur', - Exposure = 'exposure', - Noise = 'noise', -} +export type FaceAttributeType = 'age' | 'gender' | 'headPose' | 'smile' | 'facialHair' | 'glasses' | 'emotion' | 'hair' | 'makeup' | 'occlusion' | 'accessories' | 'blur' | 'exposure' | 'noise'; /** * Contains response data for the findSimilar operation. diff --git a/packages/@azure/cognitiveservices-face/lib/operations/face.ts b/packages/@azure/cognitiveservices-face/lib/operations/face.ts index f1e0dad0a848..dc711e459624 100644 --- a/packages/@azure/cognitiveservices-face/lib/operations/face.ts +++ b/packages/@azure/cognitiveservices-face/lib/operations/face.ts @@ -48,7 +48,7 @@ export class Face { * @param callback The callback */ findSimilar(faceId: string, options: Models.FaceFindSimilarOptionalParams, callback: msRest.ServiceCallback): void; - findSimilar(faceId: string, options?: Models.FaceFindSimilarOptionalParams, callback?: msRest.ServiceCallback): Promise { + findSimilar(faceId: string, options?: Models.FaceFindSimilarOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceId, @@ -76,7 +76,7 @@ export class Face { * @param callback The callback */ group(faceIds: string[], options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - group(faceIds: string[], options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + group(faceIds: string[], options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceIds, @@ -108,7 +108,7 @@ export class Face { * @param callback The callback */ identify(faceIds: string[], options: Models.FaceIdentifyOptionalParams, callback: msRest.ServiceCallback): void; - identify(faceIds: string[], options?: Models.FaceIdentifyOptionalParams, callback?: msRest.ServiceCallback): Promise { + identify(faceIds: string[], options?: Models.FaceIdentifyOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceIds, @@ -139,7 +139,7 @@ export class Face { * @param callback The callback */ verifyFaceToFace(faceId1: string, faceId2: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - verifyFaceToFace(faceId1: string, faceId2: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + verifyFaceToFace(faceId1: string, faceId2: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceId1, @@ -169,7 +169,7 @@ export class Face { * @param callback The callback */ detectWithUrl(url: string, options: Models.FaceDetectWithUrlOptionalParams, callback: msRest.ServiceCallback): void; - detectWithUrl(url: string, options?: Models.FaceDetectWithUrlOptionalParams, callback?: msRest.ServiceCallback): Promise { + detectWithUrl(url: string, options?: Models.FaceDetectWithUrlOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { url, @@ -203,7 +203,7 @@ export class Face { * @param callback The callback */ verifyFaceToPerson(faceId: string, personId: string, options: Models.FaceVerifyFaceToPersonOptionalParams, callback: msRest.ServiceCallback): void; - verifyFaceToPerson(faceId: string, personId: string, options?: Models.FaceVerifyFaceToPersonOptionalParams, callback?: msRest.ServiceCallback): Promise { + verifyFaceToPerson(faceId: string, personId: string, options?: Models.FaceVerifyFaceToPersonOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceId, @@ -233,7 +233,7 @@ export class Face { * @param callback The callback */ detectWithStream(image: msRest.HttpRequestBody, options: Models.FaceDetectWithStreamOptionalParams, callback: msRest.ServiceCallback): void; - detectWithStream(image: msRest.HttpRequestBody, options?: Models.FaceDetectWithStreamOptionalParams, callback?: msRest.ServiceCallback): Promise { + detectWithStream(image: msRest.HttpRequestBody, options?: Models.FaceDetectWithStreamOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { image, diff --git a/packages/@azure/cognitiveservices-face/lib/operations/faceListOperations.ts b/packages/@azure/cognitiveservices-face/lib/operations/faceListOperations.ts index f38f11cfd5ba..0033fad7e938 100644 --- a/packages/@azure/cognitiveservices-face/lib/operations/faceListOperations.ts +++ b/packages/@azure/cognitiveservices-face/lib/operations/faceListOperations.ts @@ -44,7 +44,7 @@ export class FaceListOperations { * @param callback The callback */ create(faceListId: string, options: Models.FaceListCreateOptionalParams, callback: msRest.ServiceCallback): void; - create(faceListId: string, options?: Models.FaceListCreateOptionalParams, callback?: msRest.ServiceCallback): Promise { + create(faceListId: string, options?: Models.FaceListCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceListId, @@ -72,7 +72,7 @@ export class FaceListOperations { * @param callback The callback */ get(faceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(faceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(faceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceListId, @@ -100,7 +100,7 @@ export class FaceListOperations { * @param callback The callback */ update(faceListId: string, options: Models.FaceListUpdateOptionalParams, callback: msRest.ServiceCallback): void; - update(faceListId: string, options?: Models.FaceListUpdateOptionalParams, callback?: msRest.ServiceCallback): Promise { + update(faceListId: string, options?: Models.FaceListUpdateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceListId, @@ -129,7 +129,7 @@ export class FaceListOperations { * @param callback The callback */ deleteMethod(faceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(faceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(faceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceListId, @@ -155,7 +155,7 @@ export class FaceListOperations { * @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 @@ -186,7 +186,7 @@ export class FaceListOperations { * @param callback The callback */ deleteFace(faceListId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteFace(faceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteFace(faceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceListId, @@ -219,7 +219,7 @@ export class FaceListOperations { * @param callback The callback */ addFaceFromUrl(faceListId: string, url: string, options: Models.FaceListAddFaceFromUrlOptionalParams, callback: msRest.ServiceCallback): void; - addFaceFromUrl(faceListId: string, url: string, options?: Models.FaceListAddFaceFromUrlOptionalParams, callback?: msRest.ServiceCallback): Promise { + addFaceFromUrl(faceListId: string, url: string, options?: Models.FaceListAddFaceFromUrlOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceListId, @@ -252,7 +252,7 @@ export class FaceListOperations { * @param callback The callback */ addFaceFromStream(faceListId: string, image: msRest.HttpRequestBody, options: Models.FaceListAddFaceFromStreamOptionalParams, callback: msRest.ServiceCallback): void; - addFaceFromStream(faceListId: string, image: msRest.HttpRequestBody, options?: Models.FaceListAddFaceFromStreamOptionalParams, callback?: msRest.ServiceCallback): Promise { + addFaceFromStream(faceListId: string, image: msRest.HttpRequestBody, options?: Models.FaceListAddFaceFromStreamOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { faceListId, diff --git a/packages/@azure/cognitiveservices-face/lib/operations/largeFaceListOperations.ts b/packages/@azure/cognitiveservices-face/lib/operations/largeFaceListOperations.ts index 6971b752285d..9988d40df3aa 100644 --- a/packages/@azure/cognitiveservices-face/lib/operations/largeFaceListOperations.ts +++ b/packages/@azure/cognitiveservices-face/lib/operations/largeFaceListOperations.ts @@ -45,7 +45,7 @@ export class LargeFaceListOperations { * @param callback The callback */ create(largeFaceListId: string, options: Models.LargeFaceListCreateOptionalParams, callback: msRest.ServiceCallback): void; - create(largeFaceListId: string, options?: Models.LargeFaceListCreateOptionalParams, callback?: msRest.ServiceCallback): Promise { + create(largeFaceListId: string, options?: Models.LargeFaceListCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -73,7 +73,7 @@ export class LargeFaceListOperations { * @param callback The callback */ get(largeFaceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(largeFaceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(largeFaceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -101,7 +101,7 @@ export class LargeFaceListOperations { * @param callback The callback */ update(largeFaceListId: string, options: Models.LargeFaceListUpdateOptionalParams, callback: msRest.ServiceCallback): void; - update(largeFaceListId: string, options?: Models.LargeFaceListUpdateOptionalParams, callback?: msRest.ServiceCallback): Promise { + update(largeFaceListId: string, options?: Models.LargeFaceListUpdateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -130,7 +130,7 @@ export class LargeFaceListOperations { * @param callback The callback */ deleteMethod(largeFaceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(largeFaceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(largeFaceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -158,7 +158,7 @@ export class LargeFaceListOperations { * @param callback The callback */ getTrainingStatus(largeFaceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getTrainingStatus(largeFaceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getTrainingStatus(largeFaceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -184,7 +184,7 @@ export class LargeFaceListOperations { * @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 @@ -211,7 +211,7 @@ export class LargeFaceListOperations { * @param callback The callback */ train(largeFaceListId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - train(largeFaceListId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + train(largeFaceListId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -243,7 +243,7 @@ export class LargeFaceListOperations { * @param callback The callback */ deleteFace(largeFaceListId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteFace(largeFaceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteFace(largeFaceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -276,7 +276,7 @@ export class LargeFaceListOperations { * @param callback The callback */ getFace(largeFaceListId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getFace(largeFaceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getFace(largeFaceListId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -308,7 +308,7 @@ export class LargeFaceListOperations { * @param callback The callback */ updateFace(largeFaceListId: string, persistedFaceId: string, options: Models.LargeFaceListUpdateFaceOptionalParams, callback: msRest.ServiceCallback): void; - updateFace(largeFaceListId: string, persistedFaceId: string, options?: Models.LargeFaceListUpdateFaceOptionalParams, callback?: msRest.ServiceCallback): Promise { + updateFace(largeFaceListId: string, persistedFaceId: string, options?: Models.LargeFaceListUpdateFaceOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -342,7 +342,7 @@ export class LargeFaceListOperations { * @param callback The callback */ addFaceFromUrl(largeFaceListId: string, url: string, options: Models.LargeFaceListAddFaceFromUrlOptionalParams, callback: msRest.ServiceCallback): void; - addFaceFromUrl(largeFaceListId: string, url: string, options?: Models.LargeFaceListAddFaceFromUrlOptionalParams, callback?: msRest.ServiceCallback): Promise { + addFaceFromUrl(largeFaceListId: string, url: string, options?: Models.LargeFaceListAddFaceFromUrlOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -372,7 +372,7 @@ export class LargeFaceListOperations { * @param callback The callback */ listFaces(largeFaceListId: string, options: Models.LargeFaceListListFacesOptionalParams, callback: msRest.ServiceCallback): void; - listFaces(largeFaceListId: string, options?: Models.LargeFaceListListFacesOptionalParams, callback?: msRest.ServiceCallback): Promise { + listFaces(largeFaceListId: string, options?: Models.LargeFaceListListFacesOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, @@ -405,7 +405,7 @@ export class LargeFaceListOperations { * @param callback The callback */ addFaceFromStream(largeFaceListId: string, image: msRest.HttpRequestBody, options: Models.LargeFaceListAddFaceFromStreamOptionalParams, callback: msRest.ServiceCallback): void; - addFaceFromStream(largeFaceListId: string, image: msRest.HttpRequestBody, options?: Models.LargeFaceListAddFaceFromStreamOptionalParams, callback?: msRest.ServiceCallback): Promise { + addFaceFromStream(largeFaceListId: string, image: msRest.HttpRequestBody, options?: Models.LargeFaceListAddFaceFromStreamOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largeFaceListId, diff --git a/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupOperations.ts b/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupOperations.ts index bfedff478382..59e6a9c5137a 100644 --- a/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupOperations.ts +++ b/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupOperations.ts @@ -45,7 +45,7 @@ export class LargePersonGroupOperations { * @param callback The callback */ create(largePersonGroupId: string, options: Models.LargePersonGroupCreateOptionalParams, callback: msRest.ServiceCallback): void; - create(largePersonGroupId: string, options?: Models.LargePersonGroupCreateOptionalParams, callback?: msRest.ServiceCallback): Promise { + create(largePersonGroupId: string, options?: Models.LargePersonGroupCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -74,7 +74,7 @@ export class LargePersonGroupOperations { * @param callback The callback */ deleteMethod(largePersonGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(largePersonGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(largePersonGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -102,7 +102,7 @@ export class LargePersonGroupOperations { * @param callback The callback */ get(largePersonGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(largePersonGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(largePersonGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -131,7 +131,7 @@ export class LargePersonGroupOperations { * @param callback The callback */ update(largePersonGroupId: string, options: Models.LargePersonGroupUpdateOptionalParams, callback: msRest.ServiceCallback): void; - update(largePersonGroupId: string, options?: Models.LargePersonGroupUpdateOptionalParams, callback?: msRest.ServiceCallback): Promise { + update(largePersonGroupId: string, options?: Models.LargePersonGroupUpdateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -159,7 +159,7 @@ export class LargePersonGroupOperations { * @param callback The callback */ getTrainingStatus(largePersonGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getTrainingStatus(largePersonGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getTrainingStatus(largePersonGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -184,7 +184,7 @@ export class LargePersonGroupOperations { * @param callback The callback */ list(options: Models.LargePersonGroupListOptionalParams, callback: msRest.ServiceCallback): void; - list(options?: Models.LargePersonGroupListOptionalParams, callback?: msRest.ServiceCallback): Promise { + list(options?: Models.LargePersonGroupListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -211,7 +211,7 @@ export class LargePersonGroupOperations { * @param callback The callback */ train(largePersonGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - train(largePersonGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + train(largePersonGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, diff --git a/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupPerson.ts b/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupPerson.ts index e0c94641a31f..990dd5098401 100644 --- a/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupPerson.ts +++ b/packages/@azure/cognitiveservices-face/lib/operations/largePersonGroupPerson.ts @@ -44,7 +44,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ create(largePersonGroupId: string, options: Models.LargePersonGroupPersonCreateOptionalParams, callback: msRest.ServiceCallback): void; - create(largePersonGroupId: string, options?: Models.LargePersonGroupPersonCreateOptionalParams, callback?: msRest.ServiceCallback): Promise { + create(largePersonGroupId: string, options?: Models.LargePersonGroupPersonCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -73,7 +73,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ list(largePersonGroupId: string, options: Models.LargePersonGroupPersonListOptionalParams, callback: msRest.ServiceCallback): void; - list(largePersonGroupId: string, options?: Models.LargePersonGroupPersonListOptionalParams, callback?: msRest.ServiceCallback): Promise { + list(largePersonGroupId: string, options?: Models.LargePersonGroupPersonListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -105,7 +105,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ deleteMethod(largePersonGroupId: string, personId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(largePersonGroupId: string, personId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(largePersonGroupId: string, personId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -137,7 +137,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ get(largePersonGroupId: string, personId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(largePersonGroupId: string, personId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(largePersonGroupId: string, personId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -169,7 +169,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ update(largePersonGroupId: string, personId: string, options: Models.LargePersonGroupPersonUpdateOptionalParams, callback: msRest.ServiceCallback): void; - update(largePersonGroupId: string, personId: string, options?: Models.LargePersonGroupPersonUpdateOptionalParams, callback?: msRest.ServiceCallback): Promise { + update(largePersonGroupId: string, personId: string, options?: Models.LargePersonGroupPersonUpdateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -204,7 +204,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ deleteFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -241,7 +241,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ getFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -277,7 +277,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ updateFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options: Models.LargePersonGroupPersonUpdateFaceOptionalParams, callback: msRest.ServiceCallback): void; - updateFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: Models.LargePersonGroupPersonUpdateFaceOptionalParams, callback?: msRest.ServiceCallback): Promise { + updateFace(largePersonGroupId: string, personId: string, persistedFaceId: string, options?: Models.LargePersonGroupPersonUpdateFaceOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -314,7 +314,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ addFaceFromUrl(largePersonGroupId: string, personId: string, url: string, options: Models.LargePersonGroupPersonAddFaceFromUrlOptionalParams, callback: msRest.ServiceCallback): void; - addFaceFromUrl(largePersonGroupId: string, personId: string, url: string, options?: Models.LargePersonGroupPersonAddFaceFromUrlOptionalParams, callback?: msRest.ServiceCallback): Promise { + addFaceFromUrl(largePersonGroupId: string, personId: string, url: string, options?: Models.LargePersonGroupPersonAddFaceFromUrlOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, @@ -351,7 +351,7 @@ export class LargePersonGroupPerson { * @param callback The callback */ addFaceFromStream(largePersonGroupId: string, personId: string, image: msRest.HttpRequestBody, options: Models.LargePersonGroupPersonAddFaceFromStreamOptionalParams, callback: msRest.ServiceCallback): void; - addFaceFromStream(largePersonGroupId: string, personId: string, image: msRest.HttpRequestBody, options?: Models.LargePersonGroupPersonAddFaceFromStreamOptionalParams, callback?: msRest.ServiceCallback): Promise { + addFaceFromStream(largePersonGroupId: string, personId: string, image: msRest.HttpRequestBody, options?: Models.LargePersonGroupPersonAddFaceFromStreamOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { largePersonGroupId, diff --git a/packages/@azure/cognitiveservices-face/lib/operations/personGroupOperations.ts b/packages/@azure/cognitiveservices-face/lib/operations/personGroupOperations.ts index 58b547ce5353..df2778f5b356 100644 --- a/packages/@azure/cognitiveservices-face/lib/operations/personGroupOperations.ts +++ b/packages/@azure/cognitiveservices-face/lib/operations/personGroupOperations.ts @@ -44,7 +44,7 @@ export class PersonGroupOperations { * @param callback The callback */ create(personGroupId: string, options: Models.PersonGroupCreateOptionalParams, callback: msRest.ServiceCallback): void; - create(personGroupId: string, options?: Models.PersonGroupCreateOptionalParams, callback?: msRest.ServiceCallback): Promise { + create(personGroupId: string, options?: Models.PersonGroupCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -73,7 +73,7 @@ export class PersonGroupOperations { * @param callback The callback */ deleteMethod(personGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(personGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(personGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -101,7 +101,7 @@ export class PersonGroupOperations { * @param callback The callback */ get(personGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(personGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(personGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -130,7 +130,7 @@ export class PersonGroupOperations { * @param callback The callback */ update(personGroupId: string, options: Models.PersonGroupUpdateOptionalParams, callback: msRest.ServiceCallback): void; - update(personGroupId: string, options?: Models.PersonGroupUpdateOptionalParams, callback?: msRest.ServiceCallback): Promise { + update(personGroupId: string, options?: Models.PersonGroupUpdateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -158,7 +158,7 @@ export class PersonGroupOperations { * @param callback The callback */ getTrainingStatus(personGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getTrainingStatus(personGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getTrainingStatus(personGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -183,7 +183,7 @@ export class PersonGroupOperations { * @param callback The callback */ list(options: Models.PersonGroupListOptionalParams, callback: msRest.ServiceCallback): void; - list(options?: Models.PersonGroupListOptionalParams, callback?: msRest.ServiceCallback): Promise { + list(options?: Models.PersonGroupListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -210,7 +210,7 @@ export class PersonGroupOperations { * @param callback The callback */ train(personGroupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - train(personGroupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + train(personGroupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, diff --git a/packages/@azure/cognitiveservices-face/lib/operations/personGroupPerson.ts b/packages/@azure/cognitiveservices-face/lib/operations/personGroupPerson.ts index bc61ac26e3a1..05b49c116372 100644 --- a/packages/@azure/cognitiveservices-face/lib/operations/personGroupPerson.ts +++ b/packages/@azure/cognitiveservices-face/lib/operations/personGroupPerson.ts @@ -44,7 +44,7 @@ export class PersonGroupPerson { * @param callback The callback */ create(personGroupId: string, options: Models.PersonGroupPersonCreateOptionalParams, callback: msRest.ServiceCallback): void; - create(personGroupId: string, options?: Models.PersonGroupPersonCreateOptionalParams, callback?: msRest.ServiceCallback): Promise { + create(personGroupId: string, options?: Models.PersonGroupPersonCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -73,7 +73,7 @@ export class PersonGroupPerson { * @param callback The callback */ list(personGroupId: string, options: Models.PersonGroupPersonListOptionalParams, callback: msRest.ServiceCallback): void; - list(personGroupId: string, options?: Models.PersonGroupPersonListOptionalParams, callback?: msRest.ServiceCallback): Promise { + list(personGroupId: string, options?: Models.PersonGroupPersonListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -105,7 +105,7 @@ export class PersonGroupPerson { * @param callback The callback */ deleteMethod(personGroupId: string, personId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(personGroupId: string, personId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(personGroupId: string, personId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -137,7 +137,7 @@ export class PersonGroupPerson { * @param callback The callback */ get(personGroupId: string, personId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(personGroupId: string, personId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(personGroupId: string, personId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -169,7 +169,7 @@ export class PersonGroupPerson { * @param callback The callback */ update(personGroupId: string, personId: string, options: Models.PersonGroupPersonUpdateOptionalParams, callback: msRest.ServiceCallback): void; - update(personGroupId: string, personId: string, options?: Models.PersonGroupPersonUpdateOptionalParams, callback?: msRest.ServiceCallback): Promise { + update(personGroupId: string, personId: string, options?: Models.PersonGroupPersonUpdateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -204,7 +204,7 @@ export class PersonGroupPerson { * @param callback The callback */ deleteFace(personGroupId: string, personId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteFace(personGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteFace(personGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -241,7 +241,7 @@ export class PersonGroupPerson { * @param callback The callback */ getFace(personGroupId: string, personId: string, persistedFaceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getFace(personGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getFace(personGroupId: string, personId: string, persistedFaceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -277,7 +277,7 @@ export class PersonGroupPerson { * @param callback The callback */ updateFace(personGroupId: string, personId: string, persistedFaceId: string, options: Models.PersonGroupPersonUpdateFaceOptionalParams, callback: msRest.ServiceCallback): void; - updateFace(personGroupId: string, personId: string, persistedFaceId: string, options?: Models.PersonGroupPersonUpdateFaceOptionalParams, callback?: msRest.ServiceCallback): Promise { + updateFace(personGroupId: string, personId: string, persistedFaceId: string, options?: Models.PersonGroupPersonUpdateFaceOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -314,7 +314,7 @@ export class PersonGroupPerson { * @param callback The callback */ addFaceFromUrl(personGroupId: string, personId: string, url: string, options: Models.PersonGroupPersonAddFaceFromUrlOptionalParams, callback: msRest.ServiceCallback): void; - addFaceFromUrl(personGroupId: string, personId: string, url: string, options?: Models.PersonGroupPersonAddFaceFromUrlOptionalParams, callback?: msRest.ServiceCallback): Promise { + addFaceFromUrl(personGroupId: string, personId: string, url: string, options?: Models.PersonGroupPersonAddFaceFromUrlOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, @@ -351,7 +351,7 @@ export class PersonGroupPerson { * @param callback The callback */ addFaceFromStream(personGroupId: string, personId: string, image: msRest.HttpRequestBody, options: Models.PersonGroupPersonAddFaceFromStreamOptionalParams, callback: msRest.ServiceCallback): void; - addFaceFromStream(personGroupId: string, personId: string, image: msRest.HttpRequestBody, options?: Models.PersonGroupPersonAddFaceFromStreamOptionalParams, callback?: msRest.ServiceCallback): Promise { + addFaceFromStream(personGroupId: string, personId: string, image: msRest.HttpRequestBody, options?: Models.PersonGroupPersonAddFaceFromStreamOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { personGroupId, diff --git a/packages/@azure/cognitiveservices-face/package.json b/packages/@azure/cognitiveservices-face/package.json index ed86978ad025..d8f0ea3d5669 100644 --- a/packages/@azure/cognitiveservices-face/package.json +++ b/packages/@azure/cognitiveservices-face/package.json @@ -4,7 +4,7 @@ "description": "FaceClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "ms-rest-js": "^1.0.455", + "ms-rest-js": "^1.0.461", "tslib": "^1.9.3" }, "keywords": [ @@ -32,10 +32,23 @@ "bugs": { "url": "https://github.com/azure/azure-sdk-for-js/issues" }, + "files": [ + "dist/**/*.js", + "dist/**/*.js.map", + "dist/**/*.d.ts", + "dist/**/*.d.ts.map", + "esm/**/*.js", + "esm/**/*.js.map", + "esm/**/*.d.ts", + "esm/**/*.d.ts.map", + "lib/**/*.ts", + "rollup.config.js", + "tsconfig.json" + ], "scripts": { "build": "tsc && rollup -c rollup.config.js && npm run minify", "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/cognitiveservices-face.js.map'\" -o ./dist/cognitiveservices-face.min.js ./dist/cognitiveservices-face.js", - "prepare": "npm run build" + "prepack": "npm install && npm run build" }, "sideEffects": false } \ No newline at end of file diff --git a/packages/@azure/graph/README.md b/packages/@azure/graph/README.md index 960e011a3112..a6b5947ec87e 100644 --- a/packages/@azure/graph/README.md +++ b/packages/@azure/graph/README.md @@ -20,10 +20,10 @@ import * as msRest from "ms-rest-js"; import * as msRestAzure from "ms-rest-azure-js"; import * as msRestNodeAuth from "ms-rest-nodeauth"; import { GraphRbacManagementClient, GraphRbacManagementModels, GraphRbacManagementMappers } from "@azure/graph"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; +const tenantId = process.env["AZURE_TENANT_ID"]; msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new GraphRbacManagementClient(creds, subscriptionId); + const client = new GraphRbacManagementClient(creds, tenantId); client.signedInUser.get().then((result) => { console.log("The result is:"); console.log(result); @@ -47,7 +47,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to - - - + ``` -# Related projects - - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +## Related projects + +- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-security/lib/models/allowedConnectionsMappers.ts b/packages/@azure/arm-security/lib/models/allowedConnectionsMappers.ts new file mode 100644 index 000000000000..d8a8951a7057 --- /dev/null +++ b/packages/@azure/arm-security/lib/models/allowedConnectionsMappers.ts @@ -0,0 +1,19 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * 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. + */ + +export { + discriminators, + AllowedConnectionsList, + AllowedConnectionsResource, + ConnectableResource, + ConnectedResource, + CloudError +} from "../models/mappers"; + diff --git a/packages/@azure/arm-security/lib/models/index.ts b/packages/@azure/arm-security/lib/models/index.ts index 9381b7c73d71..491aee7cc5ab 100644 --- a/packages/@azure/arm-security/lib/models/index.ts +++ b/packages/@azure/arm-security/lib/models/index.ts @@ -68,9 +68,9 @@ export interface SecurityContact extends Resource { */ email: string; /** - * @member {string} phone The phone number of this security contact + * @member {string} [phone] The phone number of this security contact */ - phone: string; + phone?: string; /** * @member {AlertNotifications} alertNotifications Whether to send security * alerts notifications to the security contact. Possible values include: @@ -1438,6 +1438,111 @@ export interface AadConnectivityState1 { connectivityState?: AadConnectivityState; } +/** + * @interface + * An interface representing ConnectedResource. + * Describes properties of a connected resource + * + */ +export interface ConnectedResource { + /** + * @member {string} [connectedResourceId] The Azure resource id of the + * connected resource + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly connectedResourceId?: string; + /** + * @member {string} [tcpPorts] The allowed tcp ports + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly tcpPorts?: string; + /** + * @member {string} [udpPorts] The allowed udp ports + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly udpPorts?: string; +} + +/** + * @interface + * An interface representing ConnectableResource. + * Describes the allowed inbound and outbound traffic of an Azure resource + * + */ +export interface ConnectableResource { + /** + * @member {string} [id] The Azure resource id + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly id?: string; + /** + * @member {ConnectedResource[]} [inboundConnectedResources] The list of + * Azure resources that the resource has inbound allowed connection from + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly inboundConnectedResources?: ConnectedResource[]; + /** + * @member {ConnectedResource[]} [outboundConnectedResources] The list of + * Azure resources that the resource has outbound allowed connection to + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly outboundConnectedResources?: ConnectedResource[]; +} + +/** + * @interface + * An interface representing AllowedConnectionsResource. + * The resource whose properties describes the allowed traffic between Azure + * resources + * + */ +export interface AllowedConnectionsResource { + /** + * @member {string} [id] Resource Id + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly id?: string; + /** + * @member {string} [name] Resource name + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly name?: string; + /** + * @member {string} [type] Resource type + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly type?: string; + /** + * @member {string} [location] Location where the resource is stored + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly location?: string; + /** + * @member {Date} [calculatedDateTime] The UTC time on which the allowed + * connections resource was calculated + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly calculatedDateTime?: Date; + /** + * @member {ConnectableResource[]} [connectableResources] List of connectable + * resources + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly connectableResources?: ConnectableResource[]; +} + /** * @interface * An interface representing TasksListOptionalParams. @@ -1813,343 +1918,181 @@ export interface TopologyList extends Array { readonly nextLink?: string; } +/** + * @interface + * An interface representing the AllowedConnectionsList. + * List of all possible traffic between Azure resources + * + * @extends Array + */ +export interface AllowedConnectionsList extends Array { + /** + * @member {string} [nextLink] The URI to fetch the next page. + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly nextLink?: string; +} + /** * Defines values for AlertNotifications. * Possible values include: 'On', 'Off' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AlertNotifications = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AlertNotifications { - /** - * Get notifications on new alerts - */ - On = 'On', - /** - * Don't get notifications on new alerts - */ - Off = 'Off', -} +export type AlertNotifications = 'On' | 'Off'; /** * Defines values for AlertsToAdmins. * Possible values include: 'On', 'Off' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AlertsToAdmins = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AlertsToAdmins { - /** - * Send notification on new alerts to the subscription's admins - */ - On = 'On', - /** - * Don't send notification on new alerts to the subscription's admins - */ - Off = 'Off', -} +export type AlertsToAdmins = 'On' | 'Off'; /** * Defines values for PricingTier. * Possible values include: 'Free', 'Standard' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: PricingTier = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum PricingTier { - /** - * Get free Azure security center experience with basic security features - */ - Free = 'Free', - /** - * Get the standard Azure security center experience with advanced security - * features - */ - Standard = 'Standard', -} +export type PricingTier = 'Free' | 'Standard'; /** * Defines values for AutoProvision. * Possible values include: 'On', 'Off' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AutoProvision = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AutoProvision { - /** - * Install missing security agent on VMs automatically - */ - On = 'On', - /** - * Do not install security agent on the VMs automatically - */ - Off = 'Off', -} +export type AutoProvision = 'On' | 'Off'; /** * Defines values for SettingKind. * Possible values include: 'DataExportSetting' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: SettingKind = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum SettingKind { - DataExportSetting = 'DataExportSetting', -} +export type SettingKind = 'DataExportSetting'; /** * Defines values for SecurityFamily. * Possible values include: 'Waf', 'Ngfw', 'SaasWaf', 'Va' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: SecurityFamily = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum SecurityFamily { - Waf = 'Waf', - Ngfw = 'Ngfw', - SaasWaf = 'SaasWaf', - Va = 'Va', -} +export type SecurityFamily = 'Waf' | 'Ngfw' | 'SaasWaf' | 'Va'; /** * Defines values for Protocol. * Possible values include: 'TCP', 'UDP', 'All' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: Protocol = "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum Protocol { - TCP = 'TCP', - UDP = 'UDP', - All = '*', -} +export type Protocol = 'TCP' | 'UDP' | '*'; /** * Defines values for Status. * Possible values include: 'Revoked', 'Initiated' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: Status = "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum Status { - Revoked = 'Revoked', - Initiated = 'Initiated', -} +export type Status = 'Revoked' | 'Initiated'; /** * Defines values for StatusReason. * Possible values include: 'Expired', 'UserRequested', 'NewerRequestInitiated' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: StatusReason = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum StatusReason { - Expired = 'Expired', - UserRequested = 'UserRequested', - NewerRequestInitiated = 'NewerRequestInitiated', -} +export type StatusReason = 'Expired' | 'UserRequested' | 'NewerRequestInitiated'; /** * Defines values for AadConnectivityState. * Possible values include: 'Discovered', 'NotLicensed', 'Connected' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AadConnectivityState = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AadConnectivityState { - Discovered = 'Discovered', - NotLicensed = 'NotLicensed', - Connected = 'Connected', -} +export type AadConnectivityState = 'Discovered' | 'NotLicensed' | 'Connected'; /** * Defines values for ExternalSecuritySolutionKind. * Possible values include: 'CEF', 'ATA', 'AAD' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: ExternalSecuritySolutionKind = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum ExternalSecuritySolutionKind { - CEF = 'CEF', - ATA = 'ATA', - AAD = 'AAD', -} +export type ExternalSecuritySolutionKind = 'CEF' | 'ATA' | 'AAD'; + +/** + * Defines values for ConnectionType. + * Possible values include: 'Internal', 'External' + * @readonly + * @enum {string} + */ +export type ConnectionType = 'Internal' | 'External'; /** * Defines values for SettingName. * Possible values include: 'MCAS', 'WDATP' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: SettingName = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum SettingName { - MCAS = 'MCAS', - WDATP = 'WDATP', -} +export type SettingName = 'MCAS' | 'WDATP'; /** * Defines values for SettingName1. * Possible values include: 'MCAS', 'WDATP' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: SettingName1 = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum SettingName1 { - MCAS = 'MCAS', - WDATP = 'WDATP', -} +export type SettingName1 = 'MCAS' | 'WDATP'; /** * Defines values for InformationProtectionPolicyName. * Possible values include: 'effective', 'custom' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: InformationProtectionPolicyName = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum InformationProtectionPolicyName { - Effective = 'effective', - Custom = 'custom', -} +export type InformationProtectionPolicyName = 'effective' | 'custom'; /** * Defines values for InformationProtectionPolicyName1. * Possible values include: 'effective', 'custom' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: InformationProtectionPolicyName1 = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum InformationProtectionPolicyName1 { - Effective = 'effective', - Custom = 'custom', -} +export type InformationProtectionPolicyName1 = 'effective' | 'custom'; /** * Defines values for TaskUpdateActionType. * Possible values include: 'Activate', 'Dismiss', 'Start', 'Resolve', 'Close' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: TaskUpdateActionType = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum TaskUpdateActionType { - Activate = 'Activate', - Dismiss = 'Dismiss', - Start = 'Start', - Resolve = 'Resolve', - Close = 'Close', -} +export type TaskUpdateActionType = 'Activate' | 'Dismiss' | 'Start' | 'Resolve' | 'Close'; /** * Defines values for TaskUpdateActionType1. * Possible values include: 'Activate', 'Dismiss', 'Start', 'Resolve', 'Close' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: TaskUpdateActionType1 = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum TaskUpdateActionType1 { - Activate = 'Activate', - Dismiss = 'Dismiss', - Start = 'Start', - Resolve = 'Resolve', - Close = 'Close', -} +export type TaskUpdateActionType1 = 'Activate' | 'Dismiss' | 'Start' | 'Resolve' | 'Close'; /** * Defines values for AlertUpdateActionType. * Possible values include: 'Dismiss', 'Reactivate' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AlertUpdateActionType = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AlertUpdateActionType { - Dismiss = 'Dismiss', - Reactivate = 'Reactivate', -} +export type AlertUpdateActionType = 'Dismiss' | 'Reactivate'; /** * Defines values for AlertUpdateActionType1. * Possible values include: 'Dismiss', 'Reactivate' - * There could be more values for this enum apart from the ones defined here.If - * you want to set a value that is not from the known values then you can do - * the following: - * let param: AlertUpdateActionType1 = - * "someUnknownValueThatWillStillBeValid"; * @readonly * @enum {string} */ -export enum AlertUpdateActionType1 { - Dismiss = 'Dismiss', - Reactivate = 'Reactivate', -} +export type AlertUpdateActionType1 = 'Dismiss' | 'Reactivate'; /** * Contains response data for the list operation. @@ -3746,3 +3689,98 @@ export type TopologyListByHomeRegionNextResponse = TopologyList & { parsedBody: TopologyList; }; }; + +/** + * Contains response data for the list operation. + */ +export type AllowedConnectionsListResponse = AllowedConnectionsList & { + /** + * 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: AllowedConnectionsList; + }; +}; + +/** + * Contains response data for the listByHomeRegion operation. + */ +export type AllowedConnectionsListByHomeRegionResponse = AllowedConnectionsList & { + /** + * 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: AllowedConnectionsList; + }; +}; + +/** + * Contains response data for the get operation. + */ +export type AllowedConnectionsGetResponse = AllowedConnectionsResource & { + /** + * 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: AllowedConnectionsResource; + }; +}; + +/** + * Contains response data for the listNext operation. + */ +export type AllowedConnectionsListNextResponse = AllowedConnectionsList & { + /** + * 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: AllowedConnectionsList; + }; +}; + +/** + * Contains response data for the listByHomeRegionNext operation. + */ +export type AllowedConnectionsListByHomeRegionNextResponse = AllowedConnectionsList & { + /** + * 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: AllowedConnectionsList; + }; +}; diff --git a/packages/@azure/arm-security/lib/models/mappers.ts b/packages/@azure/arm-security/lib/models/mappers.ts index 085717255d8b..9e95b88e8fb8 100644 --- a/packages/@azure/arm-security/lib/models/mappers.ts +++ b/packages/@azure/arm-security/lib/models/mappers.ts @@ -76,7 +76,6 @@ export const SecurityContact: msRest.CompositeMapper = { } }, phone: { - required: true, serializedName: "properties.phone", type: { name: "String" @@ -1750,6 +1749,138 @@ export const AadConnectivityState1: msRest.CompositeMapper = { } }; +export const ConnectedResource: msRest.CompositeMapper = { + serializedName: "ConnectedResource", + type: { + name: "Composite", + className: "ConnectedResource", + modelProperties: { + connectedResourceId: { + readOnly: true, + serializedName: "connectedResourceId", + type: { + name: "String" + } + }, + tcpPorts: { + readOnly: true, + serializedName: "tcpPorts", + type: { + name: "String" + } + }, + udpPorts: { + readOnly: true, + serializedName: "udpPorts", + type: { + name: "String" + } + } + } + } +}; + +export const ConnectableResource: msRest.CompositeMapper = { + serializedName: "ConnectableResource", + type: { + name: "Composite", + className: "ConnectableResource", + modelProperties: { + id: { + readOnly: true, + serializedName: "id", + type: { + name: "String" + } + }, + inboundConnectedResources: { + readOnly: true, + serializedName: "inboundConnectedResources", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ConnectedResource" + } + } + } + }, + outboundConnectedResources: { + readOnly: true, + serializedName: "outboundConnectedResources", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ConnectedResource" + } + } + } + } + } + } +}; + +export const AllowedConnectionsResource: msRest.CompositeMapper = { + serializedName: "AllowedConnectionsResource", + type: { + name: "Composite", + className: "AllowedConnectionsResource", + 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" + } + }, + location: { + readOnly: true, + serializedName: "location", + type: { + name: "String" + } + }, + calculatedDateTime: { + readOnly: true, + serializedName: "properties.calculatedDateTime", + type: { + name: "DateTime" + } + }, + connectableResources: { + readOnly: true, + serializedName: "properties.connectableResources", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ConnectableResource" + } + } + } + } + } + } +}; + export const PricingList: msRest.CompositeMapper = { serializedName: "PricingList", type: { @@ -1911,11 +2042,6 @@ export const SettingsList: msRest.CompositeMapper = { element: { type: { name: "Composite", - polymorphicDiscriminator: { - serializedName: "kind", - clientName: "kind" - }, - uberParent: "Setting", className: "Setting" } } @@ -2150,11 +2276,6 @@ export const ExternalSecuritySolutionList: msRest.CompositeMapper = { element: { type: { name: "Composite", - polymorphicDiscriminator: { - serializedName: "kind", - clientName: "kind" - }, - uberParent: "ExternalSecuritySolution", className: "ExternalSecuritySolution" } } @@ -2201,6 +2322,36 @@ export const TopologyList: msRest.CompositeMapper = { } }; +export const AllowedConnectionsList: msRest.CompositeMapper = { + serializedName: "AllowedConnectionsList", + type: { + name: "Composite", + className: "AllowedConnectionsList", + modelProperties: { + value: { + readOnly: true, + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "AllowedConnectionsResource" + } + } + } + }, + nextLink: { + readOnly: true, + serializedName: "nextLink", + type: { + name: "String" + } + } + } + } +}; + export const discriminators = { 'Setting' : Setting, 'Setting.DataExportSetting' : DataExportSetting, diff --git a/packages/@azure/arm-security/lib/models/parameters.ts b/packages/@azure/arm-security/lib/models/parameters.ts index e29af8ef13fa..c82a9dc84bd2 100644 --- a/packages/@azure/arm-security/lib/models/parameters.ts +++ b/packages/@azure/arm-security/lib/models/parameters.ts @@ -84,6 +84,16 @@ export const complianceName: msRest.OperationURLParameter = { } } }; +export const connectionType: msRest.OperationURLParameter = { + parameterPath: "connectionType", + mapper: { + required: true, + serializedName: "connectionType", + type: { + name: "String" + } + } +}; export const discoveredSecuritySolutionName: msRest.OperationURLParameter = { parameterPath: "discoveredSecuritySolutionName", mapper: { diff --git a/packages/@azure/arm-security/lib/operations/advancedThreatProtection.ts b/packages/@azure/arm-security/lib/operations/advancedThreatProtection.ts index 22ae552991d1..0ed82debd211 100644 --- a/packages/@azure/arm-security/lib/operations/advancedThreatProtection.ts +++ b/packages/@azure/arm-security/lib/operations/advancedThreatProtection.ts @@ -44,7 +44,7 @@ export class AdvancedThreatProtection { * @param callback The callback */ get(resourceId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceId, @@ -75,7 +75,7 @@ export class AdvancedThreatProtection { * @param callback The callback */ create(resourceId: string, advancedThreatProtectionSetting: Models.AdvancedThreatProtectionSetting, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(resourceId: string, advancedThreatProtectionSetting: Models.AdvancedThreatProtectionSetting, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + create(resourceId: string, advancedThreatProtectionSetting: Models.AdvancedThreatProtectionSetting, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceId, diff --git a/packages/@azure/arm-security/lib/operations/alerts.ts b/packages/@azure/arm-security/lib/operations/alerts.ts index b8122cff7717..93e42d71cbce 100644 --- a/packages/@azure/arm-security/lib/operations/alerts.ts +++ b/packages/@azure/arm-security/lib/operations/alerts.ts @@ -41,7 +41,7 @@ export class Alerts { * @param callback The callback */ list(options: Models.AlertsListOptionalParams, callback: msRest.ServiceCallback): void; - list(options?: Models.AlertsListOptionalParams, callback?: msRest.ServiceCallback): Promise { + list(options?: Models.AlertsListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -71,7 +71,7 @@ export class Alerts { * @param callback The callback */ listByResourceGroup(resourceGroupName: string, options: Models.AlertsListByResourceGroupOptionalParams, callback: msRest.ServiceCallback): void; - listByResourceGroup(resourceGroupName: string, options?: Models.AlertsListByResourceGroupOptionalParams, callback?: msRest.ServiceCallback): Promise { + listByResourceGroup(resourceGroupName: string, options?: Models.AlertsListByResourceGroupOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -97,7 +97,7 @@ export class Alerts { * @param callback The callback */ listSubscriptionLevelAlertsByRegion(options: Models.AlertsListSubscriptionLevelAlertsByRegionOptionalParams, callback: msRest.ServiceCallback): void; - listSubscriptionLevelAlertsByRegion(options?: Models.AlertsListSubscriptionLevelAlertsByRegionOptionalParams, callback?: msRest.ServiceCallback): Promise { + listSubscriptionLevelAlertsByRegion(options?: Models.AlertsListSubscriptionLevelAlertsByRegionOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -128,7 +128,7 @@ export class Alerts { * @param callback The callback */ listResourceGroupLevelAlertsByRegion(resourceGroupName: string, options: Models.AlertsListResourceGroupLevelAlertsByRegionOptionalParams, callback: msRest.ServiceCallback): void; - listResourceGroupLevelAlertsByRegion(resourceGroupName: string, options?: Models.AlertsListResourceGroupLevelAlertsByRegionOptionalParams, callback?: msRest.ServiceCallback): Promise { + listResourceGroupLevelAlertsByRegion(resourceGroupName: string, options?: Models.AlertsListResourceGroupLevelAlertsByRegionOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -156,7 +156,7 @@ export class Alerts { * @param callback The callback */ getSubscriptionLevelAlert(alertName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getSubscriptionLevelAlert(alertName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getSubscriptionLevelAlert(alertName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { alertName, @@ -190,7 +190,7 @@ export class Alerts { * @param callback The callback */ getResourceGroupLevelAlerts(alertName: string, resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getResourceGroupLevelAlerts(alertName: string, resourceGroupName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getResourceGroupLevelAlerts(alertName: string, resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { alertName, @@ -225,7 +225,7 @@ export class Alerts { * @param callback The callback */ updateSubscriptionLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateSubscriptionLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateSubscriptionLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { alertName, @@ -266,7 +266,7 @@ export class Alerts { * @param callback The callback */ updateResourceGroupLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType1, resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateResourceGroupLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType1, resourceGroupName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateResourceGroupLevelAlertState(alertName: string, alertUpdateActionType: Models.AlertUpdateActionType1, resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { alertName, @@ -296,7 +296,7 @@ export class Alerts { * @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, @@ -324,7 +324,7 @@ export class Alerts { * @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, @@ -353,7 +353,7 @@ export class Alerts { * @param callback The callback */ listSubscriptionLevelAlertsByRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listSubscriptionLevelAlertsByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listSubscriptionLevelAlertsByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -382,7 +382,7 @@ export class Alerts { * @param callback The callback */ listResourceGroupLevelAlertsByRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listResourceGroupLevelAlertsByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listResourceGroupLevelAlertsByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/allowedConnections.ts b/packages/@azure/arm-security/lib/operations/allowedConnections.ts new file mode 100644 index 000000000000..2c88ee2f1e4d --- /dev/null +++ b/packages/@azure/arm-security/lib/operations/allowedConnections.ts @@ -0,0 +1,288 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * 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. + */ + +import * as msRest from "ms-rest-js"; +import * as Models from "../models"; +import * as Mappers from "../models/allowedConnectionsMappers"; +import * as Parameters from "../models/parameters"; +import { SecurityCenterContext } from "../securityCenterContext"; + +/** Class representing a AllowedConnections. */ +export class AllowedConnections { + private readonly client: SecurityCenterContext; + + /** + * Create a AllowedConnections. + * @param {SecurityCenterContext} client Reference to the service client. + */ + constructor(client: SecurityCenterContext) { + this.client = client; + } + + /** + * Gets the list of all possible traffic between resources for the subscription + * @param [options] The optional parameters + * @returns Promise + */ + list(options?: msRest.RequestOptionsBase): Promise; + /** + * @param callback The callback + */ + list(callback: msRest.ServiceCallback): void; + /** + * @param options The optional parameters + * @param callback The callback + */ + list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + options + }, + listOperationSpec, + callback) as Promise; + } + + /** + * Gets the list of all possible traffic between resources for the subscription and location. + * @param [options] The optional parameters + * @returns Promise + */ + listByHomeRegion(options?: msRest.RequestOptionsBase): Promise; + /** + * @param callback The callback + */ + listByHomeRegion(callback: msRest.ServiceCallback): void; + /** + * @param options The optional parameters + * @param callback The callback + */ + listByHomeRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByHomeRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + options + }, + listByHomeRegionOperationSpec, + callback) as Promise; + } + + /** + * Gets the list of all possible traffic between resources for the subscription and location, based + * on connection type. + * @param resourceGroupName The name of the resource group within the user's subscription. The name + * is case insensitive. + * @param connectionType The type of allowed connections (Internal, External). Possible values + * include: 'Internal', 'External' + * @param [options] The optional parameters + * @returns Promise + */ + get(resourceGroupName: string, connectionType: Models.ConnectionType, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group within the user's subscription. The name + * is case insensitive. + * @param connectionType The type of allowed connections (Internal, External). Possible values + * include: 'Internal', 'External' + * @param callback The callback + */ + get(resourceGroupName: string, connectionType: Models.ConnectionType, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group within the user's subscription. The name + * is case insensitive. + * @param connectionType The type of allowed connections (Internal, External). Possible values + * include: 'Internal', 'External' + * @param options The optional parameters + * @param callback The callback + */ + get(resourceGroupName: string, connectionType: Models.ConnectionType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, connectionType: Models.ConnectionType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + connectionType, + options + }, + getOperationSpec, + callback) as Promise; + } + + /** + * Gets the list of all possible traffic between resources for the subscription + * @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; + } + + /** + * Gets the list of all possible traffic between resources for the subscription and location. + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param [options] The optional parameters + * @returns Promise + */ + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param callback The callback + */ + listByHomeRegionNext(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 + */ + listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + nextPageLink, + options + }, + listByHomeRegionNextOperationSpec, + callback) as Promise; + } +} + +// Operation Specifications +const serializer = new msRest.Serializer(Mappers); +const listOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/providers/Microsoft.Security/allowedConnections", + urlParameters: [ + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion1 + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AllowedConnectionsList + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const listByHomeRegionOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections", + urlParameters: [ + Parameters.subscriptionId, + Parameters.ascLocation + ], + queryParameters: [ + Parameters.apiVersion1 + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AllowedConnectionsList + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const getOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/locations/{ascLocation}/allowedConnections/{connectionType}", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.ascLocation, + Parameters.connectionType + ], + queryParameters: [ + Parameters.apiVersion1 + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AllowedConnectionsResource + }, + 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.AllowedConnectionsList + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const listByHomeRegionNextOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + baseUrl: "https://management.azure.com", + path: "{nextLink}", + urlParameters: [ + Parameters.nextPageLink + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AllowedConnectionsList + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; diff --git a/packages/@azure/arm-security/lib/operations/autoProvisioningSettings.ts b/packages/@azure/arm-security/lib/operations/autoProvisioningSettings.ts index c1982d1738fe..7c0d4a92e18f 100644 --- a/packages/@azure/arm-security/lib/operations/autoProvisioningSettings.ts +++ b/packages/@azure/arm-security/lib/operations/autoProvisioningSettings.ts @@ -41,7 +41,7 @@ export class AutoProvisioningSettings { * @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 AutoProvisioningSettings { * @param callback The callback */ get(settingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(settingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(settingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { settingName, @@ -99,7 +99,7 @@ export class AutoProvisioningSettings { * @param callback The callback */ create(settingName: string, setting: Models.AutoProvisioningSetting, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(settingName: string, setting: Models.AutoProvisioningSetting, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + create(settingName: string, setting: Models.AutoProvisioningSetting, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { settingName, @@ -128,7 +128,7 @@ export class AutoProvisioningSettings { * @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-security/lib/operations/compliances.ts b/packages/@azure/arm-security/lib/operations/compliances.ts index 66ad2842a7e9..ef0f6407f21a 100644 --- a/packages/@azure/arm-security/lib/operations/compliances.ts +++ b/packages/@azure/arm-security/lib/operations/compliances.ts @@ -50,7 +50,7 @@ export class Compliances { * @param callback The callback */ list(scope: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(scope: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + list(scope: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -87,7 +87,7 @@ export class Compliances { * @param callback The callback */ get(scope: string, complianceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(scope: string, complianceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(scope: string, complianceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -116,7 +116,7 @@ export class Compliances { * @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-security/lib/operations/discoveredSecuritySolutions.ts b/packages/@azure/arm-security/lib/operations/discoveredSecuritySolutions.ts index af7edf1e8b88..293a8c48a169 100644 --- a/packages/@azure/arm-security/lib/operations/discoveredSecuritySolutions.ts +++ b/packages/@azure/arm-security/lib/operations/discoveredSecuritySolutions.ts @@ -41,7 +41,7 @@ export class DiscoveredSecuritySolutions { * @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 @@ -65,7 +65,7 @@ export class DiscoveredSecuritySolutions { * @param callback The callback */ listByHomeRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegion(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -98,7 +98,7 @@ export class DiscoveredSecuritySolutions { * @param callback The callback */ get(resourceGroupName: string, discoveredSecuritySolutionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, discoveredSecuritySolutionName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, discoveredSecuritySolutionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -127,7 +127,7 @@ export class DiscoveredSecuritySolutions { * @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, @@ -155,7 +155,7 @@ export class DiscoveredSecuritySolutions { * @param callback The callback */ listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/externalSecuritySolutions.ts b/packages/@azure/arm-security/lib/operations/externalSecuritySolutions.ts index 6941fb194139..098c85e4e0de 100644 --- a/packages/@azure/arm-security/lib/operations/externalSecuritySolutions.ts +++ b/packages/@azure/arm-security/lib/operations/externalSecuritySolutions.ts @@ -41,7 +41,7 @@ export class ExternalSecuritySolutions { * @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 @@ -65,7 +65,7 @@ export class ExternalSecuritySolutions { * @param callback The callback */ listByHomeRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegion(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -98,7 +98,7 @@ export class ExternalSecuritySolutions { * @param callback The callback */ get(resourceGroupName: string, externalSecuritySolutionsName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, externalSecuritySolutionsName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, externalSecuritySolutionsName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -127,7 +127,7 @@ export class ExternalSecuritySolutions { * @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, @@ -155,7 +155,7 @@ export class ExternalSecuritySolutions { * @param callback The callback */ listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/index.ts b/packages/@azure/arm-security/lib/operations/index.ts index c1a747614647..dd820149dfa7 100644 --- a/packages/@azure/arm-security/lib/operations/index.ts +++ b/packages/@azure/arm-security/lib/operations/index.ts @@ -24,3 +24,4 @@ export * from "./discoveredSecuritySolutions"; export * from "./jitNetworkAccessPolicies"; export * from "./externalSecuritySolutions"; export * from "./topology"; +export * from "./allowedConnections"; diff --git a/packages/@azure/arm-security/lib/operations/informationProtectionPolicies.ts b/packages/@azure/arm-security/lib/operations/informationProtectionPolicies.ts index 66afcd508670..140759ccc73b 100644 --- a/packages/@azure/arm-security/lib/operations/informationProtectionPolicies.ts +++ b/packages/@azure/arm-security/lib/operations/informationProtectionPolicies.ts @@ -56,7 +56,7 @@ export class InformationProtectionPolicies { * @param callback The callback */ get(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -97,7 +97,7 @@ export class InformationProtectionPolicies { * @param callback The callback */ createOrUpdate(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName1, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - createOrUpdate(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName1, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + createOrUpdate(scope: string, informationProtectionPolicyName: Models.InformationProtectionPolicyName1, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -132,7 +132,7 @@ export class InformationProtectionPolicies { * @param callback The callback */ list(scope: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(scope: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + list(scope: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { scope, @@ -160,7 +160,7 @@ export class InformationProtectionPolicies { * @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-security/lib/operations/jitNetworkAccessPolicies.ts b/packages/@azure/arm-security/lib/operations/jitNetworkAccessPolicies.ts index 47c5a34c7718..f37baabf017a 100644 --- a/packages/@azure/arm-security/lib/operations/jitNetworkAccessPolicies.ts +++ b/packages/@azure/arm-security/lib/operations/jitNetworkAccessPolicies.ts @@ -41,7 +41,7 @@ export class JitNetworkAccessPolicies { * @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 @@ -66,7 +66,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ listByRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByRegion(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -97,7 +97,7 @@ export class JitNetworkAccessPolicies { * @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, @@ -129,7 +129,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ listByResourceGroupAndRegion(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupAndRegion(resourceGroupName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByResourceGroupAndRegion(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -164,7 +164,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ get(resourceGroupName: string, jitNetworkAccessPolicyName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, jitNetworkAccessPolicyName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, jitNetworkAccessPolicyName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -202,7 +202,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ createOrUpdate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicy, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - createOrUpdate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicy, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + createOrUpdate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicy, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -238,7 +238,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ deleteMethod(resourceGroupName: string, jitNetworkAccessPolicyName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(resourceGroupName: string, jitNetworkAccessPolicyName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(resourceGroupName: string, jitNetworkAccessPolicyName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -276,7 +276,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ initiate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicyInitiateRequest, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - initiate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicyInitiateRequest, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + initiate(resourceGroupName: string, jitNetworkAccessPolicyName: string, body: Models.JitNetworkAccessPolicyInitiateRequest, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -306,7 +306,7 @@ export class JitNetworkAccessPolicies { * @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, @@ -335,7 +335,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ listByRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -364,7 +364,7 @@ export class JitNetworkAccessPolicies { * @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, @@ -393,7 +393,7 @@ export class JitNetworkAccessPolicies { * @param callback The callback */ listByResourceGroupAndRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupAndRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByResourceGroupAndRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/locations.ts b/packages/@azure/arm-security/lib/operations/locations.ts index 65941639937b..ac9186be5c5f 100644 --- a/packages/@azure/arm-security/lib/operations/locations.ts +++ b/packages/@azure/arm-security/lib/operations/locations.ts @@ -43,7 +43,7 @@ export class Locations { * @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 @@ -67,7 +67,7 @@ export class Locations { * @param callback The callback */ get(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -96,7 +96,7 @@ export class Locations { * @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-security/lib/operations/operations.ts b/packages/@azure/arm-security/lib/operations/operations.ts index 4e4b4c8ac880..bcc646936806 100644 --- a/packages/@azure/arm-security/lib/operations/operations.ts +++ b/packages/@azure/arm-security/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-security/lib/operations/pricings.ts b/packages/@azure/arm-security/lib/operations/pricings.ts index d312e2b9b9c9..79d78ddfe8ff 100644 --- a/packages/@azure/arm-security/lib/operations/pricings.ts +++ b/packages/@azure/arm-security/lib/operations/pricings.ts @@ -41,7 +41,7 @@ export class Pricings { * @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 @@ -71,7 +71,7 @@ export class Pricings { * @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, @@ -100,7 +100,7 @@ export class Pricings { * @param callback The callback */ getSubscriptionPricing(pricingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getSubscriptionPricing(pricingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getSubscriptionPricing(pricingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { pricingName, @@ -131,7 +131,7 @@ export class Pricings { * @param callback The callback */ updateSubscriptionPricing(pricingName: string, pricing: Models.Pricing, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateSubscriptionPricing(pricingName: string, pricing: Models.Pricing, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateSubscriptionPricing(pricingName: string, pricing: Models.Pricing, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { pricingName, @@ -166,7 +166,7 @@ export class Pricings { * @param callback The callback */ getResourceGroupPricing(resourceGroupName: string, pricingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getResourceGroupPricing(resourceGroupName: string, pricingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getResourceGroupPricing(resourceGroupName: string, pricingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -204,7 +204,7 @@ export class Pricings { * @param callback The callback */ createOrUpdateResourceGroupPricing(resourceGroupName: string, pricingName: string, pricing: Models.Pricing, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - createOrUpdateResourceGroupPricing(resourceGroupName: string, pricingName: string, pricing: Models.Pricing, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + createOrUpdateResourceGroupPricing(resourceGroupName: string, pricingName: string, pricing: Models.Pricing, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -234,7 +234,7 @@ export class Pricings { * @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, @@ -262,7 +262,7 @@ export class Pricings { * @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, diff --git a/packages/@azure/arm-security/lib/operations/securityContacts.ts b/packages/@azure/arm-security/lib/operations/securityContacts.ts index 6ca92cca8560..3874df2da328 100644 --- a/packages/@azure/arm-security/lib/operations/securityContacts.ts +++ b/packages/@azure/arm-security/lib/operations/securityContacts.ts @@ -41,7 +41,7 @@ export class SecurityContacts { * @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 SecurityContacts { * @param callback The callback */ get(securityContactName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(securityContactName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(securityContactName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { securityContactName, @@ -99,7 +99,7 @@ export class SecurityContacts { * @param callback The callback */ create(securityContactName: string, securityContact: Models.SecurityContact, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(securityContactName: string, securityContact: Models.SecurityContact, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + create(securityContactName: string, securityContact: Models.SecurityContact, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { securityContactName, @@ -128,7 +128,7 @@ export class SecurityContacts { * @param callback The callback */ deleteMethod(securityContactName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(securityContactName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(securityContactName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { securityContactName, @@ -159,7 +159,7 @@ export class SecurityContacts { * @param callback The callback */ update(securityContactName: string, securityContact: Models.SecurityContact, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - update(securityContactName: string, securityContact: Models.SecurityContact, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + update(securityContactName: string, securityContact: Models.SecurityContact, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { securityContactName, @@ -188,7 +188,7 @@ export class SecurityContacts { * @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-security/lib/operations/settings.ts b/packages/@azure/arm-security/lib/operations/settings.ts index 1e4fb07d3150..50f5b84a9826 100644 --- a/packages/@azure/arm-security/lib/operations/settings.ts +++ b/packages/@azure/arm-security/lib/operations/settings.ts @@ -41,7 +41,7 @@ export class Settings { * @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 Settings { * @param callback The callback */ get(settingName: Models.SettingName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(settingName: Models.SettingName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(settingName: Models.SettingName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { settingName, @@ -99,7 +99,7 @@ export class Settings { * @param callback The callback */ update(settingName: Models.SettingName1, setting: Models.SettingUnion, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - update(settingName: Models.SettingName1, setting: Models.SettingUnion, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + update(settingName: Models.SettingName1, setting: Models.SettingUnion, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { settingName, @@ -128,7 +128,7 @@ export class Settings { * @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-security/lib/operations/tasks.ts b/packages/@azure/arm-security/lib/operations/tasks.ts index 5da96f0c436c..0601a9e586cd 100644 --- a/packages/@azure/arm-security/lib/operations/tasks.ts +++ b/packages/@azure/arm-security/lib/operations/tasks.ts @@ -41,7 +41,7 @@ export class Tasks { * @param callback The callback */ list(options: Models.TasksListOptionalParams, callback: msRest.ServiceCallback): void; - list(options?: Models.TasksListOptionalParams, callback?: msRest.ServiceCallback): Promise { + list(options?: Models.TasksListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -65,7 +65,7 @@ export class Tasks { * @param callback The callback */ listByHomeRegion(options: Models.TasksListByHomeRegionOptionalParams, callback: msRest.ServiceCallback): void; - listByHomeRegion(options?: Models.TasksListByHomeRegionOptionalParams, callback?: msRest.ServiceCallback): Promise { + listByHomeRegion(options?: Models.TasksListByHomeRegionOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -92,7 +92,7 @@ export class Tasks { * @param callback The callback */ getSubscriptionLevelTask(taskName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getSubscriptionLevelTask(taskName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getSubscriptionLevelTask(taskName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { taskName, @@ -126,7 +126,7 @@ export class Tasks { * @param callback The callback */ updateSubscriptionLevelTaskState(taskName: string, taskUpdateActionType: Models.TaskUpdateActionType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateSubscriptionLevelTaskState(taskName: string, taskUpdateActionType: Models.TaskUpdateActionType, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateSubscriptionLevelTaskState(taskName: string, taskUpdateActionType: Models.TaskUpdateActionType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { taskName, @@ -158,7 +158,7 @@ export class Tasks { * @param callback The callback */ listByResourceGroup(resourceGroupName: string, options: Models.TasksListByResourceGroupOptionalParams, callback: msRest.ServiceCallback): void; - listByResourceGroup(resourceGroupName: string, options?: Models.TasksListByResourceGroupOptionalParams, callback?: msRest.ServiceCallback): Promise { + listByResourceGroup(resourceGroupName: string, options?: Models.TasksListByResourceGroupOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -192,7 +192,7 @@ export class Tasks { * @param callback The callback */ getResourceGroupLevelTask(resourceGroupName: string, taskName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - getResourceGroupLevelTask(resourceGroupName: string, taskName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + getResourceGroupLevelTask(resourceGroupName: string, taskName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -233,7 +233,7 @@ export class Tasks { * @param callback The callback */ updateResourceGroupLevelTaskState(resourceGroupName: string, taskName: string, taskUpdateActionType: Models.TaskUpdateActionType1, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - updateResourceGroupLevelTaskState(resourceGroupName: string, taskName: string, taskUpdateActionType: Models.TaskUpdateActionType1, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + updateResourceGroupLevelTaskState(resourceGroupName: string, taskName: string, taskUpdateActionType: Models.TaskUpdateActionType1, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -263,7 +263,7 @@ export class Tasks { * @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, @@ -291,7 +291,7 @@ export class Tasks { * @param callback The callback */ listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -319,7 +319,7 @@ export class Tasks { * @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, diff --git a/packages/@azure/arm-security/lib/operations/topology.ts b/packages/@azure/arm-security/lib/operations/topology.ts index f1b36b658acc..5eed9ef73698 100644 --- a/packages/@azure/arm-security/lib/operations/topology.ts +++ b/packages/@azure/arm-security/lib/operations/topology.ts @@ -41,7 +41,7 @@ export class Topology { * @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 @@ -65,7 +65,7 @@ export class Topology { * @param callback The callback */ listByHomeRegion(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegion(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegion(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { options @@ -98,7 +98,7 @@ export class Topology { * @param callback The callback */ get(resourceGroupName: string, topologyResourceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, topologyResourceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, topologyResourceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -127,7 +127,7 @@ export class Topology { * @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, @@ -155,7 +155,7 @@ export class Topology { * @param callback The callback */ listByHomeRegionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByHomeRegionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, diff --git a/packages/@azure/arm-security/lib/operations/workspaceSettings.ts b/packages/@azure/arm-security/lib/operations/workspaceSettings.ts index 956d87b6e7d1..3edeaa7ee145 100644 --- a/packages/@azure/arm-security/lib/operations/workspaceSettings.ts +++ b/packages/@azure/arm-security/lib/operations/workspaceSettings.ts @@ -41,7 +41,7 @@ export class WorkspaceSettings { * @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 WorkspaceSettings { * @param callback The callback */ get(workspaceSettingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(workspaceSettingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(workspaceSettingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { workspaceSettingName, @@ -99,7 +99,7 @@ export class WorkspaceSettings { * @param callback The callback */ create(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + create(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { workspaceSettingName, @@ -131,7 +131,7 @@ export class WorkspaceSettings { * @param callback The callback */ update(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - update(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + update(workspaceSettingName: string, workspaceSetting: Models.WorkspaceSetting, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { workspaceSettingName, @@ -161,7 +161,7 @@ export class WorkspaceSettings { * @param callback The callback */ deleteMethod(workspaceSettingName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(workspaceSettingName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + deleteMethod(workspaceSettingName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { workspaceSettingName, @@ -189,7 +189,7 @@ export class WorkspaceSettings { * @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-security/lib/securityCenter.ts b/packages/@azure/arm-security/lib/securityCenter.ts index 89aa4ac6b283..5a690b9c21c3 100644 --- a/packages/@azure/arm-security/lib/securityCenter.ts +++ b/packages/@azure/arm-security/lib/securityCenter.ts @@ -33,6 +33,7 @@ class SecurityCenter extends SecurityCenterContext { jitNetworkAccessPolicies: operations.JitNetworkAccessPolicies; externalSecuritySolutions: operations.ExternalSecuritySolutions; topology: operations.Topology; + allowedConnections: operations.AllowedConnections; /** * Initializes a new instance of the SecurityCenter class. @@ -60,6 +61,7 @@ class SecurityCenter extends SecurityCenterContext { this.jitNetworkAccessPolicies = new operations.JitNetworkAccessPolicies(this); this.externalSecuritySolutions = new operations.ExternalSecuritySolutions(this); this.topology = new operations.Topology(this); + this.allowedConnections = new operations.AllowedConnections(this); } } diff --git a/packages/@azure/arm-security/lib/securityCenterContext.ts b/packages/@azure/arm-security/lib/securityCenterContext.ts index 887ba2fe2fd3..7a8c6c1b6dfb 100644 --- a/packages/@azure/arm-security/lib/securityCenterContext.ts +++ b/packages/@azure/arm-security/lib/securityCenterContext.ts @@ -13,7 +13,7 @@ import * as msRest from "ms-rest-js"; import * as msRestAzure from "ms-rest-azure-js"; const packageName = "@azure/arm-security"; -const packageVersion = "1.0.0-preview"; +const packageVersion = "0.1.0"; export class SecurityCenterContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; @@ -42,6 +42,11 @@ export class SecurityCenterContext extends msRestAzure.AzureServiceClient { if (!options) { options = {}; } + if(!options.userAgent) { + const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); + options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; + } + super(credentials, options); this.acceptLanguage = 'en-US'; @@ -52,7 +57,6 @@ export class SecurityCenterContext extends msRestAzure.AzureServiceClient { this.subscriptionId = subscriptionId; this.ascLocation = ascLocation; - this.addUserAgentInfo(`${packageName}/${packageVersion}`); if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } diff --git a/packages/@azure/arm-security/package.json b/packages/@azure/arm-security/package.json index dacc3d8e9f57..d0451c2bf085 100644 --- a/packages/@azure/arm-security/package.json +++ b/packages/@azure/arm-security/package.json @@ -4,8 +4,8 @@ "description": "SecurityCenter 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.462", "tslib": "^1.9.3" }, "keywords": [ @@ -52,4 +52,4 @@ "prepack": "npm install && npm run build" }, "sideEffects": false -} \ No newline at end of file +} diff --git a/packages/@azure/arm-security/tsconfig.json b/packages/@azure/arm-security/tsconfig.json index f32d1664f320..51ea90961ce5 100644 --- a/packages/@azure/arm-security/tsconfig.json +++ b/packages/@azure/arm-security/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*"], + "include": ["./lib/**/*.ts"], "exclude": ["node_modules"] }