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

fix(lockfilemaintenance): ensure isLockFileMaintenance on grouping #33971

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(lockfilemaintenance): ensure isLockFileMaintenance on grouping #33971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/modules/manager/bun/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ describe('modules/manager/bun/artifacts', () => {
updateArtifact.updatedDeps = [
{ manager: 'bun', lockFiles: ['bun.lockb'] },
];
updateArtifact.config.updateType = 'lockFileMaintenance';
updateArtifact.config.isLockFileMaintenance = true;
const oldLock = Buffer.from('old');
fs.readFile.mockResolvedValueOnce(oldLock as never);
const newLock = Buffer.from('new');
Expand Down Expand Up @@ -176,7 +176,7 @@ describe('modules/manager/bun/artifacts', () => {
updateArtifact.updatedDeps = [
{ manager: 'bun', lockFiles: ['bun.lock'] },
];
updateArtifact.config.updateType = 'lockFileMaintenance';
updateArtifact.config.isLockFileMaintenance = true;
const oldLock = Buffer.from('old');
fs.readFile.mockResolvedValueOnce(oldLock as never);
const newLock = Buffer.from('new');
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/bun/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export async function updateArtifacts(
const { packageFileName, updatedDeps, newPackageFileContent, config } =
updateArtifact;
logger.debug(`bun.updateArtifacts(${packageFileName})`);
const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;

if (is.emptyArray(updatedDeps) && !isLockFileMaintenance) {
logger.debug('No updated bun deps - returning null');
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/cargo/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ describe('modules/manager/cargo/artifacts', () => {
packageFileName: 'Cargo.toml',
updatedDeps: [],
newPackageFileContent: '{}',
config: { ...config, updateType: 'lockFileMaintenance' },
config: { ...config, isLockFileMaintenance: true },
}),
).not.toBeNull();
expect(execSnapshots).toMatchSnapshot();
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/cargo/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ async function updateArtifactsImpl(
return null;
}

const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;
if (!isLockFileMaintenance && !updatedDeps?.length) {
logger.debug('No more dependencies to update');
return [
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/manager/gleam/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ describe('modules/manager/gleam/artifacts', () => {

it('supports lockFileMaintenance', async () => {
updateArtifact.updatedDeps = [{ manager: 'gleam' }];
updateArtifact.config.updateType = 'lockFileMaintenance';
updateArtifact.config.isLockFileMaintenance = true;
fs.readLocalFile.mockResolvedValueOnce('old');
fs.readLocalFile.mockResolvedValueOnce('new');
fs.getSiblingFileName.mockReturnValueOnce('manifest.toml');
Expand All @@ -98,7 +98,7 @@ describe('modules/manager/gleam/artifacts', () => {

it('returns null if lockfile content unchanged', async () => {
updateArtifact.updatedDeps = [{ manager: 'gleam' }];
updateArtifact.config.updateType = 'lockFileMaintenance';
updateArtifact.config.isLockFileMaintenance = true;
fs.readLocalFile.mockResolvedValueOnce('old');
fs.readLocalFile.mockResolvedValueOnce('old');
fs.getSiblingFileName.mockReturnValueOnce('manifest.toml');
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/gleam/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export async function updateArtifacts(
const { packageFileName, updatedDeps, newPackageFileContent, config } =
updateArtifact;
logger.debug(`gleam.updateArtifacts(${packageFileName})`);
const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I see old code which references config.updateType, it implies to me that config just be an "update" config and not a "branch" config.


if (is.emptyArray(updatedDeps) && !isLockFileMaintenance) {
logger.debug('No updated gleam deps - returning null');
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/helmfile/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export async function updateArtifacts({
}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
logger.trace(`helmfile.updateArtifacts(${packageFileName})`);

const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;
if (
!isLockFileMaintenance &&
(updatedDeps === undefined || updatedDeps.length < 1)
Expand Down
22 changes: 11 additions & 11 deletions lib/modules/manager/helmv3/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ describe('modules/manager/helmv3/artifacts', () => {
packageFileName: 'Chart.yaml',
updatedDeps: [],
newPackageFileContent: chartFile,
config: { ...config, updateType: 'lockFileMaintenance' },
config: { ...config, isLockFileMaintenance: true },
}),
).toMatchObject([
{
Expand Down Expand Up @@ -589,7 +589,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFile,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: { stable: 'the stable_url', repo1: 'the_repo1_url' },
},
}),
Expand Down Expand Up @@ -630,7 +630,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFile,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: { stable: 'the_stable_url', repo1: 'the_repo1_url' },
},
}),
Expand Down Expand Up @@ -676,7 +676,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFile,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: {
stable: 'the_stable_url',
oci: 'oci://registry.example.com/organization',
Expand Down Expand Up @@ -726,7 +726,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFile,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: {},
},
}),
Expand Down Expand Up @@ -774,7 +774,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFileECR,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: {},
},
}),
Expand Down Expand Up @@ -840,7 +840,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFileECR,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: {},
},
}),
Expand Down Expand Up @@ -895,7 +895,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFileECR,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: {},
},
}),
Expand Down Expand Up @@ -954,7 +954,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFileECR,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: {},
},
}),
Expand Down Expand Up @@ -1009,7 +1009,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFile,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: {
repo1:
'https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable',
Expand Down Expand Up @@ -1057,7 +1057,7 @@ describe('modules/manager/helmv3/artifacts', () => {
newPackageFileContent: chartFileAlias,
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
registryAliases: {
jetstack: 'https://charts.jetstack.io',
},
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/helmv3/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export async function updateArtifacts({
}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
logger.debug(`helmv3.updateArtifacts(${packageFileName})`);

const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;
const isUpdateOptionAddChartArchives = config.postUpdateOptions?.includes(
'helmUpdateSubChartArchives',
);
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/npm/post-update/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ describe('modules/manager/npm/post-update/index', () => {
...baseConfig,
upgrades: [{ isLockfileUpdate: false }],
reuseExistingBranch: true,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
updateLockFiles: true,
},
additionalFiles,
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/npm/post-update/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ export async function getAdditionalFiles(
}
logger.debug('Getting updated lock files');
if (
config.updateType === 'lockFileMaintenance' &&
config.isLockFileMaintenance &&
config.reuseExistingBranch &&
(await scm.branchExists(config.branchName))
) {
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/manager/pep621/processors/pdm.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ describe('modules/manager/pep621/processors/pdm', () => {
packageFileName: 'folder/pyproject.toml',
newPackageFileContent: '',
config: {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
},
updatedDeps: [],
},
Expand Down Expand Up @@ -329,7 +329,7 @@ describe('modules/manager/pep621/processors/pdm', () => {
packageFileName: 'folder/pyproject.toml',
newPackageFileContent: '',
config: {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
},
updatedDeps: [],
},
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/pep621/processors/pdm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export class PdmProcessor implements PyProjectProcessor {
): Promise<UpdateArtifactsResult[] | null> {
const { config, updatedDeps, packageFileName } = updateArtifact;

const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;

// abort if no lockfile is defined
const lockFileName = getSiblingFileName(packageFileName, 'pdm.lock');
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/pep621/processors/uv.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ describe('modules/manager/pep621/processors/uv', () => {
packageFileName: 'folder/pyproject.toml',
newPackageFileContent: '',
config: {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
},
updatedDeps: [],
},
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/pep621/processors/uv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export class UvProcessor implements PyProjectProcessor {
): Promise<UpdateArtifactsResult[] | null> {
const { config, updatedDeps, packageFileName } = updateArtifact;

const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;

// abort if no lockfile is defined
const lockFileName = getSiblingFileName(packageFileName, 'uv.lock');
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/poetry/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ describe('modules/manager/poetry/artifacts', () => {
newPackageFileContent: '{}',
config: {
...config,
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
},
}),
).toEqual([
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/poetry/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export async function updateArtifacts({
config,
}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
logger.debug(`poetry.updateArtifacts(${packageFileName})`);
const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;

if (!is.nonEmptyArray(updatedDeps) && !isLockFileMaintenance) {
logger.debug('No updated poetry deps - returning null');
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/pub/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ describe('modules/manager/pub/artifacts', () => {
await pub.updateArtifacts({
...updateArtifact,
newPackageFileContent: params.packageFileContent,
config: { ...config, updateType: 'lockFileMaintenance' },
config: { ...config, isLockFileMaintenance: true },
}),
).toEqual([
{
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/manager/pub/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export async function updateArtifacts({
config,
}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
logger.debug(`pub.updateArtifacts(${packageFileName})`);
const isLockFileMaintenance = config.updateType === 'lockFileMaintenance';
const { isLockFileMaintenance } = config;

if (is.emptyArray(updatedDeps) && !isLockFileMaintenance) {
logger.debug('No updated pub deps - returning null');
Expand Down Expand Up @@ -101,7 +101,7 @@ export async function updateArtifacts({
function getExecCommand(
toolName: string,
updatedDeps: Upgrade<Record<string, unknown>>[],
isLockFileMaintenance: boolean,
isLockFileMaintenance: boolean | undefined,
): string {
if (isLockFileMaintenance) {
return `${toolName} pub upgrade`;
Expand Down
10 changes: 5 additions & 5 deletions lib/modules/manager/terraform/lockfile/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ describe('modules/manager/terraform/lockfile/index', () => {
]);

const localConfig: UpdateArtifactsConfig = {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
...config,
};

Expand Down Expand Up @@ -769,7 +769,7 @@ describe('modules/manager/terraform/lockfile/index', () => {
]);

const localConfig: UpdateArtifactsConfig = {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
...config,
};

Expand Down Expand Up @@ -874,7 +874,7 @@ describe('modules/manager/terraform/lockfile/index', () => {
]);

const localConfig: UpdateArtifactsConfig = {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
...config,
};
const result = await updateArtifacts({
Expand Down Expand Up @@ -944,7 +944,7 @@ describe('modules/manager/terraform/lockfile/index', () => {
mockHash.mockResolvedValue(null);

const localConfig: UpdateArtifactsConfig = {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
...config,
};

Expand Down Expand Up @@ -980,7 +980,7 @@ describe('modules/manager/terraform/lockfile/index', () => {

it('return null if experimental flag is not set', async () => {
const localConfig: UpdateArtifactsConfig = {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
...config,
};
const result = await updateArtifacts({
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/terraform/lockfile/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export async function updateArtifacts({
}

const updates: ProviderLockUpdate[] = [];
if (config.updateType === 'lockFileMaintenance') {
if (config.isLockFileMaintenance) {
// update all locks in the file during maintenance --> only update version in constraints
const maintenanceUpdates = await updateAllLocks(locks);
updates.push(...maintenanceUpdates);
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/terragrunt/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('modules/manager/terragrunt/artifacts', () => {

it('calls terraform updateArtifacts if the update type is lockfileMaintenance', async () => {
const localConfig: UpdateArtifactsConfig = {
updateType: 'lockFileMaintenance',
isLockFileMaintenance: true,
...config,
};

Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/terragrunt/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { UpdateArtifact, UpdateArtifactsResult } from '../types';
export async function updateArtifacts(
artifact: UpdateArtifact,
): Promise<UpdateArtifactsResult[] | null> {
if (artifact.config.updateType !== 'lockFileMaintenance') {
if (!artifact.config.isLockFileMaintenance) {
logger.debug(
`UpdateType ${
artifact.config.updateType as string
Expand Down
2 changes: 2 additions & 0 deletions lib/modules/manager/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,4 +315,6 @@ export interface PostUpdateConfig<T = Record<string, any>>
yarnLock?: string;
branchName: string;
reuseExistingBranch?: boolean;

isLockFileMaintenance?: boolean;
}
2 changes: 1 addition & 1 deletion lib/modules/manager/vendir/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ describe('modules/manager/vendir/artifacts', () => {
packageFileName: 'vendir.yml',
updatedDeps: [],
newPackageFileContent: vendirFile,
config: { ...config, updateType: 'lockFileMaintenance' },
config: { ...config, isLockFileMaintenance: true },
}),
).toEqual([
{
Expand Down
Loading