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.

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

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?><metadata>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.10-SNAPSHOT</version>
<versioning>
<snapshot>
<timestamp>20200101.123456</timestamp>
<buildNumber>5</buildNumber>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>8.0.10-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>8.0.10-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>javadoc</classifier>
<extension>jar</extension>
<value>8.0.10-20200101.123456-5</value>
<updated>20200101123456</updated>
</snapshotVersion>
</snapshotVersions>
<lastUpdated>20130301200000</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.13-SNAPSHOT</version>
<packaging>jar</packaging>

<name>MySQL Connector/J</name>
<description>JDBC Type 4 driver for MySQL</description>

<licenses>
<license>
<name>The GNU General Public License, v2 with FOSS exception</name>
<distribution>repo</distribution>
<comments>For detailed license information see the LICENSE file in this distribution.</comments>
</license>
</licenses>

<url>http://dev.mysql.com/doc/connector-j/en/</url>

<scm>
<connection>scm:git:git@github.com:mysql/mysql-connector-j.git</connection>
<url>https://github.com/mysql/mysql-connector-j</url>
</scm>

<organization>
<name>Oracle Corporation</name>
<url>http://www.oracle.com</url>
</organization>

<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.6.0</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<versions>
<version>8.0.12</version>
<version>8.0.11</version>
<version>8.0.10-SNAPSHOT</version>
<version>8.0.9</version>
<version>8.0.8</version>
<version>8.0.7</version>
Expand Down
3 changes: 3 additions & 0 deletions lib/datasource/maven/__snapshots__/index.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ Object {
Object {
"version": "8.0.9",
},
Object {
"version": "8.0.10-SNAPSHOT",
},
Object {
"version": "8.0.11",
},
Expand Down
43 changes: 41 additions & 2 deletions lib/datasource/maven/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ import * as hostRules from '../../util/host-rules';
import * as mavenVersioning from '../../versioning/maven';
import { id as datasource } from '.';

const MYSQL_VERSIONS = ['6.0.5', '6.0.6', '8.0.7', '8.0.8', '8.0.9'];
const MYSQL_VERSIONS = [
'6.0.5',
'6.0.6',
'8.0.7',
'8.0.8',
'8.0.9',
'8.0.10-SNAPSHOT',
];

const MYSQL_MAVEN_METADATA = fs.readFileSync(
resolve(
Expand All @@ -25,6 +32,25 @@ const MYSQL_MAVEN_MYSQL_POM = fs.readFileSync(
'utf8'
);

const MYSQL_SNAPSHOT_MAVEN_METADATA = fs.readFileSync(
resolve(
__dirname,
'./__fixtures__/repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.10-SNAPSHOT/maven-metadata.xml'
),
'utf8'
);

const MYSQL_SNAPSHOT_MAVEN_MYSQL_POM = fs.readFileSync(
resolve(
__dirname,
'./__fixtures__/repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.10-SNAPSHOT/mysql-connector-java-8.0.10-20200101.123456-5.pom'
),
'utf8'
);

const MYSQL_SNAPSHOT_PATH =
'/maven2/mysql/mysql-connector-java/8.0.10-SNAPSHOT/mysql-connector-java-8.0.10-20200101.123456-5.pom';

const config = {
versioning: mavenVersioning.id,
datasource,
Expand Down Expand Up @@ -70,6 +96,16 @@ describe('datasource/maven', () => {
'/maven2/mysql/mysql-connector-java/8.0.12/mysql-connector-java-8.0.12.pom'
)
.reply(200, MYSQL_MAVEN_MYSQL_POM);
nock('https://repo.maven.apache.org')
.get(
'/maven2/mysql/mysql-connector-java/8.0.10-SNAPSHOT/maven-metadata.xml'
)
.reply(200, MYSQL_SNAPSHOT_MAVEN_METADATA);
nock('https://repo.maven.apache.org')
.get(MYSQL_SNAPSHOT_PATH)
.reply(200, MYSQL_SNAPSHOT_MAVEN_MYSQL_POM)
.head(MYSQL_SNAPSHOT_PATH)
.reply(200, '', { 'Last-Modified': timestamp('8.0.10-SNAPSHOT') });
nock('https://custom.registry.renovatebot.com')
.get('/mysql/mysql-connector-java/maven-metadata.xml')
.reply(200, MYSQL_MAVEN_METADATA);
Expand Down Expand Up @@ -115,6 +151,7 @@ describe('datasource/maven', () => {
'8.0.7': 200,
'8.0.8': 200,
'8.0.9': 200,
'8.0.10-SNAPSHOT': 404,
'8.0.11': 404,
'8.0.12': 500,
}).forEach(([v, status]) => {
Expand Down Expand Up @@ -329,7 +366,9 @@ describe('datasource/maven', () => {
depName: 'mysql:mysql-connector-java',
registryUrls: ['http://frontend_for_private_s3_repository/maven2'],
});
expect(releases.releases).toEqual(generateReleases(MYSQL_VERSIONS));
expect(releases.releases).toEqual(
generateReleases(MYSQL_VERSIONS.filter((i) => i !== '8.0.10-SNAPSHOT'))
);
});
});
});
70 changes: 66 additions & 4 deletions lib/datasource/maven/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,66 @@ function isValidArtifactsInfo(
return versions.every((v) => info[v] !== undefined);
}

function isSnapshotVersion(version: string): boolean {
if (version.endsWith('-SNAPSHOT')) {
return true;
}
return false;
}

function extractSnapshotVersion(metadata: XmlDocument): string {
const version = metadata
.descendantWithPath('version')
?.val?.replace('-SNAPSHOT', '');

const snapshot = metadata.descendantWithPath('versioning.snapshot');
const timestamp = snapshot?.childNamed('timestamp')?.val;
const build = snapshot?.childNamed('buildNumber')?.val;

if (!version || !timestamp || !build) {
return null;
}
return `${version}-${timestamp}-${build}`;
}

async function getSnapshotFullVersion(
version: string,
dependency: MavenDependency,
repoUrl: string
): Promise<string | null> {
const metadataUrl = getMavenUrl(
dependency,
repoUrl,
`${version}/maven-metadata.xml`
);

const { xml: mavenMetadata } = await downloadMavenXml(metadataUrl);
if (!mavenMetadata) {
return null;
}

return extractSnapshotVersion(mavenMetadata);
}

async function createUrlForDependencyPom(
version: string,
dependency: MavenDependency,
repoUrl: string
): Promise<string> {
if (isSnapshotVersion(version)) {
const fullVersion = await getSnapshotFullVersion(
version,
dependency,
repoUrl
);
if (fullVersion !== null) {
return `${version}/${dependency.name}-${fullVersion}.pom`;
}
}

return `${version}/${dependency.name}-${version}.pom`;
}

type ArtifactInfoResult = [string, boolean | string | null];

async function getArtifactInfo(
Expand Down Expand Up @@ -218,15 +278,17 @@ async function filterMissingArtifacts(
);

if (!isValidArtifactsInfo(artifactsInfo, versions)) {
const queue = versions
.map((version): [string, url.URL | null] => {
const versionUrls = versions.map(
async (version): Promise<[string, url.URL | null]> => {
const artifactUrl = getMavenUrl(
dependency,
repoUrl,
`${version}/${dependency.name}-${version}.pom`
await createUrlForDependencyPom(version, dependency, repoUrl)
);
return [version, artifactUrl];
})
}
);
const queue = (await Promise.all(versionUrls))
.filter(([_, artifactUrl]) => Boolean(artifactUrl))
.map(([version, artifactUrl]) => (): Promise<ArtifactInfoResult> =>
getArtifactInfo(version, artifactUrl)
Expand Down