From 82a6aa85d3055e1f5033a82d5bb19a4cbc8ee159 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 16 Oct 2018 21:36:47 -0700 Subject: [PATCH 1/3] Generated from b6aeed45dd11f9251470f6a2f0b5371a1ee914d5 (#3870) added descriptions for filter and expand --- .../lib/resource/operations/index.d.ts | 102 +++++++++++-- .../lib/resource/operations/resourceGroups.js | 15 +- .../lib/resource/operations/resources.js | 138 +++++++++++++++--- 3 files changed, 220 insertions(+), 35 deletions(-) diff --git a/lib/services/resourceManagement/lib/resource/operations/index.d.ts b/lib/services/resourceManagement/lib/resource/operations/index.d.ts index 735a29ab74..14cdef5799 100644 --- a/lib/services/resourceManagement/lib/resource/operations/index.d.ts +++ b/lib/services/resourceManagement/lib/resource/operations/index.d.ts @@ -2755,9 +2755,26 @@ export interface Resources { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resources. @@ -2781,9 +2798,26 @@ export interface Resources { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resources. @@ -2989,9 +3023,26 @@ export interface Resources { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter. + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. @@ -3012,9 +3063,26 @@ export interface Resources { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter. + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. @@ -5702,7 +5770,10 @@ export interface ResourceGroups { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. + * @param {string} [options.filter] The filter to apply on the + * operation.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1' * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. @@ -5723,7 +5794,10 @@ export interface ResourceGroups { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. + * @param {string} [options.filter] The filter to apply on the + * operation.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1' * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. diff --git a/lib/services/resourceManagement/lib/resource/operations/resourceGroups.js b/lib/services/resourceManagement/lib/resource/operations/resourceGroups.js index 9430b89bc6..cefdb22969 100644 --- a/lib/services/resourceManagement/lib/resource/operations/resourceGroups.js +++ b/lib/services/resourceManagement/lib/resource/operations/resourceGroups.js @@ -946,7 +946,10 @@ function _exportTemplate(resourceGroupName, parameters, options, callback) { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. + * @param {string} [options.filter] The filter to apply on the + * operation.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1' * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. @@ -1975,7 +1978,10 @@ class ResourceGroups { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. + * @param {string} [options.filter] The filter to apply on the + * operation.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1' * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. @@ -2008,7 +2014,10 @@ class ResourceGroups { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. + * @param {string} [options.filter] The filter to apply on the + * operation.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1' * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. diff --git a/lib/services/resourceManagement/lib/resource/operations/resources.js b/lib/services/resourceManagement/lib/resource/operations/resources.js index 6c6d5f2ac0..ba3dd0df9f 100644 --- a/lib/services/resourceManagement/lib/resource/operations/resources.js +++ b/lib/services/resourceManagement/lib/resource/operations/resources.js @@ -22,9 +22,26 @@ const WebResource = msRest.WebResource; * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resources. @@ -352,9 +369,26 @@ function _validateMoveResources(sourceResourceGroupName, parameters, options, ca * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter. + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. @@ -3644,9 +3678,26 @@ class Resources { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resources. @@ -3682,9 +3733,26 @@ class Resources { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resources. @@ -3959,9 +4027,26 @@ class Resources { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter. + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. @@ -3994,9 +4079,26 @@ class Resources { * * @param {object} [options] Optional Parameters. * - * @param {string} [options.filter] The filter to apply on the operation. - * - * @param {string} [options.expand] The $expand query parameter. + * @param {string} [options.filter] The filter to apply on the + * operation.

The properties you can use for eq (equals) or ne (not + * equals) are: location, resourceType, name, resourceGroup, identity, + * identity/principalId, plan, plan/publisher, plan/product, plan/name, + * plan/version, and plan/promotionCode.

For example, to filter by a + * resource type, use: $filter=resourceType eq + * 'Microsoft.Network/virtualNetworks'

You can use substringof(value, + * property) in the filter. The properties you can use for substring are: name + * and resourceGroup.

For example, to get all resources with 'demo' + * anywhere in the name, use: $filter=substringof('demo', name)

You can + * link more than one substringof together by adding and/or + * operators.

You can filter by tag names and values. For example, to + * filter for a tag name and value, use $filter=tagName eq 'tag1' and tagValue + * eq 'Value1'

You can use some properties together when filtering. The + * combinations you can use are: substringof and/or resourceType, plan and + * plan/publisher and plan/name, identity and identity/principalId. + * + * @param {string} [options.expand] The $expand query parameter. You can expand + * createdTime and changedTime. For example, to expand both properties, use + * $expand=changedTime,createdTime * * @param {number} [options.top] The number of results to return. If null is * passed, returns all resource groups. From 67df0834fa979638db09d9e6dde813cbf3f23e10 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Sun, 21 Oct 2018 14:49:19 -0700 Subject: [PATCH 2/3] [AutoPR resources/resource-manager] added to description of allowed characters for resource group name (#3918) * Generated from 773581c3a2be72522eb2bc770800bbef994454d3 added to description of allowed characters for resource group name * Generated from 3d920ef4d7524961f809597d3f47f70cfce462ef changed description --- .../lib/resource/operations/index.d.ts | 6 ++++-- .../lib/resource/operations/resourceGroups.js | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/services/resourceManagement/lib/resource/operations/index.d.ts b/lib/services/resourceManagement/lib/resource/operations/index.d.ts index 14cdef5799..7dc8dcb7ed 100644 --- a/lib/services/resourceManagement/lib/resource/operations/index.d.ts +++ b/lib/services/resourceManagement/lib/resource/operations/index.d.ts @@ -5398,7 +5398,8 @@ export interface ResourceGroups { * Creates or updates a resource group. * * @param {string} resourceGroupName The name of the resource group to create - * or update. + * or update. Can include alphanumeric, underscore, parentheses, hyphen, period + * (except at end), and Unicode characters that match the allowed characters. * * @param {object} parameters Parameters supplied to the create or update a * resource group. @@ -5431,7 +5432,8 @@ export interface ResourceGroups { * Creates or updates a resource group. * * @param {string} resourceGroupName The name of the resource group to create - * or update. + * or update. Can include alphanumeric, underscore, parentheses, hyphen, period + * (except at end), and Unicode characters that match the allowed characters. * * @param {object} parameters Parameters supplied to the create or update a * resource group. diff --git a/lib/services/resourceManagement/lib/resource/operations/resourceGroups.js b/lib/services/resourceManagement/lib/resource/operations/resourceGroups.js index cefdb22969..6c32b4df0e 100644 --- a/lib/services/resourceManagement/lib/resource/operations/resourceGroups.js +++ b/lib/services/resourceManagement/lib/resource/operations/resourceGroups.js @@ -155,7 +155,8 @@ function _checkExistence(resourceGroupName, options, callback) { * Creates or updates a resource group. * * @param {string} resourceGroupName The name of the resource group to create - * or update. + * or update. Can include alphanumeric, underscore, parentheses, hyphen, period + * (except at end), and Unicode characters that match the allowed characters. * * @param {object} parameters Parameters supplied to the create or update a * resource group. @@ -1471,7 +1472,8 @@ class ResourceGroups { * Creates or updates a resource group. * * @param {string} resourceGroupName The name of the resource group to create - * or update. + * or update. Can include alphanumeric, underscore, parentheses, hyphen, period + * (except at end), and Unicode characters that match the allowed characters. * * @param {object} parameters Parameters supplied to the create or update a * resource group. @@ -1516,7 +1518,8 @@ class ResourceGroups { * Creates or updates a resource group. * * @param {string} resourceGroupName The name of the resource group to create - * or update. + * or update. Can include alphanumeric, underscore, parentheses, hyphen, period + * (except at end), and Unicode characters that match the allowed characters. * * @param {object} parameters Parameters supplied to the create or update a * resource group. From 704f0a6f91dc7ec0a61c24b49b94643357adf17f Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Tue, 23 Oct 2018 12:21:29 -0700 Subject: [PATCH 3/3] Update azure-arm-resource to 7.0.1 --- lib/services/resourceManagement/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/resourceManagement/package.json b/lib/services/resourceManagement/package.json index 0cf2d243bc..05cb662041 100644 --- a/lib/services/resourceManagement/package.json +++ b/lib/services/resourceManagement/package.json @@ -6,7 +6,7 @@ "Zavery, Amar ", "Srinivasan, Vivek " ], - "version": "7.0.0", + "version": "7.0.1", "description": "Microsoft Azure Resource Management Client Library for node", "tags": [ "azure",