address feedback

Author: Churro

lib/modules/datasource/bitbucket-server-tags/index.spec.ts

@@ -77,6 +77,14 @@ describe('modules/datasource/bitbucket-server-tags/index', () => {
       expect(res).toBeNull();
     });
 
+    it('returns null on missing registryUrl', async () => {
+      const res = await getPkgReleases({
+        datasource,
+        packageName: 'some-org/notexisting',
+      });
+      expect(res).toBeNull();
+    });
+
     it('handles not found', async () => {
       httpMock
         .scope(apiBaseUrl)
@@ -132,23 +140,6 @@ describe('modules/datasource/bitbucket-server-tags/index', () => {
       );
       expect(res).toBeNull();
     });
-
-    it('fallback to invalid defaultRegistryUrl if none is provided', async () => {
-      httpMock
-        .scope('https://bitbucket.org/rest/api/1.0')
-        .get('/projects/some-org/repos/notexisting/tags/v1.0.0')
-        .reply(404);
-
-      await expect(
-        getDigest(
-          {
-            datasource,
-            packageName: 'some-org/notexisting',
-          },
-          'v1.0.0',
-        ),
-      ).rejects.toThrow(HttpError);
-    });
   });
 
   describe('getDigest', () => {
@@ -217,6 +208,14 @@ describe('modules/datasource/bitbucket-server-tags/index', () => {
       expect(res).toBeNull();
     });
 
+    it('returns null on missing registryUrl', async () => {
+      const res = await getDigest({
+        datasource,
+        packageName: 'some-org/notexisting',
+      });
+      expect(res).toBeNull();
+    });
+
     it('handles not found', async () => {
       httpMock
         .scope(apiBaseUrl)

lib/modules/datasource/bitbucket-server-tags/index.ts

@@ -20,8 +20,6 @@ export class BitbucketServerTagsDatasource extends Datasource {
 
   override http = new BitbucketServerHttp(BitbucketServerTagsDatasource.id);
 
-  static readonly defaultRegistryUrls = ['https://bitbucket.org'];
-
   static readonly sourceUrlSupport = 'package';
   static readonly sourceUrlNote =
     'The source URL is determined by using the `packageName` and `registryUrl`.';
@@ -32,23 +30,20 @@ export class BitbucketServerTagsDatasource extends Datasource {
     super(BitbucketServerTagsDatasource.id);
   }
 
-  static getRegistryURL(registryUrl?: string): string {
-    return (
-      registryUrl?.replace(regEx(/\/rest\/api\/1.0$/), '') ??
-      this.defaultRegistryUrls[0]
-    );
+  static getRegistryURL(registryUrl: string): string {
+    return registryUrl?.replace(regEx(/\/rest\/api\/1.0$/), '');
   }
 
   static getSourceUrl(
     projectKey: string,
     repositorySlug: string,
-    registryUrl?: string,
+    registryUrl: string,
   ): string {
     const url = BitbucketServerTagsDatasource.getRegistryURL(registryUrl);
     return `${ensureTrailingSlash(url)}projects/${projectKey}/repos/${repositorySlug}`;
   }
 
-  static getApiUrl(registryUrl?: string): string {
+  static getApiUrl(registryUrl: string): string {
     const res = BitbucketServerTagsDatasource.getRegistryURL(registryUrl);
     return `${ensureTrailingSlash(res)}rest/api/1.0/`;
   }
@@ -58,7 +53,7 @@ export class BitbucketServerTagsDatasource extends Datasource {
     repo: string,
     type: string,
   ): string {
-    return `${BitbucketServerTagsDatasource.getRegistryURL(registryUrl)}:${repo}:${type}`;
+    return `${BitbucketServerTagsDatasource.getRegistryURL(registryUrl ?? '')}:${repo}:${type}`;
   }
 
   // getReleases fetches list of tags for the repository
@@ -74,6 +69,10 @@ export class BitbucketServerTagsDatasource extends Datasource {
   async getReleases(config: GetReleasesConfig): Promise<ReleaseResult | null> {
     const { registryUrl, packageName } = config;
     const [projectKey, repositorySlug] = packageName.split('/');
+    if (!registryUrl) {
+      logger.debug('Missing registryUrl');
+      return null;
+    }
 
     const result = Result.parse(config, ReleasesConfig)
       .transform(({ registryUrl }) => {
@@ -153,6 +152,10 @@ export class BitbucketServerTagsDatasource extends Datasource {
   ): Promise<string | null> {
     const { registryUrl, packageName } = config;
     const [projectKey, repositorySlug] = packageName.split('/');
+    if (!registryUrl) {
+      logger.debug('Missing registryUrl');
+      return null;
+    }
 
     const baseUrl = `${BitbucketServerTagsDatasource.getApiUrl(registryUrl)}projects/${projectKey}/repos/${repositorySlug}`;
 

lib/util/http/bitbucket-server.ts

@@ -3,7 +3,7 @@ import { HttpBase, type InternalJsonUnsafeOptions } from './http';
 import type { HttpMethod, HttpOptions, HttpResponse } from './types';
 
 const MAX_LIMIT = 100;
-const MAX_PAGES = Number.MAX_SAFE_INTEGER;
+const MAX_PAGES = 100;
 
 let baseUrl: string;
 export const setBaseUrl = (url: string): void => {

lib/workers/repository/update/pr/changelog/bitbucket-server/index.ts

@@ -5,12 +5,7 @@ import { Files } from '../../../../../../modules/platform/bitbucket-server/schem
 import { BitbucketServerHttp } from '../../../../../../util/http/bitbucket-server';
 import { ensureTrailingSlash, joinUrlParts } from '../../../../../../util/url';
 import { compareChangelogFilePath } from '../common';
-import type {
-  ChangeLogFile,
-  ChangeLogNotes,
-  ChangeLogProject,
-  ChangeLogRelease,
-} from '../types';
+import type { ChangeLogFile } from '../types';
 
 export const id = 'bitbucket-server-changelog';
 const http = new BitbucketServerHttp(id);
@@ -72,15 +67,3 @@ export async function getReleaseNotesMd(
 
   return { changelogFile, changelogMd };
 }
-
-export function getReleaseList(
-  _project: ChangeLogProject,
-  _release: ChangeLogRelease,
-): ChangeLogNotes[] {
-  logger.trace('bitbucketServer.getReleaseList()');
-  logger.debug(
-    'Unsupported Bitbucket Server feature. Skipping release fetching.',
-  );
-
-  return [];
-}

lib/workers/repository/update/pr/changelog/release-notes.ts

@@ -46,7 +46,10 @@ export async function getReleaseList(
       case 'bitbucket':
         return bitbucket.getReleaseList(project, release);
       case 'bitbucket-server':
-        return bitbucketServer.getReleaseList(project, release);
+        logger.trace(
+          'Unsupported Bitbucket Server feature. Skipping release fetching.',
+        );
+        return [];
       default:
         logger.warn({ apiBaseUrl, repository, type }, 'Invalid project type');
         return [];