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

Jump to bottom

feat(node): remove hard-coded docker grouping #9469

Merged
merged 1 commit into from Apr 9, 2021
Merged

feat(node): remove hard-coded docker grouping #9469

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions lib/config/presets/internal/group.ts
View file
Open in desktop
Expand Up @@ -29,10 +29,24 @@ const staticGroups = {
},
],
},
nodeJs: {
description:
"Group anything that looks like Node.js together so that it's updated together",
packageRules: [
{
matchDatasources: ['docker'],
matchPackageNames: ['node'],
matchPackagePatterns: ['/node$'],
excludePackageNames: ['calico/node'],
commitMessageTopic: 'Node.js',
},
],
},
recommended: {
description:
'Use curated list of recommended non-monorepo package groupings',
extends: [
'group:nodeJs',
'group:allApollographql',
'group:fortawesome',
'group:fusionjs',
Expand Down
5 changes: 0 additions & 5 deletions lib/manager/circleci/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@ exports[`lib/manager/circleci/extract extractPackageFile() extracts image withou
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "14.8.0",
"datasource": "docker",
Expand All @@ -20,7 +19,6 @@ exports[`lib/manager/circleci/extract extractPackageFile() extracts multiple ima
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": undefined,
"datasource": "docker",
Expand All @@ -31,7 +29,6 @@ Array [
},
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "4",
"datasource": "docker",
Expand All @@ -42,7 +39,6 @@ Array [
},
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "6",
"datasource": "docker",
Expand All @@ -53,7 +49,6 @@ Array [
},
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8.9.0",
"datasource": "docker",
Expand Down
1 change: 0 additions & 1 deletion lib/manager/cloudbuild/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Expand Up @@ -12,7 +12,6 @@ Array [
},
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "12",
"datasource": "docker",
Expand Down
2 changes: 0 additions & 2 deletions lib/manager/docker-compose/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Expand Up @@ -12,7 +12,6 @@ Array [
},
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "10.0.0",
"datasource": "docker",
Expand Down Expand Up @@ -80,7 +79,6 @@ Array [
},
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "10.0.0",
"datasource": "docker",
Expand Down
20 changes: 0 additions & 20 deletions lib/manager/dockerfile/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() detects ["stage"] a
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8.15.1-alpine",
"datasource": "docker",
Expand Down Expand Up @@ -123,7 +122,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() extracts images on
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": "sha256:d743b4141b02fcfb8beb68f92b4cd164f60ee457bf2d053f36785bf86de16b0d",
"currentValue": "8.11.3-alpine",
"datasource": "docker",
Expand All @@ -147,7 +145,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() extracts multiple F
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "6.12.3",
"datasource": "docker",
Expand Down Expand Up @@ -185,7 +182,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles abnormal sp
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8.7.0",
"datasource": "docker",
Expand Down Expand Up @@ -214,7 +210,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles comments 1`
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": undefined,
"datasource": "docker",
Expand All @@ -229,7 +224,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles custom host
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8",
"datasource": "docker",
Expand All @@ -244,7 +238,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles custom host
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8-alpine",
"datasource": "docker",
Expand All @@ -259,7 +252,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles custom host
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8",
"datasource": "docker",
Expand All @@ -274,7 +266,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles custom host
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8",
"datasource": "docker",
Expand All @@ -289,7 +280,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles custom host
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": undefined,
"datasource": "docker",
Expand All @@ -304,7 +294,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles digest 1`]
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": "sha256:eb85fc5b1198f5e1ec025ea07586bdbbf397e7d82df66c90d7511f533517e063",
"currentValue": undefined,
"datasource": "docker",
Expand All @@ -319,7 +308,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles from as 1`]
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8.9.0-alpine",
"datasource": "docker",
Expand All @@ -334,7 +322,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles naked dep 1
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": undefined,
"datasource": "docker",
Expand All @@ -349,7 +336,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles namespaced
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8",
"datasource": "docker",
Expand All @@ -364,7 +350,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles tag 1`] = `
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "8.9.0-alpine",
"datasource": "docker",
Expand All @@ -379,7 +364,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() handles tag and dig
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": "sha256:eb85fc5b1198f5e1ec025ea07586bdbbf397e7d82df66c90d7511f533517e063",
"currentValue": "8.9.0",
"datasource": "docker",
Expand Down Expand Up @@ -409,7 +393,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() is case insensitive
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": undefined,
"datasource": "docker",
Expand All @@ -424,7 +407,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() skips index referen
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "6.12.3",
"datasource": "docker",
Expand All @@ -439,7 +421,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() skips named multist
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "6.12.3",
"datasource": "docker",
Expand All @@ -454,7 +435,6 @@ exports[`lib/manager/dockerfile/extract extractPackageFile() skips named multist
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "6.12.3",
"datasource": "docker",
Expand Down
8 changes: 0 additions & 8 deletions lib/manager/dockerfile/extract.ts
View file
Open in desktop
Expand Up @@ -48,14 +48,6 @@ export function getDep(
'{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}';
}
dep.datasource = datasourceDocker.id;
if (
dep.depName &&
(dep.depName === 'node' || dep.depName.endsWith('/node')) &&
dep.depName !== 'calico/node'
) {
dep.commitMessageTopic = 'Node.js';
}

if (dep.depName === 'ubuntu') {
dep.versioning = ubuntuVersioning.id;
}
Expand Down
1 change: 0 additions & 1 deletion lib/manager/droneci/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@ Array [
},
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": "sha256:36adc17e9cceab32179d3314da9cb9c737ffb11f0de4e688f407ad6d9ca32201",
"currentValue": "10.0.0",
"datasource": "docker",
Expand Down
1 change: 0 additions & 1 deletion lib/manager/github-actions/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Expand Up @@ -67,7 +67,6 @@ Array [
},
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": "sha256:7b65413af120ec5328077775022c78101f103258a1876ec2f83890bce416e896",
"currentValue": "6",
"datasource": "docker",
Expand Down
1 change: 0 additions & 1 deletion lib/manager/gitlabci/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Expand Up @@ -148,7 +148,6 @@ Array [
"deps": Array [
Object {
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"commitMessageTopic": "Node.js",
"currentDigest": undefined,
"currentValue": "12",
"datasource": "docker",
Expand Down