From 2651fa80202f419d8d237eefec425c1ce0182547 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 15 Oct 2018 17:05:18 -0700 Subject: [PATCH 1/4] [AutoPR automation/resource-manager] Swagger change for Update configuration dynamic group (#3815) * Generated from da88a237aa03b5de9cc7e5e0081c0f25bbb720dc Swagger change for Update configuration dynamic group * Generated from fc491695edaba989b6f14e4a7541852d0e98b780 Addressing the feedback and adding the sample examples * Generated from 010387285df8d64aa4d2a36593fce01cd95e2efe fixing the capitalization and grammer on the description * Generated from 915d19ed0f6a41d54a20040b8166514b5c9ef7f8 Changes after reviewing the descriptions * Generated from 915d19ed0f6a41d54a20040b8166514b5c9ef7f8 Changes after reviewing the descriptions --- .../lib/models/azureQueryProperties.js | 87 +++++++++++++++++++ .../lib/models/index.d.ts | 57 ++++++++++++ .../automationManagement/lib/models/index.js | 3 + .../lib/models/softwareUpdateConfiguration.js | 4 + .../lib/models/tagSettingsProperties.js | 76 ++++++++++++++++ .../lib/models/targetProperties.js | 61 +++++++++++++ .../lib/models/updateConfiguration.js | 12 +++ .../lib/operations/index.d.ts | 12 +++ .../softwareUpdateConfigurations.js | 18 ++++ 9 files changed, 330 insertions(+) create mode 100644 lib/services/automationManagement/lib/models/azureQueryProperties.js create mode 100644 lib/services/automationManagement/lib/models/tagSettingsProperties.js create mode 100644 lib/services/automationManagement/lib/models/targetProperties.js diff --git a/lib/services/automationManagement/lib/models/azureQueryProperties.js b/lib/services/automationManagement/lib/models/azureQueryProperties.js new file mode 100644 index 0000000000..d856eb6ce2 --- /dev/null +++ b/lib/services/automationManagement/lib/models/azureQueryProperties.js @@ -0,0 +1,87 @@ +/* + * 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. + */ + +'use strict'; + +/** + * Azure query for the update configuration. + * + */ +class AzureQueryProperties { + /** + * Create a AzureQueryProperties. + * @member {array} [scope] List of Subscription or Resource Group ARM Ids. + * @member {array} [location] List of locations to scope the query to. + * @member {object} [tagSettings] Tag settings for the VM. + * @member {object} [tagSettings.tags] Dictionary of tags with its list of + * values. + * @member {string} [tagSettings.filterOperator] Filter VMs by Any or All + * specified tags. Possible values include: 'All', 'Any' + */ + constructor() { + } + + /** + * Defines the metadata of AzureQueryProperties + * + * @returns {object} metadata of AzureQueryProperties + * + */ + mapper() { + return { + required: false, + serializedName: 'AzureQueryProperties', + type: { + name: 'Composite', + className: 'AzureQueryProperties', + modelProperties: { + scope: { + required: false, + serializedName: 'scope', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'StringElementType', + type: { + name: 'String' + } + } + } + }, + location: { + required: false, + serializedName: 'location', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'StringElementType', + type: { + name: 'String' + } + } + } + }, + tagSettings: { + required: false, + serializedName: 'tagSettings', + type: { + name: 'Composite', + className: 'TagSettingsProperties' + } + } + } + } + }; + } +} + +module.exports = AzureQueryProperties; diff --git a/lib/services/automationManagement/lib/models/index.d.ts b/lib/services/automationManagement/lib/models/index.d.ts index 636a0014c2..3a5278d0e2 100644 --- a/lib/services/automationManagement/lib/models/index.d.ts +++ b/lib/services/automationManagement/lib/models/index.d.ts @@ -1570,6 +1570,54 @@ export interface LinuxProperties { rebootSetting?: string; } +/** + * @class + * Initializes a new instance of the TagSettingsProperties class. + * @constructor + * Tag filter information for the VM. + * + * @member {object} [tags] Dictionary of tags with its list of values. + * @member {string} [filterOperator] Filter VMs by Any or All specified tags. + * Possible values include: 'All', 'Any' + */ +export interface TagSettingsProperties { + tags?: { [propertyName: string]: string[] }; + filterOperator?: string; +} + +/** + * @class + * Initializes a new instance of the AzureQueryProperties class. + * @constructor + * Azure query for the update configuration. + * + * @member {array} [scope] List of Subscription or Resource Group ARM Ids. + * @member {array} [location] List of locations to scope the query to. + * @member {object} [tagSettings] Tag settings for the VM. + * @member {object} [tagSettings.tags] Dictionary of tags with its list of + * values. + * @member {string} [tagSettings.filterOperator] Filter VMs by Any or All + * specified tags. Possible values include: 'All', 'Any' + */ +export interface AzureQueryProperties { + scope?: string[]; + location?: string[]; + tagSettings?: TagSettingsProperties; +} + +/** + * @class + * Initializes a new instance of the TargetProperties class. + * @constructor + * Group specific to the update configuration. + * + * @member {array} [azureQueries] List of Azure queries in the software update + * configuration. + */ +export interface TargetProperties { + azureQueries?: AzureQueryProperties[]; +} + /** * @class * Initializes a new instance of the UpdateConfiguration class. @@ -1607,6 +1655,10 @@ export interface LinuxProperties { * virtual machines targeted by the software update configuration. * @member {array} [nonAzureComputerNames] List of names of non-azure machines * targeted by the software update configuration. + * @member {object} [targets] Group targets for the software update + * configuration. + * @member {array} [targets.azureQueries] List of Azure queries in the software + * update configuration. */ export interface UpdateConfiguration { operatingSystem: string; @@ -1615,6 +1667,7 @@ export interface UpdateConfiguration { duration?: moment.Duration; azureVirtualMachines?: string[]; nonAzureComputerNames?: string[]; + targets?: TargetProperties; } /** @@ -1662,6 +1715,10 @@ export interface UpdateConfiguration { * configuration. * @member {array} [updateConfiguration.nonAzureComputerNames] List of names of * non-azure machines targeted by the software update configuration. + * @member {object} [updateConfiguration.targets] Group targets for the + * software update configuration. + * @member {array} [updateConfiguration.targets.azureQueries] List of Azure + * queries in the software update configuration. * @member {object} scheduleInfo Schedule information for the Software update * configuration * @member {date} [scheduleInfo.startTime] Gets or sets the start time of the diff --git a/lib/services/automationManagement/lib/models/index.js b/lib/services/automationManagement/lib/models/index.js index d58720acf3..c5ae1ffd9a 100644 --- a/lib/services/automationManagement/lib/models/index.js +++ b/lib/services/automationManagement/lib/models/index.js @@ -88,6 +88,9 @@ exports.Watcher = require('./watcher'); exports.WatcherUpdateParameters = require('./watcherUpdateParameters'); exports.WindowsProperties = require('./windowsProperties'); exports.LinuxProperties = require('./linuxProperties'); +exports.TagSettingsProperties = require('./tagSettingsProperties'); +exports.AzureQueryProperties = require('./azureQueryProperties'); +exports.TargetProperties = require('./targetProperties'); exports.UpdateConfiguration = require('./updateConfiguration'); exports.SoftwareUpdateConfiguration = require('./softwareUpdateConfiguration'); exports.CollectionItemUpdateConfiguration = require('./collectionItemUpdateConfiguration'); diff --git a/lib/services/automationManagement/lib/models/softwareUpdateConfiguration.js b/lib/services/automationManagement/lib/models/softwareUpdateConfiguration.js index 47ee95120a..c115a62c0e 100644 --- a/lib/services/automationManagement/lib/models/softwareUpdateConfiguration.js +++ b/lib/services/automationManagement/lib/models/softwareUpdateConfiguration.js @@ -61,6 +61,10 @@ class SoftwareUpdateConfiguration extends models['BaseResource'] { * configuration. * @member {array} [updateConfiguration.nonAzureComputerNames] List of names * of non-azure machines targeted by the software update configuration. + * @member {object} [updateConfiguration.targets] Group targets for the + * software update configuration. + * @member {array} [updateConfiguration.targets.azureQueries] List of Azure + * queries in the software update configuration. * @member {object} scheduleInfo Schedule information for the Software update * configuration * @member {date} [scheduleInfo.startTime] Gets or sets the start time of the diff --git a/lib/services/automationManagement/lib/models/tagSettingsProperties.js b/lib/services/automationManagement/lib/models/tagSettingsProperties.js new file mode 100644 index 0000000000..6caf46de7e --- /dev/null +++ b/lib/services/automationManagement/lib/models/tagSettingsProperties.js @@ -0,0 +1,76 @@ +/* + * 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. + */ + +'use strict'; + +/** + * Tag filter information for the VM. + * + */ +class TagSettingsProperties { + /** + * Create a TagSettingsProperties. + * @member {object} [tags] Dictionary of tags with its list of values. + * @member {string} [filterOperator] Filter VMs by Any or All specified tags. + * Possible values include: 'All', 'Any' + */ + constructor() { + } + + /** + * Defines the metadata of TagSettingsProperties + * + * @returns {object} metadata of TagSettingsProperties + * + */ + mapper() { + return { + required: false, + serializedName: 'TagSettingsProperties', + type: { + name: 'Composite', + className: 'TagSettingsProperties', + modelProperties: { + tags: { + required: false, + serializedName: 'tags', + type: { + name: 'Dictionary', + value: { + required: false, + serializedName: 'ArrayElementType', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'StringElementType', + type: { + name: 'String' + } + } + } + } + } + }, + filterOperator: { + required: false, + serializedName: 'filterOperator', + type: { + name: 'Enum', + allowedValues: [ 'All', 'Any' ] + } + } + } + } + }; + } +} + +module.exports = TagSettingsProperties; diff --git a/lib/services/automationManagement/lib/models/targetProperties.js b/lib/services/automationManagement/lib/models/targetProperties.js new file mode 100644 index 0000000000..f7ecd24f08 --- /dev/null +++ b/lib/services/automationManagement/lib/models/targetProperties.js @@ -0,0 +1,61 @@ +/* + * 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. + */ + +'use strict'; + +/** + * Group specific to the update configuration. + * + */ +class TargetProperties { + /** + * Create a TargetProperties. + * @member {array} [azureQueries] List of Azure queries in the software + * update configuration. + */ + constructor() { + } + + /** + * Defines the metadata of TargetProperties + * + * @returns {object} metadata of TargetProperties + * + */ + mapper() { + return { + required: false, + serializedName: 'TargetProperties', + type: { + name: 'Composite', + className: 'TargetProperties', + modelProperties: { + azureQueries: { + required: false, + serializedName: 'azureQueries', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'AzureQueryPropertiesElementType', + type: { + name: 'Composite', + className: 'AzureQueryProperties' + } + } + } + } + } + } + }; + } +} + +module.exports = TargetProperties; diff --git a/lib/services/automationManagement/lib/models/updateConfiguration.js b/lib/services/automationManagement/lib/models/updateConfiguration.js index e2624ad4b5..1c6e6bc95e 100644 --- a/lib/services/automationManagement/lib/models/updateConfiguration.js +++ b/lib/services/automationManagement/lib/models/updateConfiguration.js @@ -48,6 +48,10 @@ class UpdateConfiguration { * azure virtual machines targeted by the software update configuration. * @member {array} [nonAzureComputerNames] List of names of non-azure * machines targeted by the software update configuration. + * @member {object} [targets] Group targets for the software update + * configuration. + * @member {array} [targets.azureQueries] List of Azure queries in the + * software update configuration. */ constructor() { } @@ -124,6 +128,14 @@ class UpdateConfiguration { } } } + }, + targets: { + required: false, + serializedName: 'targets', + type: { + name: 'Composite', + className: 'TargetProperties' + } } } } diff --git a/lib/services/automationManagement/lib/operations/index.d.ts b/lib/services/automationManagement/lib/operations/index.d.ts index 06b0f956f9..3af7e176c9 100644 --- a/lib/services/automationManagement/lib/operations/index.d.ts +++ b/lib/services/automationManagement/lib/operations/index.d.ts @@ -6805,6 +6805,12 @@ export interface SoftwareUpdateConfigurations { * of names of non-azure machines targeted by the software update * configuration. * + * @param {object} [parameters.updateConfiguration.targets] Group targets for + * the software update configuration. + * + * @param {array} [parameters.updateConfiguration.targets.azureQueries] List of + * Azure queries in the software update configuration. + * * @param {object} parameters.scheduleInfo Schedule information for the * Software update configuration * @@ -6948,6 +6954,12 @@ export interface SoftwareUpdateConfigurations { * of names of non-azure machines targeted by the software update * configuration. * + * @param {object} [parameters.updateConfiguration.targets] Group targets for + * the software update configuration. + * + * @param {array} [parameters.updateConfiguration.targets.azureQueries] List of + * Azure queries in the software update configuration. + * * @param {object} parameters.scheduleInfo Schedule information for the * Software update configuration * diff --git a/lib/services/automationManagement/lib/operations/softwareUpdateConfigurations.js b/lib/services/automationManagement/lib/operations/softwareUpdateConfigurations.js index f22d9985d7..d54b2a451d 100644 --- a/lib/services/automationManagement/lib/operations/softwareUpdateConfigurations.js +++ b/lib/services/automationManagement/lib/operations/softwareUpdateConfigurations.js @@ -82,6 +82,12 @@ const WebResource = msRest.WebResource; * of names of non-azure machines targeted by the software update * configuration. * + * @param {object} [parameters.updateConfiguration.targets] Group targets for + * the software update configuration. + * + * @param {array} [parameters.updateConfiguration.targets.azureQueries] List of + * Azure queries in the software update configuration. + * * @param {object} parameters.scheduleInfo Schedule information for the * Software update configuration * @@ -934,6 +940,12 @@ class SoftwareUpdateConfigurations { * of names of non-azure machines targeted by the software update * configuration. * + * @param {object} [parameters.updateConfiguration.targets] Group targets for + * the software update configuration. + * + * @param {array} [parameters.updateConfiguration.targets.azureQueries] List of + * Azure queries in the software update configuration. + * * @param {object} parameters.scheduleInfo Schedule information for the * Software update configuration * @@ -1089,6 +1101,12 @@ class SoftwareUpdateConfigurations { * of names of non-azure machines targeted by the software update * configuration. * + * @param {object} [parameters.updateConfiguration.targets] Group targets for + * the software update configuration. + * + * @param {array} [parameters.updateConfiguration.targets.azureQueries] List of + * Azure queries in the software update configuration. + * * @param {object} parameters.scheduleInfo Schedule information for the * Software update configuration * From 13b3ba76097c0ad32af3eec309dfdf6bb7a25208 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 16 Oct 2018 15:20:55 -0700 Subject: [PATCH 2/4] Generated from 38e72e8bf46e5fcbea6f9cfda52f6f98e3560a24 (#3882) Removing PartialSync and adding IncrementalSync for sync type. Also, updating examples. --- lib/services/automationManagement/lib/models/index.d.ts | 4 ++-- .../automationManagement/lib/models/sourceControlSyncJob.js | 2 +- .../lib/models/sourceControlSyncJobById.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/services/automationManagement/lib/models/index.d.ts b/lib/services/automationManagement/lib/models/index.d.ts index 3a5278d0e2..e814c5bf91 100644 --- a/lib/services/automationManagement/lib/models/index.d.ts +++ b/lib/services/automationManagement/lib/models/index.d.ts @@ -2154,7 +2154,7 @@ export interface SourceControlCreateOrUpdateParameters { * @member {date} [startTime] The start time of the job. * @member {date} [endTime] The end time of the job. * @member {string} [syncType] The sync type. Possible values include: - * 'PartialSync', 'FullSync' + * 'IncrementalSync', 'FullSync' */ export interface SourceControlSyncJob { readonly name?: string; @@ -2195,7 +2195,7 @@ export interface SourceControlSyncJobCreateParameters { * @member {date} [startTime] The start time of the job. * @member {date} [endTime] The end time of the job. * @member {string} [syncType] The sync type. Possible values include: - * 'PartialSync', 'FullSync' + * 'IncrementalSync', 'FullSync' * @member {string} [exception] The exceptions that occured while running the * sync job. */ diff --git a/lib/services/automationManagement/lib/models/sourceControlSyncJob.js b/lib/services/automationManagement/lib/models/sourceControlSyncJob.js index 1804c497a0..56bd2433a4 100644 --- a/lib/services/automationManagement/lib/models/sourceControlSyncJob.js +++ b/lib/services/automationManagement/lib/models/sourceControlSyncJob.js @@ -27,7 +27,7 @@ class SourceControlSyncJob { * @member {date} [startTime] The start time of the job. * @member {date} [endTime] The end time of the job. * @member {string} [syncType] The sync type. Possible values include: - * 'PartialSync', 'FullSync' + * 'IncrementalSync', 'FullSync' */ constructor() { } diff --git a/lib/services/automationManagement/lib/models/sourceControlSyncJobById.js b/lib/services/automationManagement/lib/models/sourceControlSyncJobById.js index c8910f5b72..7bae89431e 100644 --- a/lib/services/automationManagement/lib/models/sourceControlSyncJobById.js +++ b/lib/services/automationManagement/lib/models/sourceControlSyncJobById.js @@ -25,7 +25,7 @@ class SourceControlSyncJobById { * @member {date} [startTime] The start time of the job. * @member {date} [endTime] The end time of the job. * @member {string} [syncType] The sync type. Possible values include: - * 'PartialSync', 'FullSync' + * 'IncrementalSync', 'FullSync' * @member {string} [exception] The exceptions that occured while running the * sync job. */ From 88d567faf2b3bd248c0110eec0fc3927c7e8b7cd Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Tue, 23 Oct 2018 12:34:32 -0700 Subject: [PATCH 3/4] Update azure-arm-automation to 8.1.0-preview --- lib/services/automationManagement/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/automationManagement/package.json b/lib/services/automationManagement/package.json index e0c23f58d1..f36532cd4c 100644 --- a/lib/services/automationManagement/package.json +++ b/lib/services/automationManagement/package.json @@ -2,7 +2,7 @@ "name": "azure-arm-automation", "author": "Microsoft Corporation", "description": "AutomationClient Library with typescript type definitions for node", - "version": "8.0.0-preview", + "version": "8.1.0-preview", "dependencies": { "ms-rest": "^2.3.3", "ms-rest-azure": "^2.5.5" From 19e085b9e61e044f6fc0188e7df3193b7dd00679 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 23 Oct 2018 12:59:18 -0700 Subject: [PATCH 4/4] Generated from f6da3626466b6ad2a915d6343b6c5721dc5df56c (#3924) Reverting change: Replacing PartialSync for IncrementalSync for sync type and updating examples. --- lib/services/automationManagement/lib/models/index.d.ts | 4 ++-- .../automationManagement/lib/models/sourceControlSyncJob.js | 2 +- .../lib/models/sourceControlSyncJobById.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/services/automationManagement/lib/models/index.d.ts b/lib/services/automationManagement/lib/models/index.d.ts index e814c5bf91..3a5278d0e2 100644 --- a/lib/services/automationManagement/lib/models/index.d.ts +++ b/lib/services/automationManagement/lib/models/index.d.ts @@ -2154,7 +2154,7 @@ export interface SourceControlCreateOrUpdateParameters { * @member {date} [startTime] The start time of the job. * @member {date} [endTime] The end time of the job. * @member {string} [syncType] The sync type. Possible values include: - * 'IncrementalSync', 'FullSync' + * 'PartialSync', 'FullSync' */ export interface SourceControlSyncJob { readonly name?: string; @@ -2195,7 +2195,7 @@ export interface SourceControlSyncJobCreateParameters { * @member {date} [startTime] The start time of the job. * @member {date} [endTime] The end time of the job. * @member {string} [syncType] The sync type. Possible values include: - * 'IncrementalSync', 'FullSync' + * 'PartialSync', 'FullSync' * @member {string} [exception] The exceptions that occured while running the * sync job. */ diff --git a/lib/services/automationManagement/lib/models/sourceControlSyncJob.js b/lib/services/automationManagement/lib/models/sourceControlSyncJob.js index 56bd2433a4..1804c497a0 100644 --- a/lib/services/automationManagement/lib/models/sourceControlSyncJob.js +++ b/lib/services/automationManagement/lib/models/sourceControlSyncJob.js @@ -27,7 +27,7 @@ class SourceControlSyncJob { * @member {date} [startTime] The start time of the job. * @member {date} [endTime] The end time of the job. * @member {string} [syncType] The sync type. Possible values include: - * 'IncrementalSync', 'FullSync' + * 'PartialSync', 'FullSync' */ constructor() { } diff --git a/lib/services/automationManagement/lib/models/sourceControlSyncJobById.js b/lib/services/automationManagement/lib/models/sourceControlSyncJobById.js index 7bae89431e..c8910f5b72 100644 --- a/lib/services/automationManagement/lib/models/sourceControlSyncJobById.js +++ b/lib/services/automationManagement/lib/models/sourceControlSyncJobById.js @@ -25,7 +25,7 @@ class SourceControlSyncJobById { * @member {date} [startTime] The start time of the job. * @member {date} [endTime] The end time of the job. * @member {string} [syncType] The sync type. Possible values include: - * 'IncrementalSync', 'FullSync' + * 'PartialSync', 'FullSync' * @member {string} [exception] The exceptions that occured while running the * sync job. */