Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions codegen_mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,9 @@
"servicebus": {
"resource-manager": {
"packageName": "azure-arm-sb",
"packageVersion": "2.2.0-preview",
"generateLicenseTxt": true,
"generatePackageJson": true,
"dir": "serviceBusManagement2",
"source": "servicebus/resource-manager/readme.md"
}
Expand Down
4 changes: 2 additions & 2 deletions lib/services/serviceBusManagement2/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 Microsoft
Copyright (c) 2018 Microsoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
15 changes: 15 additions & 0 deletions lib/services/serviceBusManagement2/lib/models/correlationFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
class CorrelationFilter {
/**
* Create a CorrelationFilter.
* @member {object} [properties] dictionary object for custom filters
* @member {string} [correlationId] Identifier of the correlation.
* @member {string} [messageId] Identifier of the message.
* @member {string} [to] Address to send to.
Expand Down Expand Up @@ -45,6 +46,20 @@ class CorrelationFilter {
name: 'Composite',
className: 'CorrelationFilter',
modelProperties: {
properties: {
required: false,
serializedName: 'properties',
type: {
name: 'Dictionary',
value: {
required: false,
serializedName: 'StringElementType',
type: {
name: 'String'
}
}
}
},
correlationId: {
required: false,
serializedName: 'correlationId',
Expand Down
7 changes: 7 additions & 0 deletions lib/services/serviceBusManagement2/lib/models/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,8 @@ export interface MessageCountDetails {
* messaging entity. Possible values include: 'Active', 'Disabled',
* 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
* 'Renaming', 'Unknown'
* @member {boolean} [enableBatchedOperations] Value that indicates whether
* server-side batched operations are enabled.
* @member {moment.duration} [autoDeleteOnIdle] ISO 8061 timeSpan idle interval
* after which the queue is automatically deleted. The minimum duration is 5
* minutes.
Expand Down Expand Up @@ -310,6 +312,7 @@ export interface SBQueue extends Resource {
duplicateDetectionHistoryTimeWindow?: moment.Duration;
maxDeliveryCount?: number;
status?: string;
enableBatchedOperations?: boolean;
autoDeleteOnIdle?: moment.Duration;
enablePartitioning?: boolean;
enableExpress?: boolean;
Expand Down Expand Up @@ -592,6 +595,7 @@ export interface SqlFilter {
* @constructor
* Represents the correlation filter expression.
*
* @member {object} [properties] dictionary object for custom filters
* @member {string} [correlationId] Identifier of the correlation.
* @member {string} [messageId] Identifier of the message.
* @member {string} [to] Address to send to.
Expand All @@ -604,6 +608,7 @@ export interface SqlFilter {
* rule action requires preprocessing. Default value: true .
*/
export interface CorrelationFilter {
properties?: { [propertyName: string]: string };
correlationId?: string;
messageId?: string;
to?: string;
Expand Down Expand Up @@ -642,6 +647,8 @@ export interface CorrelationFilter {
* @member {boolean} [sqlFilter.requiresPreprocessing] Value that indicates
* whether the rule action requires preprocessing.
* @member {object} [correlationFilter] Properties of correlationFilter
* @member {object} [correlationFilter.properties] dictionary object for custom
* filters
* @member {string} [correlationFilter.correlationId] Identifier of the
* correlation.
* @member {string} [correlationFilter.messageId] Identifier of the message.
Expand Down
2 changes: 2 additions & 0 deletions lib/services/serviceBusManagement2/lib/models/rule.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class Rule extends models['Resource'] {
* @member {boolean} [sqlFilter.requiresPreprocessing] Value that indicates
* whether the rule action requires preprocessing.
* @member {object} [correlationFilter] Properties of correlationFilter
* @member {object} [correlationFilter.properties] dictionary object for
* custom filters
* @member {string} [correlationFilter.correlationId] Identifier of the
* correlation.
* @member {string} [correlationFilter.messageId] Identifier of the message.
Expand Down
9 changes: 9 additions & 0 deletions lib/services/serviceBusManagement2/lib/models/sBQueue.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ class SBQueue extends models['Resource'] {
* a messaging entity. Possible values include: 'Active', 'Disabled',
* 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
* 'Renaming', 'Unknown'
* @member {boolean} [enableBatchedOperations] Value that indicates whether
* server-side batched operations are enabled.
* @member {moment.duration} [autoDeleteOnIdle] ISO 8061 timeSpan idle
* interval after which the queue is automatically deleted. The minimum
* duration is 5 minutes.
Expand Down Expand Up @@ -233,6 +235,13 @@ class SBQueue extends models['Resource'] {
allowedValues: [ 'Active', 'Disabled', 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown' ]
}
},
enableBatchedOperations: {
required: false,
serializedName: 'properties.enableBatchedOperations',
type: {
name: 'Boolean'
}
},
autoDeleteOnIdle: {
required: false,
serializedName: 'properties.autoDeleteOnIdle',
Expand Down
12 changes: 12 additions & 0 deletions lib/services/serviceBusManagement2/lib/operations/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2323,6 +2323,9 @@ export interface Queues {
* 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
* 'Renaming', 'Unknown'
*
* @param {boolean} [parameters.enableBatchedOperations] Value that indicates
* whether server-side batched operations are enabled.
*
* @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
* idle interval after which the queue is automatically deleted. The minimum
* duration is 5 minutes.
Expand Down Expand Up @@ -2402,6 +2405,9 @@ export interface Queues {
* 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
* 'Renaming', 'Unknown'
*
* @param {boolean} [parameters.enableBatchedOperations] Value that indicates
* whether server-side batched operations are enabled.
*
* @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
* idle interval after which the queue is automatically deleted. The minimum
* duration is 5 minutes.
Expand Down Expand Up @@ -4582,6 +4588,9 @@ export interface Rules {
* @param {object} [parameters.correlationFilter] Properties of
* correlationFilter
*
* @param {object} [parameters.correlationFilter.properties] dictionary object
* for custom filters
*
* @param {string} [parameters.correlationFilter.correlationId] Identifier of
* the correlation.
*
Expand Down Expand Up @@ -4665,6 +4674,9 @@ export interface Rules {
* @param {object} [parameters.correlationFilter] Properties of
* correlationFilter
*
* @param {object} [parameters.correlationFilter.properties] dictionary object
* for custom filters
*
* @param {string} [parameters.correlationFilter.correlationId] Identifier of
* the correlation.
*
Expand Down
9 changes: 9 additions & 0 deletions lib/services/serviceBusManagement2/lib/operations/queues.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@ function _listByNamespace(resourceGroupName, namespaceName, options, callback) {
* 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
* 'Renaming', 'Unknown'
*
* @param {boolean} [parameters.enableBatchedOperations] Value that indicates
* whether server-side batched operations are enabled.
*
* @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
* idle interval after which the queue is automatically deleted. The minimum
* duration is 5 minutes.
Expand Down Expand Up @@ -2374,6 +2377,9 @@ class Queues {
* 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
* 'Renaming', 'Unknown'
*
* @param {boolean} [parameters.enableBatchedOperations] Value that indicates
* whether server-side batched operations are enabled.
*
* @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
* idle interval after which the queue is automatically deleted. The minimum
* duration is 5 minutes.
Expand Down Expand Up @@ -2465,6 +2471,9 @@ class Queues {
* 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
* 'Renaming', 'Unknown'
*
* @param {boolean} [parameters.enableBatchedOperations] Value that indicates
* whether server-side batched operations are enabled.
*
* @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
* idle interval after which the queue is automatically deleted. The minimum
* duration is 5 minutes.
Expand Down
9 changes: 9 additions & 0 deletions lib/services/serviceBusManagement2/lib/operations/rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@ function _listBySubscriptions(resourceGroupName, namespaceName, topicName, subsc
* @param {object} [parameters.correlationFilter] Properties of
* correlationFilter
*
* @param {object} [parameters.correlationFilter.properties] dictionary object
* for custom filters
*
* @param {string} [parameters.correlationFilter.correlationId] Identifier of
* the correlation.
*
Expand Down Expand Up @@ -1181,6 +1184,9 @@ class Rules {
* @param {object} [parameters.correlationFilter] Properties of
* correlationFilter
*
* @param {object} [parameters.correlationFilter.properties] dictionary object
* for custom filters
*
* @param {string} [parameters.correlationFilter.correlationId] Identifier of
* the correlation.
*
Expand Down Expand Up @@ -1276,6 +1282,9 @@ class Rules {
* @param {object} [parameters.correlationFilter] Properties of
* correlationFilter
*
* @param {object} [parameters.correlationFilter.properties] dictionary object
* for custom filters
*
* @param {string} [parameters.correlationFilter.correlationId] Identifier of
* the correlation.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@

import { ServiceClientCredentials } from 'ms-rest';
import { AzureServiceClient, AzureServiceClientOptions } from 'ms-rest-azure';
import * as models from "./models";
import * as operations from "./operations";

declare class ServiceBusManagementClient extends AzureServiceClient {
export default class ServiceBusManagementClient extends AzureServiceClient {
/**
* Initializes a new instance of the ServiceBusManagementClient class.
* @constructor
Expand Down Expand Up @@ -67,4 +68,4 @@ declare class ServiceBusManagementClient extends AzureServiceClient {
eventHubs: operations.EventHubs;
}

export = ServiceBusManagementClient;
export { ServiceBusManagementClient, models as ServiceBusManagementModels };
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,6 @@ class ServiceBusManagementClient extends ServiceClient {
}

module.exports = ServiceBusManagementClient;
module.exports['default'] = ServiceBusManagementClient;
module.exports.ServiceBusManagementClient = ServiceBusManagementClient;
module.exports.ServiceBusManagementModels = models;
31 changes: 10 additions & 21 deletions lib/services/serviceBusManagement2/package.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,20 @@
{
"name": "azure-arm-sb",
"author": "Microsoft Corporation",
"contributors": [
"Zeeshan Sayed <sazeesha@microsoft.com>",
"Amar Zavery <amzavery@microsoft.com>"
],
"version": "2.1.0-preview",
"description": "Microsoft Servicebus Management Client Library for node",
"tags": [
"azure",
"sdk"
],
"keywords": [
"node",
"azure"
],
"main": "./lib/serviceBusManagementClient.js",
"types": "./lib/serviceBusManagementClient.d.ts",
"license": "MIT",
"description": "ServiceBusManagementClient Library with typescript type definitions for node",
"version": "2.2.0-preview",
"dependencies": {
"ms-rest-azure": "^2.5.2",
"ms-rest": "^2.3.0"
"ms-rest": "^2.3.3",
"ms-rest-azure": "^2.5.5"
},
"homepage": "https://github.com/Azure/azure-sdk-for-node",
"keywords": [ "node", "azure" ],
"license": "MIT",
"main": "./lib/serviceBusManagementClient.js",
"types": "./lib/serviceBusManagementClient.d.ts",
"homepage": "https://github.com/azure/azure-sdk-for-node",
"repository": {
"type": "git",
"url": "git@github.com:Azure/azure-sdk-for-node.git"
"url": "https://github.com/azure/azure-sdk-for-node.git"
},
"bugs": {
"url": "https://github.com/Azure/azure-sdk-for-node/issues"
Expand Down