CodeGen from PR 21040 in Azure/azure-rest-api-specs

Merge 7bd52349f9ff83af1cf1f034be5bd3b0529fca93 into 42b348107ef4a56801065d8d2b98dfb425044cf1

Author: SDKAuto

common/config/rush/pnpm-lock.yaml

@@ -1,8 +1,8 @@
 {
-  "commit": "065b070773ed6fa98ede768ad602f4c4d2edf739",
+  "commit": "ee679ba59913797507f3bfcf191a6ad53d1a1306",
   "readme": "specification/network/resource-manager/readme.md",
-  "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",
+  "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]",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/[email protected].2",
-  "use": "@autorest/[email protected].20220727.1"
+  "release_tool": "@azure-tools/[email protected].4",
+  "use": "@autorest/[email protected]"
 }

sdk/network/arm-network/_meta.json

@@ -28,15 +28,15 @@
   "module": "./dist-esm/src/index.js",
   "types": "./types/arm-network.d.ts",
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.31.1",
+    "@microsoft/api-extractor": "7.18.11",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-multi-entry": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
     "mkdirp": "^1.0.4",
     "rollup": "^2.66.1",
     "rollup-plugin-sourcemaps": "^0.6.3",
-    "typescript": "~4.6.0",
+    "typescript": "~4.2.0",
     "uglify-js": "^3.4.9",
     "rimraf": "^3.0.0",
     "@azure/identity": "^2.0.1",
@@ -109,13 +109,5 @@
       }
     ]
   },
-  "autoPublish": true,
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-network?view=azure-node-preview"
-  }
-}
+  "autoPublish": true
+}

sdk/network/arm-network/package.json

@@ -120,7 +120,6 @@ export interface AdminRule extends BaseAdminRule {
     destinationPortRanges?: string[];
     destinations?: AddressPrefixItem[];
     direction?: SecurityConfigurationRuleDirection;
-    kind: "Custom";
     priority?: number;
     protocol?: SecurityConfigurationRuleProtocol;
     readonly provisioningState?: ProvisioningState;
@@ -3017,7 +3016,6 @@ export interface DefaultAdminRule extends BaseAdminRule {
     readonly destinations?: AddressPrefixItem[];
     readonly direction?: SecurityConfigurationRuleDirection;
     flag?: string;
-    kind: "Default";
     readonly priority?: number;
     readonly protocol?: SecurityConfigurationRuleProtocol;
     readonly provisioningState?: ProvisioningState;

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

@@ -11183,8 +11183,6 @@ export interface NetworkRule extends FirewallPolicyRule {
 
 /** Network admin rule. */
 export interface AdminRule extends BaseAdminRule {
-  /** Polymorphic discriminator, which specifies the different types this object can be */
-  kind: "Custom";
   /** A description for this rule. Restricted to 140 chars. */
   description?: string;
   /** Network protocol this rule applies to. */
@@ -11212,8 +11210,6 @@ export interface AdminRule extends BaseAdminRule {
 
 /** Network default admin rule. */
 export interface DefaultAdminRule extends BaseAdminRule {
-  /** Polymorphic discriminator, which specifies the different types this object can be */
-  kind: "Default";
   /**
    * A description for this rule. Restricted to 140 chars.
    * NOTE: This property will not be serialized. It can only be populated by the server.

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

@@ -29767,8 +29767,8 @@ export const AdminRule: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AdminRule",
-    uberParent: "BaseAdminRule",
-    polymorphicDiscriminator: BaseAdminRule.type.polymorphicDiscriminator,
+    uberParent: "ChildResource",
+    polymorphicDiscriminator: ChildResource.type.polymorphicDiscriminator,
     modelProperties: {
       ...BaseAdminRule.type.modelProperties,
       description: {
@@ -29867,8 +29867,8 @@ export const DefaultAdminRule: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DefaultAdminRule",
-    uberParent: "BaseAdminRule",
-    polymorphicDiscriminator: BaseAdminRule.type.polymorphicDiscriminator,
+    uberParent: "ChildResource",
+    polymorphicDiscriminator: ChildResource.type.polymorphicDiscriminator,
     modelProperties: {
       ...BaseAdminRule.type.modelProperties,
       description: {
@@ -30108,6 +30108,6 @@ export let discriminators = {
   "FirewallPolicyRule.ApplicationRule": ApplicationRule,
   "FirewallPolicyRule.NatRule": NatRule,
   "FirewallPolicyRule.NetworkRule": NetworkRule,
-  "BaseAdminRule.Custom": AdminRule,
-  "BaseAdminRule.Default": DefaultAdminRule
+  "ChildResource.Custom": AdminRule,
+  "ChildResource.Default": DefaultAdminRule
 };