Skip to content

Commit 670fa91

Browse files
author
SDKAuto
committed
CodeGen from PR 20978 in Azure/azure-rest-api-specs
Merge db739a5f2b96e2ecb962043f4f3d6adb299c34ff into d0965e7f28fc087c87c7411a14d8acdc8f37252e
1 parent e2f9999 commit 670fa91

File tree

10 files changed

+106
-92
lines changed

10 files changed

+106
-92
lines changed

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

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

‎sdk/network/arm-network/CHANGELOG.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
# Release History
2+
3+
## 31.0.0 (2022-10-10)
4+
5+
**Breaking Changes**
26

3-
## 30.0.1 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
12-
7+
- Interface AdminRule no longer has parameter kind
8+
- Interface DefaultAdminRule no longer has parameter kind
9+
10+
1311
## 30.0.0 (2022-09-29)
1412

1513
**Features**

‎sdk/network/arm-network/_meta.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "065b070773ed6fa98ede768ad602f4c4d2edf739",
2+
"commit": "88b24decc5aff10926bd14665a3ca885c4c4cbec",
33
"readme": "specification/network/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.8.4 --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\\network\\resource-manager\\readme.md --use=@autorest/[email protected].20220727.1 --generate-sample=true",
4+
"autorest_command": "autorest --version=3.8.4 --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/network/resource-manager/readme.md --use=@autorest/[email protected]",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/[email protected].2",
7-
"use": "@autorest/[email protected].20220727.1"
6+
"release_tool": "@azure-tools/[email protected].3",
7+
"use": "@autorest/[email protected]"
88
}

‎sdk/network/arm-network/package.json‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for NetworkManagementClient.",
6-
"version": "30.0.1",
6+
"version": "31.0.0",
77
"engines": {
88
"node": ">=12.0.0"
99
},
@@ -28,15 +28,15 @@
2828
"module": "./dist-esm/src/index.js",
2929
"types": "./types/arm-network.d.ts",
3030
"devDependencies": {
31-
"@microsoft/api-extractor": "^7.31.1",
31+
"@microsoft/api-extractor": "7.18.11",
3232
"@rollup/plugin-commonjs": "^21.0.1",
3333
"@rollup/plugin-json": "^4.1.0",
3434
"@rollup/plugin-multi-entry": "^4.1.0",
3535
"@rollup/plugin-node-resolve": "^13.1.3",
3636
"mkdirp": "^1.0.4",
3737
"rollup": "^2.66.1",
3838
"rollup-plugin-sourcemaps": "^0.6.3",
39-
"typescript": "~4.6.0",
39+
"typescript": "~4.2.0",
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
4242
"@azure/identity": "^2.0.1",
@@ -109,13 +109,5 @@
109109
}
110110
]
111111
},
112-
"autoPublish": true,
113-
"//sampleConfiguration": {
114-
"productName": "",
115-
"productSlugs": [
116-
"azure"
117-
],
118-
"disableDocsMs": true,
119-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-network?view=azure-node-preview"
120-
}
121-
}
112+
"autoPublish": true
113+
}

‎sdk/network/arm-network/review/arm-network.api.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ export interface AdminRule extends BaseAdminRule {
120120
destinationPortRanges?: string[];
121121
destinations?: AddressPrefixItem[];
122122
direction?: SecurityConfigurationRuleDirection;
123-
kind: "Custom";
124123
priority?: number;
125124
protocol?: SecurityConfigurationRuleProtocol;
126125
readonly provisioningState?: ProvisioningState;
@@ -3017,7 +3016,6 @@ export interface DefaultAdminRule extends BaseAdminRule {
30173016
readonly destinations?: AddressPrefixItem[];
30183017
readonly direction?: SecurityConfigurationRuleDirection;
30193018
flag?: string;
3020-
kind: "Default";
30213019
readonly priority?: number;
30223020
readonly protocol?: SecurityConfigurationRuleProtocol;
30233021
readonly provisioningState?: ProvisioningState;

‎sdk/network/arm-network/src/models/index.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11183,8 +11183,6 @@ export interface NetworkRule extends FirewallPolicyRule {
1118311183

1118411184
/** Network admin rule. */
1118511185
export interface AdminRule extends BaseAdminRule {
11186-
/** Polymorphic discriminator, which specifies the different types this object can be */
11187-
kind: "Custom";
1118811186
/** A description for this rule. Restricted to 140 chars. */
1118911187
description?: string;
1119011188
/** Network protocol this rule applies to. */
@@ -11212,8 +11210,6 @@ export interface AdminRule extends BaseAdminRule {
1121211210

1121311211
/** Network default admin rule. */
1121411212
export interface DefaultAdminRule extends BaseAdminRule {
11215-
/** Polymorphic discriminator, which specifies the different types this object can be */
11216-
kind: "Default";
1121711213
/**
1121811214
* A description for this rule. Restricted to 140 chars.
1121911215
* NOTE: This property will not be serialized. It can only be populated by the server.

‎sdk/network/arm-network/src/models/mappers.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29767,8 +29767,8 @@ export const AdminRule: coreClient.CompositeMapper = {
2976729767
type: {
2976829768
name: "Composite",
2976929769
className: "AdminRule",
29770-
uberParent: "BaseAdminRule",
29771-
polymorphicDiscriminator: BaseAdminRule.type.polymorphicDiscriminator,
29770+
uberParent: "ChildResource",
29771+
polymorphicDiscriminator: ChildResource.type.polymorphicDiscriminator,
2977229772
modelProperties: {
2977329773
...BaseAdminRule.type.modelProperties,
2977429774
description: {
@@ -29867,8 +29867,8 @@ export const DefaultAdminRule: coreClient.CompositeMapper = {
2986729867
type: {
2986829868
name: "Composite",
2986929869
className: "DefaultAdminRule",
29870-
uberParent: "BaseAdminRule",
29871-
polymorphicDiscriminator: BaseAdminRule.type.polymorphicDiscriminator,
29870+
uberParent: "ChildResource",
29871+
polymorphicDiscriminator: ChildResource.type.polymorphicDiscriminator,
2987229872
modelProperties: {
2987329873
...BaseAdminRule.type.modelProperties,
2987429874
description: {
@@ -30108,6 +30108,6 @@ export let discriminators = {
3010830108
"FirewallPolicyRule.ApplicationRule": ApplicationRule,
3010930109
"FirewallPolicyRule.NatRule": NatRule,
3011030110
"FirewallPolicyRule.NetworkRule": NetworkRule,
30111-
"BaseAdminRule.Custom": AdminRule,
30112-
"BaseAdminRule.Default": DefaultAdminRule
30111+
"ChildResource.Custom": AdminRule,
30112+
"ChildResource.Default": DefaultAdminRule
3011330113
};

‎sdk/network/arm-network/src/networkManagementClient.ts‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ export class NetworkManagementClient extends coreClient.ServiceClient {
358358
credential: credentials
359359
};
360360

361-
const packageDetails = `azsdk-js-arm-network/30.0.1`;
361+
const packageDetails = `azsdk-js-arm-network/31.0.0`;
362362
const userAgentPrefix =
363363
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
364364
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -378,34 +378,27 @@ export class NetworkManagementClient extends coreClient.ServiceClient {
378378
};
379379
super(optionsWithDefaults);
380380

381-
let bearerTokenAuthenticationPolicyFound: boolean = false;
382381
if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
383382
const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
384-
bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
383+
const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
385384
(pipelinePolicy) =>
386385
pipelinePolicy.name ===
387386
coreRestPipeline.bearerTokenAuthenticationPolicyName
388387
);
389-
}
390-
if (
391-
!options ||
392-
!options.pipeline ||
393-
options.pipeline.getOrderedPolicies().length == 0 ||
394-
!bearerTokenAuthenticationPolicyFound
395-
) {
396-
this.pipeline.removePolicy({
397-
name: coreRestPipeline.bearerTokenAuthenticationPolicyName
398-
});
399-
this.pipeline.addPolicy(
400-
coreRestPipeline.bearerTokenAuthenticationPolicy({
401-
credential: credentials,
402-
scopes: `${optionsWithDefaults.credentialScopes}`,
403-
challengeCallbacks: {
404-
authorizeRequestOnChallenge:
405-
coreClient.authorizeRequestOnClaimChallenge
406-
}
407-
})
408-
);
388+
if (!bearerTokenAuthenticationPolicyFound) {
389+
this.pipeline.removePolicy({
390+
name: coreRestPipeline.bearerTokenAuthenticationPolicyName
391+
});
392+
this.pipeline.addPolicy(
393+
coreRestPipeline.bearerTokenAuthenticationPolicy({
394+
scopes: `${optionsWithDefaults.baseUri}/.default`,
395+
challengeCallbacks: {
396+
authorizeRequestOnChallenge:
397+
coreClient.authorizeRequestOnClaimChallenge
398+
}
399+
})
400+
);
401+
}
409402
}
410403
// Parameter assignments
411404
this.subscriptionId = subscriptionId;

0 commit comments

Comments
 (0)