mirror of
https://github.com/renovatebot/renovate.git
synced 2026-11-01 10:09:50 +00:00
4b4d14ec00
* feat(manager): pass extracted constraints to updateArtifacts `extractedConstraints` were collected during extraction but only ever read by `fetch.ts` for the lookup. At artifact time every manager had to derive the same tool constraints a second time, and when the updated package file no longer carried the constraint there was nothing to fall back to. `generateBranchConfig()` now merges the `extractedConstraints` of all upgrades of a branch onto the branch config, which reaches `updateArtifacts()` through `patchConfigForArtifactsUpdate()`. `UpdateArtifactsConfig` declares the field and documents what it contains. The new `resolveToolConstraint()` helper implements the ladder once: user `constraints` > an optional artifact-time derivation > the extracted value. The derivation is ranked above the extracted value on purpose: it reads the package files as the branch changed them, so poetry (python is an updatable dependency there), composer, pipenv (`pipenv` can be a dev package) and pep621 (`requires-python` is an updatable dependency) would otherwise regress to a stale constraint. pipenv, pep621 uv/pdm, poetry and composer are migrated to the helper and keep their derivation. Behaviour change: these managers now use the extract-time constraint as a last resort instead of running unconstrained, for example on lock file maintenance where pipenv deletes `Pipfile.lock` before deriving. `execute-post-upgrade-commands.ts` is unaffected: it reads `upgrade.constraints` per upgrade, and the extracted values are kept in a separate field rather than folded into `constraints`, so post-upgrade task tool constraints still come from user config only. Not migrated, because their constraints are never extracted, so the fallback would be dead code: bundler (`ruby`/`bundler`), pixi (`pixi`), pep621 uv (`required-version`) and npm's node ladder, whose last step already reads `package.json` engines. * refactor(manager): resolve tool constraints through resolveToolConstraint() Every manager now obtains the constraint of a tool it runs through `resolveToolConstraint()` instead of reading `config.constraints` itself, so the precedence "user config, then a value derived from the updated files, then the constraints collected during extraction" applies everywhere. The helper treats an empty string as not set at every step and accepts the `PostUpdateConfig` shape, whose `constraints` may be `null`. Behaviour changes that go beyond the new fallback to extracted constraints: - `mix` applies its hardcoded erlang default only after the extracted constraint, so an erlang version collected at extraction can win over it. - `kustomize` decides `HELM_EXPERIMENTAL_OCI` from the fully resolved helm constraint; `generateHelmEnvs()` takes that value instead of the config. - `npm` (yarn): an upgrade of yarn without a new value now consults the user constraint before deriving one from package.json or the lock file. - The "Using <tool> constraint from config" debug lines in bundler, composer, copier and pip-compile are gone, as the helper is the only reader of the config now. Helpers that read the config synchronously became async: bundler `getBundlerConstraint()`, copier `getPythonVersionConstraint()` and `getCopierVersionConstraint()`, pip-compile `get*VersionConstraint()` and `getToolVersionConstraint()`, gomod `deriveGoToolchainConstraints()` and `getUpdateImportPathCmds()`, mise `getMiseLockToolConstraints()`. composer `getPhpConstraint()` is removed. Each converted manager has a test showing the extracted constraint reaching the executed tool, and, where a derive callback exists, that the derived value still wins over it. * refactor(linters): add prefer-resolve-tool-constraint rule Reports member reads and destructuring of `constraints` and `extractedConstraints` from a manager config in `lib/modules/manager/**`, so that tool constraints are resolved through `resolveToolConstraint()` in `lib/modules/manager/util.ts` only. Writes and the same properties on package files, which extraction has to populate, are not reported. The helper itself and spec files are exempt in `.oxlintrc.json`. * refactor(manager): inline thin resolveToolConstraint wrappers Drop copier/utils.ts and the pip-compile getPipToolsVersionConstraint / getUvVersionConstraint helpers, which only forwarded to resolveToolConstraint(). Callers now call it directly. * docs(development): note lock file maintenance in tool constraints section * refactor(manager): address review on tool constraint resolution composer only runs extractConstraints() when a user constraint is missing, via Lazy. UpdateArtifactsConfig no longer re-declares constraints and extractedConstraints, which ToolConstraintsConfig already provides.
965 lines
31 KiB
TypeScript
965 lines
31 KiB
TypeScript
import { codeBlock } from 'common-tags';
|
|
import upath from 'upath';
|
|
import { envMock, mockExecAll, mockExecSequence } from '~test/exec-util.ts';
|
|
import { env, fs } from '~test/util.ts';
|
|
import { GlobalConfig } from '../../../config/global.ts';
|
|
import type {
|
|
InternalGlobalConfigOptions,
|
|
RepoGlobalConfig,
|
|
} from '../../../config/types.ts';
|
|
import * as docker from '../../../util/exec/docker/index.ts';
|
|
import type { FileAddition } from '../../../util/git/types.ts';
|
|
import type { UpdateArtifactsConfig, Upgrade } from '../types.ts';
|
|
import { updateArtifacts } from './index.ts';
|
|
import * as rules from './post-update/rules.ts';
|
|
|
|
vi.mock('../../../util/exec/env.ts');
|
|
vi.mock('../../../util/fs/index.ts');
|
|
|
|
const adminConfig: RepoGlobalConfig & InternalGlobalConfigOptions = {
|
|
// `join` fixes Windows CI
|
|
localDir: upath.join('/tmp/github/some/repo'),
|
|
cacheDir: upath.join('/tmp/renovate/cache'),
|
|
containerbaseDir: upath.join('/tmp/renovate/cache/containerbase'),
|
|
binarySource: 'global',
|
|
};
|
|
const dockerAdminConfig = {
|
|
...adminConfig,
|
|
binarySource: 'docker',
|
|
dockerSidecarImage: 'ghcr.io/renovatebot/base-image',
|
|
} satisfies RepoGlobalConfig;
|
|
|
|
process.env.CONTAINERBASE = 'true';
|
|
|
|
const config: UpdateArtifactsConfig = {};
|
|
const validDepUpdate = {
|
|
depName: 'pnpm',
|
|
depType: 'packageManager',
|
|
currentValue:
|
|
'8.15.5+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589',
|
|
newVersion: '8.15.6',
|
|
} satisfies Upgrade<Record<string, unknown>>;
|
|
|
|
describe('modules/manager/npm/artifacts', () => {
|
|
const spyProcessHostRules = vi.spyOn(rules, 'processHostRules');
|
|
|
|
beforeEach(() => {
|
|
env.getChildProcessEnv.mockReturnValue({
|
|
...envMock.basic,
|
|
LANG: 'en_US.UTF-8',
|
|
LC_ALL: 'en_US',
|
|
});
|
|
GlobalConfig.set(adminConfig);
|
|
docker.resetPrefetchedImages();
|
|
spyProcessHostRules.mockReturnValue({
|
|
additionalNpmrcContent: [],
|
|
additionalYarnRcYml: undefined,
|
|
});
|
|
});
|
|
|
|
it('returns null if no packageManager updates present', async () => {
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'flake.nix',
|
|
updatedDeps: [{ ...validDepUpdate, depName: 'xmldoc', depType: 'patch' }],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('returns null if currentValue is undefined', async () => {
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'flake.nix',
|
|
updatedDeps: [{ ...validDepUpdate, currentValue: undefined }],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('returns null if currentValue has no hash', async () => {
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'flake.nix',
|
|
updatedDeps: [{ ...validDepUpdate, currentValue: '8.15.5' }],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('returns null if unchanged', async () => {
|
|
fs.readLocalFile.mockResolvedValueOnce('some content');
|
|
const execSnapshots = mockExecAll();
|
|
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [validDepUpdate],
|
|
newPackageFileContent: 'some content',
|
|
config: { ...config },
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
expect(execSnapshots).toMatchObject([{ cmd: 'corepack use pnpm@8.15.6' }]);
|
|
});
|
|
|
|
it('returns updated package.json', async () => {
|
|
fs.readLocalFile
|
|
.mockResolvedValueOnce('# dummy') // for npmrc
|
|
.mockResolvedValueOnce('{}') // for node constraints
|
|
.mockResolvedValue('some new content'); // for updated package.json
|
|
const execSnapshots = mockExecAll();
|
|
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [validDepUpdate],
|
|
newPackageFileContent: 'some content',
|
|
config: { ...config },
|
|
});
|
|
|
|
expect(res).toEqual([
|
|
{
|
|
file: {
|
|
contents: 'some new content',
|
|
path: 'package.json',
|
|
type: 'addition',
|
|
},
|
|
},
|
|
]);
|
|
expect(execSnapshots).toMatchObject([{ cmd: 'corepack use pnpm@8.15.6' }]);
|
|
});
|
|
|
|
it('quotes the corepack package spec', async () => {
|
|
fs.readLocalFile
|
|
.mockResolvedValueOnce('# dummy') // for npmrc
|
|
.mockResolvedValueOnce('{}') // for node constraints
|
|
.mockResolvedValue('some new content'); // for updated package.json
|
|
const execSnapshots = mockExecAll();
|
|
|
|
await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'pnpm; echo hello',
|
|
},
|
|
],
|
|
newPackageFileContent: 'some content',
|
|
config: { ...config },
|
|
});
|
|
|
|
expect(execSnapshots).toMatchObject([
|
|
{ cmd: `corepack use 'pnpm; echo hello@8.15.6'` },
|
|
]);
|
|
});
|
|
|
|
it('supports docker mode', async () => {
|
|
GlobalConfig.set(dockerAdminConfig);
|
|
const execSnapshots = mockExecAll();
|
|
fs.readLocalFile
|
|
.mockResolvedValueOnce('# dummy') // for npmrc
|
|
.mockResolvedValueOnce('some new content');
|
|
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [validDepUpdate],
|
|
newPackageFileContent: 'some content',
|
|
config: {
|
|
...config,
|
|
constraints: { node: '20.1.0', corepack: '0.29.3' },
|
|
},
|
|
});
|
|
|
|
expect(res).toEqual([
|
|
{
|
|
file: {
|
|
contents: 'some new content',
|
|
path: 'package.json',
|
|
type: 'addition',
|
|
},
|
|
},
|
|
]);
|
|
|
|
expect(execSnapshots).toMatchObject([
|
|
{ cmd: 'docker pull ghcr.io/renovatebot/base-image' },
|
|
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
|
|
{
|
|
cmd:
|
|
'docker run --rm --name=renovate_sidecar --label=renovate_child ' +
|
|
'-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' +
|
|
'-v "/tmp/renovate/cache":"/tmp/renovate/cache" ' +
|
|
'-e CI ' +
|
|
'-e CONTAINERBASE_CACHE_DIR ' +
|
|
'-w "/tmp/github/some/repo" ' +
|
|
'ghcr.io/renovatebot/base-image ' +
|
|
"bash -l -c '" +
|
|
'install-tool node 20.1.0 ' +
|
|
'&& ' +
|
|
'install-tool corepack 0.29.3 ' +
|
|
'&& ' +
|
|
'corepack use pnpm@8.15.6' +
|
|
"'",
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('supports install mode', async () => {
|
|
GlobalConfig.set({ ...adminConfig, binarySource: 'install' });
|
|
const execSnapshots = mockExecAll();
|
|
fs.readLocalFile
|
|
.mockResolvedValueOnce('# dummy') // for npmrc
|
|
.mockResolvedValueOnce('some new content');
|
|
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [validDepUpdate],
|
|
newPackageFileContent: 'some content',
|
|
config: {
|
|
...config,
|
|
constraints: { node: '20.1.0', corepack: '0.29.3' },
|
|
},
|
|
});
|
|
|
|
expect(res).toEqual([
|
|
{
|
|
file: {
|
|
contents: 'some new content',
|
|
path: 'package.json',
|
|
type: 'addition',
|
|
},
|
|
},
|
|
]);
|
|
|
|
expect(execSnapshots).toMatchObject([
|
|
{
|
|
cmd: 'install-tool node 20.1.0',
|
|
options: { cwd: '/tmp/github/some/repo' },
|
|
},
|
|
{ cmd: 'install-tool corepack 0.29.3' },
|
|
|
|
{
|
|
cmd: 'corepack use pnpm@8.15.6',
|
|
options: { cwd: '/tmp/github/some/repo' },
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('falls back to the extracted node and corepack constraints', async () => {
|
|
GlobalConfig.set({ ...adminConfig, binarySource: 'install' });
|
|
fs.readLocalFile
|
|
.mockResolvedValueOnce('# dummy') // for npmrc
|
|
.mockResolvedValueOnce('{}') // for node constraints
|
|
.mockResolvedValue('some new content'); // for updated package.json
|
|
const execSnapshots = mockExecAll();
|
|
|
|
await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [validDepUpdate],
|
|
newPackageFileContent: 'some content',
|
|
config: {
|
|
...config,
|
|
extractedConstraints: { node: '20.1.0', corepack: '0.29.3' },
|
|
},
|
|
});
|
|
|
|
expect(execSnapshots).toMatchObject([
|
|
{ cmd: 'install-tool node 20.1.0' },
|
|
{ cmd: 'install-tool corepack 0.29.3' },
|
|
{ cmd: 'corepack use pnpm@8.15.6' },
|
|
]);
|
|
});
|
|
|
|
it('catches errors', async () => {
|
|
const execSnapshots = mockExecSequence([new Error('exec error')]);
|
|
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [validDepUpdate],
|
|
newPackageFileContent: 'some content',
|
|
config: {
|
|
...config,
|
|
constraints: { node: '20.1.0', corepack: '0.29.3' },
|
|
},
|
|
});
|
|
|
|
expect(res).toEqual([
|
|
{
|
|
artifactError: { fileName: 'package.json', stderr: 'exec error' },
|
|
},
|
|
]);
|
|
expect(execSnapshots).toMatchObject([{ cmd: 'corepack use pnpm@8.15.6' }]);
|
|
});
|
|
|
|
describe('updatePnpmWorkspace()', () => {
|
|
it('returns null if no security updates are found', async () => {
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [{ ...validDepUpdate, currentValue: '8.15.5' }],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('returns null if pnpm workspace file does not exist', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(false);
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
currentValue: '8.15.5',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('returns null if the pnpmLockFile file is not found', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080`,
|
|
);
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
currentValue: '8.15.5',
|
|
managerData: {
|
|
// to be super explicit it's not set
|
|
pnpmLockFile: undefined,
|
|
|
|
// data from testing in https://github.com/JamieTanna-Mend-testing/pnpm-test-mra-no-workspace/pull/3
|
|
hasPackageManager: false,
|
|
npmrcFileName: null,
|
|
yarnZeroInstall: false,
|
|
},
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('returns null if no minimumReleaseAge setting found', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(''); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
currentValue: '8.15.5',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('returns null if minimumReleaseAgeExclude excludes all versions of updated dep', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080
|
|
minimumReleaseAgeExclude:
|
|
- '@myorg/*'
|
|
- pnpm`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
currentValue: '8.15.5',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
{
|
|
...validDepUpdate,
|
|
depName: '@myorg/fs-alternative',
|
|
currentValue: '8.15.5',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('updates pnpm workspace - adds minimumReleaseAgeExclude block if not found', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
currentValue: '8.15.5',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n # Renovate security update: pnpm@8.15.6\n - pnpm@8.15.6\n',
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('updates pnpm workspace - appends new minimumReleaseAgeExclude setting', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080
|
|
minimumReleaseAgeExclude:
|
|
- otherdep@5.6.7`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
currentValue: '8.15.5',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n - otherdep@5.6.7\n # Renovate security update: pnpm@8.15.6\n - pnpm@8.15.6\n',
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('updates pnpm workspace - expands existing minimumReleaseAgeExclude setting', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080
|
|
minimumReleaseAgeExclude:
|
|
- pnpm@5.6.7
|
|
- '@next/env@16.0.7 || 16.0.9'`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
currentValue: '8.15.5',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
{
|
|
...validDepUpdate,
|
|
depName: '@next/env',
|
|
depType: 'dependency',
|
|
currentValue: '16.0.9',
|
|
newVersion: '16.0.10',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
"minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n # Renovate security update: pnpm@8.15.6\n - pnpm@5.6.7 || 8.15.6\n # Renovate security update: @next/env@16.0.10\n - '@next/env@16.0.7 || 16.0.9 || 16.0.10'\n",
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('updates pnpm workspace - handles comment with version already present on an inner minimumReleaseAgeExclude setting', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080
|
|
minimumReleaseAgeExclude:
|
|
- pnpm@5.6.7
|
|
# Renovate security update: lodash@4.17.21 || 4.17.23
|
|
- lodash@4.17.23`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'lodash',
|
|
depType: 'devDependencies',
|
|
currentValue: '^4.17.15',
|
|
currentVersion: '4.17.21',
|
|
newVersion: '4.17.23',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
// no changes needed
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('updates pnpm workspace - handles comment on an inner minimumReleaseAgeExclude setting', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080
|
|
minimumReleaseAgeExclude:
|
|
- pnpm@5.6.7
|
|
# Renovate security update: lodash@4.17.21
|
|
- lodash@4.17.21`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'lodash',
|
|
depType: 'devDependencies',
|
|
currentValue: '^4.17.15',
|
|
currentVersion: '4.17.21',
|
|
newVersion: '4.17.23',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n - pnpm@5.6.7\n # Renovate security update: lodash@4.17.21 || 4.17.23\n - lodash@4.17.21 || 4.17.23\n',
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
// As per https://github.com/renovatebot/renovate/issues/40610, we don't want to allow version constraints with i.e. a caret like `^4.17.15`
|
|
it('updates pnpm workspace - uses newVersion over newValue in minimumReleaseAgeExclude', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'lodash',
|
|
depType: 'devDependencies',
|
|
currentValue: '^4.17.15',
|
|
currentVersion: '4.17.21',
|
|
newVersion: '4.17.23',
|
|
newValue: '^4.17.15',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n # Renovate security update: lodash@4.17.23\n - lodash@4.17.23\n',
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('handles multiple security upgrades of the same package (at different versions) in a monorepo', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
|
|
// for the first package file
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080`,
|
|
); // for pnpm-workspace.yaml
|
|
let res = await updateArtifacts({
|
|
packageFileName: 'packages/a/package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'lodash',
|
|
depType: 'dependencies',
|
|
currentValue: '4.17.20',
|
|
newVersion: '4.17.21',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n # Renovate security update: lodash@4.17.21\n - lodash@4.17.21\n',
|
|
},
|
|
},
|
|
]);
|
|
expect(res).not.toBeNull();
|
|
|
|
const addition = res![0].file as FileAddition;
|
|
const newContents = addition.contents as string;
|
|
|
|
// then for the next update
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(newContents); // for pnpm-workspace.yaml
|
|
|
|
res = await updateArtifacts({
|
|
packageFileName: 'packages/b/package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'lodash',
|
|
depType: 'devDependencies',
|
|
currentValue: '4.17.20',
|
|
newVersion: '4.17.23',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n # Renovate security update: lodash@4.17.21 || 4.17.23\n - lodash@4.17.21 || 4.17.23\n',
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('handles multiple security upgrades of the same package (at the same version) in a monorepo', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
|
|
// for the first package file
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080`,
|
|
); // for pnpm-workspace.yaml
|
|
let res = await updateArtifacts({
|
|
packageFileName: 'packages/a/package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'lodash',
|
|
depType: 'dependencies',
|
|
currentValue: '4.17.20',
|
|
newVersion: '4.17.21',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n # Renovate security update: lodash@4.17.21\n - lodash@4.17.21\n',
|
|
},
|
|
},
|
|
]);
|
|
expect(res).not.toBeNull();
|
|
|
|
const addition = res![0].file as FileAddition;
|
|
const newContents = addition.contents as string;
|
|
|
|
// then for the next update
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(newContents); // for pnpm-workspace.yaml
|
|
|
|
res = await updateArtifacts({
|
|
packageFileName: 'packages/b/package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'lodash',
|
|
depType: 'devDependencies',
|
|
currentValue: '4.17.20',
|
|
newVersion: '4.17.21',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
// no updates are needed, as they're at the same version
|
|
expect(res).toBeNull();
|
|
});
|
|
|
|
it('replaces malformed minimumReleaseAgeExclude entries from prior Renovate bug', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 4320
|
|
minimumReleaseAgeExclude:
|
|
- fast-xml-parser@<=5.3.5@5.5.7`,
|
|
);
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'fast-xml-parser@<=5.3.5',
|
|
packageName: 'fast-xml-parser',
|
|
depType: 'pnpm.overrides',
|
|
currentValue: '5.3.5',
|
|
newVersion: '5.5.7',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents: `${codeBlock`
|
|
minimumReleaseAge: 4320
|
|
minimumReleaseAgeExclude:
|
|
# Renovate security update: fast-xml-parser@5.5.7
|
|
- fast-xml-parser@5.5.7
|
|
`}\n`,
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('appends to valid minimumReleaseAgeExclude when malformed entry also exists', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 4320
|
|
minimumReleaseAgeExclude:
|
|
- fast-xml-parser@5.5.6
|
|
- fast-xml-parser@<=5.3.5@5.5.7`,
|
|
);
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'fast-xml-parser@<=5.3.5',
|
|
packageName: 'fast-xml-parser',
|
|
depType: 'pnpm.overrides',
|
|
currentValue: '5.5.6',
|
|
newVersion: '5.5.7',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents: `${codeBlock`
|
|
minimumReleaseAge: 4320
|
|
minimumReleaseAgeExclude:
|
|
# Renovate security update: fast-xml-parser@5.5.7
|
|
- fast-xml-parser@5.5.6 || 5.5.7
|
|
`}\n`,
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('uses packageName (bare package name) for pnpm overrides with range selectors', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 4320`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'fast-xml-parser@<=5.3.5',
|
|
packageName: 'fast-xml-parser',
|
|
depType: 'pnpm.overrides',
|
|
currentValue: '5.3.5',
|
|
newVersion: '5.5.7',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents: `${codeBlock`
|
|
minimumReleaseAge: 4320
|
|
minimumReleaseAgeExclude:
|
|
# Renovate security update: fast-xml-parser@5.5.7
|
|
- fast-xml-parser@5.5.7
|
|
`}\n`,
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('preserves catalog changes in pnpm-workspace.yaml when adding minimumReleaseAgeExclude', async () => {
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`
|
|
minimumReleaseAge: 10080
|
|
catalog:
|
|
effect: ^3.19.0`,
|
|
);
|
|
const newPackageFileContent = codeBlock`
|
|
minimumReleaseAge: 10080
|
|
catalog:
|
|
effect: ^3.20.0`;
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'pnpm-workspace.yaml',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'effect',
|
|
depType: 'pnpm.catalog.default',
|
|
currentValue: '^3.19.0',
|
|
newVersion: '3.20.0',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent,
|
|
config,
|
|
});
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\ncatalog:\n effect: ^3.20.0\nminimumReleaseAgeExclude:\n # Renovate security update: effect@3.20.0\n - effect@3.20.0\n',
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
|
|
it('handles multiple security upgrades correctly (bug fix test)', async () => {
|
|
fs.getSiblingFileName.mockReturnValueOnce('pnpm-workspace.yaml');
|
|
fs.localPathExists.mockResolvedValueOnce(true);
|
|
fs.readLocalFile.mockResolvedValueOnce(
|
|
codeBlock`minimumReleaseAge: 10080`,
|
|
); // for pnpm-workspace.yaml
|
|
const res = await updateArtifacts({
|
|
packageFileName: 'package.json',
|
|
updatedDeps: [
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'lodash',
|
|
currentValue: '4.17.20',
|
|
newVersion: '4.17.21',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
{
|
|
...validDepUpdate,
|
|
depName: 'axios',
|
|
currentValue: '0.21.0',
|
|
newVersion: '0.21.1',
|
|
managerData: { pnpmLockFile: 'pnpm-lock.yaml' },
|
|
isVulnerabilityAlert: true,
|
|
},
|
|
],
|
|
newPackageFileContent: 'some new content',
|
|
config,
|
|
});
|
|
// Both upgrades should be present - this confirms the oldContent bug fix
|
|
expect(res).toStrictEqual([
|
|
{
|
|
file: {
|
|
type: 'addition',
|
|
path: 'pnpm-workspace.yaml',
|
|
contents:
|
|
'minimumReleaseAge: 10080\nminimumReleaseAgeExclude:\n # Renovate security update: lodash@4.17.21\n - lodash@4.17.21\n # Renovate security update: axios@0.21.1\n - axios@0.21.1\n',
|
|
},
|
|
},
|
|
]);
|
|
});
|
|
});
|
|
});
|