diff --git a/lib/datasource/adoptium-java/__snapshots__/index.spec.ts.snap b/lib/datasource/adoptium-java/__snapshots__/index.spec.ts.snap index 5b273483414707f2e3e4ace22be39f20945a4974..4966264e8cd98c1d03580ac16b332bf0e0795cd8 100644 --- a/lib/datasource/adoptium-java/__snapshots__/index.spec.ts.snap +++ b/lib/datasource/adoptium-java/__snapshots__/index.spec.ts.snap @@ -159,31 +159,6 @@ Object { } `; -exports[`datasource/adoptium-java/index getReleases pages 2`] = ` -Array [ - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate, br", - "host": "api.adoptium.net", - "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", - }, - "method": "GET", - "url": "https://api.adoptium.net/v3/release_versions?page_size=50&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=0", - }, - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate, br", - "host": "api.adoptium.net", - "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", - }, - "method": "GET", - "url": "https://api.adoptium.net/v3/release_versions?page_size=50&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=1", - }, -] -`; - exports[`datasource/adoptium-java/index getReleases processes real data 1`] = ` Object { "homepage": "https://adoptium.net", @@ -201,78 +176,3 @@ Object { ], } `; - -exports[`datasource/adoptium-java/index getReleases processes real data 2`] = ` -Array [ - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate, br", - "host": "api.adoptium.net", - "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", - }, - "method": "GET", - "url": "https://api.adoptium.net/v3/release_versions?page_size=50&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=0", - }, -] -`; - -exports[`datasource/adoptium-java/index getReleases returns null for 404 1`] = ` -Array [ - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate, br", - "host": "api.adoptium.net", - "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", - }, - "method": "GET", - "url": "https://api.adoptium.net/v3/release_versions?page_size=50&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=0", - }, -] -`; - -exports[`datasource/adoptium-java/index getReleases returns null for empty 200 OK 1`] = ` -Array [ - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate, br", - "host": "api.adoptium.net", - "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", - }, - "method": "GET", - "url": "https://api.adoptium.net/v3/release_versions?page_size=50&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=0", - }, -] -`; - -exports[`datasource/adoptium-java/index getReleases throws for 5xx 1`] = ` -Array [ - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate, br", - "host": "api.adoptium.net", - "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", - }, - "method": "GET", - "url": "https://api.adoptium.net/v3/release_versions?page_size=50&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=0", - }, -] -`; - -exports[`datasource/adoptium-java/index getReleases throws for error 1`] = ` -Array [ - Object { - "headers": Object { - "accept": "application/json", - "accept-encoding": "gzip, deflate, br", - "host": "api.adoptium.net", - "user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)", - }, - "method": "GET", - "url": "https://api.adoptium.net/v3/release_versions?page_size=50&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=0", - }, -] -`; diff --git a/lib/datasource/adoptium-java/index.spec.ts b/lib/datasource/adoptium-java/index.spec.ts index 2960089109338d0561ef695c1cdd18365a1779f6..f775b9fd0c9d6f7f495740c78e4c0c28a156192f 100644 --- a/lib/datasource/adoptium-java/index.spec.ts +++ b/lib/datasource/adoptium-java/index.spec.ts @@ -7,7 +7,7 @@ import { datasource, defaultRegistryUrl, pageSize } from './common'; const res1 = loadFixture('page.json'); function getPath(page: number): string { - return `/v3/release_versions?page_size=${pageSize}&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=${page}`; + return `/v3/info/release_versions?page_size=${pageSize}&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium&page=${page}`; } function* range(start: number, end: number): Generator<number, number, number> { yield start; @@ -30,7 +30,6 @@ describe(getName(), () => { depName: 'adoptium-java', }) ).rejects.toThrow(EXTERNAL_HOST_ERROR); - expect(httpMock.getTrace()).toMatchSnapshot(); }); it('returns null for 404', async () => { @@ -41,7 +40,6 @@ describe(getName(), () => { depName: 'adoptium-java', }) ).toBeNull(); - expect(httpMock.getTrace()).toMatchSnapshot(); }); it('returns null for empty 200 OK', async () => { @@ -55,7 +53,6 @@ describe(getName(), () => { depName: 'adoptium-java', }) ).toBeNull(); - expect(httpMock.getTrace()).toMatchSnapshot(); }); it('throws for 5xx', async () => { @@ -66,7 +63,6 @@ describe(getName(), () => { depName: 'adoptium-java', }) ).rejects.toThrow(EXTERNAL_HOST_ERROR); - expect(httpMock.getTrace()).toMatchSnapshot(); }); it('processes real data', async () => { @@ -77,7 +73,6 @@ describe(getName(), () => { }); expect(res).toMatchSnapshot(); expect(res.releases).toHaveLength(3); - expect(httpMock.getTrace()).toMatchSnapshot(); }); it('pages', async () => { @@ -95,7 +90,6 @@ describe(getName(), () => { }); expect(res).toMatchSnapshot(); expect(res.releases).toHaveLength(50); - expect(httpMock.getTrace()).toMatchSnapshot(); }); }); }); diff --git a/lib/datasource/adoptium-java/index.ts b/lib/datasource/adoptium-java/index.ts index 22653b0a3258a11814558b98e9c6cea0e4c1ab36..0d51760f0d3c366a71f7aa449fc0a51019670184 100644 --- a/lib/datasource/adoptium-java/index.ts +++ b/lib/datasource/adoptium-java/index.ts @@ -3,7 +3,7 @@ import { cache } from '../../util/cache/package/decorator'; import { HttpError } from '../../util/http/types'; import { Datasource } from '../datasource'; import type { GetReleasesConfig, ReleaseResult } from '../types'; -import { datasource, pageSize } from './common'; +import { datasource, defaultRegistryUrl, pageSize } from './common'; import type { AdoptiumJavaResponse } from './types'; export class AdoptiumJavaDatasource extends Datasource { @@ -15,7 +15,7 @@ export class AdoptiumJavaDatasource extends Datasource { customRegistrySupport = false; - defaultRegistryUrls = ['https://api.adoptium.net/']; + defaultRegistryUrls = [defaultRegistryUrl]; caching = true; @@ -27,7 +27,7 @@ export class AdoptiumJavaDatasource extends Datasource { registryUrl, }: GetReleasesConfig): Promise<ReleaseResult | null> { let page = 0; - const url = `${registryUrl}v3/release_versions?page_size=${pageSize}&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium`; + const url = `${registryUrl}v3/info/release_versions?page_size=${pageSize}&project=jdk&release_type=ga&sort_method=DATE&sort_order=DESC&vendor=adoptium`; const result: ReleaseResult = { homepage: 'https://adoptium.net',