From e49572e10578b5bca1734a4563217362cc2371de Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 6 Sep 2022 13:26:27 +0300
Subject: [PATCH] fix(datasource/github-tags): don't use github-releases for
extra meta (#17650)
---
.../datasource/github-tags/index.spec.ts | 11 -------
lib/modules/datasource/github-tags/index.ts | 29 +------------------
2 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/lib/modules/datasource/github-tags/index.spec.ts b/lib/modules/datasource/github-tags/index.spec.ts
index e3f40cbb3e..621825e36a 100644
--- a/lib/modules/datasource/github-tags/index.spec.ts
+++ b/lib/modules/datasource/github-tags/index.spec.ts
@@ -1,7 +1,6 @@
import { getPkgReleases } from '..';
import * as httpMock from '../../../../test/http-mock';
import * as _hostRules from '../../../util/host-rules';
-import { CacheableGithubReleases } from '../github-releases/cache';
import { CacheableGithubTags } from './cache';
import { GithubTagsDatasource } from '.';
@@ -12,10 +11,6 @@ const githubApiHost = 'https://api.github.com';
const githubEnterpriseApiHost = 'https://git.enterprise.com';
describe('modules/datasource/github-tags/index', () => {
- const releasesCacheGetItems = jest.spyOn(
- CacheableGithubReleases.prototype,
- 'getItems'
- );
const tagsCacheGetItems = jest.spyOn(
CacheableGithubTags.prototype,
'getItems'
@@ -109,10 +104,6 @@ describe('modules/datasource/github-tags/index', () => {
{ version: 'v1.0.0', releaseTimestamp: '2021-01-01', hash: '123' },
{ version: 'v2.0.0', releaseTimestamp: '2022-01-01', hash: 'abc' },
]);
- releasesCacheGetItems.mockResolvedValueOnce([
- { version: 'v1.0.0', releaseTimestamp: '2021-01-01', isStable: true },
- { version: 'v2.0.0', releaseTimestamp: '2022-01-01', isStable: false },
- ] as never);
const res = await getPkgReleases({ datasource: github.id, depName });
@@ -123,7 +114,6 @@ describe('modules/datasource/github-tags/index', () => {
{
gitRef: 'v1.0.0',
hash: '123',
- isStable: true,
releaseTimestamp: '2021-01-01T00:00:00.000Z',
version: 'v1.0.0',
},
@@ -131,7 +121,6 @@ describe('modules/datasource/github-tags/index', () => {
{
gitRef: 'v2.0.0',
hash: 'abc',
- isStable: false,
releaseTimestamp: '2022-01-01T00:00:00.000Z',
version: 'v2.0.0',
},
diff --git a/lib/modules/datasource/github-tags/index.ts b/lib/modules/datasource/github-tags/index.ts
index b6990fea04..bec906551c 100644
--- a/lib/modules/datasource/github-tags/index.ts
+++ b/lib/modules/datasource/github-tags/index.ts
@@ -2,12 +2,7 @@ import { logger } from '../../../logger';
import { cache } from '../../../util/cache/package/decorator';
import { GithubReleasesDatasource } from '../github-releases';
import { getApiBaseUrl, getSourceUrl } from '../github-releases/common';
-import type {
- DigestConfig,
- GetReleasesConfig,
- Release,
- ReleaseResult,
-} from '../types';
+import type { DigestConfig, GetReleasesConfig, ReleaseResult } from '../types';
import { CacheableGithubTags } from './cache';
export class GithubTagsDatasource extends GithubReleasesDatasource {
@@ -88,28 +83,6 @@ export class GithubTagsDatasource extends GithubReleasesDatasource {
releases: tagReleases.map((item) => ({ ...item, gitRef: item.version })),
};
- try {
- // Fetch additional data from releases endpoint when possible
- const releasesResult = await super.getReleases(config);
- type PartialRelease = Omit<Release, 'version'>;
-
- const releaseByVersion: Record<string, PartialRelease> = {};
- releasesResult?.releases?.forEach((release) => {
- const { version, ...value } = release;
- releaseByVersion[version] = value;
- });
-
- const mergedReleases: Release[] = [];
- tagsResult.releases.forEach((tag) => {
- const release = releaseByVersion[tag.version];
- mergedReleases.push({ ...release, ...tag });
- });
-
- tagsResult.releases = mergedReleases;
- } catch (err) /* istanbul ignore next */ {
- logger.debug({ err }, `Error fetching additional info for GitHub tags`);
- }
-
return tagsResult;
}
}
--
GitLab