refactor: Adapt poetry for modern logs

Author: pgrzesik

lib/poetry.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const fse = require('fs-extra');
 const path = require('path');
+
 const spawn = require('child-process-ext/spawn');
 const tomlParse = require('@iarna/toml/parse-string');
 
@@ -12,58 +13,75 @@ async function pyprojectTomlToRequirements() {
     return;
   }
 
-  this.serverless.cli.log('Generating requirements.txt from pyproject.toml...');
+  let generateRequirementsProgress;
+  if (this.progress) {
+    generateRequirementsProgress = this.progress.get(
+      'python-generate-requirements-toml'
+    );
+  } else {
+    this.serverless.cli.log(
+      'Generating requirements.txt from pyproject.toml...'
+    );
+  }
 
   try {
-    await spawn(
-      'poetry',
-      [
-        'export',
-        '--without-hashes',
-        '-f',
-        'requirements.txt',
-        '-o',
-        'requirements.txt',
-        '--with-credentials',
-      ],
-      {
-        cwd: this.servicePath,
-      }
-    );
-  } catch (e) {
-    if (
-      e.stderrBuffer &&
-      e.stderrBuffer.toString().includes('command not found')
-    ) {
-      throw new Error(
-        `poetry not found! Install it according to the poetry docs.`
+    try {
+      await spawn(
+        'poetry',
+        [
+          'export',
+          '--without-hashes',
+          '-f',
+          'requirements.txt',
+          '-o',
+          'requirements.txt',
+          '--with-credentials',
+        ],
+        {
+          cwd: this.servicePath,
+        }
       );
+    } catch (e) {
+      if (
+        e.stderrBuffer &&
+        e.stderrBuffer.toString().includes('command not found')
+      ) {
+        throw new Error(
+          `poetry not found! Install it according to the poetry docs.`
+        );
+      }
+      throw e;
     }
-    throw e;
-  }
 
-  const editableFlag = new RegExp(/^-e /gm);
-  const sourceRequirements = path.join(this.servicePath, 'requirements.txt');
-  const requirementsContents = fse.readFileSync(sourceRequirements, {
-    encoding: 'utf-8',
-  });
+    const editableFlag = new RegExp(/^-e /gm);
+    const sourceRequirements = path.join(this.servicePath, 'requirements.txt');
+    const requirementsContents = fse.readFileSync(sourceRequirements, {
+      encoding: 'utf-8',
+    });
 
-  if (requirementsContents.match(editableFlag)) {
-    this.serverless.cli.log(
-      'The generated file contains -e flags, removing them...'
-    );
-    fse.writeFileSync(
+    if (requirementsContents.match(editableFlag)) {
+      if (this.log) {
+        this.log.info('The generated file contains -e flags, removing them');
+      } else {
+        this.serverless.cli.log(
+          'The generated file contains -e flags, removing them...'
+        );
+      }
+      fse.writeFileSync(
+        sourceRequirements,
+        requirementsContents.replace(editableFlag, '')
+      );
+    }
+
+    fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
+    fse.moveSync(
       sourceRequirements,
-      requirementsContents.replace(editableFlag, '')
+      path.join(this.servicePath, '.serverless', 'requirements.txt'),
+      { overwrite: true }
     );
+  } finally {
+    generateRequirementsProgress && generateRequirementsProgress.remove();
   }
-
-  fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
-  fse.moveSync(
-    sourceRequirements,
-    path.join(this.servicePath, '.serverless', 'requirements.txt'),
-    { overwrite: true }
-  );
 }
 
 /**