[v6] Complete support for LRO (#611)

* Transform OperationOptions to BaseRequestOptions

* Keep original request state

* Mode strategy discovery to LRO poller

* Override delay in tests

* Update LRO tests

* Fix unit Tests

* generate all test swaggers

* Add AzureASyncOperation

* Fix tests

* re-generate everything

* Fix injection issue

* Fixes in LRO Policy

* re-gen

* Refactor strategy methods

* Add tests

* Re generate

* enable test postDoubleHeadersFinalAzureHeaderGetDefault

* safely build path for copying LRO files

* Move response injection to generation

* Regen everything with latest testserver

* Use core-http dev and update test-server

* Update generated files

* renegerate

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "trailingComma": "none"
+}

.vscode/launch.json

@@ -51,6 +51,23 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "protocol": "inspector"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "IntegrationTests - Current File",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": [
+        "-r",
+        "ts-node/register",
+        "--timeout",
+        "999999",
+        "--colors",
+        "${workspaceFolder}/${relativeFile}"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "protocol": "inspector"
     }
   ]
 }

package.json

@@ -29,7 +29,7 @@
         "@azure-tools/codemodel": "4.13.317",
         "@azure-tools/linq": "3.1.206",
         "@azure-tools/openapi": "3.0.209",
-        "@azure/core-http": "^1.0.4",
+        "@azure/core-http": "^1.1.1-dev.20200410.1",
         "@azure/core-lro": "^1.0.1",
         "@azure/core-paging": "^1.0.0",
         "@azure/logger": "^1.0.0",

src/generators/LROGenerator.ts

@@ -2,6 +2,7 @@ import { ClientDetails } from "../models/clientDetails";
 import { Project } from "ts-morph";
 import { OperationGroupDetails } from "../models/operationDetails";
 import { promises } from "fs";
+import { join as joinPath } from "path";
 
 export async function generateLROFiles(
   clientDetails: ClientDetails,
@@ -11,19 +12,16 @@ export async function generateLROFiles(
     return;
   }
 
-  const lroFiles = [
-    { name: "bodyPollingStrategy", file: "./src/lro/bodyPollingStrategy.ts" },
-    { name: "lroPoller", file: "./src/lro/lroPoller.ts" },
-    { name: "models", file: "./src/lro/models.ts" },
-    { name: "operation", file: "./src/lro/operation.ts" }
-  ];
+  const lroDir = joinPath(__dirname, "..", "..", "..", "src", "lro");
+  const lroFiles = await promises.readdir(lroDir);
 
   for (let i = 0; i < lroFiles.length; i++) {
-    const { name, file } = lroFiles[i];
-    const fileContent = await promises.readFile(file, "utf-8");
+    const file = lroFiles[i];
+    const filePath = joinPath(lroDir, file);
+    const fileContent = await promises.readFile(filePath, "utf-8");
 
     project.createSourceFile(
-      `${clientDetails.srcPath}/lro/${name}.ts`,
+      joinPath(clientDetails.srcPath || "", "lro", file),
       fileContent,
       { overwrite: true }
     );

src/generators/clientContextFileGenerator.ts

@@ -25,6 +25,11 @@ export function generateClientContext(
   const clientParams = clientDetails.parameters.filter(
     param => param.implementationLocation === ImplementationLocation.Client
   );
+
+  const hasLRO = clientDetails.operationGroups.some(og =>
+    og.operations.some(o => o.isLRO)
+  );
+
   const clientContextClassName = `${clientDetails.className}Context`;
   const clientContextFileName = normalizeName(
     clientContextClassName,
@@ -39,7 +44,7 @@ export function generateClientContext(
     }
   );
 
-  writeImports(sourceFile);
+  writeImports(sourceFile, hasLRO);
   writePackageInfo(sourceFile, packageDetails);
 
   const contextClass = buildClass(sourceFile, clientContextClassName);
@@ -51,18 +56,22 @@ export function generateClientContext(
     clientParams
   });
 
-  writeConstructorBody(classConstructor, {
-    clientParams,
-    clientDetails
-  });
+  writeConstructorBody(
+    classConstructor,
+    {
+      clientParams,
+      clientDetails
+    },
+    hasLRO
+  );
 }
 
 interface WriteConstructorBodyParameters {
   clientParams: ParameterDetails[];
   clientDetails: ClientDetails;
 }
 
-function writeImports(sourceFile: SourceFile) {
+function writeImports(sourceFile: SourceFile, hasLRO: boolean) {
   sourceFile.addImportDeclaration({
     namespaceImport: "coreHttp",
     moduleSpecifier: "@azure/core-http"
@@ -72,6 +81,13 @@ function writeImports(sourceFile: SourceFile) {
     namespaceImport: "Models",
     moduleSpecifier: "./models"
   });
+
+  if (hasLRO) {
+    sourceFile.addImportDeclaration({
+      namedImports: ["lroPolicy"],
+      moduleSpecifier: "./lro"
+    });
+  }
 }
 
 function writePackageInfo(
@@ -104,7 +120,8 @@ function writeClassProperties(
 
 function writeConstructorBody(
   classConstructor: ConstructorDeclaration,
-  { clientParams, clientDetails }: WriteConstructorBodyParameters
+  { clientParams, clientDetails }: WriteConstructorBodyParameters,
+  hasLRO: boolean
 ) {
   const requiredParams = getRequiredParameters(clientParams);
   const addBlankLine = true;
@@ -113,7 +130,10 @@ function writeConstructorBody(
   classConstructor.addStatements([
     writeStatements(getRequiredParamChecks(requiredParams), addBlankLine),
     writeStatement(
-      writeDefaultOptions(clientParams.some(p => p.name === "credentials"))
+      writeDefaultOptions(
+        clientParams.some(p => p.name === "credentials"),
+        hasLRO
+      )
     ),
     writeStatement(getEndpointStatement(clientDetails.endpoint), addBlankLine),
     requiredParameters.length ? "// Parameter assignments" : "",
@@ -141,7 +161,16 @@ const writeStatements = (lines: string[], shouldAddBlankLine = false) => (
   shouldAddBlankLine && writer.blankLine();
 };
 
-function writeDefaultOptions(hasCredentials: boolean) {
+function writeDefaultOptions(hasCredentials: boolean, hasLRO: boolean) {
+  const policies = ` 
+  const defaultPipelines = coreHttp.createPipelineFromOptions(options)
+      .requestPolicyFactories as coreHttp.RequestPolicyFactory[];
+
+  options = {
+      ...options,
+      requestPolicyFactories: [lroPolicy(), ...defaultPipelines]
+    };`;
+
   return `// Initializing default values for options
   if (!options) {
      options = {};
@@ -152,6 +181,8 @@ function writeDefaultOptions(hasCredentials: boolean) {
      options.userAgent = \`\${packageName}/\${packageVersion} \${defaultUserAgent}\`;
    }
   
+   ${hasLRO ? policies : ""}
+
   super(${hasCredentials ? "credentials" : `undefined`}, options);
   
   this.requestContentType = "application/json; charset=utf-8";