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

Review request for Microsoft.ContainerService to add version 2022-02-01 (Azure#18324) * Adds base for updating Microsoft.ContainerService from version stable/2022-01-01 to version 2022-02-01 * Updates readme * Updates API version in new specs and examples * Update readmes for the 2022-02-01 dev branch of container service (Azure#17887) * update readme * remove useless -only tags * Fix violated rule R2026 for 2022-02-01 managedCluster swagger (Azure#18024) * fix allof * add missing type * GA alias minor version (Azure#18038) * GA alias minor version * polish more details on kubernetesVersion and currentKubernetesVersion * Update specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2022-02-01/managedClusters.json minor revision Co-authored-by: Matthew Christopher <[email protected]> Co-authored-by: Matthew Christopher <[email protected]> * add missing type object (Azure#18115) * Revert "GA alias minor version (Azure#18038)" (Azure#18291) This reverts commit 3a99cda3cb48e05c74923f5467c0737014322b0f. * Align modifications of several common definitions with 2022-02-02-preview for container service 2022-02-01 (Azure#18216) * sync modification * fix ref Co-authored-by: Jianping Zeng <[email protected]> Co-authored-by: Matthew Christopher <[email protected]>
AzureSDKAutomation · Mar 22, 2022 · c604780 · c604780
1 parent 79fdcd8
commit c604780
Show file tree

Hide file tree

Showing 28 changed files with 383 additions and 300 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/sdk/containerservice/arm-containerservice/CHANGELOG.md b/sdk/containerservice/arm-containerservice/CHANGELOG.md
@@ -1,15 +1,12 @@
 # Release History
+
+## 15.2.0 (2022-03-22)
+
+**Features**
 
-## 15.1.1 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
-
+  - Interface Resource has a new optional parameter systemData
+
+
 ## 15.1.0 (2022-02-24)
 
 **Features**

diff --git a/sdk/containerservice/arm-containerservice/README.md b/sdk/containerservice/arm-containerservice/README.md
@@ -16,8 +16,6 @@ The Container Service Client.
 - [LTS versions of Node.js](https://nodejs.org/about/releases/)
 - Latest versions of Safari, Chrome, Edge and Firefox.
 
-See our [support policy](https://github.com/Azure/azure-sdk-for-js/blob/main/SUPPORT.md) for more details.
-
 ### Prerequisites
 
 - An [Azure subscription][azure_sub].
@@ -51,17 +49,8 @@ For more information about how to create an Azure AD Application check out [this
 ```javascript
 const { ContainerServiceClient } = require("@azure/arm-containerservice");
 const { DefaultAzureCredential } = require("@azure/identity");
-// For client-side applications running in the browser, use InteractiveBrowserCredential instead of DefaultAzureCredential. See https://aka.ms/azsdk/js/identity/examples for more details.
-
 const subscriptionId = "00000000-0000-0000-0000-000000000000";
 const client = new ContainerServiceClient(new DefaultAzureCredential(), subscriptionId);
-
-// For client-side applications running in the browser, use this code instead:
-// const credential = new InteractiveBrowserCredential({
-//   tenantId: "<YOUR_TENANT_ID>",
-//   clientId: "<YOUR_CLIENT_ID>"
-// });
-// const client = new ContainerServiceClient(credential, subscriptionId);
 ```
 
 

diff --git a/sdk/containerservice/arm-containerservice/_meta.json b/sdk/containerservice/arm-containerservice/_meta.json
@@ -1,7 +1,8 @@
 {
-  "commit": "9f48feaf684784644513d11ddb7bd0ac2e32f48e",
+  "commit": "2fbe5679bf51f8c2d0585525f6fdf89ce5f9ef83",
   "readme": "specification/containerservice/resource-manager/readme.md",
-  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/containerservice/resource-manager/readme.md --use=@autorest/[email protected].20220221.1 --generate-sample=true",
+  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/containerservice/resource-manager/readme.md --use=@autorest/[email protected].20220105.1",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "use": "@autorest/[email protected]"
+  "release_tool": "@azure-tools/[email protected]",
+  "use": "@autorest/[email protected]"
 }
diff --git a/sdk/containerservice/arm-containerservice/package.json b/sdk/containerservice/arm-containerservice/package.json
@@ -3,7 +3,7 @@
   "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
   "description": "A generated SDK for ContainerServiceClient.",
-  "version": "15.1.1",
+  "version": "15.2.0",
   "engines": {
     "node": ">=12.0.0"
   },
@@ -29,13 +29,13 @@
   "types": "./types/arm-containerservice.d.ts",
   "devDependencies": {
     "@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",
+    "@rollup/plugin-commonjs": "11.0.2",
+    "@rollup/plugin-json": "^4.0.0",
+    "@rollup/plugin-multi-entry": "^3.0.0",
+    "@rollup/plugin-node-resolve": "^8.0.0",
     "mkdirp": "^1.0.4",
-    "rollup": "^2.66.1",
-    "rollup-plugin-sourcemaps": "^0.6.3",
+    "rollup": "^1.16.3",
+    "rollup-plugin-sourcemaps": "^0.4.2",
     "typescript": "~4.2.0",
     "uglify-js": "^3.4.9",
     "rimraf": "^3.0.0",
@@ -98,21 +98,5 @@
     "docs": "echo skipped"
   },
   "sideEffects": false,
-  "//metadata": {
-    "constantPaths": [
-      {
-        "path": "src/containerServiceClient.ts",
-        "prefix": "packageDetails"
-      }
-    ]
-  },
-  "autoPublish": true,
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-containerservice?view=azure-node-preview"
-  }
-}
+  "autoPublish": true
+}
diff --git a/sdk/containerservice/arm-containerservice/review/arm-containerservice.api.md b/sdk/containerservice/arm-containerservice/review/arm-containerservice.api.md
@@ -1771,6 +1771,7 @@ export interface Resource {
     readonly id?: string;
     location: string;
     readonly name?: string;
+    readonly systemData?: SystemData;
     tags?: {
         [propertyName: string]: string;
     };
@@ -1814,7 +1815,6 @@ export type ScaleSetPriority = string;
 
 // @public
 export type Snapshot = Resource & {
-    readonly systemData?: SystemData;
     creationData?: CreationData;
     snapshotType?: SnapshotType;
     readonly kubernetesVersion?: string;

diff --git a/sdk/containerservice/arm-containerservice/rollup.config.js b/sdk/containerservice/arm-containerservice/rollup.config.js
@@ -14,14 +14,62 @@ import json from "@rollup/plugin-json";
 
 import nodeBuiltins from "builtin-modules";
 
+/**
+ * Gets the proper configuration needed for rollup's commonJS plugin for @opentelemetry/api.
+ *
+ * NOTE: this manual configuration is only needed because OpenTelemetry uses an
+ * __exportStar downleveled helper function to declare its exports which confuses
+ * rollup's automatic discovery mechanism.
+ *
+ * @returns an object reference that can be `...`'d into your cjs() configuration.
+ */
+export function openTelemetryCommonJs() {
+  const namedExports = {};
+
+  for (const key of [
+    "@opentelemetry/api",
+    "@azure/core-tracing/node_modules/@opentelemetry/api"
+  ]) {
+    namedExports[key] = [
+      "SpanKind",
+      "TraceFlags",
+      "getSpan",
+      "setSpan",
+      "SpanStatusCode",
+      "getSpanContext",
+      "setSpanContext"
+    ];
+  }
+
+  const releasedOpenTelemetryVersions = ["0.10.2", "1.0.0-rc.0"];
+
+  for (const version of releasedOpenTelemetryVersions) {
+    namedExports[
+      // working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path.
+      `../../../common/temp/node_modules/.pnpm/@opentelemetry/api@${version}/node_modules/@opentelemetry/api/build/src/index.js`
+    ] = [
+      "SpanKind",
+      "TraceFlags",
+      "getSpan",
+      "setSpan",
+      "StatusCode",
+      "CanonicalCode",
+      "getSpanContext",
+      "setSpanContext"
+    ];
+  }
+
+  return namedExports;
+}
+
 // #region Warning Handler
 
 /**
- * A function that can determine whether a rollup warning should be ignored. If
+ * A function that can determine whether a rollupwarning should be ignored. If
  * the function returns `true`, then the warning will not be displayed.
  */
 
-function ignoreNiseSinonEval(warning) {
+function ignoreNiseSinonEvalWarnings(warning) {
   return (
     warning.code === "EVAL" &&
     warning.id &&
@@ -30,14 +78,17 @@ function ignoreNiseSinonEval(warning) {
   );
 }
 
-function ignoreChaiCircularDependency(warning) {
+function ignoreChaiCircularDependencyWarnings(warning) {
   return (
     warning.code === "CIRCULAR_DEPENDENCY" &&
     warning.importer && warning.importer.includes("node_modules/chai") === true
   );
 }
 
-const warningInhibitors = [ignoreChaiCircularDependency, ignoreNiseSinonEval];
+const warningInhibitors = [
+  ignoreChaiCircularDependencyWarnings,
+  ignoreNiseSinonEvalWarnings
+];
 
 /**
  * Construct a warning handler for the shared rollup configuration
@@ -71,7 +122,22 @@ function makeBrowserTestConfig() {
       nodeResolve({
         mainFields: ["module", "browser"]
       }),
-      cjs(),
+      cjs({
+        namedExports: {
+          // Chai's strange internal architecture makes it impossible to statically
+          // analyze its exports.
+          chai: [
+            "version",
+            "use",
+            "util",
+            "config",
+            "expect",
+            "should",
+            "assert"
+          ],
+          ...openTelemetryCommonJs()
+        }
+      }),
       json(),
       sourcemaps()
       //viz({ filename: "dist-test/browser-stats.html", sourcemap: true })
@@ -107,7 +173,7 @@ export function makeConfig(pkg, options) {
     ],
     output: { file: "dist/index.js", format: "cjs", sourcemap: true },
     preserveSymlinks: false,
-    plugins: [sourcemaps(), nodeResolve()]
+    plugins: [sourcemaps(), nodeResolve(), cjs()]
   };
 
   const config = [baseConfig];

diff --git a/sdk/containerservice/arm-containerservice/src/containerServiceClient.ts b/sdk/containerservice/arm-containerservice/src/containerServiceClient.ts
@@ -38,8 +38,7 @@ export class ContainerServiceClient extends coreClient.ServiceClient {
   /**
    * Initializes a new instance of the ContainerServiceClient class.
    * @param credentials Subscription credentials which uniquely identify client subscription.
-   * @param subscriptionId Subscription credentials which uniquely identify Microsoft Azure subscription.
-   *                       The subscription ID forms part of the URI for every service call.
+   * @param subscriptionId The ID of the target subscription.
    * @param options The parameter options
    */
   constructor(
@@ -63,7 +62,7 @@ export class ContainerServiceClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-containerservice/15.1.1`;
+    const packageDetails = `azsdk-js-arm-containerservice/15.2.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -86,7 +85,7 @@ export class ContainerServiceClient extends coreClient.ServiceClient {
 
     // Assigning values to Constant parameters
     this.$host = options.$host || "https://management.azure.com";
-    this.apiVersion = options.apiVersion || "2022-01-01";
+    this.apiVersion = options.apiVersion || "2022-02-01";
     this.operations = new OperationsImpl(this);
     this.managedClusters = new ManagedClustersImpl(this);
     this.maintenanceConfigurations = new MaintenanceConfigurationsImpl(this);