Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/flux-chartref
Browse files Browse the repository at this point in the history
  • Loading branch information
ssams committed Jan 20, 2025
2 parents e1cd013 + 9d818ff commit 8301898
Show file tree
Hide file tree
Showing 146 changed files with 1,710 additions and 914 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/containerbase/devcontainer:13.5.8
FROM ghcr.io/containerbase/devcontainer:13.5.11
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ jobs:
os: ${{ runner.os }}

- name: Lint markdown
uses: DavidAnson/markdownlint-cli2-action@a23dae216ce3fee4db69da41fed90d2a4af801cf # v19.0.0
uses: DavidAnson/markdownlint-cli2-action@05f32210e84442804257b2a6f20b273450ec8265 # v19.1.0

- name: Lint fenced code blocks
run: pnpm doc-fence-check
Expand Down Expand Up @@ -684,7 +684,7 @@ jobs:
show-progress: false

- name: docker-config
uses: containerbase/internal-tools@c8f78cbc830d1883e695d06e3028136656e70f5b # v3.5.17
uses: containerbase/internal-tools@4453842226e67bc5d507c41b21184cc9220f4974 # v3.5.19
with:
command: docker-config

Expand Down
4 changes: 2 additions & 2 deletions docs/usage/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ Renovate will get the credentials with the [`google-auth-library`](https://www.n
service_account: ${{ env.SERVICE_ACCOUNT }}

- name: renovate
uses: renovatebot/github-action@v41.0.8
uses: renovatebot/github-action@v41.0.10
env:
RENOVATE_HOST_RULES: |
[
Expand Down Expand Up @@ -478,7 +478,7 @@ Make sure to install the Google Cloud SDK into the custom image, as you need the
For example:

```Dockerfile
FROM renovate/renovate:39.104.1
FROM renovate/renovate:39.117.2
# Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
# under "Installation" for "Debian/Ubuntu"
RUN ...
Expand Down
10 changes: 5 additions & 5 deletions docs/usage/examples/self-hosting.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ It builds `latest` based on the `main` branch and all SemVer tags are published
```sh title="Example of valid tags"
docker run --rm renovate/renovate
docker run --rm renovate/renovate:39
docker run --rm renovate/renovate:39.104
docker run --rm renovate/renovate:39.104.1
docker run --rm renovate/renovate:39.117
docker run --rm renovate/renovate:39.117.2
```

<!-- prettier-ignore -->
Expand Down Expand Up @@ -62,7 +62,7 @@ spec:
- name: renovate
# Update this to the latest available and then enable Renovate on
# the manifest
image: renovate/renovate:39.104.1
image: renovate/renovate:39.117.2
args:
- user/repo
# Environment Variables
Expand Down Expand Up @@ -121,7 +121,7 @@ spec:
template:
spec:
containers:
- image: renovate/renovate:39.104.1
- image: renovate/renovate:39.117.2
name: renovate-bot
env: # For illustration purposes, please use secrets.
- name: RENOVATE_PLATFORM
Expand Down Expand Up @@ -367,7 +367,7 @@ spec:
containers:
- name: renovate
# Update this to the latest available and then enable Renovate on the manifest
image: renovate/renovate:39.104.1
image: renovate/renovate:39.117.2
volumeMounts:
- name: ssh-key-volume
readOnly: true
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/mend-hosted/.pages
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: Mend-hosted Apps
nav:
- 'Overview': 'renovate-plans.md'
- 'Overview': 'overview.md'
- 'Configuration': 'hosted-apps-config.md'
- 'Credentials': 'credentials.md'
- 'Migrating Secrets': 'migrating-secrets.md'
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,9 @@ Details of the Mend Renovate Cloud versions are shown in the table below.
**Mend Renovate Community Cloud (Free)** - Available for free for all repositories.

**Mend Renovate Enterprise Cloud** - Supported premium version. Contact Mend at [sales@mend.io](mailto:sales@mend.io) for purchase details.

<!-- prettier-ignore -->
!!! note
OSS-licensed orgs can request increased resources on Mend Renovate Community Cloud.
To request increased resources, create a “[Suggest an Idea](/~https://github.com/renovatebot/renovate/discussions/categories/suggest-an-idea)” item on the Renovate discussions board on GitHub.
Acceptance is at the discretion of Mend.io.
2 changes: 1 addition & 1 deletion lib/config/options/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ const options: RenovateOptions[] = [
description:
'Change this value to override the default Renovate sidecar image.',
type: 'string',
default: 'ghcr.io/containerbase/sidecar:13.5.8',
default: 'ghcr.io/containerbase/sidecar:13.5.11',
globalOnly: true,
},
{
Expand Down
2 changes: 1 addition & 1 deletion lib/config/presets/github/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export async function fetchJSONFile(
logger.trace({ url }, `Preset URL`);
let res: { body: { content: string } };
try {
res = await http.getJson(url);
res = await http.getJsonUnchecked(url);
} catch (err) {
// istanbul ignore if: not testable with nock
if (err instanceof ExternalHostError) {
Expand Down
2 changes: 1 addition & 1 deletion lib/config/presets/gitlab/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async function getDefaultBranchName(
urlEncodedPkgName: string,
endpoint: string,
): Promise<string> {
const res = await gitlabApi.getJson<GitlabProject>(
const res = await gitlabApi.getJsonUnchecked<GitlabProject>(
`${endpoint}projects/${urlEncodedPkgName}`,
);
return res.body.default_branch ?? 'master'; // should never happen, but we keep this to ensure the current behavior
Expand Down
2 changes: 1 addition & 1 deletion lib/config/presets/npm/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export async function getPreset({
'Using npm packages for Renovate presets is now deprecated. Please migrate to repository-based presets instead.',
);
const packageUrl = resolvePackageUrl(registryUrl, pkg);
const body = (await http.getJson<NpmResponse>(packageUrl)).body;
const body = (await http.getJsonUnchecked<NpmResponse>(packageUrl)).body;
// TODO: check null #22198
dep = body.versions![body['dist-tags']!.latest];
} catch {
Expand Down
1 change: 1 addition & 0 deletions lib/config/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ export interface RenovateConfig

branchTopic?: string;
additionalBranchPrefix?: string;
sharedVariableName?: string;
}

const CustomDatasourceFormats = ['json', 'plain', 'yaml', 'html'] as const;
Expand Down
1 change: 1 addition & 0 deletions lib/data/monorepo.json
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@
"prisma": "/~https://github.com/prisma/prisma",
"prometheus-net": "/~https://github.com/prometheus-net/prometheus-net",
"promster": "/~https://github.com/tdeekens/promster",
"protobuf": "/~https://github.com/protocolbuffers/protobuf",
"quartznet": "/~https://github.com/quartznet/quartznet",
"radix-ui-primitives": "/~https://github.com/radix-ui/primitives",
"reach-ui": "/~https://github.com/reach/reach-ui",
Expand Down
14 changes: 4 additions & 10 deletions lib/modules/datasource/artifactory/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { cache } from '../../../util/cache/package/decorator';
import { parse } from '../../../util/html';
import { HttpError } from '../../../util/http';
import { regEx } from '../../../util/regex';
import { asTimestamp } from '../../../util/timestamp';
import { joinUrlParts } from '../../../util/url';
import { Datasource } from '../datasource';
import type { GetReleasesConfig, Release, ReleaseResult } from '../types';
Expand Down Expand Up @@ -72,13 +73,13 @@ export class ArtifactoryDatasource extends Datasource {
? node.innerHTML.slice(0, -1)
: node.innerHTML;

const published = ArtifactoryDatasource.parseReleaseTimestamp(
node.nextSibling!.text, // TODO: can be null (#22198)
const releaseTimestamp = asTimestamp(
node.nextSibling?.text?.trimStart()?.split(regEx(/\s{2,}/))?.[0],
);

const thisRelease: Release = {
version,
releaseTimestamp: published,
releaseTimestamp,
};

result.releases.push(thisRelease);
Expand Down Expand Up @@ -112,11 +113,4 @@ export class ArtifactoryDatasource extends Datasource {

return result.releases.length ? result : null;
}

private static parseReleaseTimestamp(rawText: string): string {
return (
rawText.split(regEx(/\s{2,}/)).filter((e) => !isNaN(Date.parse(e)))[0] +
'Z'
);
}
}
18 changes: 12 additions & 6 deletions lib/modules/datasource/bitbucket-tags/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,12 @@ export class BitbucketTagsDatasource extends Datasource {
}: GetReleasesConfig): Promise<ReleaseResult | null> {
const url = `/2.0/repositories/${repo}/refs/tags`;
const bitbucketTags = (
await this.bitbucketHttp.getJson<PagedResult<BitbucketTag>>(url, {
paginate: true,
})
await this.bitbucketHttp.getJsonUnchecked<PagedResult<BitbucketTag>>(
url,
{
paginate: true,
},
)
).body.values;

const dependency: ReleaseResult = {
Expand Down Expand Up @@ -96,8 +99,9 @@ export class BitbucketTagsDatasource extends Datasource {
): Promise<string | null> {
const url = `/2.0/repositories/${repo}/refs/tags/${tag}`;

const bitbucketTag = (await this.bitbucketHttp.getJson<BitbucketTag>(url))
.body;
const bitbucketTag = (
await this.bitbucketHttp.getJsonUnchecked<BitbucketTag>(url)
).body;

return bitbucketTag.target?.hash ?? null;
}
Expand Down Expand Up @@ -136,7 +140,9 @@ export class BitbucketTagsDatasource extends Datasource {

const url = `/2.0/repositories/${repo}/commits/${mainBranch}`;
const bitbucketCommits = (
await this.bitbucketHttp.getJson<PagedResult<BitbucketCommit>>(url)
await this.bitbucketHttp.getJsonUnchecked<PagedResult<BitbucketCommit>>(
url,
)
).body;

if (bitbucketCommits.values.length === 0) {
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/conan/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export class ConanDatasource extends Datasource {
);

try {
const rep = await this.http.getJson(lookupUrl);
const rep = await this.http.getJsonUnchecked(lookupUrl);
const conanJson = ConanJSON.parse(rep.body);
if (conanJson) {
logger.trace({ lookupUrl }, 'Got conan api result');
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/conda/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export class CondaDatasource extends Datasource {
let response: { body: CondaPackage };

try {
response = await this.http.getJson(url);
response = await this.http.getJsonUnchecked(url);

result.homepage = response.body.html_url;
result.sourceUrl = response.body.dev_url;
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/crate/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export class CrateDatasource extends Datasource {

try {
type Response = { crate: CrateMetadata };
const response = await this.http.getJson<Response>(crateUrl);
const response = await this.http.getJsonUnchecked<Response>(crateUrl);
return response.body.crate;
} catch (err) {
logger.warn(
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/custom/formats/json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { CustomDatasourceFetcher } from './types';

export class JSONFetcher implements CustomDatasourceFetcher {
async fetch(http: Http, registryURL: string): Promise<unknown> {
const response = await http.getJson(registryURL);
const response = await http.getJsonUnchecked(registryURL);
return response.body;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/dart-version/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class DartVersionDatasource extends Datasource {
try {
for (const channel of this.channels) {
const resp = (
await this.http.getJson<DartResponse>(
await this.http.getJsonUnchecked<DartResponse>(
`${registryUrl}/storage/v1/b/dart-archive/o?delimiter=%2F&prefix=channels%2F${channel}%2Frelease%2F&alt=json`,
)
).body;
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/dart/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class DartDatasource extends Datasource {

let raw: HttpResponse<DartResult> | null = null;
try {
raw = await this.http.getJson<DartResult>(pkgUrl);
raw = await this.http.getJsonUnchecked<DartResult>(pkgUrl);
} catch (err) {
this.handleGenericErrors(err);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/datasource/docker/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export async function getAuthHeaders(
? await http.get(apiCheckUrl, options)
: // use json request, as this will be cached for tags, so it returns json
// TODO: add cache test
await http.getJson(apiCheckUrl, options);
await http.getJsonUnchecked(apiCheckUrl, options);

if (apiCheckResponse.statusCode === 200) {
logger.debug(`No registry auth required for ${apiCheckUrl}`);
Expand Down Expand Up @@ -193,7 +193,7 @@ export async function getAuthHeaders(
);
opts.noAuth = true;
const authResponse = (
await http.getJson<{ token?: string; access_token?: string }>(
await http.getJsonUnchecked<{ token?: string; access_token?: string }>(
authUrl.href,
opts,
)
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/datasource/docker/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ export class DockerDatasource extends Datasource {

// typescript issue :-/
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
const res = (await this.http.getJson<QuayRestDockerTags>(
const res = (await this.http.getJsonUnchecked<QuayRestDockerTags>(
url,
)) as HttpResponse<QuayRestDockerTags>;
const pageTags = res.body.tags.map((tag) => tag.name);
Expand Down Expand Up @@ -671,7 +671,7 @@ export class DockerDatasource extends Datasource {
do {
let res: HttpResponse<{ tags: string[] }>;
try {
res = await this.http.getJson<{ tags: string[] }>(url, {
res = await this.http.getJsonUnchecked<{ tags: string[] }>(url, {
headers,
noAuth: true,
});
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/flutter-version/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class FlutterVersionDatasource extends Datasource {
};
try {
const resp = (
await this.http.getJson<FlutterResponse>(
await this.http.getJsonUnchecked<FlutterResponse>(
`${registryUrl}/flutter_infra_release/releases/releases_linux.json`,
)
).body;
Expand Down
5 changes: 2 additions & 3 deletions lib/modules/datasource/galaxy/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ export class GalaxyDatasource extends Datasource {
}
}
if (body.results.length === 0) {
logger.info(
{ dependency: packageName },
`Received no results from ${galaxyAPIUrl}`,
logger.debug(
`Received no results for ${packageName} from ${galaxyAPIUrl} `,
);
return null;
}
Expand Down
14 changes: 8 additions & 6 deletions lib/modules/datasource/github-release-attachments/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,10 @@ export class GithubReleaseAttachmentsDatasource extends Datasource {
}

const apiBaseUrl = getApiBaseUrl(registryUrl);
const { body: currentRelease } = await this.http.getJson<GithubRestRelease>(
`${apiBaseUrl}repos/${repo}/releases/tags/${currentValue}`,
);
const { body: currentRelease } =
await this.http.getJsonUnchecked<GithubRestRelease>(
`${apiBaseUrl}repos/${repo}/releases/tags/${currentValue}`,
);
const digestAsset = await this.findDigestAsset(
currentRelease,
currentDigest,
Expand All @@ -221,9 +222,10 @@ export class GithubReleaseAttachmentsDatasource extends Datasource {
if (!digestAsset || newValue === currentValue) {
newDigest = currentDigest;
} else {
const { body: newRelease } = await this.http.getJson<GithubRestRelease>(
`${apiBaseUrl}repos/${repo}/releases/tags/${newValue}`,
);
const { body: newRelease } =
await this.http.getJsonUnchecked<GithubRestRelease>(
`${apiBaseUrl}repos/${repo}/releases/tags/${newValue}`,
);
newDigest = await this.mapDigestAssetToRelease(digestAsset, newRelease);
}
return newDigest;
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/github-tags/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class GithubTagsDatasource extends Datasource {
let digest: string | null = null;
try {
const url = `${apiBaseUrl}repos/${githubRepo}/commits?per_page=1`;
const res = await this.http.getJson<{ sha: string }[]>(url);
const res = await this.http.getJsonUnchecked<{ sha: string }[]>(url);
digest = res.body[0].sha;
} catch (err) {
logger.debug(
Expand Down
4 changes: 3 additions & 1 deletion lib/modules/datasource/gitlab-packages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ export class GitlabPackagesDatasource extends Datasource {
let response: GitlabPackage[];
try {
response = (
await this.http.getJson<GitlabPackage[]>(apiUrl, { paginate: true })
await this.http.getJsonUnchecked<GitlabPackage[]>(apiUrl, {
paginate: true,
})
).body;

result.releases = response
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/datasource/gitlab-releases/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class GitlabReleasesDatasource extends Datasource {

try {
const gitlabReleasesResponse = (
await this.http.getJson<GitlabRelease[]>(apiUrl)
await this.http.getJsonUnchecked<GitlabRelease[]>(apiUrl)
).body;

return {
Expand Down
Loading

0 comments on commit 8301898

Please sign in to comment.