Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(datasource/maven): look for maven snapshot pom #11327

Merged
merged 16 commits into from Oct 10, 2021
Merged

fix(datasource/maven): look for maven snapshot pom #11327

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
10a03eb
fix(datasource/maven): look for maven snapshot pom
bpfoster Aug 18, 2021
d87476c
Add test cases to cover untested lines
bpfoster Aug 18, 2021
33ed28c
Merge branch 'main' into fix/maven-snapshot-resolve
viceice Aug 27, 2021
6e6e46b
Apply suggestions from code review
bpfoster Aug 27, 2021
8876b72
Merge branch 'main' into fix/maven-snapshot-resolve
bpfoster Aug 27, 2021
1f416a2
Remove obsolete snapshots
bpfoster Aug 27, 2021
64e54d4
Merge branch 'main' into fix/maven-snapshot-resolve
viceice Aug 28, 2021
1e40eec
Merge branch 'main' into fix/maven-snapshot-resolve
bpfoster Sep 9, 2021
cdee44b
Rework artifact filter pipeline
bpfoster Sep 9, 2021
ba7e792
Update unit tests
bpfoster Sep 10, 2021
a948366
Fix jest testTimeout flag
bpfoster Sep 10, 2021
15bf3dd
Simplify some logic
bpfoster Sep 10, 2021
e8a85b2
Merge remote-tracking branch 'upstream/main' into fix/maven-snapshot-…
bpfoster Sep 28, 2021
83171c1
Fix filtering out of values that shouldn't have been
bpfoster Sep 28, 2021
6149cb1
Add some comments through the maven snapshot logic per request
bpfoster Sep 29, 2021
1ec490e
Merge branch 'main' into fix/maven-snapshot-resolve
rarkins Oct 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions lib/datasource/maven/__fixtures__/metadata-snapshot-version-invalid.xml
View file
Open in desktop
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?><metadata>
<groupId>org.example</groupId>
<artifactId>package</artifactId>
<version>1.0.1-SNAPSHOT</version>
<versioning>
<snapshot>
<buildNumber>5</buildNumber>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>1.0.1-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>1.0.1-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>javadoc</classifier>
<extension>jar</extension>
<value>1.0.1-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
</snapshotVersions>
<lastUpdated>20130301200000</lastUpdated>
</versioning>
</metadata>
30 changes: 30 additions & 0 deletions lib/datasource/maven/__fixtures__/metadata-snapshot-version.xml
View file
Open in desktop
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?><metadata>
<groupId>org.example</groupId>
<artifactId>package</artifactId>
<version>1.0.1-SNAPSHOT</version>
<versioning>
<snapshot>
<timestamp>20200101.123456</timestamp>
<buildNumber>5</buildNumber>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>1.0.1-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>1.0.1-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>javadoc</classifier>
<extension>jar</extension>
<value>1.0.1-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
</snapshotVersions>
<lastUpdated>20130301200000</lastUpdated>
</versioning>
</metadata>
14 changes: 14 additions & 0 deletions lib/datasource/maven/__fixtures__/metadata-snapshot.xml
View file
Open in desktop
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.example</groupId>
<artifactId>package</artifactId>
<versioning>
<latest>1.0.1-SNAPSHOT</latest>
<release>1.0.0</release>
<versions>
<version>1.0.0</version>
<version>1.0.1-SNAPSHOT</version>
</versions>
<lastUpdated>20210101000000</lastUpdated>
</versioning>
</metadata>
150 changes: 150 additions & 0 deletions lib/datasource/maven/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Expand Up @@ -749,6 +749,56 @@ Array [
]
`;

exports[`datasource/maven/index includes snapshot releases 1`] = `
Array [
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/maven-metadata.xml",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.1-SNAPSHOT/maven-metadata.xml",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "HEAD",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.0/package-1.0.0.pom",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "HEAD",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.1-SNAPSHOT/package-1.0.1-20200101.123456-5.pom",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.0/package-1.0.0.pom",
},
]
`;

exports[`datasource/maven/index removes authentication header after redirect 1`] = `
Object {
"display": "org.example:package",
Expand Down Expand Up @@ -994,6 +1044,106 @@ Array [
]
`;

exports[`datasource/maven/index skips invalid snapshot releases 1`] = `
Array [
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/maven-metadata.xml",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.1-SNAPSHOT/maven-metadata.xml",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "HEAD",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.0/package-1.0.0.pom",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "HEAD",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.1-SNAPSHOT/package-1.0.1-SNAPSHOT.pom",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.0/package-1.0.0.pom",
},
]
`;

exports[`datasource/maven/index skips missing snapshot releases 1`] = `
Array [
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/maven-metadata.xml",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.1-SNAPSHOT/maven-metadata.xml",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "HEAD",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.0/package-1.0.0.pom",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "HEAD",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.1-SNAPSHOT/package-1.0.1-SNAPSHOT.pom",
},
Object {
"headers": Object {
"accept-encoding": "gzip, deflate, br",
"host": "repo.maven.apache.org",
"user-agent": "RenovateBot/0.0.0-semantic-release (https://github.com/renovatebot/renovate)",
},
"method": "GET",
"url": "https://repo.maven.apache.org/maven2/org/example/package/1.0.0/package-1.0.0.pom",
},
]
`;

exports[`datasource/maven/index skips registry with invalid XML 1`] = `
Object {
"display": "org.example:package",
Expand Down
101 changes: 101 additions & 0 deletions lib/datasource/maven/index.spec.ts
View file
Open in desktop
Expand Up @@ -9,13 +9,20 @@ import { id as datasource } from '.';
const baseUrl = 'https://repo.maven.apache.org/maven2';
const baseUrlCustom = 'https://custom.registry.renovatebot.com';

interface SnapshotOpts {
version: string;
concreteVersions?: string[];
meta?: string;
}

interface MockOpts {
dep?: string;
base?: string;
meta?: string | null;
pom?: string | null;
latest?: string;
jars?: Record<string, number> | null;
snapshots?: SnapshotOpts[] | null;
}

function mockGenericPackage(opts: MockOpts = {}) {
Expand Down Expand Up @@ -64,6 +71,31 @@ function mockGenericPackage(opts: MockOpts = {}) {
.reply(status, '', { 'Last-Modified': timestamp });
});
}

if (opts.snapshots !== undefined) {
opts.snapshots.forEach((snapshot) => {
if (snapshot.meta) {
scope
.get(`/${packagePath}/${snapshot.version}/maven-metadata.xml`)
.reply(200, snapshot.meta);
}

if (snapshot.concreteVersions) {
snapshot.concreteVersions.forEach((concreteVersion) => {
const [major, minor, patch] = snapshot.version
.split('.')
.map((x) => parseInt(x, 10))
.map((x) => (x < 10 ? `0${x}` : `${x}`));
const timestamp = `2020-01-01T${major}:${minor}:${patch}.000Z`;
scope
.head(
`/${packagePath}/${snapshot.version}/${artifact}-${concreteVersion}.pom`
)
.reply(200, '', { 'Last-Modified': timestamp });
});
}
});
}
}

function get(
Expand Down Expand Up @@ -306,6 +338,75 @@ describe('datasource/maven/index', () => {
expect(httpMock.getTrace()).toMatchSnapshot();
});

it('includes snapshot releases', async () => {
mockGenericPackage({
meta: loadFixture('metadata-snapshot.xml'),
latest: '1.0.0',
jars: { '1.0.0': 200 },
snapshots: [
{
version: '1.0.1-SNAPSHOT',
concreteVersions: ['1.0.1-20200101.123456-5'],
meta: loadFixture('metadata-snapshot-version.xml'),
},
],
});

const { releases } = await get('org.example:package', baseUrl);

expect(releases).toMatchObject([
{ version: '1.0.0' },
{ version: '1.0.1-SNAPSHOT' },
]);
expect(httpMock.getTrace()).toMatchSnapshot();
bpfoster marked this conversation as resolved.
Show resolved Hide resolved
});

it('skips missing snapshot releases', async () => {
mockGenericPackage({
meta: loadFixture('metadata-snapshot.xml'),
latest: '1.0.0',
jars: { '1.0.0': 200 },
});

httpMock
.scope(baseUrl)
.get('/org/example/package/1.0.1-SNAPSHOT/maven-metadata.xml')
.reply(404, '');
httpMock
.scope(baseUrl)
.head('/org/example/package/1.0.1-SNAPSHOT/package-1.0.1-SNAPSHOT.pom')
.reply(404, '');
bpfoster marked this conversation as resolved.
Show resolved Hide resolved

const { releases } = await get('org.example:package', baseUrl);

expect(releases).toMatchObject([{ version: '1.0.0' }]);
expect(httpMock.getTrace()).toMatchSnapshot();
bpfoster marked this conversation as resolved.
Show resolved Hide resolved
});

it('skips invalid snapshot releases', async () => {
mockGenericPackage({
meta: loadFixture('metadata-snapshot.xml'),
latest: '1.0.0',
jars: { '1.0.0': 200 },
snapshots: [
{
version: '1.0.1-SNAPSHOT',
meta: loadFixture('metadata-snapshot-version-invalid.xml'),
},
],
});

httpMock
.scope(baseUrl)
.head('/org/example/package/1.0.1-SNAPSHOT/package-1.0.1-SNAPSHOT.pom')
.reply(404, '');
bpfoster marked this conversation as resolved.
Show resolved Hide resolved

const { releases } = await get('org.example:package', baseUrl);

expect(releases).toMatchObject([{ version: '1.0.0' }]);
expect(httpMock.getTrace()).toMatchSnapshot();
bpfoster marked this conversation as resolved.
Show resolved Hide resolved
});

describe('fetching parent info', () => {
const parentPackage = {
dep: 'org.example:parent',
Expand Down