Merge branch 'development' into 'master'

fix for whl filename

See merge request !230

dist/manager/ironbank/update.js

@@ -61,6 +61,7 @@ async function getPypiData(url) {
                     const output = {
                         sha: results.urls[i].digests.sha256,
                         updatedUrl: results.urls[i].url,
+                        updatedFilename: results.urls[i].filename,
                     };
                     return output;
                 }
@@ -140,12 +141,16 @@ async function updateDependency({ fileContent, upgrade, }) {
             }
             const newValue = upgrade.newValue;
             const oldUrl = upgrade.managerData.item.url;
+            const oldFilename = upgrade.managerData.item.filename;
             const searchURL = `https://pypi.org/pypi/${upgrade.depName}/${newValue}/json`;
             const updatedData = getPypiData(searchURL);
             let newContent = fileContent;
-            if ((await updatedData).sha && (await updatedData).updatedUrl) {
+            if ((await updatedData).sha &&
+                (await updatedData).updatedUrl &&
+                (await updatedData).updatedFilename) {
                 newContent = newContent.replace(upgrade.managerData.item.validation.value, (await updatedData).sha);
                 newContent = newContent.replace(oldUrl, (await updatedData).updatedUrl);
+                newContent = newContent.replace(oldFilename, (await updatedData).updatedFilename);
             }
             return newContent;
         }

lib/manager/ironbank/update.ts

@@ -55,7 +55,7 @@ async function getHashFromUrl(url: string): Promise<string | string> {
 
 async function getPypiData(
   url: string
-): Promise<{ sha: string; updatedUrl: string }> {
+): Promise<{ sha: string; updatedUrl: string; updatedFilename: string }> {
   logger.debug(`${'getPypiData:'} ${url} ${'filename'}`);
   try {
     const result = await http.get(url);
@@ -67,6 +67,7 @@ async function getPypiData(
           const output = {
             sha: results.urls[i].digests.sha256,
             updatedUrl: results.urls[i].url,
+            updatedFilename: results.urls[i].filename,
           };
 
           return output;
@@ -171,16 +172,25 @@ export async function updateDependency({
 
       const newValue = upgrade.newValue;
       const oldUrl = upgrade.managerData.item.url;
+      const oldFilename = upgrade.managerData.item.filename;
       const searchURL = `https://pypi.org/pypi/${upgrade.depName}/${newValue}/json`;
       const updatedData = getPypiData(searchURL);
 
       let newContent = fileContent;
-      if ((await updatedData).sha && (await updatedData).updatedUrl) {
+      if (
+        (await updatedData).sha &&
+        (await updatedData).updatedUrl &&
+        (await updatedData).updatedFilename
+      ) {
         newContent = newContent.replace(
           upgrade.managerData.item.validation.value,
           (await updatedData).sha
         );
         newContent = newContent.replace(oldUrl, (await updatedData).updatedUrl);
+        newContent = newContent.replace(
+          oldFilename,
+          (await updatedData).updatedFilename
+        );
       }
       return newContent;
     }