handle NPM metadata missing registry key (#1519)

Author: jakecoffman

__tests__/updater.test.ts

@@ -184,6 +184,65 @@ describe('Updater', () => {
     })
   })
 
+  describe('when given npm_registry credentials with a URL and not a registry', () => {
+    const jobDetails = {...mockJobDetails}
+
+    new Updater(
+      'MOCK_UPDATER_IMAGE_NAME',
+      'MOCK_PROXY_IMAGE_NAME',
+      mockApiClient,
+      jobDetails,
+      [
+        {
+          type: 'npm_registry',
+          url: 'https://registry.npmjs.org/some/path',
+          username: 'npm_user',
+          token: 'npm_token'
+        }
+      ],
+      workingDirectory
+    )
+
+    it('generates credentials metadata with the registry from the URL', () => {
+      expect(jobDetails['credentials-metadata']).toEqual([
+        {
+          type: 'npm_registry',
+          registry: 'registry.npmjs.org',
+          url: 'https://registry.npmjs.org/some/path'
+        }
+      ])
+    })
+  })
+
+  describe('when given npm_registry credentials with a URL and not a registry, but the URL is malformed', () => {
+    const jobDetails = {...mockJobDetails}
+
+    new Updater(
+      'MOCK_UPDATER_IMAGE_NAME',
+      'MOCK_PROXY_IMAGE_NAME',
+      mockApiClient,
+      jobDetails,
+      [
+        {
+          type: 'npm_registry',
+          url: 'not-a-url',
+          username: 'npm_user',
+          token: 'npm_token'
+        }
+      ],
+      workingDirectory
+    )
+
+    it('generates credentials metadata with the registry from the URL', () => {
+      expect(jobDetails['credentials-metadata']).toEqual([
+        {
+          type: 'npm_registry',
+          url: 'not-a-url'
+        }
+      ])
+    })
+  })
+
   describe('when given duplicate credentials', () => {
     const jobDetails = {...mockJobDetails}
 

dist/main/index.js

@@ -73,15 +73,27 @@ export class Updater {
       if (credential.registry !== undefined) {
         obj.registry = credential.registry
       }
+      if (credential.url !== undefined) {
+        obj.url = credential.url
+      }
+      if (
+        credential.type === 'npm_registry' &&
+        !credential.registry &&
+        credential.url
+      ) {
+        try {
+          obj.registry = new URL(credential.url).hostname
+        } catch {
+          // If the URL is invalid, we skip setting the registry
+          // as it will be set to the default npm registry.
+        }
+      }
       if (credential['index-url'] !== undefined) {
         obj['index-url'] = credential['index-url']
       }
       if (credential['env-key'] !== undefined) {
         obj['env-key'] = credential['env-key']
       }
-      if (credential.url !== undefined) {
-        obj.url = credential.url
-      }
       if (credential.organization !== undefined) {
         obj.organization = credential.organization
       }