From b8ffb113648a1ff0f6e8eba63e6b176656250ab7 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 7 Nov 2018 15:28:46 +0000 Subject: [PATCH 1/2] Generated from 3f99e72342d5d4f194ff74c8c553657530955783 Remove security contact phone field mandatory fields --- .../@azure/arm-security/lib/models/index.ts | 228 ++---------------- .../@azure/arm-security/lib/models/mappers.ts | 1 - .../operations/advancedThreatProtection.ts | 4 +- .../arm-security/lib/operations/alerts.ts | 24 +- .../operations/autoProvisioningSettings.ts | 8 +- .../lib/operations/compliances.ts | 6 +- .../operations/discoveredSecuritySolutions.ts | 10 +- .../operations/externalSecuritySolutions.ts | 10 +- .../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 +- .../arm-security/lib/securityCenterContext.ts | 8 +- packages/@azure/arm-security/package.json | 6 +- 20 files changed, 121 insertions(+), 304 deletions(-) diff --git a/packages/@azure/arm-security/lib/models/index.ts b/packages/@azure/arm-security/lib/models/index.ts index 9381b7c73d71..08e93cad55fa 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: @@ -1816,340 +1816,154 @@ export interface TopologyList extends Array { /** * 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 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. diff --git a/packages/@azure/arm-security/lib/models/mappers.ts b/packages/@azure/arm-security/lib/models/mappers.ts index 085717255d8b..010515a1fa93 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" 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/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/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/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 9a5578218a68262528ba75c1559fb5d7a8829a5f Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 12 Nov 2018 18:36:00 +0000 Subject: [PATCH 2/2] Generated from e94d9f5b16a429a3f1d2270a981be7218f06fd36 Update security contact examples - refactored - second iteration --- .../lib/models/allowedConnectionsMappers.ts | 19 ++ .../@azure/arm-security/lib/models/index.ts | 224 ++++++++++++++ .../@azure/arm-security/lib/models/mappers.ts | 162 ++++++++++ .../arm-security/lib/models/parameters.ts | 10 + .../lib/operations/allowedConnections.ts | 288 ++++++++++++++++++ .../arm-security/lib/operations/index.ts | 1 + .../@azure/arm-security/lib/securityCenter.ts | 2 + 7 files changed, 706 insertions(+) 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 08e93cad55fa..491aee7cc5ab 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,6 +1918,22 @@ 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' @@ -1901,6 +2022,14 @@ export type AadConnectivityState = 'Discovered' | 'NotLicensed' | 'Connected'; */ 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' @@ -3560,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 010515a1fa93..898a47ac8882 100644 --- a/packages/@azure/arm-security/lib/models/mappers.ts +++ b/packages/@azure/arm-security/lib/models/mappers.ts @@ -1749,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: { @@ -2200,6 +2332,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/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/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/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); } }