extract registry from url for other ecosystems (#1520)

Author: jakecoffman

__tests__/updater.test.ts

@@ -214,6 +214,66 @@ describe('Updater', () => {
     })
   })
 
+  describe('when given docker credentials with a URL and not a registry', () => {
+    const jobDetails = {...mockJobDetails}
+
+    new Updater(
+      'MOCK_UPDATER_IMAGE_NAME',
+      'MOCK_PROXY_IMAGE_NAME',
+      mockApiClient,
+      jobDetails,
+      [
+        {
+          type: 'docker_registry',
+          url: 'https://ghcr.io/some/path',
+          username: 'user',
+          token: 'token'
+        }
+      ],
+      workingDirectory
+    )
+
+    it('generates credentials metadata with the registry from the URL', () => {
+      expect(jobDetails['credentials-metadata']).toEqual([
+        {
+          type: 'docker_registry',
+          registry: 'ghcr.io',
+          url: 'https://ghcr.io/some/path'
+        }
+      ])
+    })
+  })
+
+  describe('when given composer credentials with a URL and not a registry', () => {
+    const jobDetails = {...mockJobDetails}
+
+    new Updater(
+      'MOCK_UPDATER_IMAGE_NAME',
+      'MOCK_PROXY_IMAGE_NAME',
+      mockApiClient,
+      jobDetails,
+      [
+        {
+          type: 'composer_repository',
+          url: 'https://example.com/some/path',
+          username: 'user',
+          token: 'token'
+        }
+      ],
+      workingDirectory
+    )
+
+    it('generates credentials metadata with the registry from the URL', () => {
+      expect(jobDetails['credentials-metadata']).toEqual([
+        {
+          type: 'composer_repository',
+          registry: 'example.com',
+          url: 'https://example.com/some/path'
+        }
+      ])
+    })
+  })
+
   describe('when given npm_registry credentials with a URL and not a registry, but the URL is malformed', () => {
     const jobDetails = {...mockJobDetails}
 

dist/main/index.js

@@ -76,18 +76,7 @@ export class Updater {
       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.
-        }
-      }
+      this.setRegistryFromUrl(obj, credential)
       if (credential['index-url'] !== undefined) {
         obj['index-url'] = credential['index-url']
       }
@@ -115,6 +104,27 @@ export class Updater {
     return result
   }
 
+  private setRegistryFromUrl(obj: Credential, credential: Credential): void {
+    const typesThatUseRegistryAsHost = [
+      'npm_registry',
+      'composer_repository',
+      'docker_registry'
+    ]
+
+    if (!typesThatUseRegistryAsHost.includes(credential.type)) {
+      return
+    }
+
+    if (!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 fall back to the default registry for the given type (e.g., npm, Docker, or Composer).
+      }
+    }
+  }
+
   private async runUpdate(proxy: Proxy): Promise<void> {
     const name = `dependabot-job-${this.apiClient.params.jobId}`
     const container = await this.createContainer(proxy, name, {