From 1c82ddec9ba2f779df8554dba497ea817f51e99b Mon Sep 17 00:00:00 2001 From: Sergei Zharinov <zharinov@users.noreply.github.com> Date: Sat, 11 Jan 2025 10:16:47 -0300 Subject: [PATCH] refactor(bitrise): Simplify file parsing usage (#33525) --- lib/modules/datasource/bitrise/index.ts | 5 +---- lib/modules/datasource/bitrise/schema.ts | 11 +++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/modules/datasource/bitrise/index.ts b/lib/modules/datasource/bitrise/index.ts index f3b2b66b83..0a412c1dc9 100644 --- a/lib/modules/datasource/bitrise/index.ts +++ b/lib/modules/datasource/bitrise/index.ts @@ -6,7 +6,6 @@ import { parseGitUrl } from '../../../util/git/url'; import { GithubHttp } from '../../../util/http/github'; import { fromBase64 } from '../../../util/string'; import { joinUrlParts } from '../../../util/url'; -import { parseSingleYaml } from '../../../util/yaml'; import { GithubContentResponse } from '../../platform/github/schema'; import semver from '../../versioning/semver'; import { Datasource } from '../datasource'; @@ -111,9 +110,7 @@ export class BitriseDatasource extends Datasource { } const content = fromBase64(body.content); - const { published_at, source_code_url } = parseSingleYaml(content, { - customSchema: BitriseStepFile, - }); + const { published_at, source_code_url } = BitriseStepFile.parse(content); result.releases.push({ version: versionDir.name, diff --git a/lib/modules/datasource/bitrise/schema.ts b/lib/modules/datasource/bitrise/schema.ts index b06b5d3c10..064151a45d 100644 --- a/lib/modules/datasource/bitrise/schema.ts +++ b/lib/modules/datasource/bitrise/schema.ts @@ -1,6 +1,9 @@ import { z } from 'zod'; +import { Yaml } from '../../../util/schema-utils'; -export const BitriseStepFile = z.object({ - published_at: z.string(), - source_code_url: z.string().optional(), -}); +export const BitriseStepFile = Yaml.pipe( + z.object({ + published_at: z.string(), + source_code_url: z.string().optional(), + }), +); -- GitLab