Skip to content

Commit 24a597c

Browse files
author
SDKAuto
committed
CodeGen from PR 25378 in Azure/azure-rest-api-specs
Merge 658fb5c422a8caaffe413286e71c6a1a7722187d into 624dbc769880e5676ae8bb20d3c82ebd1783c64a
1 parent d8560f0 commit 24a597c

File tree

11 files changed

+186
-51
lines changed

11 files changed

+186
-51
lines changed

‎common/config/rush/pnpm-lock.yaml

Lines changed: 13 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/web-pubsub/arm-webpubsub/CHANGELOG.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
# Release History
2-
3-
## 2.0.0-beta.2 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
12-
13-
## 2.0.0-beta.1 (2023-07-11)
2+
3+
## 2.0.0-beta.2 (2023-08-18)
144

155
**Features**
166

177
- Added operation group WebPubSubReplicas
188
- Added operation WebPubSub.listReplicaSkus
9+
- Added Interface IPRule
1910
- Added Interface Replica
2011
- Added Interface ReplicaList
2112
- Added Interface WebPubSubListReplicaSkusOptionalParams
@@ -41,17 +32,20 @@
4132
- Added Type Alias WebPubSubReplicasUpdateResponse
4233
- Added Type Alias WebPubSubRestartResponse
4334
- Interface Resource has a new optional parameter systemData
35+
- Interface WebPubSubNetworkACLs has a new optional parameter ipRules
4436
- Interface WebPubSubResource has a new optional parameter kind
37+
- Interface WebPubSubResource has a new optional parameter regionEndpointEnabled
38+
- Interface WebPubSubResource has a new optional parameter resourceStopped
4539
- Added Enum KnownServiceKind
40+
41+
**Breaking Changes**
42+
4643
- Interface CustomCertificate no longer has parameter systemData
4744
- Interface CustomDomain no longer has parameter systemData
4845
- Interface PrivateEndpointConnection no longer has parameter systemData
4946
- Interface SharedPrivateLinkResource no longer has parameter systemData
5047
- Interface WebPubSubHub no longer has parameter systemData
5148
- Interface WebPubSubResource no longer has parameter systemData
52-
53-
**Breaking Changes**
54-
5549
- Parameter location of interface TrackedResource is now required
5650

5751

‎sdk/web-pubsub/arm-webpubsub/_meta.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "9975d3476c05bcc6bd9535ad3dfb564e6a168fa5",
2+
"commit": "e4f05ae0d0ec8fd2258803174f88602cd6ad31cb",
33
"readme": "specification/webpubsub/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\webpubsub\\resource-manager\\readme.md --use=@autorest/[email protected].5 --generate-sample=true",
4+
"autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/webpubsub/resource-manager/readme.md --use=@autorest/typescript@^6.0.4",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/[email protected].0",
7-
"use": "@autorest/[email protected].5"
6+
"release_tool": "@azure-tools/[email protected].1",
7+
"use": "@autorest/typescript@^6.0.4"
88
}

‎sdk/web-pubsub/arm-webpubsub/package.json

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"node": ">=14.0.0"
99
},
1010
"dependencies": {
11-
"@azure/core-lro": "^2.5.3",
11+
"@azure/core-lro": "^2.5.4",
1212
"@azure/abort-controller": "^1.0.0",
1313
"@azure/core-paging": "^1.2.0",
1414
"@azure/core-client": "^1.7.0",
1515
"@azure/core-auth": "^1.3.0",
16-
"@azure/core-rest-pipeline": "^1.8.0",
16+
"@azure/core-rest-pipeline": "^1.12.0",
1717
"tslib": "^2.2.0"
1818
},
1919
"keywords": [
@@ -48,6 +48,7 @@
4848
"chai": "^4.2.0",
4949
"cross-env": "^7.0.2",
5050
"@types/node": "^14.0.0",
51+
"ts-node": "^10.0.0",
5152
"@azure/dev-tool": "^1.0.0"
5253
},
5354
"repository": {
@@ -111,13 +112,5 @@
111112
]
112113
},
113114
"autoPublish": true,
114-
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/web-pubsub/arm-webpubsub",
115-
"//sampleConfiguration": {
116-
"productName": "",
117-
"productSlugs": [
118-
"azure"
119-
],
120-
"disableDocsMs": true,
121-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-webpubsub?view=azure-node-preview"
122-
}
123-
}
115+
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/web-pubsub/arm-webpubsub"
116+
}

‎sdk/web-pubsub/arm-webpubsub/review/arm-webpubsub.api.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ export interface EventNameFilter extends EventListenerFilter {
125125
// @public
126126
export function getContinuationToken(page: unknown): string | undefined;
127127

128+
// @public
129+
export interface IPRule {
130+
action?: ACLAction;
131+
value?: string;
132+
}
133+
128134
// @public
129135
type KeyType_2 = string;
130136
export { KeyType_2 as KeyType }
@@ -409,6 +415,8 @@ export interface RegenerateKeyParameters {
409415
// @public
410416
export interface Replica extends TrackedResource {
411417
readonly provisioningState?: ProvisioningState;
418+
regionEndpointEnabled?: string;
419+
resourceStopped?: string;
412420
sku?: ResourceSku;
413421
}
414422

@@ -890,6 +898,7 @@ export interface WebPubSubManagementClientOptionalParams extends coreClient.Serv
890898
// @public
891899
export interface WebPubSubNetworkACLs {
892900
defaultAction?: ACLAction;
901+
ipRules?: IPRule[];
893902
privateEndpoints?: PrivateEndpointACL[];
894903
publicNetwork?: NetworkACL;
895904
}
@@ -1066,7 +1075,9 @@ export interface WebPubSubResource extends TrackedResource {
10661075
readonly provisioningState?: ProvisioningState;
10671076
publicNetworkAccess?: string;
10681077
readonly publicPort?: number;
1078+
regionEndpointEnabled?: string;
10691079
resourceLogConfiguration?: ResourceLogConfiguration;
1080+
resourceStopped?: string;
10701081
readonly serverPort?: number;
10711082
readonly sharedPrivateLinkResources?: SharedPrivateLinkResource[];
10721083
sku?: ResourceSku;

‎sdk/web-pubsub/arm-webpubsub/src/models/index.ts

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ export interface WebPubSubNetworkACLs {
376376
publicNetwork?: NetworkACL;
377377
/** ACLs for requests from private endpoints */
378378
privateEndpoints?: PrivateEndpointACL[];
379+
/** IP rules for filtering public traffic */
380+
ipRules?: IPRule[];
379381
}
380382

381383
/** Network ACL */
@@ -386,6 +388,14 @@ export interface NetworkACL {
386388
deny?: WebPubSubRequestType[];
387389
}
388390

391+
/** An IP rule */
392+
export interface IPRule {
393+
/** An IP or CIDR or ServiceTag */
394+
value?: string;
395+
/** Azure Networking ACL Action. */
396+
action?: ACLAction;
397+
}
398+
389399
/** A class represent managed identities used for request and response */
390400
export interface ManagedIdentity {
391401
/** Represents the identity type: systemAssigned, userAssigned, None */
@@ -880,6 +890,18 @@ export interface WebPubSubResource extends TrackedResource {
880890
* When set as true, connection with AuthType=aad won't work.
881891
*/
882892
disableAadAuth?: boolean;
893+
/**
894+
* Enable or disable the regional endpoint. Default to "Enabled".
895+
* When it's Disabled, new connections will not be routed to this endpoint, however existing connections will not be affected.
896+
* This property is replica specific. Disable the regional endpoint without replica is not allowed.
897+
*/
898+
regionEndpointEnabled?: string;
899+
/**
900+
* Stop or start the resource. Default to "false".
901+
* When it's true, the data plane of the resource is shutdown.
902+
* When it's false, the data plane of the resource is started.
903+
*/
904+
resourceStopped?: string;
883905
}
884906

885907
/** A class represent a replica resource. */
@@ -891,6 +913,17 @@ export interface Replica extends TrackedResource {
891913
* NOTE: This property will not be serialized. It can only be populated by the server.
892914
*/
893915
readonly provisioningState?: ProvisioningState;
916+
/**
917+
* Enable or disable the regional endpoint. Default to "Enabled".
918+
* When it's Disabled, new connections will not be routed to this endpoint, however existing connections will not be affected.
919+
*/
920+
regionEndpointEnabled?: string;
921+
/**
922+
* Stop or start the resource. Default to "false".
923+
* When it's true, the data plane of the resource is shutdown.
924+
* When it's false, the data plane of the resource is started.
925+
*/
926+
resourceStopped?: string;
894927
}
895928

896929
/** Defines headers for WebPubSub_update operation. */

‎sdk/web-pubsub/arm-webpubsub/src/models/mappers.ts

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,21 @@ export const WebPubSubNetworkACLs: coreClient.CompositeMapper = {
838838
}
839839
}
840840
}
841+
},
842+
ipRules: {
843+
constraints: {
844+
MaxItems: 30
845+
},
846+
serializedName: "ipRules",
847+
type: {
848+
name: "Sequence",
849+
element: {
850+
type: {
851+
name: "Composite",
852+
className: "IPRule"
853+
}
854+
}
855+
}
841856
}
842857
}
843858
}
@@ -874,6 +889,27 @@ export const NetworkACL: coreClient.CompositeMapper = {
874889
}
875890
};
876891

892+
export const IPRule: coreClient.CompositeMapper = {
893+
type: {
894+
name: "Composite",
895+
className: "IPRule",
896+
modelProperties: {
897+
value: {
898+
serializedName: "value",
899+
type: {
900+
name: "String"
901+
}
902+
},
903+
action: {
904+
serializedName: "action",
905+
type: {
906+
name: "String"
907+
}
908+
}
909+
}
910+
}
911+
};
912+
877913
export const ManagedIdentity: coreClient.CompositeMapper = {
878914
type: {
879915
name: "Composite",
@@ -2008,6 +2044,20 @@ export const WebPubSubResource: coreClient.CompositeMapper = {
20082044
type: {
20092045
name: "Boolean"
20102046
}
2047+
},
2048+
regionEndpointEnabled: {
2049+
defaultValue: "Enabled",
2050+
serializedName: "properties.regionEndpointEnabled",
2051+
type: {
2052+
name: "String"
2053+
}
2054+
},
2055+
resourceStopped: {
2056+
defaultValue: "false",
2057+
serializedName: "properties.resourceStopped",
2058+
type: {
2059+
name: "String"
2060+
}
20112061
}
20122062
}
20132063
}
@@ -2032,6 +2082,20 @@ export const Replica: coreClient.CompositeMapper = {
20322082
type: {
20332083
name: "String"
20342084
}
2085+
},
2086+
regionEndpointEnabled: {
2087+
defaultValue: "Enabled",
2088+
serializedName: "properties.regionEndpointEnabled",
2089+
type: {
2090+
name: "String"
2091+
}
2092+
},
2093+
resourceStopped: {
2094+
defaultValue: "false",
2095+
serializedName: "properties.resourceStopped",
2096+
type: {
2097+
name: "String"
2098+
}
20352099
}
20362100
}
20372101
}

0 commit comments

Comments
 (0)