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

Fixes ExampleId type and incorrect ArmTokenParameter name (Azure#12896) Co-authored-by: Younes <[email protected]>
AzureSDKAutomation · Feb 9, 2021 · f687e44 · f687e44
1 parent 7bee627
commit f687e44
Show file tree

Hide file tree

Showing 28 changed files with 134 additions and 149 deletions.
diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/LICENSE.txt b/sdk/cognitiveservices/cognitiveservices-luis-authoring/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Microsoft
+Copyright (c) 2021 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/sdk/cognitiveservices/cognitiveservices-luis-authoring/README.md b/sdk/cognitiveservices/cognitiveservices-luis-authoring/README.md
@@ -2,11 +2,6 @@
 
 This package contains an isomorphic SDK for LUISAuthoringClient.
 
-Package version | LUIS Authoring API version
---------------- | --------------------------
-3.0.0           |  /luis/api/v2.0
-4.0.0-preview.3 |  /luis/authoring/v3.0-preview
-
 ### Currently supported environments
 
 - Node.js version 6.x.x or higher
@@ -20,85 +15,83 @@ npm install @azure/cognitiveservices-luis-authoring
 
 ### How to use
 
-#### nodejs - Authentication, client creation and listPhraseLists features as an example written in TypeScript.
+#### nodejs - client creation and listPhraseLists features as an example written in TypeScript.
 
-##### Install @azure/ms-rest-azure-js
+##### Install @azure/ms-rest-nodeauth
 
+- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
 ```bash
-npm install @azure/ms-rest-azure-js
+npm install @azure/ms-rest-nodeauth@"^3.0.0"
 ```
 
 ##### Sample code
 
-```javascript
-const { CognitiveServicesCredentials } = require("@azure/ms-rest-azure-js");
+While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
+```typescript
+const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
 const { LUISAuthoringClient } = require("@azure/cognitiveservices-luis-authoring");
-
-let authoringKey = process.env["luis-authoring-key"];
-const creds = new CognitiveServicesCredentials(authoringKey);
-
-// check the following link to find your region
-// https://docs.microsoft.com/azure/cognitive-services/luis/luis-reference-regions
-const region = "<your-region>";
-const client = new LUISAuthoringClient(
-  creds,
-  "https://" + region + ".api.cognitive.microsoft.com/"
-);
-
-const appId = "<your-app-id>"; // replace this with your appId.
-const versionId = "0.1"; // replace with version of your luis application. Initial value will be 0.1
-
-const skip = 1;
-const take = 1;
-
-client.features
-  .listPhraseLists(appId, versionId, { skip, take })
-  .then((result) => {
+const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
+
+msRestNodeAuth.interactiveLogin().then((creds) => {
+  const client = new LUISAuthoringClient(creds, subscriptionId);
+  const appId = ec7b1657-199d-4d8a-bbb2-89a11a42e02a;
+  const versionId = "testversionId";
+  const skip = 1;
+  const take = 1;
+  client.features.listPhraseLists(appId, versionId, skip, take).then((result) => {
     console.log("The result is:");
     console.log(result);
-  })
-  .catch((err) => {
-    console.error(err);
   });
+}).catch((err) => {
+  console.error(err);
+});
 ```
 
 #### browser - Authentication, client creation and listPhraseLists features as an example written in JavaScript.
 
+##### Install @azure/ms-rest-browserauth
+
+```bash
+npm install @azure/ms-rest-browserauth
+```
 
 ##### Sample code
 
-- index.html
+See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.
 
+- index.html
 ```html
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <title>@azure/cognitiveservices-luis-authoring sample</title>
     <script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
+    <script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
     <script src="node_modules/@azure/cognitiveservices-luis-authoring/dist/cognitiveservices-luis-authoring.js"></script>
     <script type="text/javascript">
-      let authoringKey = process.env["luis-authoring-key"];
-      const creds = new msRest.ApiKeyCredentials({ inHeader: { 'Ocp-Apim-Subscription-Key': authoringKey } });
-
-      const region = "<your-region>";
-      const client = new Azure.CognitiveservicesLuisAuthoring.LUISAuthoringClient(
-        creds,
-        "https://" + region + ".api.cognitive.microsoft.com/"
-      );
-      const appId = "<your-app-id>"; // replace this with your appId.
-      const versionId = "0.1"; // replace with version of your luis application. Initial value will be 0.1
-      const skip = 1;
-      const take = 1;
-      client.features
-        .listPhraseLists(appId, versionId, { skip, take })
-        .then((result) => {
+      const subscriptionId = "<Subscription_Id>";
+      const authManager = new msAuth.AuthManager({
+        clientId: "<client id for your Azure AD app>",
+        tenant: "<optional tenant for your organization>"
+      });
+      authManager.finalizeLogin().then((res) => {
+        if (!res.isLoggedIn) {
+          // may cause redirects
+          authManager.login();
+        }
+        const client = new Azure.CognitiveservicesLuisAuthoring.LUISAuthoringClient(res.creds, subscriptionId);
+        const appId = ec7b1657-199d-4d8a-bbb2-89a11a42e02a;
+        const versionId = "testversionId";
+        const skip = 1;
+        const take = 1;
+        client.features.listPhraseLists(appId, versionId, skip, take).then((result) => {
           console.log("The result is:");
           console.log(result);
-        })
-        .catch((err) => {
+        }).catch((err) => {
           console.log("An error occurred:");
           console.error(err);
         });
+      });
     </script>
   </head>
   <body></body>
@@ -109,4 +102,4 @@ client.features
 
 - [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%2Fsdk%2Fcognitiveservices%2Fcognitiveservices-luis-authoring%2FREADME.png)
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/cognitiveservices/cognitiveservices-luis-authoring/README.png)
diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/package.json b/sdk/cognitiveservices/cognitiveservices-luis-authoring/package.json
@@ -4,7 +4,7 @@
   "description": "LUISAuthoringClient Library with typescript type definitions for node.js and browser.",
   "version": "4.0.0-preview.3",
   "dependencies": {
-    "@azure/ms-rest-js": "^2.0.3",
+    "@azure/ms-rest-js": "^2.0.4",
     "tslib": "^1.10.0"
   },
   "keywords": [
@@ -19,20 +19,13 @@
   "module": "./esm/lUISAuthoringClient.js",
   "types": "./esm/lUISAuthoringClient.d.ts",
   "devDependencies": {
-    "@types/chai": "^4.2.0",
-    "@types/mocha": "^5.2.7",
-    "mocha": "^6.1.4",
-    "nock": "^10.0.0",
-    "rollup": "^0.66.2",
-    "@azure/ms-rest-azure-js": "^2.0.1",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "typescript": "^3.5.3",
+    "rollup": "^1.18.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
-    "ts-node": "^8.3.0",
-    "typescript": "^3.1.1",
-    "uglify-js": "^3.4.9",
-    "ts-mocha": "^6.0.0"
+    "uglify-js": "^3.6.0"
   },
-  "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/sdk/cognitiveservices/cognitiveservices-luis-authoring",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/cognitiveservices/cognitiveservices-luis-authoring",
   "repository": {
     "type": "git",
     "url": "https://github.com/Azure/azure-sdk-for-js.git"
@@ -57,8 +50,7 @@
   "scripts": {
     "build": "tsc && rollup -c rollup.config.js && npm run minify",
     "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/cognitiveservices-luis-authoring.js.map'\" -o ./dist/cognitiveservices-luis-authoring.min.js ./dist/cognitiveservices-luis-authoring.js",
-    "prepack": "npm install && npm run build",
-    "test": "ts-mocha -p tsconfig.test.json test/**/*.test.ts --timeout 100000"
+    "prepack": "npm install && npm run build"
   },
   "sideEffects": false,
   "autoPublish": true

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/rollup.config.js b/sdk/cognitiveservices/cognitiveservices-luis-authoring/rollup.config.js
@@ -21,10 +21,9 @@ const config = {
       "@azure/ms-rest-azure-js": "msRestAzure"
     },
     banner: `/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- * 
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */`

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/lUISAuthoringClient.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/lUISAuthoringClient.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/lUISAuthoringClientContext.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/lUISAuthoringClientContext.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/appsMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/appsMappers.ts
@@ -1,8 +1,7 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- * 
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/azureAccountsMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/azureAccountsMappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/examplesMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/examplesMappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/featuresMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/featuresMappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/index.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/index.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
@@ -2379,6 +2378,16 @@ export interface VersionsImportLuFormatOptionalParams extends msRest.RequestOpti
   versionId?: string;
 }
 
+/**
+ * Optional Parameters.
+ */
+export interface TrainTrainVersionOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * An enum value specifying mode of training.
+   */
+  mode?: string;
+}
+
 /**
  * Optional Parameters.
  */

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/mappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/mappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/modelMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/modelMappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/parameters.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/parameters.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is
@@ -217,6 +216,18 @@ export const itemId: msRest.OperationURLParameter = {
     }
   }
 };
+export const mode: msRest.OperationQueryParameter = {
+  parameterPath: [
+    "options",
+    "mode"
+  ],
+  mapper: {
+    serializedName: "mode",
+    type: {
+      name: "String"
+    }
+  }
+};
 export const modelId: msRest.OperationURLParameter = {
   parameterPath: "modelId",
   mapper: {

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/patternMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/patternMappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/settingsMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/settingsMappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/trainMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/trainMappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.

diff --git a/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/versionsMappers.ts b/sdk/cognitiveservices/cognitiveservices-luis-authoring/src/models/versionsMappers.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.