diff --git a/lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap index 73caee37c68cbd2839933d1539618e2740f51724..8bf9586e76082eec4c195f4643711a866c9a1075 100644 --- a/lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/bazel/__snapshots__/extract.spec.ts.snap @@ -44,7 +44,6 @@ Array [ )", }, "packageName": "google/subpar", - "repo": "google/subpar", }, Object { "currentValue": "0.6.0", @@ -60,7 +59,6 @@ Array [ )", }, "packageName": "bazelbuild/bazel-skylib", - "repo": "bazelbuild/bazel-skylib", }, Object { "currentValue": "0.5.0", @@ -79,7 +77,6 @@ Array [ )", }, "packageName": "bazelbuild/stardoc", - "repo": "bazelbuild/stardoc", }, ] `; @@ -100,7 +97,6 @@ Array [ )", }, "packageName": "lmirosevic/GBDeviceInfo", - "repo": "lmirosevic/GBDeviceInfo", }, Object { "currentDigest": "135d46b4c9423ee7d494c78a21ff621bc73c12f3", @@ -116,7 +112,6 @@ Array [ )", }, "packageName": "nelhage/rules_boost", - "repo": "nelhage/rules_boost", }, Object { "currentValue": "6.3.0", @@ -132,7 +127,6 @@ Array [ )", }, "packageName": "lmirosevic/GBDeviceInfo", - "repo": "lmirosevic/GBDeviceInfo", }, Object { "currentDigest": "135d46b4c9423ee7d494c78a21ff621bc73c12f3", @@ -148,7 +142,6 @@ Array [ )", }, "packageName": "nelhage/rules_boost", - "repo": "nelhage/rules_boost", }, Object { "currentValue": "v0.29.0", @@ -164,7 +157,6 @@ Array [ )", }, "packageName": "bazelbuild/rules_go", - "repo": "bazelbuild/rules_go", }, ] `; @@ -258,7 +250,6 @@ Array [ )", }, "packageName": "GoogleContainerTools/distroless", - "repo": "GoogleContainerTools/distroless", }, Object { "currentDigest": "d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4", @@ -277,7 +268,6 @@ Array [ )", }, "packageName": "bazelbuild/bazel-toolchains", - "repo": "bazelbuild/bazel-toolchains", }, Object { "currentValue": "0.0.3", @@ -321,7 +311,6 @@ Array [ )", }, "packageName": "bazelbuild/rules_go", - "repo": "bazelbuild/rules_go", }, Object { "currentValue": "0.5.0", @@ -340,7 +329,6 @@ Array [ )", }, "packageName": "bazelbuild/bazel-skylib", - "repo": "bazelbuild/bazel-skylib", }, Object { "currentDigest": "446923c3756ceeaa75888f52fcbdd48bb314fbf8", @@ -356,7 +344,6 @@ Array [ )", }, "packageName": "GoogleContainerTools/distroless", - "repo": "GoogleContainerTools/distroless", }, Object { "currentValue": "v0.29.0", @@ -372,7 +359,6 @@ Array [ )", }, "packageName": "bazelbuild/rules_go", - "repo": "bazelbuild/rules_go", }, Object { "currentValue": "v0.24.0", @@ -391,7 +377,6 @@ Array [ )", }, "packageName": "bazelbuild/bazel-gazelle", - "repo": "bazelbuild/bazel-gazelle", }, Object { "currentDigest": "816c9085562cd7ee03e7f8188a1cfd942858cded", @@ -446,7 +431,6 @@ Array [ )", }, "packageName": "GoogleContainerTools/distroless", - "repo": "GoogleContainerTools/distroless", }, ] `; @@ -467,7 +451,6 @@ Array [ )", }, "packageName": "nelhage/rules_boost", - "repo": "nelhage/rules_boost", }, ] `; diff --git a/lib/modules/manager/bazel/extract.ts b/lib/modules/manager/bazel/extract.ts index 0833ecd38132b3847695240d50da55e415cc8a48..8562cd9aaeeddc7598d2f7f74c2694fd5e2c9424 100644 --- a/lib/modules/manager/bazel/extract.ts +++ b/lib/modules/manager/bazel/extract.ts @@ -294,14 +294,13 @@ export function extractPackageFile( return; } dep.depName = depName; - dep.repo = parsedUrl.repo; if (regEx(/^[a-f0-9]{40}$/i).test(parsedUrl.currentValue)) { dep.currentDigest = parsedUrl.currentValue; } else { dep.currentValue = parsedUrl.currentValue; } dep.datasource = parsedUrl.datasource; - dep.packageName = dep.repo; + dep.packageName = parsedUrl.repo; deps.push(dep); } else if ( depType === 'container_pull' && diff --git a/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap b/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap index 0628a164eed571036961a51037137d4c588a2479..83fe49cb5f9960c3ee77234bae6c8b00b1865bd2 100644 --- a/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap +++ b/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap @@ -178,7 +178,6 @@ Object { "depName": "c", "depType": "dependencies", "gitRef": true, - "githubRepo": "owner/c", "packageName": "owner/c", "pinDigests": false, "prettyDepType": "dependency", @@ -199,7 +198,6 @@ Object { "depName": "e", "depType": "dependencies", "gitRef": true, - "githubRepo": "owner/e", "packageName": "owner/e", "prettyDepType": "dependency", "sourceUrl": "https://github.com/owner/e", @@ -211,7 +209,6 @@ Object { "depName": "f", "depType": "dependencies", "gitRef": true, - "githubRepo": "owner/f", "packageName": "owner/f", "pinDigests": false, "prettyDepType": "dependency", @@ -253,7 +250,6 @@ Object { "depName": "k", "depType": "dependencies", "gitRef": true, - "githubRepo": "owner/k", "packageName": "owner/k", "prettyDepType": "dependency", "sourceUrl": "https://github.com/owner/k", @@ -266,7 +262,6 @@ Object { "depName": "l", "depType": "dependencies", "gitRef": true, - "githubRepo": "owner/l", "packageName": "owner/l", "prettyDepType": "dependency", "sourceUrl": "https://github.com/owner/l", @@ -278,7 +273,6 @@ Object { "depName": "m", "depType": "dependencies", "gitRef": true, - "githubRepo": "owner/m", "packageName": "owner/m", "pinDigests": false, "prettyDepType": "dependency", @@ -291,7 +285,6 @@ Object { "depName": "n", "depType": "dependencies", "gitRef": true, - "githubRepo": "owner/n", "packageName": "owner/n", "pinDigests": false, "prettyDepType": "dependency", @@ -304,7 +297,6 @@ Object { "depName": "o", "depType": "dependencies", "gitRef": true, - "githubRepo": "owner/o", "packageName": "owner/o", "pinDigests": false, "prettyDepType": "dependency", @@ -317,7 +309,6 @@ Object { "depName": "p", "depType": "dependencies", "gitRef": true, - "githubRepo": "Owner/P", "packageName": "Owner/P", "pinDigests": false, "prettyDepType": "dependency", diff --git a/lib/modules/manager/npm/extract/index.ts b/lib/modules/manager/npm/extract/index.ts index cd15aebd610ae0166c689dfcf6af464e62a94630..023f81b8773b473dee03230113802515b6dd58c3 100644 --- a/lib/modules/manager/npm/extract/index.ts +++ b/lib/modules/manager/npm/extract/index.ts @@ -334,7 +334,6 @@ export async function extractPackageFile( dep.skipReason = 'unversioned-reference'; return dep; } - dep.githubRepo = githubOwnerRepo; dep.sourceUrl = `https://github.com/${githubOwnerRepo}`; dep.gitRef = true; return dep; diff --git a/lib/modules/manager/types.ts b/lib/modules/manager/types.ts index 6ee514be284b9d7a566a6c4462a2848f94e5a10e..38b81ff98041c09b45eed36b596c0731e180c39a 100644 --- a/lib/modules/manager/types.ts +++ b/lib/modules/manager/types.ts @@ -98,7 +98,6 @@ export interface Package<T> extends ManagerData<T> { groupName?: string; lineNumber?: number; packageName?: string | null; - repo?: string; target?: string; versioning?: string; dataType?: string; @@ -109,7 +108,6 @@ export interface Package<T> extends ManagerData<T> { packageFileVersion?: string; gitRef?: boolean; sourceUrl?: string | null; - githubRepo?: string; pinDigests?: boolean; currentRawValue?: string; major?: { enabled?: boolean };