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

chore(deps): lock file maintenance #18082

Merged
merged 4 commits into from
Oct 11, 2022
Merged

chore(deps): lock file maintenance #18082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
400d61e
chore(deps): lock file maintenance
renovate[bot] Oct 11, 2022
6e2f927
fix lint
rarkins Oct 11, 2022
7756e34
toMatchSnapshot -> toMatchObject
rarkins Oct 11, 2022
08ee3b8
Merge branch 'main' into renovate/lock-file-maintenance
rarkins Oct 11, 2022
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
37 changes: 0 additions & 37 deletions lib/logger/__snapshots__/index.spec.ts.snap
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lib/logger/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('logger/index', () => {
logger.error({ some: 'meta' }, 'message');
logger.warn('a warning with a p4$$w0rd');
logger.info('ignored');
expect(getProblems()).toMatchSnapshot([
expect(getProblems()).toMatchObject([
{ msg: 'some meta' },
{ some: 'meta', password: '***********' },
{ some: 'meta', msg: 'message' },
Expand Down
181 changes: 0 additions & 181 deletions lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,166 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`modules/manager/bazel/extract extractPackageFile() extracts dependencies for container_pull deptype 1`] = `
[
{
"currentDigest": "sha256:a4e8d8c444ca04fe706649e82263c9f4c2a4229bc30d2a64561b5e1d20cc8548",
"currentValue": "v1.0.0-alpha31.cli-migrations",
"datasource": "docker",
"depName": "hasura",
"depType": "container_pull",
"managerData": {
"def": "container_pull(
name="hasura",
registry="index.docker.io",
repository="hasura/graphql-engine",
# v1.0.0-alpha31.cli-migrations 11/28
digest="sha256:a4e8d8c444ca04fe706649e82263c9f4c2a4229bc30d2a64561b5e1d20cc8548",
tag="v1.0.0-alpha31.cli-migrations"
)",
},
"packageName": "hasura/graphql-engine",
"registryUrls": [
"index.docker.io",
],
"versioning": "docker",
},
]
`;

exports[`modules/manager/bazel/extract extractPackageFile() extracts dependencies from *.bzl files 1`] = `
[
{
"currentDigest": "0356bef3fbbabec5f0e196ecfacdeb6db62d48c0",
"datasource": "github-tags",
"depName": "subpar",
"depType": "http_archive",
"managerData": {
"def": "http_archive(
name = "subpar",
sha256 = "7ab6ab37ede82255e00c0456846a1428b20e8813f77d83bcf54ddd59ba34377a",
# Commit from 2019-03-07.
strip_prefix = "subpar-0356bef3fbbabec5f0e196ecfacdeb6db62d48c0",
urls = ["https://github.com/google/subpar/archive/0356bef3fbbabec5f0e196ecfacdeb6db62d48c0.tar.gz"],
)",
},
"packageName": "google/subpar",
},
{
"currentValue": "0.6.0",
"datasource": "github-tags",
"depName": "bazel_skylib",
"depType": "http_archive",
"managerData": {
"def": "http_archive(
name = "bazel_skylib",
sha256 = "eb5c57e4c12e68c0c20bc774bfbc60a568e800d025557bc4ea022c6479acc867",
strip_prefix = "bazel-skylib-0.6.0",
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz"],
)",
},
"packageName": "bazelbuild/bazel-skylib",
},
{
"currentValue": "0.5.0",
"datasource": "github-releases",
"depName": "io_bazel_stardoc",
"depType": "http_archive",
"managerData": {
"def": "maybe(
http_archive,
name = "io_bazel_stardoc",
sha256 = "c9794dcc8026a30ff67cf7cf91ebe245ca294b20b071845d12c192afe243ad72",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/stardoc/releases/download/0.5.0/stardoc-0.5.0.tar.gz",
"https://github.com/bazelbuild/stardoc/releases/download/0.5.0/stardoc-0.5.0.tar.gz",
],
)",
},
"packageName": "bazelbuild/stardoc",
},
]
`;

exports[`modules/manager/bazel/extract extractPackageFile() extracts github tags 1`] = `
[
{
"currentValue": "6.3.0",
"datasource": "github-tags",
"depName": "GBDeviceInfo",
"depType": "http_archive",
"managerData": {
"def": "http_archive(
name = "GBDeviceInfo",
url = "https://github.com/lmirosevic/GBDeviceInfo/archive/6.3.0.tar.gz",
sha256 = "d7666275dff039407ea467c3083b83e24934101777c8b55b6b1b3b7e9a9e220b",
strip_prefix = "GBDeviceInfo-6.3.0/GBDeviceInfo"
)",
},
"packageName": "lmirosevic/GBDeviceInfo",
},
{
"currentDigest": "135d46b4c9423ee7d494c78a21ff621bc73c12f3",
"datasource": "github-tags",
"depName": "com_github_nelhage_rules_boost",
"depType": "http_archive",
"managerData": {
"def": "http_archive(
name = "com_github_nelhage_rules_boost",
url = "https://github.com/nelhage/rules_boost/archive/135d46b4c9423ee7d494c78a21ff621bc73c12f3.tar.gz",
sha256 = "3651f5dda0f7296e4cecafacc7f9d1f274be0fd64e30bebd74e28ffba28fe77f",
strip_prefix = "rules_boost-135d46b4c9423ee7d494c78a21ff621bc73c12f3",
)",
},
"packageName": "nelhage/rules_boost",
},
{
"currentValue": "6.3.0",
"datasource": "github-tags",
"depName": "GBDeviceInfo-zip",
"depType": "http_archive",
"managerData": {
"def": "http_archive(
name = "GBDeviceInfo-zip",
url = "https://github.com/lmirosevic/GBDeviceInfo/archive/6.3.0.zip",
sha256 = "4ef4320c4880fd64cfb7f42132f4b02fa626bccf1ba3e1a71dfbfcb50735f141",
strip_prefix = "GBDeviceInfo-6.3.0/GBDeviceInfo"
)",
},
"packageName": "lmirosevic/GBDeviceInfo",
},
{
"currentDigest": "135d46b4c9423ee7d494c78a21ff621bc73c12f3",
"datasource": "github-tags",
"depName": "com_github_nelhage_rules_boost-zip",
"depType": "http_archive",
"managerData": {
"def": "http_archive(
name = "com_github_nelhage_rules_boost-zip",
url = "https://github.com/nelhage/rules_boost/archive/135d46b4c9423ee7d494c78a21ff621bc73c12f3.zip",
sha256 = "de8aac034cabe4a9ba5f7a33b9523862bf76c245a6c554c0e737f591bb7c7aeb",
strip_prefix = "rules_boost-135d46b4c9423ee7d494c78a21ff621bc73c12f3",
)",
},
"packageName": "nelhage/rules_boost",
},
{
"currentValue": "v0.29.0",
"datasource": "github-releases",
"depName": "io_bazel_rules_go",
"depType": "http_archive",
"managerData": {
"def": "maybe(
http_archive,
name = "io_bazel_rules_go",
sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f",
url = "https://github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
)",
},
"packageName": "bazelbuild/rules_go",
},
]
`;

exports[`modules/manager/bazel/extract extractPackageFile() extracts multiple types of dependencies 1`] = `
[
{
Expand Down Expand Up @@ -451,26 +290,6 @@ exports[`modules/manager/bazel/extract extractPackageFile() extracts multiple ty
]
`;

exports[`modules/manager/bazel/extract extractPackageFile() handle comments and strings 1`] = `
[
{
"currentDigest": "98495a618246683c9058dd87c2c78a2c06087999",
"datasource": "github-tags",
"depName": "com_github_nelhage_rules_boost",
"depType": "http_archive",
"managerData": {
"def": "http_archive(
name = "com_github_nelhage_rules_boost",
url = "https://github.com/nelhage/rules_boost/archive/98495a618246683c9058dd87c2c78a2c06087999.tar.gz",
sha256 = "f92cb7ed66a5b24f97a7fc3917407f808c70d2689273bdd68f93d70a379d22d3",
strip_prefix = "rules_boost-98495a618246683c9058dd87c2c78a2c06087999",
)",
},
"packageName": "nelhage/rules_boost",
},
]
`;

exports[`modules/manager/bazel/extract extractPackageFile() sequential http_archive 1`] = `
[
{
Expand Down
10 changes: 4 additions & 6 deletions lib/modules/manager/bazel/extract.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('modules/manager/bazel/extract', () => {

it('extracts github tags', () => {
const res = extractPackageFile(Fixtures.get('WORKSPACE2'));
expect(res?.deps).toMatchSnapshot([
expect(res?.deps).toMatchObject([
{ packageName: 'lmirosevic/GBDeviceInfo' },
{ packageName: 'nelhage/rules_boost' },
{ packageName: 'lmirosevic/GBDeviceInfo' },
Expand All @@ -39,14 +39,12 @@ describe('modules/manager/bazel/extract', () => {

it('handle comments and strings', () => {
const res = extractPackageFile(Fixtures.get('WORKSPACE3'));
expect(res?.deps).toMatchSnapshot([
{ packageName: 'nelhage/rules_boost' },
]);
expect(res?.deps).toMatchObject([{ packageName: 'nelhage/rules_boost' }]);
});

it('extracts dependencies from *.bzl files', () => {
const res = extractPackageFile(Fixtures.get('repositories.bzl'));
expect(res?.deps).toMatchSnapshot([
expect(res?.deps).toMatchObject([
{
currentDigest: '0356bef3fbbabec5f0e196ecfacdeb6db62d48c0',
packageName: 'google/subpar',
Expand Down Expand Up @@ -74,7 +72,7 @@ describe('modules/manager/bazel/extract', () => {
tag="v1.0.0-alpha31.cli-migrations"
)`
);
expect(res?.deps).toMatchSnapshot([
expect(res?.deps).toMatchObject([
{
currentDigest:
'sha256:a4e8d8c444ca04fe706649e82263c9f4c2a4229bc30d2a64561b5e1d20cc8548',
Expand Down
110 changes: 0 additions & 110 deletions lib/modules/manager/circleci/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`modules/manager/circleci/extract extractPackageFile() extracts image without leading dash 1`] = `
[
{
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"currentDigest": undefined,
"currentValue": "14.8.0",
"datasource": "docker",
"depName": "cimg/node",
"depType": "docker",
"replaceString": "cimg/node:14.8.0",
"versioning": "docker",
},
]
`;

exports[`modules/manager/circleci/extract extractPackageFile() extracts multiple image lines 1`] = `
[
{
Expand Down Expand Up @@ -59,98 +44,3 @@ exports[`modules/manager/circleci/extract extractPackageFile() extracts multiple
},
]
`;

exports[`modules/manager/circleci/extract extractPackageFile() extracts orbs too 1`] = `
[
{
"commitMessageTopic": "{{{depName}}} orb",
"currentValue": "4.1.0",
"datasource": "orb",
"depName": "release-workflows",
"depType": "orb",
"packageName": "hutson/library-release-workflows",
"rangeStrategy": "pin",
"versioning": "npm",
},
{
"commitMessageTopic": "{{{depName}}} orb",
"currentValue": undefined,
"datasource": "orb",
"depName": "no-version",
"depType": "orb",
"packageName": "abc/def",
"rangeStrategy": "pin",
"versioning": "npm",
},
{
"commitMessageTopic": "{{{depName}}} orb",
"currentValue": "volatile",
"datasource": "orb",
"depName": "volatile",
"depType": "orb",
"packageName": "zzz/zzz",
"rangeStrategy": "pin",
"versioning": "npm",
},
{
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"currentDigest": "sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"currentValue": "3.7",
"datasource": "docker",
"depName": "python",
"depType": "docker",
"replaceString": "python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"versioning": "docker",
},
{
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"currentDigest": "sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"currentValue": "3.7",
"datasource": "docker",
"depName": "python",
"depType": "docker",
"replaceString": "python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"versioning": "docker",
},
{
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"currentDigest": "sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"currentValue": "3.7",
"datasource": "docker",
"depName": "python",
"depType": "docker",
"replaceString": "python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"versioning": "docker",
},
{
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"currentDigest": "sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"currentValue": "3.7",
"datasource": "docker",
"depName": "python",
"depType": "docker",
"replaceString": "python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"versioning": "docker",
},
{
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"currentDigest": "sha256:eb6325b75c1c70b4992eaa1bdd29e24e5f14d5324b4714a49f3e67783473214b",
"currentValue": "3-6",
"datasource": "docker",
"depName": "pypy",
"depType": "docker",
"replaceString": "pypy:3-6@sha256:eb6325b75c1c70b4992eaa1bdd29e24e5f14d5324b4714a49f3e67783473214b",
"versioning": "docker",
},
{
"autoReplaceStringTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
"currentDigest": "sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"currentValue": "3.7",
"datasource": "docker",
"depName": "python",
"depType": "docker",
"replaceString": "python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077",
"versioning": "docker",
},
]
`;
Loading