Skip to content

Commit

Permalink
fix(manager/nuget): Add autoReplaceStringTemplate (#26508)
Browse files Browse the repository at this point in the history
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
  • Loading branch information
marcmognol and viceice committed Jan 5, 2024
1 parent 31dc0fd commit b39ad3a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
7 changes: 7 additions & 0 deletions lib/modules/manager/nuget/extract.spec.ts
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
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

0 comments on commit b39ad3a

Please sign in to comment.