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(java): handle version manifest snapshot release version #297

Merged
merged 2 commits into from
Oct 24, 2019
Merged
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
17 changes: 10 additions & 7 deletions __snapshots__/version-manifest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
exports['VersionManifest parseVersions parses multiple versions in versions.txt 1'] = {
"google-cloud-trace": "0.108.0-beta",
"grpc-google-cloud-trace-v1": "0.73.0",
"grpc-google-cloud-trace-v2": "0.73.0",
"proto-google-cloud-trace-v1": "0.73.0",
"proto-google-cloud-trace-v2": "0.73.0"
}
exports['VersionManifest updateContent updates versions.txt with snapshot released version 1'] = `
# Format:
# module:released-version:current-version

google-cloud-trace:0.109.0:0.109.0
grpc-google-cloud-trace-v1:0.74.0:0.74.0
grpc-google-cloud-trace-v2:0.73.1-SNAPSHOT:0.73.1-SNAPSHOT
proto-google-cloud-trace-v1:0.73.1-SNAPSHOT:0.73.1-SNAPSHOT
proto-google-cloud-trace-v2:0.73.1-SNAPSHOT:0.73.1-SNAPSHOT
`
2 changes: 1 addition & 1 deletion src/updaters/java/versions-manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class VersionsManifest extends JavaUpdate {
newLines.push(
line.replace(
new RegExp(
`${packageName}:[0-9]+\\.[0-9]+\\.[0-9]+(-\\w+)?:[0-9]+\\.[0-9]+\\.[0-9]+(-\\w+)?(-SNAPSHOT)?`,
`${packageName}:[0-9]+\\.[0-9]+\\.[0-9]+(-\\w+)?(-SNAPSHOT)?:[0-9]+\\.[0-9]+\\.[0-9]+(-\\w+)?(-SNAPSHOT)?`,
'g'
),
`${packageName}:${version}:${version}`
Expand Down
8 changes: 8 additions & 0 deletions test/updaters/fixtures/versions-double-snapshot.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Format:
# module:released-version:current-version

google-cloud-trace:0.108.1-beta-SNAPSHOT:0.108.1-beta-SNAPSHOT
grpc-google-cloud-trace-v1:0.73.1-SNAPSHOT:0.73.1-SNAPSHOT
grpc-google-cloud-trace-v2:0.73.1-SNAPSHOT:0.73.1-SNAPSHOT
proto-google-cloud-trace-v1:0.73.1-SNAPSHOT:0.73.1-SNAPSHOT
proto-google-cloud-trace-v2:0.73.1-SNAPSHOT:0.73.1-SNAPSHOT
22 changes: 22 additions & 0 deletions test/updaters/version-manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import { readFileSync } from 'fs';
import { resolve } from 'path';
import * as snapshot from 'snap-shot-it';

import { VersionsManifest } from '../../src/updaters/java/versions-manifest';
import { expect } from 'chai';
Expand Down Expand Up @@ -55,4 +56,25 @@ describe('VersionManifest', () => {
expect(VersionsManifest.needsSnapshot(content)).to.equal(false);
});
});

describe('updateContent', () => {
it('updates versions.txt with snapshot released version', async () => {
const oldContent = readFileSync(
resolve(fixturesPath, './versions-double-snapshot.txt'),
'utf8'
).replace(/\r\n/g, '\n');
const versions = new Map<string, string>();
versions.set('google-cloud-trace', '0.109.0');
versions.set('grpc-google-cloud-trace-v1', '0.74.0');
const javaAuthVersions = new VersionsManifest({
path: 'versions.txt',
changelogEntry: '',
versions,
version: 'unused',
packageName: 'used',
});
const newContent = javaAuthVersions.updateContent(oldContent);
snapshot(newContent);
});
});
});