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(manager/nuget): Add autoReplaceStringTemplate #26508

Merged
merged 12 commits into from
Jan 5, 2024
Merged

fix(manager/nuget): Add autoReplaceStringTemplate #26508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c6b4d85
Add autoReplaceStringTemplate
marcmognol Jan 4, 2024
bf4c137
Updates
marcmognol Jan 4, 2024
ac3bd62
Merge branch 'main' into pin-digest
marcmognol Jan 4, 2024
7109f7d
Use properties from getDep
marcmognol Jan 5, 2024
84722f5
Update lib/modules/manager/nuget/extract.ts
marcmognol Jan 5, 2024
dbe7651
Updates
marcmognol Jan 5, 2024
6001ec7
Updates
marcmognol Jan 5, 2024
adb4f43
Remove currentDigest
marcmognol Jan 5, 2024
1306030
Update lib/modules/manager/nuget/extract.ts
marcmognol Jan 5, 2024
6019c85
Update lib/modules/manager/nuget/extract.ts
viceice Jan 5, 2024
c3e60ae
Update lib/modules/manager/nuget/extract.ts
marcmognol Jan 5, 2024
8551356
Update lib/modules/manager/nuget/extract.ts
marcmognol Jan 5, 2024
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
7 changes: 7 additions & 0 deletions lib/modules/manager/nuget/extract.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,13 @@ describe('modules/manager/nuget/extract', () => {
expect(await extractPackageFile(contents, contents, config)).toEqual({
deps: [
{
autoReplaceStringTemplate:
'{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
depName: 'mcr.microsoft.com/dotnet/runtime',
depType: 'docker',
datasource: 'docker',
currentValue: '7.0.10',
replaceString: 'mcr.microsoft.com/dotnet/runtime:7.0.10',
},
],
packageFileVersion: '0.1.0',
Expand All @@ -102,12 +105,16 @@ describe('modules/manager/nuget/extract', () => {
expect(await extractPackageFile(contents, contents, config)).toEqual({
deps: [
{
autoReplaceStringTemplate:
'{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
depName: 'mcr.microsoft.com/dotnet/runtime',
depType: 'docker',
datasource: 'docker',
currentValue: '7.0.10',
currentDigest:
'sha256:181067029e094856691ee1ce3782ea3bd3fda01bb5b6d19411d0f673cab1ab19',
replaceString:
'mcr.microsoft.com/dotnet/runtime:7.0.10@sha256:181067029e094856691ee1ce3782ea3bd3fda01bb5b6d19411d0f673cab1ab19',
},
],
packageFileVersion: '0.1.0',
Expand Down
13 changes: 3 additions & 10 deletions lib/modules/manager/nuget/extract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { logger } from '../../../logger';
import { getSiblingFileName, localPathExists } from '../../../util/fs';
import { hasKey } from '../../../util/object';
import { regEx } from '../../../util/regex';
import { DockerDatasource } from '../../datasource/docker';
import { NugetDatasource } from '../../datasource/nuget';
import { getDep } from '../dockerfile/extract';
import type {
Expand Down Expand Up @@ -49,16 +48,10 @@ function extractDepsFromXml(xmlNode: XmlDocument): NugetPackageDependency[] {
const { name, attr } = child;

if (name === 'ContainerBaseImage') {
const dep = getDep(child.val, true);
const { depName, ...dep } = getDep(child.val, true);

if (is.nonEmptyStringAndNotWhitespace(dep.depName)) {
results.push({
datasource: DockerDatasource.id,
depType: 'docker',
depName: dep.depName,
currentValue: dep.currentValue,
currentDigest: dep.currentDigest,
});
if (is.nonEmptyStringAndNotWhitespace(depName)) {
results.push({ ...dep, depName, depType: 'docker' });
}
}

Expand Down