diff --git a/packages/@azure/arm-servicebus/LICENSE.txt b/packages/@azure/arm-servicebus/LICENSE.txt index 5431ba98b936..8f3d856145c5 100644 --- a/packages/@azure/arm-servicebus/LICENSE.txt +++ b/packages/@azure/arm-servicebus/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018 Microsoft +Copyright (c) 2019 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 diff --git a/packages/@azure/arm-servicebus/README.md b/packages/@azure/arm-servicebus/README.md index 4c1e4bdb2dc5..870e40706c60 100644 --- a/packages/@azure/arm-servicebus/README.md +++ b/packages/@azure/arm-servicebus/README.md @@ -9,7 +9,7 @@ This package contains an isomorphic SDK for ServiceBusManagementClient. ### How to Install -``` +```bash npm install @azure/arm-servicebus ``` @@ -19,13 +19,13 @@ npm install @azure/arm-servicebus ##### Install @azure/ms-rest-nodeauth -``` +```bash npm install @azure/ms-rest-nodeauth ``` ##### Sample code -```ts +```typescript import * as msRest from "@azure/ms-rest-js"; import * as msRestAzure from "@azure/ms-rest-azure-js"; import * as msRestNodeAuth from "@azure/ms-rest-nodeauth"; @@ -47,7 +47,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => { ##### Install @azure/ms-rest-browserauth -``` +```bash npm install @azure/ms-rest-browserauth ``` @@ -94,6 +94,3 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to ## Related projects - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) - - -![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fpackages%2F%40azure%2Farm-servicebus%2FREADME.png) diff --git a/packages/@azure/arm-servicebus/lib/models/disasterRecoveryConfigsMappers.ts b/packages/@azure/arm-servicebus/lib/models/disasterRecoveryConfigsMappers.ts index d5fcdad27398..a1ad6d7ec132 100644 --- a/packages/@azure/arm-servicebus/lib/models/disasterRecoveryConfigsMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/disasterRecoveryConfigsMappers.ts @@ -38,6 +38,10 @@ export { Eventhub, CaptureDescription, Destination, - MigrationConfigProperties + MigrationConfigProperties, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/models/eventHubsMappers.ts b/packages/@azure/arm-servicebus/lib/models/eventHubsMappers.ts index 52aad1ae182b..0f9199424329 100644 --- a/packages/@azure/arm-servicebus/lib/models/eventHubsMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/eventHubsMappers.ts @@ -34,6 +34,10 @@ export { PremiumMessagingRegions, PremiumMessagingRegionsProperties, ArmDisasterRecovery, - MigrationConfigProperties + MigrationConfigProperties, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/models/index.ts b/packages/@azure/arm-servicebus/lib/models/index.ts index f41acabac9df..d173b9e4e7ce 100644 --- a/packages/@azure/arm-servicebus/lib/models/index.ts +++ b/packages/@azure/arm-servicebus/lib/models/index.ts @@ -111,7 +111,7 @@ export interface SBSku { */ export interface SBNamespace extends TrackedResource { /** - * @member {SBSku} [sku] Porperties of Sku + * @member {SBSku} [sku] Properties of Sku */ sku?: SBSku; /** @@ -156,7 +156,7 @@ export interface SBNamespace extends TrackedResource { */ export interface SBNamespaceUpdateParameters extends ResourceNamespacePatch { /** - * @member {SBSku} [sku] Porperties of Sku + * @member {SBSku} [sku] Properties of Sku */ sku?: SBSku; /** @@ -295,7 +295,7 @@ export interface AccessKeys { * @interface * An interface representing RegenerateAccessKeyParameters. * Parameters supplied to the Regenerate Authorization Rule operation, - * specifies which key neeeds to be reset. + * specifies which key needs to be reset. * */ export interface RegenerateAccessKeyParameters { @@ -527,7 +527,7 @@ export interface SBTopic extends Resource { */ readonly subscriptionCount?: number; /** - * @member {MessageCountDetails} [countDetails] Message count deatils + * @member {MessageCountDetails} [countDetails] Message count details * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ @@ -706,8 +706,8 @@ export interface SBSubscription extends Resource { */ export interface CheckNameAvailability { /** - * @member {string} name The Name to check the namespce name availability and - * The namespace name can contain only letters, numbers, and hyphens. The + * @member {string} name The Name to check the namespace name availability + * and The namespace name can contain only letters, numbers, and hyphens. The * namespace must start with a letter, and it must end with a letter or * number. */ @@ -793,7 +793,7 @@ export interface Operation { /** * @interface * An interface representing ErrorResponse. - * Error reponse indicates ServiceBus service is not able to process the + * Error response indicates ServiceBus service is not able to process the * incoming request. The reason is provided in the error message. * */ @@ -1130,12 +1130,12 @@ export interface ArmDisasterRecovery extends Resource { readonly pendingReplicationOperationsCount?: number; /** * @member {string} [partnerNamespace] ARM Id of the Primary/Secondary - * eventhub namespace name, which is part of GEO DR pairning + * eventhub namespace name, which is part of GEO DR pairing */ partnerNamespace?: string; /** * @member {string} [alternateName] Primary/Secondary eventhub namespace - * name, which is part of GEO DR pairning + * name, which is part of GEO DR pairing */ alternateName?: string; /** @@ -1190,6 +1190,79 @@ export interface MigrationConfigProperties extends Resource { readonly migrationState?: string; } +/** + * @interface + * An interface representing Subnet. + * Properties supplied for Subnet + * + */ +export interface Subnet { + /** + * @member {string} id Resource ID of Virtual Network Subnet + */ + id: string; +} + +/** + * @interface + * An interface representing NWRuleSetIpRules. + * Description of NetWorkRuleSet - IpRules resource. + * + */ +export interface NWRuleSetIpRules { + /** + * @member {string} [ipMask] IP Mask + */ + ipMask?: string; + /** + * @member {NetworkRuleIPAction} [action] The IP Filter Action. Possible + * values include: 'Allow'. Default value: 'Allow' . + */ + action?: NetworkRuleIPAction; +} + +/** + * @interface + * An interface representing NWRuleSetVirtualNetworkRules. + * Description of VirtualNetworkRules - NetworkRules resource. + * + */ +export interface NWRuleSetVirtualNetworkRules { + /** + * @member {Subnet} [subnet] Subnet properties + */ + subnet?: Subnet; + /** + * @member {boolean} [ignoreMissingVnetServiceEndpoint] Value that indicates + * whether to ignore missing VNet Service Endpoint + */ + ignoreMissingVnetServiceEndpoint?: boolean; +} + +/** + * @interface + * An interface representing NetworkRuleSet. + * Description of NetworkRuleSet resource. + * + * @extends Resource + */ +export interface NetworkRuleSet extends Resource { + /** + * @member {DefaultAction} [defaultAction] Default Action for Network Rule + * Set. Possible values include: 'Allow', 'Deny' + */ + defaultAction?: DefaultAction; + /** + * @member {NWRuleSetVirtualNetworkRules[]} [virtualNetworkRules] List + * VirtualNetwork Rules + */ + virtualNetworkRules?: NWRuleSetVirtualNetworkRules[]; + /** + * @member {NWRuleSetIpRules[]} [ipRules] List of IpRules + */ + ipRules?: NWRuleSetIpRules[]; +} + /** * @interface * An interface representing QueuesListByNamespaceOptionalParams. @@ -1557,6 +1630,22 @@ export type ProvisioningStateDR = 'Accepted' | 'Succeeded' | 'Failed'; */ export type RoleDisasterRecovery = 'Primary' | 'PrimaryNotReplicating' | 'Secondary'; +/** + * Defines values for NetworkRuleIPAction. + * Possible values include: 'Allow' + * @readonly + * @enum {string} + */ +export type NetworkRuleIPAction = 'Allow'; + +/** + * Defines values for DefaultAction. + * Possible values include: 'Allow', 'Deny' + * @readonly + * @enum {string} + */ +export type DefaultAction = 'Allow' | 'Deny'; + /** * Contains response data for the list operation. */ @@ -1804,6 +1893,44 @@ export type NamespacesRegenerateKeysResponse = AccessKeys & { }; }; +/** + * Contains response data for the createOrUpdateNetworkRuleSet operation. + */ +export type NamespacesCreateOrUpdateNetworkRuleSetResponse = NetworkRuleSet & { + /** + * 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: NetworkRuleSet; + }; +}; + +/** + * Contains response data for the getNetworkRuleSet operation. + */ +export type NamespacesGetNetworkRuleSetResponse = NetworkRuleSet & { + /** + * 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: NetworkRuleSet; + }; +}; + /** * Contains response data for the beginCreateOrUpdate operation. */ diff --git a/packages/@azure/arm-servicebus/lib/models/mappers.ts b/packages/@azure/arm-servicebus/lib/models/mappers.ts index e35fc9c709a4..7fc8d8000cb8 100644 --- a/packages/@azure/arm-servicebus/lib/models/mappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/mappers.ts @@ -1497,6 +1497,110 @@ export const MigrationConfigProperties: msRest.CompositeMapper = { } }; +export const Subnet: msRest.CompositeMapper = { + serializedName: "Subnet", + type: { + name: "Composite", + className: "Subnet", + modelProperties: { + id: { + required: true, + serializedName: "id", + type: { + name: "String" + } + } + } + } +}; + +export const NWRuleSetIpRules: msRest.CompositeMapper = { + serializedName: "NWRuleSetIpRules", + type: { + name: "Composite", + className: "NWRuleSetIpRules", + modelProperties: { + ipMask: { + serializedName: "ipMask", + type: { + name: "String" + } + }, + action: { + serializedName: "action", + defaultValue: 'Allow', + type: { + name: "String" + } + } + } + } +}; + +export const NWRuleSetVirtualNetworkRules: msRest.CompositeMapper = { + serializedName: "NWRuleSetVirtualNetworkRules", + type: { + name: "Composite", + className: "NWRuleSetVirtualNetworkRules", + modelProperties: { + subnet: { + serializedName: "subnet", + type: { + name: "Composite", + className: "Subnet" + } + }, + ignoreMissingVnetServiceEndpoint: { + serializedName: "ignoreMissingVnetServiceEndpoint", + type: { + name: "Boolean" + } + } + } + } +}; + +export const NetworkRuleSet: msRest.CompositeMapper = { + serializedName: "NetworkRuleSet", + type: { + name: "Composite", + className: "NetworkRuleSet", + modelProperties: { + ...Resource.type.modelProperties, + defaultAction: { + serializedName: "properties.defaultAction", + type: { + name: "String" + } + }, + virtualNetworkRules: { + serializedName: "properties.virtualNetworkRules", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "NWRuleSetVirtualNetworkRules" + } + } + } + }, + ipRules: { + serializedName: "properties.ipRules", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "NWRuleSetIpRules" + } + } + } + } + } + } +}; + export const OperationListResult: msRest.CompositeMapper = { serializedName: "OperationListResult", type: { diff --git a/packages/@azure/arm-servicebus/lib/models/migrationConfigsMappers.ts b/packages/@azure/arm-servicebus/lib/models/migrationConfigsMappers.ts index 3b3cb0551077..baa32f625ee4 100644 --- a/packages/@azure/arm-servicebus/lib/models/migrationConfigsMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/migrationConfigsMappers.ts @@ -34,6 +34,10 @@ export { Eventhub, CaptureDescription, Destination, - ArmDisasterRecovery + ArmDisasterRecovery, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/models/namespacesMappers.ts b/packages/@azure/arm-servicebus/lib/models/namespacesMappers.ts index 35595140ba37..076ffeccdcf4 100644 --- a/packages/@azure/arm-servicebus/lib/models/namespacesMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/namespacesMappers.ts @@ -25,6 +25,10 @@ export { AccessKeys, RegenerateAccessKeyParameters, SBNamespaceMigrate, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules, SBQueue, MessageCountDetails, SBTopic, diff --git a/packages/@azure/arm-servicebus/lib/models/premiumMessagingRegionsOperationsMappers.ts b/packages/@azure/arm-servicebus/lib/models/premiumMessagingRegionsOperationsMappers.ts index b2ee4f41d85e..dcafd54bf6bf 100644 --- a/packages/@azure/arm-servicebus/lib/models/premiumMessagingRegionsOperationsMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/premiumMessagingRegionsOperationsMappers.ts @@ -34,6 +34,10 @@ export { CaptureDescription, Destination, ArmDisasterRecovery, - MigrationConfigProperties + MigrationConfigProperties, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/models/queuesMappers.ts b/packages/@azure/arm-servicebus/lib/models/queuesMappers.ts index 731125768d90..72662cac052b 100644 --- a/packages/@azure/arm-servicebus/lib/models/queuesMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/queuesMappers.ts @@ -37,6 +37,10 @@ export { CaptureDescription, Destination, ArmDisasterRecovery, - MigrationConfigProperties + MigrationConfigProperties, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/models/regionsMappers.ts b/packages/@azure/arm-servicebus/lib/models/regionsMappers.ts index b2ee4f41d85e..dcafd54bf6bf 100644 --- a/packages/@azure/arm-servicebus/lib/models/regionsMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/regionsMappers.ts @@ -34,6 +34,10 @@ export { CaptureDescription, Destination, ArmDisasterRecovery, - MigrationConfigProperties + MigrationConfigProperties, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/models/rulesMappers.ts b/packages/@azure/arm-servicebus/lib/models/rulesMappers.ts index 1515090abc1b..c911afe2e4e0 100644 --- a/packages/@azure/arm-servicebus/lib/models/rulesMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/rulesMappers.ts @@ -34,6 +34,10 @@ export { CaptureDescription, Destination, ArmDisasterRecovery, - MigrationConfigProperties + MigrationConfigProperties, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/models/subscriptionsMappers.ts b/packages/@azure/arm-servicebus/lib/models/subscriptionsMappers.ts index 32293dcf9088..4e6a0fc43e25 100644 --- a/packages/@azure/arm-servicebus/lib/models/subscriptionsMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/subscriptionsMappers.ts @@ -34,6 +34,10 @@ export { CaptureDescription, Destination, ArmDisasterRecovery, - MigrationConfigProperties + MigrationConfigProperties, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/models/topicsMappers.ts b/packages/@azure/arm-servicebus/lib/models/topicsMappers.ts index a9a1215ec788..ee082b2cebc0 100644 --- a/packages/@azure/arm-servicebus/lib/models/topicsMappers.ts +++ b/packages/@azure/arm-servicebus/lib/models/topicsMappers.ts @@ -37,6 +37,10 @@ export { CaptureDescription, Destination, ArmDisasterRecovery, - MigrationConfigProperties + MigrationConfigProperties, + NetworkRuleSet, + NWRuleSetVirtualNetworkRules, + Subnet, + NWRuleSetIpRules } from "../models/mappers"; diff --git a/packages/@azure/arm-servicebus/lib/operations/disasterRecoveryConfigs.ts b/packages/@azure/arm-servicebus/lib/operations/disasterRecoveryConfigs.ts index 8d08af8a251a..5e526c08ffbc 100644 --- a/packages/@azure/arm-servicebus/lib/operations/disasterRecoveryConfigs.ts +++ b/packages/@azure/arm-servicebus/lib/operations/disasterRecoveryConfigs.ts @@ -244,7 +244,7 @@ export class DisasterRecoveryConfigs { } /** - * envokes GEO DR failover and reconfigure the alias to point to the secondary namespace + * Invokes GEO DR failover and reconfigure the alias to point to the secondary namespace * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param alias The Disaster Recovery configuration name @@ -320,7 +320,7 @@ export class DisasterRecoveryConfigs { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param alias The Disaster Recovery configuration name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -329,7 +329,7 @@ export class DisasterRecoveryConfigs { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param alias The Disaster Recovery configuration name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ getAuthorizationRule(resourceGroupName: string, namespaceName: string, alias: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; @@ -337,7 +337,7 @@ export class DisasterRecoveryConfigs { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param alias The Disaster Recovery configuration name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -360,7 +360,7 @@ export class DisasterRecoveryConfigs { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param alias The Disaster Recovery configuration name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -369,7 +369,7 @@ export class DisasterRecoveryConfigs { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param alias The Disaster Recovery configuration name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ listKeys(resourceGroupName: string, namespaceName: string, alias: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; @@ -377,7 +377,7 @@ export class DisasterRecoveryConfigs { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param alias The Disaster Recovery configuration name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ diff --git a/packages/@azure/arm-servicebus/lib/operations/migrationConfigs.ts b/packages/@azure/arm-servicebus/lib/operations/migrationConfigs.ts index 42e517945582..f3f456574707 100644 --- a/packages/@azure/arm-servicebus/lib/operations/migrationConfigs.ts +++ b/packages/@azure/arm-servicebus/lib/operations/migrationConfigs.ts @@ -60,7 +60,7 @@ export class MigrationConfigs { } /** - * Creates Migration configuration and starts migration of enties from Standard to Premium + * Creates Migration configuration and starts migration of entities from Standard to Premium * namespace * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name @@ -139,7 +139,7 @@ export class MigrationConfigs { /** * This operation Completes Migration of entities by pointing the connection strings to Premium - * namespace and any enties created after the operation will be under Premium Namespace. + * namespace and any entities created after the operation will be under Premium Namespace. * CompleteMigration operation will fail when entity migration is in-progress. * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name @@ -204,7 +204,7 @@ export class MigrationConfigs { } /** - * Creates Migration configuration and starts migration of enties from Standard to Premium + * Creates Migration configuration and starts migration of entities from Standard to Premium * namespace * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name diff --git a/packages/@azure/arm-servicebus/lib/operations/namespaces.ts b/packages/@azure/arm-servicebus/lib/operations/namespaces.ts index ce119bb82582..53f80812c147 100644 --- a/packages/@azure/arm-servicebus/lib/operations/namespaces.ts +++ b/packages/@azure/arm-servicebus/lib/operations/namespaces.ts @@ -239,7 +239,7 @@ export class Namespaces { * Creates or updates an authorization rule for a namespace. * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param [options] The optional parameters * @returns Promise @@ -248,7 +248,7 @@ export class Namespaces { /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param callback The callback */ @@ -256,7 +256,7 @@ export class Namespaces { /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param options The optional parameters * @param callback The callback @@ -279,7 +279,7 @@ export class Namespaces { * Deletes a namespace authorization rule. * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -287,14 +287,14 @@ export class Namespaces { /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ deleteAuthorizationRule(resourceGroupName: string, namespaceName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -315,7 +315,7 @@ export class Namespaces { * Gets an authorization rule for a namespace by rule name. * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -323,14 +323,14 @@ export class Namespaces { /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ getAuthorizationRule(resourceGroupName: string, namespaceName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -351,7 +351,7 @@ export class Namespaces { * Gets the primary and secondary connection strings for the namespace. * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -359,14 +359,14 @@ export class Namespaces { /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ listKeys(resourceGroupName: string, namespaceName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -387,7 +387,7 @@ export class Namespaces { * Regenerates the primary or secondary connection strings for the namespace. * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param [options] The optional parameters * @returns Promise @@ -396,7 +396,7 @@ export class Namespaces { /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param callback The callback */ @@ -404,7 +404,7 @@ export class Namespaces { /** * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param options The optional parameters * @param callback The callback @@ -459,6 +459,74 @@ export class Namespaces { callback); } + /** + * Create or update NetworkRuleSet for a Namespace. + * @param resourceGroupName Name of the Resource group within the Azure subscription. + * @param namespaceName The namespace name + * @param parameters The Namespace IpFilterRule. + * @param [options] The optional parameters + * @returns Promise + */ + createOrUpdateNetworkRuleSet(resourceGroupName: string, namespaceName: string, parameters: Models.NetworkRuleSet, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName Name of the Resource group within the Azure subscription. + * @param namespaceName The namespace name + * @param parameters The Namespace IpFilterRule. + * @param callback The callback + */ + createOrUpdateNetworkRuleSet(resourceGroupName: string, namespaceName: string, parameters: Models.NetworkRuleSet, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName Name of the Resource group within the Azure subscription. + * @param namespaceName The namespace name + * @param parameters The Namespace IpFilterRule. + * @param options The optional parameters + * @param callback The callback + */ + createOrUpdateNetworkRuleSet(resourceGroupName: string, namespaceName: string, parameters: Models.NetworkRuleSet, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + createOrUpdateNetworkRuleSet(resourceGroupName: string, namespaceName: string, parameters: Models.NetworkRuleSet, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + namespaceName, + parameters, + options + }, + createOrUpdateNetworkRuleSetOperationSpec, + callback) as Promise; + } + + /** + * Gets NetworkRuleSet for a Namespace. + * @param resourceGroupName Name of the Resource group within the Azure subscription. + * @param namespaceName The namespace name + * @param [options] The optional parameters + * @returns Promise + */ + getNetworkRuleSet(resourceGroupName: string, namespaceName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName Name of the Resource group within the Azure subscription. + * @param namespaceName The namespace name + * @param callback The callback + */ + getNetworkRuleSet(resourceGroupName: string, namespaceName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName Name of the Resource group within the Azure subscription. + * @param namespaceName The namespace name + * @param options The optional parameters + * @param callback The callback + */ + getNetworkRuleSet(resourceGroupName: string, namespaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + getNetworkRuleSet(resourceGroupName: string, namespaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + namespaceName, + options + }, + getNetworkRuleSetOperationSpec, + callback) as Promise; + } + /** * Creates or updates a service namespace. Once created, this namespace's resource manifest is * immutable. This operation is idempotent. @@ -922,6 +990,63 @@ const migrateOperationSpec: msRest.OperationSpec = { serializer }; +const createOrUpdateNetworkRuleSetOperationSpec: msRest.OperationSpec = { + httpMethod: "PUT", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/networkRuleSets/default", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.namespaceName1, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + requestBody: { + parameterPath: "parameters", + mapper: { + ...Mappers.NetworkRuleSet, + required: true + } + }, + responses: { + 200: { + bodyMapper: Mappers.NetworkRuleSet + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const getNetworkRuleSetOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/networkRuleSets/default", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.namespaceName1, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.NetworkRuleSet + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}", diff --git a/packages/@azure/arm-servicebus/lib/operations/queues.ts b/packages/@azure/arm-servicebus/lib/operations/queues.ts index b1f2221172fb..94e844861442 100644 --- a/packages/@azure/arm-servicebus/lib/operations/queues.ts +++ b/packages/@azure/arm-servicebus/lib/operations/queues.ts @@ -211,7 +211,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param [options] The optional parameters * @returns Promise @@ -221,7 +221,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param callback The callback */ @@ -230,7 +230,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param options The optional parameters * @param callback The callback @@ -255,7 +255,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -264,7 +264,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ deleteAuthorizationRule(resourceGroupName: string, namespaceName: string, queueName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; @@ -272,7 +272,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -295,7 +295,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -304,7 +304,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ getAuthorizationRule(resourceGroupName: string, namespaceName: string, queueName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; @@ -312,7 +312,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -335,7 +335,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -344,7 +344,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ listKeys(resourceGroupName: string, namespaceName: string, queueName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; @@ -352,7 +352,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -375,7 +375,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param [options] The optional parameters * @returns Promise @@ -385,7 +385,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param callback The callback */ @@ -394,7 +394,7 @@ export class Queues { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param queueName The queue name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param options The optional parameters * @param callback The callback diff --git a/packages/@azure/arm-servicebus/lib/operations/topics.ts b/packages/@azure/arm-servicebus/lib/operations/topics.ts index 373df303c69e..e94ad2f30243 100644 --- a/packages/@azure/arm-servicebus/lib/operations/topics.ts +++ b/packages/@azure/arm-servicebus/lib/operations/topics.ts @@ -207,11 +207,11 @@ export class Topics { } /** - * Creates an authorizatio rule for the specified topic. + * Creates an authorization rule for the specified topic. * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param [options] The optional parameters * @returns Promise @@ -221,7 +221,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param callback The callback */ @@ -230,7 +230,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters The shared access authorization rule. * @param options The optional parameters * @param callback The callback @@ -255,7 +255,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -264,7 +264,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ getAuthorizationRule(resourceGroupName: string, namespaceName: string, topicName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; @@ -272,7 +272,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -295,7 +295,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -304,7 +304,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ deleteAuthorizationRule(resourceGroupName: string, namespaceName: string, topicName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; @@ -312,7 +312,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -335,7 +335,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param [options] The optional parameters * @returns Promise */ @@ -344,7 +344,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param callback The callback */ listKeys(resourceGroupName: string, namespaceName: string, topicName: string, authorizationRuleName: string, callback: msRest.ServiceCallback): void; @@ -352,7 +352,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param options The optional parameters * @param callback The callback */ @@ -375,7 +375,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param [options] The optional parameters * @returns Promise @@ -385,7 +385,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param callback The callback */ @@ -394,7 +394,7 @@ export class Topics { * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param namespaceName The namespace name * @param topicName The topic name. - * @param authorizationRuleName The authorizationrule name. + * @param authorizationRuleName The authorization rule name. * @param parameters Parameters supplied to regenerate the authorization rule. * @param options The optional parameters * @param callback The callback diff --git a/packages/@azure/arm-servicebus/lib/serviceBusManagementClientContext.ts b/packages/@azure/arm-servicebus/lib/serviceBusManagementClientContext.ts index d2f3fa7271c3..6b495f87f8b2 100644 --- a/packages/@azure/arm-servicebus/lib/serviceBusManagementClientContext.ts +++ b/packages/@azure/arm-servicebus/lib/serviceBusManagementClientContext.ts @@ -13,7 +13,7 @@ import * as msRest from "@azure/ms-rest-js"; import * as msRestAzure from "@azure/ms-rest-azure-js"; const packageName = "@azure/arm-servicebus"; -const packageVersion = "0.1.0"; +const packageVersion = "3.1.0"; export class ServiceBusManagementClientContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; diff --git a/packages/@azure/arm-servicebus/package.json b/packages/@azure/arm-servicebus/package.json index 3d15625c1c55..e8541bc723be 100644 --- a/packages/@azure/arm-servicebus/package.json +++ b/packages/@azure/arm-servicebus/package.json @@ -4,8 +4,8 @@ "description": "ServiceBusManagementClient Library with typescript type definitions for node.js and browser.", "version": "3.1.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", + "@azure/ms-rest-azure-js": "^1.2.0", + "@azure/ms-rest-js": "^1.2.0", "tslib": "^1.9.3" }, "keywords": [ @@ -23,6 +23,7 @@ "typescript": "^3.1.1", "rollup": "^0.66.2", "rollup-plugin-node-resolve": "^3.4.0", + "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.4.9" }, "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/arm-servicebus", @@ -51,6 +52,5 @@ "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/arm-servicebus.js.map'\" -o ./dist/arm-servicebus.min.js ./dist/arm-servicebus.js", "prepack": "npm install && npm run build" }, - "sideEffects": false, - "authPublish": true + "sideEffects": false } diff --git a/packages/@azure/arm-servicebus/rollup.config.js b/packages/@azure/arm-servicebus/rollup.config.js index 1a19480dc1a0..4f5c67554fcb 100644 --- a/packages/@azure/arm-servicebus/rollup.config.js +++ b/packages/@azure/arm-servicebus/rollup.config.js @@ -1,10 +1,16 @@ +import rollup from "rollup"; import nodeResolve from "rollup-plugin-node-resolve"; +import sourcemaps from "rollup-plugin-sourcemaps"; + /** - * @type {import('rollup').RollupFileOptions} + * @type {rollup.RollupFileOptions} */ const config = { - input: './esm/serviceBusManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + input: "./esm/serviceBusManagementClient.js", + external: [ + "@azure/ms-rest-js", + "@azure/ms-rest-azure-js" + ], output: { file: "./dist/arm-servicebus.js", format: "umd", @@ -16,16 +22,16 @@ const config = { }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * 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. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */` }, plugins: [ - nodeResolve({ module: true }) + nodeResolve({ module: true }), + sourcemaps() ] }; + export default config;