renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-14 16:46:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(manager/maven-wrapper): preserve wrapper base url (#20092)

Browse source 
Co-authored-by: Rhys Arkins <rhys@arkins.net>
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
This commit is contained in:
Trystian Offerman 2023-02-01 23:28:23 +01:00 committed by GitHub
parent 092d3f76f4
commit ad9f9d3f99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 158 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
lib/modules/manager/maven-wrapper/artifacts.spec.ts
View file

@ -308,4 +308,121 @@ describe('modules/manager/maven-wrapper/artifacts', () => {
},
]);
});
it('should run wrapper:wrapper with MVNW_REPOURL if it is a custom artifactory', async () => {
const execSnapshots = mockExecAll({ stdout: '', stderr: '' });
mockMavenFileChangedInGit();
await updateArtifacts({
packageFileName: 'maven-wrapper',
newPackageFileContent: '',
updatedDeps: [
{
depName: 'maven-wrapper',
replaceString:
'https://internal.local/maven-public/org/apache/maven/wrapper/maven-wrapper/3.0.0/maven-wrapper-3.0.0.jar',
},
],
config: { currentValue: '3.0.0', newValue: '3.3.1' },
});
expect(execSnapshots).toMatchObject([
{
cmd: './mvnw wrapper:wrapper',
options: {
cwd: '/tmp/github',
encoding: 'utf-8',
env: {
HOME: '/home/user',
HTTPS_PROXY: 'https://example.com',
HTTP_PROXY: 'http://example.com',
LANG: 'en_US.UTF-8',
LC_ALL: 'en_US',
NO_PROXY: 'localhost',
PATH: '/tmp/path',
MVNW_REPOURL: 'https://internal.local/maven-public',
},
maxBuffer: 10485760,
timeout: 900000,
},
},
]);
});
it('should run not include MVNW_REPOURL when run with default maven repo url', async () => {
const execSnapshots = mockExecAll({ stdout: '', stderr: '' });
mockMavenFileChangedInGit();
await updateArtifacts({
packageFileName: 'maven-wrapper',
newPackageFileContent: '',
updatedDeps: [
{
depName: 'maven-wrapper',
replaceString:
'https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar',
},
],
config: { currentValue: '3.0.0', newValue: '3.3.1' },
});
expect(execSnapshots).toMatchObject([
{
cmd: './mvnw wrapper:wrapper',
options: {
cwd: '/tmp/github',
encoding: 'utf-8',
env: {
HOME: '/home/user',
HTTPS_PROXY: 'https://example.com',
HTTP_PROXY: 'http://example.com',
LANG: 'en_US.UTF-8',
LC_ALL: 'en_US',
NO_PROXY: 'localhost',
PATH: '/tmp/path',
},
maxBuffer: 10485760,
timeout: 900000,
},
},
]);
expect(execSnapshots[0]!.options!.env).not.toHaveProperty('MVNW_REPOURL');
});
it('should run not include MVNW_REPOURL when run with a malformed replaceString', async () => {
const execSnapshots = mockExecAll({ stdout: '', stderr: '' });
mockMavenFileChangedInGit();
await updateArtifacts({
packageFileName: 'maven-wrapper',
newPackageFileContent: '',
updatedDeps: [
{
depName: 'maven-wrapper',
replaceString: 'not a good url',
},
],
config: { currentValue: '3.0.0', newValue: '3.3.1' },
});
expect(execSnapshots).toMatchObject([
{
cmd: './mvnw wrapper:wrapper',
options: {
cwd: '/tmp/github',
encoding: 'utf-8',
env: {
HOME: '/home/user',
HTTPS_PROXY: 'https://example.com',
HTTP_PROXY: 'http://example.com',
LANG: 'en_US.UTF-8',
LC_ALL: 'en_US',
NO_PROXY: 'localhost',
PATH: '/tmp/path',
},
maxBuffer: 10485760,
timeout: 900000,
},
},
]);
expect(execSnapshots[0]!.options!.env).not.toHaveProperty('MVNW_REPOURL');
});
});

44
lib/modules/manager/maven-wrapper/artifacts.ts
View file

@ -5,17 +5,20 @@ import { dirname, join } from 'upath';
import { GlobalConfig } from '../../../config/global';
import { logger } from '../../../logger';
import { exec } from '../../../util/exec';
import type { ExecOptions } from '../../../util/exec/types';
import type { ExecOptions, ExtraEnv } from '../../../util/exec/types';
import { chmodLocalFile, readLocalFile, statLocalFile } from '../../../util/fs';
import { getRepoStatus } from '../../../util/git';
import type { StatusResult } from '../../../util/git/types';
import { regEx } from '../../../util/regex';
import mavenVersioning from '../../versioning/maven';
import type {
PackageDependency,
UpdateArtifact,
UpdateArtifactsConfig,
UpdateArtifactsResult,
} from '../types';
const DEFAULT_MAVEN_REPO_URL = 'https://repo.maven.apache.org/maven2';
interface MavenWrapperPaths {
wrapperExecutableFileName: string;
localProjectDir: string;
@ -60,7 +63,9 @@ export async function updateArtifacts({
logger.info('No mvnw found - skipping Artifacts update');
return null;
}
await executeWrapperCommand(cmd, config, packageFileName);
const extraEnv = getExtraEnvOptions(updatedDeps);
await executeWrapperCommand(cmd, config, packageFileName, extraEnv);
const status = await getRepoStatus();
const artifactFileNames = [
@ -133,13 +138,16 @@ export function getJavaConstraint(
async function executeWrapperCommand(
cmd: string,
config: UpdateArtifactsConfig,
packageFileName: string
packageFileName: string,
extraEnv: ExtraEnv
): Promise<void> {
logger.debug(`Updating maven wrapper: "${cmd}"`);
const { wrapperFullyQualifiedPath } = getMavenPaths(packageFileName);
const execOptions: ExecOptions = {
cwdFile: wrapperFullyQualifiedPath,
docker: {},
extraEnv,
toolConstraints: [
{
toolName: 'java',
@ -157,6 +165,36 @@ async function executeWrapperCommand(
}
}
function getExtraEnvOptions(deps: PackageDependency[]): ExtraEnv {
const customMavenWrapperUrl = getCustomMavenWrapperRepoUrl(deps);
if (customMavenWrapperUrl) {
return { MVNW_REPOURL: customMavenWrapperUrl };
}
return {};
}
function getCustomMavenWrapperRepoUrl(
deps: PackageDependency[]
): string | null {
const replaceString = deps.find(
(dep) => dep.depName === 'maven-wrapper'
)?.replaceString;
if (!replaceString) {
return null;
}
const match = regEx(/^(.*?)\/org\/apache\/maven\/wrapper\//).exec(
replaceString
);
if (!match) {
return null;
}
return match[1] === DEFAULT_MAVEN_REPO_URL ? null : match[1];
}
async function createWrapperCommand(
packageFileName: string
): Promise<string | null> {