Skip to content

Commit

Permalink
refactor: remove unused ReleaseResult fields (#8737)
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins committed Feb 17, 2021
1 parent 720907e commit 01e1f38
Show file tree
Hide file tree
Showing 26 changed files with 4 additions and 119 deletions.
8 changes: 0 additions & 8 deletions lib/datasource/common.ts
Expand Up @@ -56,18 +56,10 @@ export interface ReleaseResult {
changelogUrl?: string;
dependencyUrl?: string;
deprecationMessage?: string;
display?: string;
dockerRegistry?: string;
dockerRepository?: string;
group?: string;
homepage?: string;
name?: string;
pkgName?: string;
releases: Release[];
sourceUrl?: string;
tags?: Record<string, string>;
versions?: any;
registryUrl?: string;
isPrivate?: boolean;
}

Expand Down
10 changes: 0 additions & 10 deletions lib/datasource/docker/__snapshots__/index.spec.ts.snap
Expand Up @@ -567,8 +567,6 @@ Array [

exports[`datasource/docker/index getReleases ignores unsupported manifest 1`] = `
Object {
"dockerRegistry": "https://registry.company.com",
"dockerRepository": "node",
"releases": Array [],
}
`;
Expand Down Expand Up @@ -622,8 +620,6 @@ Array [

exports[`datasource/docker/index getReleases ignores unsupported schema version 1`] = `
Object {
"dockerRegistry": "https://registry.company.com",
"dockerRepository": "node",
"releases": Array [],
}
`;
Expand Down Expand Up @@ -752,8 +748,6 @@ Array [

exports[`datasource/docker/index getReleases supports labels 1`] = `
Object {
"dockerRegistry": "https://registry.company.com",
"dockerRepository": "node",
"releases": Array [],
"sourceUrl": "https://github.com/renovatebot/renovate",
}
Expand Down Expand Up @@ -828,8 +822,6 @@ Array [

exports[`datasource/docker/index getReleases supports manifest lists 1`] = `
Object {
"dockerRegistry": "https://registry.company.com",
"dockerRepository": "node",
"releases": Array [],
"sourceUrl": "https://github.com/renovatebot/renovate",
}
Expand Down Expand Up @@ -925,8 +917,6 @@ Array [

exports[`datasource/docker/index getReleases supports redirect 1`] = `
Object {
"dockerRegistry": "https://registry.company.com",
"dockerRepository": "node",
"releases": Array [],
}
`;
Expand Down
12 changes: 4 additions & 8 deletions lib/datasource/docker/index.ts
Expand Up @@ -66,13 +66,11 @@ export function getRegistryRepository(
registryUrl: string
): RegistryRepository {
if (registryUrl !== defaultRegistryUrls[0]) {
const dockerRegistry = registryUrl
.replace('https://', '')
.replace(/\/?$/, '/');
if (lookupName.startsWith(dockerRegistry)) {
const registry = registryUrl.replace('https://', '').replace(/\/?$/, '/');
if (lookupName.startsWith(registry)) {
return {
registry: dockerRegistry,
repository: lookupName.replace(dockerRegistry, ''),
registry,
repository: lookupName.replace(registry, ''),
};
}
}
Expand Down Expand Up @@ -623,8 +621,6 @@ export async function getReleases({
}
const releases = tags.map((version) => ({ version }));
const ret: ReleaseResult = {
dockerRegistry: registry,
dockerRepository: repository,
releases,
};

Expand Down
1 change: 0 additions & 1 deletion lib/datasource/helm/__snapshots__/index.spec.ts.snap
Expand Up @@ -17,7 +17,6 @@ Array [
exports[`datasource/helm getReleases returns list of versions for normal response 1`] = `
Object {
"homepage": "https://www.getambassador.io/",
"name": "ambassador",
"releases": Array [
Object {
"releaseTimestamp": "2019-02-13T00:56:01.476Z",
Expand Down
1 change: 0 additions & 1 deletion lib/datasource/helm/index.ts
Expand Up @@ -78,7 +78,6 @@ export async function getRepositoryData(
const result: RepositoryData = {};
for (const [name, releases] of Object.entries(doc.entries)) {
result[name] = {
name,
homepage: releases[0].home,
sourceUrl: releases[0].sources ? releases[0].sources[0] : undefined,
releases: releases.map((release) => ({
Expand Down
Expand Up @@ -2,15 +2,13 @@

exports[`datasource/jenkins-plugins/index getReleases returns package releases for a hit for info and miss for releases 1`] = `
Object {
"name": "email-ext",
"releases": Array [],
"sourceUrl": "https://github.com/jenkinsci/email-ext-plugin",
}
`;

exports[`datasource/jenkins-plugins/index getReleases returns package releases for a hit for info and releases 1`] = `
Object {
"name": "email-ext",
"releases": Array [
Object {
"downloadUrl": "http://updates.jenkins-ci.org/download/plugins/email-ext/2.10/email-ext.hpi",
Expand Down
1 change: 0 additions & 1 deletion lib/datasource/jenkins-plugins/get.ts
Expand Up @@ -71,7 +71,6 @@ function updateJenkinsPluginInfoCacheCallback(
for (const name of Object.keys(response.plugins || [])) {
// eslint-disable-next-line no-param-reassign
cache.cache[name] = {
name,
releases: [], // releases are stored in another cache
sourceUrl: response.plugins[name]?.scm,
};
Expand Down
2 changes: 0 additions & 2 deletions lib/datasource/jenkins-plugins/index.spec.ts
Expand Up @@ -68,7 +68,6 @@ describe(getName(__filename), () => {
expect(res.sourceUrl).toBe(
'https://github.com/jenkinsci/email-ext-plugin'
);
expect(res.name).toBe('email-ext');

expect(
res.releases.find((release) => release.version === '2.69')
Expand Down Expand Up @@ -100,7 +99,6 @@ describe(getName(__filename), () => {
expect(res.sourceUrl).toBe(
'https://github.com/jenkinsci/email-ext-plugin'
);
expect(res.name).toBe('email-ext');
});

it('returns null empty response', async () => {
Expand Down
8 changes: 0 additions & 8 deletions lib/datasource/nuget/__snapshots__/index.spec.ts.snap
Expand Up @@ -67,7 +67,6 @@ Array [

exports[`datasource/nuget getReleases handles paginated results (v2) 1`] = `
Object {
"pkgName": "nunit",
"releases": Array [
Object {
"version": "1.0.0",
Expand Down Expand Up @@ -104,7 +103,6 @@ Array [

exports[`datasource/nuget getReleases processes real data (v2) 1`] = `
Object {
"pkgName": "nunit",
"releases": Array [
Object {
"releaseTimestamp": "2011-01-07T07:57:55.387+00:00",
Expand Down Expand Up @@ -308,7 +306,6 @@ Array [
exports[`datasource/nuget getReleases processes real data (v3) feed is a nuget.org 1`] = `
Object {
"homepage": "https://nunit.org/",
"pkgName": "nunit",
"releases": Array [
Object {
"releaseTimestamp": "2011-01-07T07:57:55.387+00:00",
Expand Down Expand Up @@ -543,7 +540,6 @@ Array [
exports[`datasource/nuget getReleases processes real data (v3) feed is not a nuget.org 1`] = `
Object {
"homepage": "https://nunit.org/",
"pkgName": "nunit",
"releases": Array [
Object {
"releaseTimestamp": "2011-01-07T07:57:55.387+00:00",
Expand Down Expand Up @@ -777,7 +773,6 @@ Array [
exports[`datasource/nuget getReleases processes real data (v3) for several catalog pages 1`] = `
Object {
"homepage": "https://nlog-project.org/",
"pkgName": "nlog",
"releases": Array [
Object {
"releaseTimestamp": "2011-01-07T07:57:35.043+00:00",
Expand Down Expand Up @@ -1586,7 +1581,6 @@ Array [

exports[`datasource/nuget getReleases processes real data with no github project url (v2) 1`] = `
Object {
"pkgName": "nunit",
"releases": Array [
Object {
"version": "3.11.0",
Expand All @@ -1612,7 +1606,6 @@ Array [

exports[`datasource/nuget getReleases processes real data without project url (v2) 1`] = `
Object {
"pkgName": "nunit",
"releases": Array [
Object {
"version": "2.5.7.10213",
Expand Down Expand Up @@ -1764,7 +1757,6 @@ Array [
exports[`datasource/nuget getReleases returns deduplicated results 1`] = `
Object {
"homepage": "https://nunit.org/",
"pkgName": "nunit",
"releases": Array [
Object {
"releaseTimestamp": "2011-01-07T07:57:55.387+00:00",
Expand Down
1 change: 0 additions & 1 deletion lib/datasource/nuget/v2.ts
Expand Up @@ -16,7 +16,6 @@ export async function getReleases(
pkgName: string
): Promise<ReleaseResult | null> {
const dep: ReleaseResult = {
pkgName,
releases: [],
};
let pkgUrlList = `${feedUrl.replace(
Expand Down
1 change: 0 additions & 1 deletion lib/datasource/nuget/v3.ts
Expand Up @@ -173,7 +173,6 @@ export async function getReleases(
}

const dep: ReleaseResult = {
pkgName,
releases,
};

Expand Down
4 changes: 0 additions & 4 deletions lib/datasource/orb/__snapshots__/index.spec.ts.snap
Expand Up @@ -3,7 +3,6 @@
exports[`datasource/orb getReleases processes homeUrl 1`] = `
Object {
"homepage": "https://google.com",
"name": "hyper-expanse/library-release-workflows",
"releases": Array [
Object {
"releaseTimestamp": "2018-12-11T05:28:14.080Z",
Expand Down Expand Up @@ -46,7 +45,6 @@ Object {
"version": "4.2.0",
},
],
"versions": Object {},
}
`;

Expand Down Expand Up @@ -85,7 +83,6 @@ Array [
exports[`datasource/orb getReleases processes real data 1`] = `
Object {
"homepage": "https://circleci.com/developer/orbs/orb/hyper-expanse/library-release-workflows",
"name": "hyper-expanse/library-release-workflows",
"releases": Array [
Object {
"releaseTimestamp": "2018-12-11T05:28:14.080Z",
Expand Down Expand Up @@ -128,7 +125,6 @@ Object {
"version": "4.2.0",
},
],
"versions": Object {},
}
`;

Expand Down
2 changes: 0 additions & 2 deletions lib/datasource/orb/index.ts
Expand Up @@ -50,8 +50,6 @@ export async function getReleases({
}
// Simplify response before caching and returning
const dep: ReleaseResult = {
name: lookupName,
versions: {},
releases: null,
};
if (res.homeUrl?.length) {
Expand Down
7 changes: 0 additions & 7 deletions lib/datasource/packagist/__snapshots__/index.spec.ts.snap
Expand Up @@ -2,7 +2,6 @@

exports[`datasource/packagist getReleases adds packagist source implicitly 1`] = `
Object {
"name": "drewm/mailchimp-api",
"releases": Array [
Object {
"gitRef": "v1.0",
Expand Down Expand Up @@ -236,7 +235,6 @@ Array [

exports[`datasource/packagist getReleases processes real versioned data 1`] = `
Object {
"name": "drewm/mailchimp-api",
"releases": Array [
Object {
"gitRef": "v1.0",
Expand Down Expand Up @@ -336,7 +334,6 @@ Array [
exports[`datasource/packagist getReleases supports includes packages 1`] = `
Object {
"homepage": "http://guzzlephp.org/",
"name": "guzzlehttp/guzzle",
"releases": Array [
Object {
"gitRef": "v3.0.0",
Expand Down Expand Up @@ -507,7 +504,6 @@ Array [

exports[`datasource/packagist getReleases supports lazy repositories 1`] = `
Object {
"name": "guzzlehttp/guzzle",
"releases": Array [
Object {
"gitRef": "5.3.4",
Expand Down Expand Up @@ -548,7 +544,6 @@ Array [

exports[`datasource/packagist getReleases supports plain packages 1`] = `
Object {
"name": "vendor/package-name",
"releases": Array [
Object {
"gitRef": "0.0.1",
Expand Down Expand Up @@ -584,7 +579,6 @@ Array [
exports[`datasource/packagist getReleases supports provider-includes 1`] = `
Object {
"homepage": "https://wordpress.org/plugins/1beyt/",
"name": "wpackagist-plugin/1beyt",
"releases": Array [
Object {
"gitRef": "1.0",
Expand Down Expand Up @@ -649,7 +643,6 @@ Array [
exports[`datasource/packagist getReleases supports providers 1`] = `
Object {
"homepage": "https://wordpress.org/plugins/1beyt/",
"name": "wpackagist-plugin/1beyt",
"releases": Array [
Object {
"gitRef": "1.0",
Expand Down
4 changes: 0 additions & 4 deletions lib/datasource/packagist/index.ts
Expand Up @@ -188,7 +188,6 @@ async function getAllPackages(regUrl: string): Promise<AllPackages | null> {
if (res.packages) {
for (const [key, val] of Object.entries(res.packages)) {
const dep = extractDepReleases(val);
dep.name = key;
includesPackages[key] = dep;
}
}
Expand Down Expand Up @@ -233,7 +232,6 @@ async function packagistOrgLookup(name: string): Promise<ReleaseResult> {
const res = (await http.getJson<any>(pkgUrl)).body.packages[name];
if (res) {
dep = extractDepReleases(res);
dep.name = name;
logger.trace({ dep }, 'dep');
}
const cacheMinutes = 10;
Expand All @@ -260,7 +258,6 @@ async function packageLookup(
} = allPackages;
if (packages?.[name]) {
const dep = extractDepReleases(packages[name]);
dep.name = name;
return dep;
}
if (includesPackages?.[name]) {
Expand All @@ -285,7 +282,6 @@ async function packageLookup(
name
];
const dep = extractDepReleases(versions);
dep.name = name;
logger.trace({ dep }, 'dep');
return dep;
} catch (err) /* istanbul ignore next */ {
Expand Down
2 changes: 0 additions & 2 deletions lib/datasource/rubygems/__snapshots__/index.spec.ts.snap
Expand Up @@ -2,7 +2,6 @@

exports[`datasource/rubygems getReleases returns a dep for rubygems.org package hit 1`] = `
Object {
"name": "1pass",
"releases": Array [
Object {
"version": "0.1.0",
Expand Down Expand Up @@ -2520,7 +2519,6 @@ Array [

exports[`datasource/rubygems getReleases uses rubygems.org if no registry urls were provided 1`] = `
Object {
"name": "1pass",
"releases": Array [
Object {
"version": "0.1.0",
Expand Down
1 change: 0 additions & 1 deletion lib/datasource/rubygems/get-rubygems-org.ts
Expand Up @@ -115,7 +115,6 @@ export async function getRubygemsOrgDependency(
return null;
}
const dep: ReleaseResult = {
name: lookupName,
releases: packageReleases[lookupName].map((version) => ({ version })),
};
return dep;
Expand Down

0 comments on commit 01e1f38

Please sign in to comment.