renovate 40.0.0-next.4 → 40.0.0-next.41

package/dist/modules/manager/gitlabci/schema.d.ts

@@ -0,0 +1,55 @@
+import { z } from 'zod';
+export declare const MultiDocumentLocalIncludes: z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, string[][], any[]>, string[], any[]>;
+export declare const Job: z.ZodObject<{
+    image: z.ZodCatch<z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodString, {
+        type: "image";
+        value: string;
+    }, string>, z.ZodEffects<z.ZodObject<{
+        name: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        name: string;
+    }, {
+        name: string;
+    }>, {
+        type: "image-name";
+        value: string;
+    }, {
+        name: string;
+    }>]>>>;
+    services: z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, string[], any[]>>;
+}, "strip", z.ZodTypeAny, {
+    services: string[];
+    image?: {
+        type: "image";
+        value: string;
+    } | {
+        type: "image-name";
+        value: string;
+    } | undefined;
+}, {
+    image?: unknown;
+    services?: unknown;
+}>;
+export declare const Jobs: z.ZodEffects<z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+    services: string[];
+    image?: {
+        type: "image";
+        value: string;
+    } | {
+        type: "image-name";
+        value: string;
+    } | undefined;
+}>, Record<string, any>>>, {
+    services: string[];
+    image?: {
+        type: "image";
+        value: string;
+    } | {
+        type: "image-name";
+        value: string;
+    } | undefined;
+}[], unknown>;
+export declare const GitlabDocument: z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, {
+    include: unknown;
+    children: unknown[];
+}, Record<string, unknown>>, string[], Record<string, unknown>>;

package/dist/modules/manager/gitlabci/schema.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GitlabDocument = exports.Jobs = exports.Job = exports.MultiDocumentLocalIncludes = void 0;
+const zod_1 = require("zod");
+const array_1 = require("../../../util/array");
+const schema_utils_1 = require("../../../util/schema-utils");
+const url_1 = require("../../../util/url");
+const LocalInclude = zod_1.z
+    .union([
+    zod_1.z.string(),
+    zod_1.z.object({ local: zod_1.z.string() }).transform(({ local }) => local),
+])
+    .transform(url_1.trimLeadingSlash);
+const DocumentLocalIncludes = zod_1.z
+    .object({
+    include: zod_1.z.union([
+        (0, schema_utils_1.LooseArray)(LocalInclude),
+        LocalInclude.transform(array_1.toArray),
+    ]),
+})
+    .transform(({ include }) => include);
+exports.MultiDocumentLocalIncludes = (0, schema_utils_1.LooseArray)(DocumentLocalIncludes).transform((includes) => includes.flat());
+exports.Job = zod_1.z.object({
+    image: zod_1.z
+        .union([
+        zod_1.z.string().transform((image) => ({
+            type: 'image',
+            value: image,
+        })),
+        zod_1.z.object({ name: zod_1.z.string() }).transform(({ name }) => ({
+            type: 'image-name',
+            value: name,
+        })),
+    ])
+        .optional()
+        .catch(undefined),
+    services: (0, schema_utils_1.LooseArray)(zod_1.z.union([
+        zod_1.z.string(),
+        zod_1.z.object({ name: zod_1.z.string() }).transform(({ name }) => name),
+    ])).catch([]),
+});
+exports.Jobs = (0, schema_utils_1.LooseRecord)(zod_1.z.string(), exports.Job)
+    .catch({})
+    .transform((x) => Object.values(x));
+const GitlabInclude = zod_1.z
+    .object({ component: zod_1.z.string() })
+    .transform(({ component }) => component);
+const GitlabIncludes = zod_1.z
+    .union([(0, schema_utils_1.LooseArray)(GitlabInclude), GitlabInclude.transform(array_1.toArray)])
+    .catch([]);
+exports.GitlabDocument = zod_1.z
+    .record(zod_1.z.unknown())
+    .transform((obj) => {
+    const { include, ...rest } = obj;
+    const children = Object.values(rest);
+    return { include, children };
+})
+    .transform(({ include, children }) => [
+    ...GitlabDocumentArray.parse(children),
+    ...GitlabIncludes.parse(include),
+]);
+const GitlabDocumentArray = (0, schema_utils_1.LooseArray)(exports.GitlabDocument).transform((x) => x.flat());
+//# sourceMappingURL=schema.js.map

package/dist/modules/manager/gitlabci/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/gitlabci/schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from 'zod';\nimport { toArray } from '../../../util/array';\nimport { LooseArray, LooseRecord } from '../../../util/schema-utils';\nimport { trimLeadingSlash } from '../../../util/url';\n\nconst LocalInclude = z\n  .union([\n    z.string(),\n    z.object({ local: z.string() }).transform(({ local }) => local),\n  ])\n  .transform(trimLeadingSlash);\n\nconst DocumentLocalIncludes = z\n  .object({\n    include: z.union([\n      LooseArray(LocalInclude),\n      LocalInclude.transform(toArray),\n    ]),\n  })\n  .transform(({ include }) => include);\n\nexport const MultiDocumentLocalIncludes = LooseArray(\n  DocumentLocalIncludes,\n).transform((includes) => includes.flat());\n\nexport const Job = z.object({\n  image: z\n    .union([\n      z.string().transform((image) => ({\n        type: 'image' as const,\n        value: image,\n      })),\n      z.object({ name: z.string() }).transform(({ name }) => ({\n        type: 'image-name' as const,\n        value: name,\n      })),\n    ])\n    .optional()\n    .catch(undefined),\n  services: LooseArray(\n    z.union([\n      z.string(),\n      z.object({ name: z.string() }).transform(({ name }) => name),\n    ]),\n  ).catch([]),\n});\n\nexport const Jobs = LooseRecord(z.string(), Job)\n  .catch({})\n  .transform((x) => Object.values(x));\n\nconst GitlabInclude = z\n  .object({ component: z.string() })\n  .transform(({ component }) => component);\n\nconst GitlabIncludes = z\n  .union([LooseArray(GitlabInclude), GitlabInclude.transform(toArray)])\n  .catch([]);\n\nexport const GitlabDocument = z\n  .record(z.unknown())\n  .transform((obj) => {\n    const { include, ...rest } = obj;\n    const children = Object.values(rest);\n    return { include, children };\n  })\n  .transform(({ include, children }): string[] => [\n    ...GitlabDocumentArray.parse(children),\n    ...GitlabIncludes.parse(include),\n  ]);\n\nconst GitlabDocumentArray = LooseArray(GitlabDocument).transform((x) =>\n  x.flat(),\n);\n"]}

package/dist/modules/manager/gitlabci-include/extract.js

@@ -1,50 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractPackageFile = extractPackageFile;
-const tslib_1 = require("tslib");
-const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
 const global_1 = require("../../../config/global");
 const logger_1 = require("../../../logger");
 const regex_1 = require("../../../util/regex");
 const yaml_1 = require("../../../util/yaml");
-const gitlab_tags_1 = require("../../datasource/gitlab-tags");
-const common_1 = require("../gitlabci/common");
-function extractDepFromIncludeFile(includeObj) {
-    const dep = {
-        datasource: gitlab_tags_1.GitlabTagsDatasource.id,
-        depName: includeObj.project,
-        depType: 'repository',
-    };
-    if (!includeObj.ref) {
-        dep.skipReason = 'unspecified-version';
-        return dep;
-    }
-    dep.currentValue = includeObj.ref;
-    return dep;
-}
-function getIncludeProjectsFromInclude(includeValue) {
-    const includes = is_1.default.array(includeValue) ? includeValue : [includeValue];
-    // Filter out includes that dont have a file & project.
-    return includes.filter(common_1.isGitlabIncludeProject);
-}
-function getAllIncludeProjects(data) {
-    // If Array, search each element.
-    if (is_1.default.array(data)) {
-        return data
-            .filter(common_1.isNonEmptyObject)
-            .map(getAllIncludeProjects)
-            .flat();
-    }
-    const childrenData = Object.values((0, common_1.filterIncludeFromGitlabPipeline)(data))
-        .filter(common_1.isNonEmptyObject)
-        .map(getAllIncludeProjects)
-        .flat();
-    // Process include key.
-    if (data.include) {
-        childrenData.push(...getIncludeProjectsFromInclude(data.include));
-    }
-    return childrenData;
-}
+const schema_1 = require("./schema");
 function extractPackageFile(content, packageFile) {
     const deps = [];
     const platform = global_1.GlobalConfig.get('platform');
@@ -53,21 +14,12 @@ function extractPackageFile(content, packageFile) {
         ? [endpoint.replace((0, regex_1.regEx)(/\/api\/v4\/?/), '')]
         : null;
     try {
-        // TODO: use schema (#9610)
-        const docs = (0, yaml_1.parseYaml)(content, {
-            uniqueKeys: false,
-        });
-        for (const doc of docs) {
-            if (is_1.default.object(doc)) {
-                const includes = getAllIncludeProjects(doc);
-                for (const includeObj of includes) {
-                    const dep = extractDepFromIncludeFile(includeObj);
-                    if (registryUrls) {
-                        dep.registryUrls = registryUrls;
-                    }
-                    deps.push(dep);
-                }
+        const docs = (0, yaml_1.parseYaml)(content, { uniqueKeys: false });
+        for (const dep of schema_1.GitlabDocumentArray.parse(docs)) {
+            if (registryUrls) {
+                dep.registryUrls = registryUrls;
             }
+            deps.push(dep);
         }
     }
     catch (err) /* istanbul ignore next */ {

package/dist/modules/manager/gitlabci-include/extract.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/gitlabci-include/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { GlobalConfig } from '../../../config/global';\nimport { logger } from '../../../logger';\nimport { regEx } from '../../../util/regex';\nimport { parseYaml } from '../../../util/yaml';\nimport { GitlabTagsDatasource } from '../../datasource/gitlab-tags';\nimport {\n  filterIncludeFromGitlabPipeline,\n  isGitlabIncludeProject,\n  isNonEmptyObject,\n} from '../gitlabci/common';\nimport type {\n  GitlabInclude,\n  GitlabIncludeProject,\n  GitlabPipeline,\n} from '../gitlabci/types';\nimport type { PackageDependency, PackageFileContent } from '../types';\n\nfunction extractDepFromIncludeFile(\n  includeObj: GitlabIncludeProject,\n): PackageDependency {\n  const dep: PackageDependency = {\n    datasource: GitlabTagsDatasource.id,\n    depName: includeObj.project,\n    depType: 'repository',\n  };\n  if (!includeObj.ref) {\n    dep.skipReason = 'unspecified-version';\n    return dep;\n  }\n  dep.currentValue = includeObj.ref;\n  return dep;\n}\n\nfunction getIncludeProjectsFromInclude(\n  includeValue: GitlabInclude[] | GitlabInclude,\n): GitlabIncludeProject[] {\n  const includes = is.array(includeValue) ? includeValue : [includeValue];\n\n  // Filter out includes that dont have a file & project.\n  return includes.filter(isGitlabIncludeProject);\n}\n\nfunction getAllIncludeProjects(data: GitlabPipeline): GitlabIncludeProject[] {\n  // If Array, search each element.\n  if (is.array(data)) {\n    return (data as GitlabPipeline[])\n      .filter(isNonEmptyObject)\n      .map(getAllIncludeProjects)\n      .flat();\n  }\n\n  const childrenData = Object.values(filterIncludeFromGitlabPipeline(data))\n    .filter(isNonEmptyObject)\n    .map(getAllIncludeProjects)\n    .flat();\n\n  // Process include key.\n  if (data.include) {\n    childrenData.push(...getIncludeProjectsFromInclude(data.include));\n  }\n  return childrenData;\n}\n\nexport function extractPackageFile(\n  content: string,\n  packageFile?: string,\n): PackageFileContent | null {\n  const deps: PackageDependency[] = [];\n  const platform = GlobalConfig.get('platform');\n  const endpoint = GlobalConfig.get('endpoint');\n  const registryUrls =\n    platform === 'gitlab' && endpoint\n      ? [endpoint.replace(regEx(/\\/api\\/v4\\/?/), '')]\n      : null;\n  try {\n    // TODO: use schema (#9610)\n    const docs = parseYaml<GitlabPipeline>(content, {\n      uniqueKeys: false,\n    });\n    for (const doc of docs) {\n      if (is.object(doc)) {\n        const includes = getAllIncludeProjects(doc);\n        for (const includeObj of includes) {\n          const dep = extractDepFromIncludeFile(includeObj);\n          if (registryUrls) {\n            dep.registryUrls = registryUrls;\n          }\n          deps.push(dep);\n        }\n      }\n    }\n  } catch (err) /* istanbul ignore next */ {\n    if (err.stack?.startsWith('YAMLException:')) {\n      logger.debug(\n        { err, packageFile },\n        'YAML exception extracting GitLab CI includes',\n      );\n    } else {\n      logger.debug({ err, packageFile }, 'Error extracting GitLab CI includes');\n    }\n  }\n  if (!deps.length) {\n    return null;\n  }\n  return { deps };\n}\n"]}
+{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/gitlabci-include/extract.ts"],"names":[],"mappings":";;AAOA,gDAoCC;AA3CD,mDAAsD;AACtD,4CAAyC;AACzC,+CAA4C;AAC5C,6CAA+C;AAE/C,qCAA+C;AAE/C,SAAgB,kBAAkB,CAChC,OAAe,EACf,WAAoB;IAEpB,MAAM,IAAI,GAAwB,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,qBAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,qBAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,YAAY,GAChB,QAAQ,KAAK,QAAQ,IAAI,QAAQ;QAC/B,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,CAAC,CAAC,IAAI,CAAC;IAEX,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,gBAAS,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QACvD,KAAK,MAAM,GAAG,IAAI,4BAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAClD,IAAI,YAAY,EAAE,CAAC;gBACjB,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC;YAClC,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC,CAAC;QACxC,IAAI,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC5C,eAAM,CAAC,KAAK,CACV,EAAE,GAAG,EAAE,WAAW,EAAE,EACpB,8CAA8C,CAC/C,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,qCAAqC,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,CAAC;AAClB,CAAC","sourcesContent":["import { GlobalConfig } from '../../../config/global';\nimport { logger } from '../../../logger';\nimport { regEx } from '../../../util/regex';\nimport { parseYaml } from '../../../util/yaml';\nimport type { PackageDependency, PackageFileContent } from '../types';\nimport { GitlabDocumentArray } from './schema';\n\nexport function extractPackageFile(\n  content: string,\n  packageFile?: string,\n): PackageFileContent | null {\n  const deps: PackageDependency[] = [];\n  const platform = GlobalConfig.get('platform');\n  const endpoint = GlobalConfig.get('endpoint');\n  const registryUrls =\n    platform === 'gitlab' && endpoint\n      ? [endpoint.replace(regEx(/\\/api\\/v4\\/?/), '')]\n      : null;\n\n  try {\n    const docs = parseYaml(content, { uniqueKeys: false });\n    for (const dep of GitlabDocumentArray.parse(docs)) {\n      if (registryUrls) {\n        dep.registryUrls = registryUrls;\n      }\n      deps.push(dep);\n    }\n  } catch (err) /* istanbul ignore next */ {\n    if (err.stack?.startsWith('YAMLException:')) {\n      logger.debug(\n        { err, packageFile },\n        'YAML exception extracting GitLab CI includes',\n      );\n    } else {\n      logger.debug({ err, packageFile }, 'Error extracting GitLab CI includes');\n    }\n  }\n\n  if (!deps.length) {\n    return null;\n  }\n\n  return { deps };\n}\n"]}

package/dist/modules/manager/gitlabci-include/schema.d.ts

@@ -0,0 +1,13 @@
+import { z } from 'zod';
+import type { PackageDependency } from '../types';
+export declare const GitlabDocument: z.ZodEffects<z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnknown>, {
+    include: unknown;
+    children: unknown[];
+}, Record<string, unknown>>, {
+    include: unknown;
+    children: unknown[];
+}[], Record<string, unknown>>, z.ZodEffects<z.ZodArray<z.ZodAny, "many">, {
+    include: unknown;
+    children: unknown[];
+}[], any[]>]>, PackageDependency<Record<string, any>>[], any[] | Record<string, unknown>>;
+export declare const GitlabDocumentArray: z.ZodCatch<z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, PackageDependency<Record<string, any>>[][], any[]>, PackageDependency<Record<string, any>>[], any[]>>;

package/dist/modules/manager/gitlabci-include/schema.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GitlabDocumentArray = exports.GitlabDocument = void 0;
+const zod_1 = require("zod");
+const array_1 = require("../../../util/array");
+const schema_utils_1 = require("../../../util/schema-utils");
+const gitlab_tags_1 = require("../../datasource/gitlab-tags");
+const GitlabInclude = zod_1.z
+    .object({
+    project: zod_1.z.string(),
+    ref: zod_1.z.string().optional().catch(undefined),
+})
+    .transform(({ project, ref }) => {
+    const dep = {
+        datasource: gitlab_tags_1.GitlabTagsDatasource.id,
+        depName: project,
+        depType: 'repository',
+    };
+    if (!ref) {
+        dep.skipReason = 'unspecified-version';
+        return dep;
+    }
+    dep.currentValue = ref;
+    return dep;
+});
+const GitlabIncludes = zod_1.z
+    .union([GitlabInclude.transform(array_1.toArray), (0, schema_utils_1.LooseArray)(GitlabInclude)])
+    .catch([]);
+const GitlabRecord = zod_1.z.record(zod_1.z.unknown()).transform((obj) => {
+    const { include, ...rest } = obj;
+    const children = Object.values(rest);
+    return { include, children };
+});
+exports.GitlabDocument = zod_1.z
+    .union([GitlabRecord.transform(array_1.toArray), (0, schema_utils_1.LooseArray)(GitlabRecord)])
+    .transform((docs) => docs
+    .map(({ include, children }) => {
+    const deps = GitlabIncludes.parse(include);
+    const childrenDeps = exports.GitlabDocumentArray.parse(children);
+    return [...childrenDeps, ...deps];
+})
+    .flat());
+exports.GitlabDocumentArray = (0, schema_utils_1.LooseArray)(exports.GitlabDocument)
+    .transform((x) => x.flat())
+    .catch([]);
+//# sourceMappingURL=schema.js.map

package/dist/modules/manager/gitlabci-include/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/gitlabci-include/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,+CAA8C;AAC9C,6DAAwD;AACxD,8DAAoE;AAGpE,MAAM,aAAa,GAAG,OAAC;KACpB,MAAM,CAAC;IACN,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;IACnB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;CAC5C,CAAC;KACD,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;IAC9B,MAAM,GAAG,GAAsB;QAC7B,UAAU,EAAE,kCAAoB,CAAC,EAAE;QACnC,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,YAAY;KACtB,CAAC;IAEF,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,GAAG,CAAC,UAAU,GAAG,qBAAqB,CAAC;QACvC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC;IACvB,OAAO,GAAG,CAAC;AACb,CAAC,CAAC,CAAC;AAEL,MAAM,cAAc,GAAG,OAAC;KACrB,KAAK,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,eAAO,CAAC,EAAE,IAAA,yBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;KACpE,KAAK,CAAC,EAAE,CAAC,CAAC;AAEb,MAAM,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;IAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,OAAC;KAC5B,KAAK,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,eAAO,CAAC,EAAE,IAAA,yBAAU,EAAC,YAAY,CAAC,CAAC,CAAC;KAClE,SAAS,CAAC,CAAC,IAAI,EAAuB,EAAE,CACvC,IAAI;KACD,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC7B,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,2BAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,YAAY,EAAE,GAAG,IAAI,CAAC,CAAC;AACpC,CAAC,CAAC;KACD,IAAI,EAAE,CACV,CAAC;AAES,QAAA,mBAAmB,GAAG,IAAA,yBAAU,EAAC,sBAAc,CAAC;KAC1D,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;KAC1B,KAAK,CAAC,EAAE,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { toArray } from '../../../util/array';\nimport { LooseArray } from '../../../util/schema-utils';\nimport { GitlabTagsDatasource } from '../../datasource/gitlab-tags';\nimport type { PackageDependency } from '../types';\n\nconst GitlabInclude = z\n  .object({\n    project: z.string(),\n    ref: z.string().optional().catch(undefined),\n  })\n  .transform(({ project, ref }) => {\n    const dep: PackageDependency = {\n      datasource: GitlabTagsDatasource.id,\n      depName: project,\n      depType: 'repository',\n    };\n\n    if (!ref) {\n      dep.skipReason = 'unspecified-version';\n      return dep;\n    }\n\n    dep.currentValue = ref;\n    return dep;\n  });\n\nconst GitlabIncludes = z\n  .union([GitlabInclude.transform(toArray), LooseArray(GitlabInclude)])\n  .catch([]);\n\nconst GitlabRecord = z.record(z.unknown()).transform((obj) => {\n  const { include, ...rest } = obj;\n  const children = Object.values(rest);\n  return { include, children };\n});\n\nexport const GitlabDocument = z\n  .union([GitlabRecord.transform(toArray), LooseArray(GitlabRecord)])\n  .transform((docs): PackageDependency[] =>\n    docs\n      .map(({ include, children }) => {\n        const deps = GitlabIncludes.parse(include);\n        const childrenDeps = GitlabDocumentArray.parse(children);\n        return [...childrenDeps, ...deps];\n      })\n      .flat(),\n  );\n\nexport const GitlabDocumentArray = LooseArray(GitlabDocument)\n  .transform((x) => x.flat())\n  .catch([]);\n"]}

package/dist/modules/manager/glasskube/schema.d.ts

@@ -30,8 +30,8 @@ export declare const Package: z.ZodObject<{
         };
     }>;
 }, "strip", z.ZodTypeAny, {
-    kind: "Package" | "ClusterPackage";
     apiVersion: string;
+    kind: "Package" | "ClusterPackage";
     spec: {
         packageInfo: {
             name: string;
@@ -40,8 +40,8 @@ export declare const Package: z.ZodObject<{
         };
     };
 }, {
-    kind: "Package" | "ClusterPackage";
     apiVersion: string;
+    kind: "Package" | "ClusterPackage";
     spec: {
         packageInfo: {
             name: string;
@@ -71,22 +71,22 @@ export declare const PackageRepository: z.ZodObject<{
         url: string;
     }>;
 }, "strip", z.ZodTypeAny, {
+    apiVersion: string;
     metadata: {
         name: string;
         annotations?: Record<string, string> | undefined;
     };
     kind: "PackageRepository";
-    apiVersion: string;
     spec: {
         url: string;
     };
 }, {
+    apiVersion: string;
     metadata: {
         name: string;
         annotations?: Record<string, string> | undefined;
     };
     kind: "PackageRepository";
-    apiVersion: string;
     spec: {
         url: string;
     };
@@ -122,8 +122,8 @@ export declare const GlasskubeResource: z.ZodUnion<[z.ZodObject<{
         };
     }>;
 }, "strip", z.ZodTypeAny, {
-    kind: "Package" | "ClusterPackage";
     apiVersion: string;
+    kind: "Package" | "ClusterPackage";
     spec: {
         packageInfo: {
             name: string;
@@ -132,8 +132,8 @@ export declare const GlasskubeResource: z.ZodUnion<[z.ZodObject<{
         };
     };
 }, {
-    kind: "Package" | "ClusterPackage";
     apiVersion: string;
+    kind: "Package" | "ClusterPackage";
     spec: {
         packageInfo: {
             name: string;
@@ -162,22 +162,22 @@ export declare const GlasskubeResource: z.ZodUnion<[z.ZodObject<{
         url: string;
     }>;
 }, "strip", z.ZodTypeAny, {
+    apiVersion: string;
     metadata: {
         name: string;
         annotations?: Record<string, string> | undefined;
     };
     kind: "PackageRepository";
-    apiVersion: string;
     spec: {
         url: string;
     };
 }, {
+    apiVersion: string;
     metadata: {
         name: string;
         annotations?: Record<string, string> | undefined;
     };
     kind: "PackageRepository";
-    apiVersion: string;
     spec: {
         url: string;
     };

package/dist/modules/manager/gomod/artifacts-extra.js

@@ -22,15 +22,22 @@ function getExtraDeps(goModBefore, goModAfter, excludeDeps) {
         if (!res) {
             continue;
         }
-        const { depName, currentValue } = res;
+        const { depName, depType, currentValue } = res;
         if (!depName || !currentValue) {
             continue;
         }
+        let expandedDepName = depName;
+        // NOTE: Right now the only special depType we care about is 'toolchain' because the table
+        // rendering prior to this change was ambiguous with regards to go version vs toolchain
+        // version updates.
+        if (depType === 'toolchain') {
+            expandedDepName = `${depName} (${depType})`;
+        }
         if (added) {
-            addDeps[depName] = currentValue;
+            addDeps[expandedDepName] = currentValue;
         }
         else {
-            rmDeps[depName] = currentValue;
+            rmDeps[expandedDepName] = currentValue;
         }
     }
     for (const [depName, currentValue] of Object.entries(rmDeps)) {
@@ -73,7 +80,8 @@ function getExtraDepsNotice(goModBefore, goModAfter, excludeDeps) {
         '\n',
     ];
     const goUpdated = extraDeps.some(({ depName }) => depName === 'go');
-    const otherDepsCount = extraDeps.length - (goUpdated ? 1 : 0);
+    const toolchainUpdated = extraDeps.some(({ depName }) => depName === 'go (toolchain)');
+    const otherDepsCount = extraDeps.length - (goUpdated ? 1 : 0) - (toolchainUpdated ? 1 : 0);
     if (otherDepsCount === 1) {
         noticeLines.push(`- ${otherDepsCount} additional dependency was updated`);
     }

package/dist/modules/manager/gomod/artifacts-extra.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts-extra.js","sourceRoot":"","sources":["../../../../lib/modules/manager/gomod/artifacts-extra.ts"],"names":[],"mappings":"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","sourcesContent":["import { diffLines } from 'diff';\nimport markdownTable from 'markdown-table';\nimport { parseLine } from './line-parser';\nimport type { ExtraDep } from './types';\n\nexport function getExtraDeps(\n  goModBefore: string,\n  goModAfter: string,\n  excludeDeps: string[],\n): ExtraDep[] {\n  const result: ExtraDep[] = [];\n\n  const diff = diffLines(goModBefore, goModAfter, {\n    newlineIsToken: true,\n  });\n\n  const addDeps: Record<string, string> = {};\n  const rmDeps: Record<string, string> = {};\n  for (const { added, removed, value } of diff) {\n    if (!added && !removed) {\n      continue;\n    }\n\n    const res = parseLine(value);\n    if (!res) {\n      continue;\n    }\n\n    const { depName, currentValue } = res;\n    if (!depName || !currentValue) {\n      continue;\n    }\n\n    if (added) {\n      addDeps[depName] = currentValue;\n    } else {\n      rmDeps[depName] = currentValue;\n    }\n  }\n\n  for (const [depName, currentValue] of Object.entries(rmDeps)) {\n    if (excludeDeps.includes(depName)) {\n      continue;\n    }\n\n    const newValue = addDeps[depName];\n    if (newValue) {\n      result.push({\n        depName,\n        currentValue,\n        newValue,\n      });\n    }\n  }\n\n  return result;\n}\n\nexport function extraDepsTable(extraDeps: ExtraDep[]): string {\n  const tableLines: string[][] = [];\n\n  tableLines.push(['**Package**', '**Change**']);\n\n  for (const { depName, currentValue, newValue } of extraDeps) {\n    const depNameQuoted = `\\`${depName}\\``;\n    const versionChangeQuoted = `\\`${currentValue}\\` -> \\`${newValue}\\``;\n    tableLines.push([depNameQuoted, versionChangeQuoted]);\n  }\n\n  return markdownTable(tableLines, {\n    align: ['l', 'l'],\n  });\n}\n\nexport function getExtraDepsNotice(\n  goModBefore: string | null,\n  goModAfter: string | null,\n  excludeDeps: string[],\n): string | null {\n  if (!goModBefore || !goModAfter) {\n    return null;\n  }\n\n  const extraDeps = getExtraDeps(goModBefore, goModAfter, excludeDeps);\n  if (extraDeps.length === 0) {\n    return null;\n  }\n\n  const noticeLines: string[] = [\n    'In order to perform the update(s) described in the table above, Renovate ran the `go get` command, which resulted in the following additional change(s):',\n    '\\n',\n  ];\n\n  const goUpdated = extraDeps.some(({ depName }) => depName === 'go');\n  const otherDepsCount = extraDeps.length - (goUpdated ? 1 : 0);\n\n  if (otherDepsCount === 1) {\n    noticeLines.push(`- ${otherDepsCount} additional dependency was updated`);\n  } else if (otherDepsCount > 1) {\n    noticeLines.push(\n      `- ${otherDepsCount} additional dependencies were updated`,\n    );\n  }\n\n  if (goUpdated) {\n    noticeLines.push(\n      '- The `go` directive was updated for compatibility reasons',\n    );\n  }\n\n  noticeLines.push('\\n');\n  noticeLines.push('Details:');\n  noticeLines.push('\\n');\n  noticeLines.push(extraDepsTable(extraDeps));\n\n  return noticeLines.join('\\n');\n}\n"]}
+{"version":3,"file":"artifacts-extra.js","sourceRoot":"","sources":["../../../../lib/modules/manager/gomod/artifacts-extra.ts"],"names":[],"mappings":"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","sourcesContent":["import { diffLines } from 'diff';\nimport markdownTable from 'markdown-table';\nimport { parseLine } from './line-parser';\nimport type { ExtraDep } from './types';\n\nexport function getExtraDeps(\n  goModBefore: string,\n  goModAfter: string,\n  excludeDeps: string[],\n): ExtraDep[] {\n  const result: ExtraDep[] = [];\n\n  const diff = diffLines(goModBefore, goModAfter, {\n    newlineIsToken: true,\n  });\n\n  const addDeps: Record<string, string> = {};\n  const rmDeps: Record<string, string> = {};\n  for (const { added, removed, value } of diff) {\n    if (!added && !removed) {\n      continue;\n    }\n\n    const res = parseLine(value);\n    if (!res) {\n      continue;\n    }\n\n    const { depName, depType, currentValue } = res;\n    if (!depName || !currentValue) {\n      continue;\n    }\n\n    let expandedDepName = depName;\n    // NOTE: Right now the only special depType we care about is 'toolchain' because the table\n    // rendering prior to this change was ambiguous with regards to go version vs toolchain\n    // version updates.\n    if (depType === 'toolchain') {\n      expandedDepName = `${depName} (${depType})`;\n    }\n\n    if (added) {\n      addDeps[expandedDepName] = currentValue;\n    } else {\n      rmDeps[expandedDepName] = currentValue;\n    }\n  }\n\n  for (const [depName, currentValue] of Object.entries(rmDeps)) {\n    if (excludeDeps.includes(depName)) {\n      continue;\n    }\n\n    const newValue = addDeps[depName];\n    if (newValue) {\n      result.push({\n        depName,\n        currentValue,\n        newValue,\n      });\n    }\n  }\n\n  return result;\n}\n\nexport function extraDepsTable(extraDeps: ExtraDep[]): string {\n  const tableLines: string[][] = [];\n\n  tableLines.push(['**Package**', '**Change**']);\n\n  for (const { depName, currentValue, newValue } of extraDeps) {\n    const depNameQuoted = `\\`${depName}\\``;\n    const versionChangeQuoted = `\\`${currentValue}\\` -> \\`${newValue}\\``;\n    tableLines.push([depNameQuoted, versionChangeQuoted]);\n  }\n\n  return markdownTable(tableLines, {\n    align: ['l', 'l'],\n  });\n}\n\nexport function getExtraDepsNotice(\n  goModBefore: string | null,\n  goModAfter: string | null,\n  excludeDeps: string[],\n): string | null {\n  if (!goModBefore || !goModAfter) {\n    return null;\n  }\n\n  const extraDeps = getExtraDeps(goModBefore, goModAfter, excludeDeps);\n  if (extraDeps.length === 0) {\n    return null;\n  }\n\n  const noticeLines: string[] = [\n    'In order to perform the update(s) described in the table above, Renovate ran the `go get` command, which resulted in the following additional change(s):',\n    '\\n',\n  ];\n\n  const goUpdated = extraDeps.some(({ depName }) => depName === 'go');\n  const toolchainUpdated = extraDeps.some(\n    ({ depName }) => depName === 'go (toolchain)',\n  );\n  const otherDepsCount =\n    extraDeps.length - (goUpdated ? 1 : 0) - (toolchainUpdated ? 1 : 0);\n\n  if (otherDepsCount === 1) {\n    noticeLines.push(`- ${otherDepsCount} additional dependency was updated`);\n  } else if (otherDepsCount > 1) {\n    noticeLines.push(\n      `- ${otherDepsCount} additional dependencies were updated`,\n    );\n  }\n\n  if (goUpdated) {\n    noticeLines.push(\n      '- The `go` directive was updated for compatibility reasons',\n    );\n  }\n\n  noticeLines.push('\\n');\n  noticeLines.push('Details:');\n  noticeLines.push('\\n');\n  noticeLines.push(extraDepsTable(extraDeps));\n\n  return noticeLines.join('\\n');\n}\n"]}

package/dist/modules/manager/gomod/artifacts.js

@@ -117,13 +117,12 @@ async function updateArtifacts({ packageFileName: goModFileName, updatedDeps, ne
             logger_1.logger.debug('Removed some relative replace statements and comments from go.mod');
         }
     }
-    const goConstraints = config.constraints?.go ?? (await getGoConstraints(goModFileName));
+    const goConstraints = config.constraints?.go ?? getGoConstraints(newGoModContent);
     try {
         await (0, fs_1.writeLocalFile)(goModFileName, massagedGoMod);
         const cmd = 'go';
         const execOptions = {
             cwdFile: goModFileName,
-            userConfiguredEnv: config.env,
             extraEnv: {
                 GOPATH: await (0, fs_1.ensureCacheDir)('go'),
                 GOPROXY: process.env.GOPROXY,
@@ -132,9 +131,8 @@ async function updateArtifacts({ packageFileName: goModFileName, updatedDeps, ne
                 GONOSUMDB: process.env.GONOSUMDB,
                 GOSUMDB: process.env.GOSUMDB,
                 GOINSECURE: process.env.GOINSECURE,
-                GOFLAGS: useModcacherw(goConstraints)
-                    ? '-modcacherw'
-                    : /* istanbul ignore next: hard to test */ null,
+                /* v8 ignore next -- TODO: add test */
+                GOFLAGS: useModcacherw(goConstraints) ? '-modcacherw' : null,
                 CGO_ENABLED: global_1.GlobalConfig.get('binarySource') === 'docker' ? '0' : null,
                 ...(0, auth_1.getGitEnvironmentVariables)(['go']),
             },
@@ -333,16 +331,32 @@ async function updateArtifacts({ packageFileName: goModFileName, updatedDeps, ne
         ];
     }
 }
-async function getGoConstraints(goModFileName) {
-    const content = (await (0, fs_1.readLocalFile)(goModFileName, 'utf8')) ?? null;
-    if (!content) {
-        return undefined;
+function getGoConstraints(content) {
+    // prefer toolchain directive when go.mod has one
+    const toolchainMatch = (0, regex_1.regEx)(/^toolchain\s*go(?<gover>\d+\.\d+\.\d+)$/m).exec(content);
+    const toolchainVer = toolchainMatch?.groups?.gover;
+    if (toolchainVer) {
+        logger_1.logger.debug(`Using go version ${toolchainVer} found in toolchain directive`);
+        return toolchainVer;
+    }
+    // If go.mod doesn't have toolchain directive and has a full go version spec,
+    // for example `go 1.23.6`, pick this version, this doesn't match major.minor version spec.
+    //
+    // This is because when go.mod have same version defined in go directive and toolchain directive,
+    // go will remove toolchain directive from go.mod.
+    //
+    // For example, go will rewrite `go 1.23.5\ntoolchain go1.23.5` to `go 1.23.5` by default,
+    // in this case, the go directive is the toolchain directive.
+    const goFullVersion = (0, regex_1.regEx)(/^go\s*(?<gover>\d+\.\d+\.\d+)$/m).exec(content)
+        ?.groups?.gover;
+    if (goFullVersion) {
+        return goFullVersion;
     }
     const re = (0, regex_1.regEx)(/^go\s*(?<gover>\d+\.\d+)$/m);
     const match = re.exec(content);
     if (!match?.groups?.gover) {
         return undefined;
     }
-    return '^' + match.groups.gover;
+    return `^${match.groups.gover}`;
 }
 //# sourceMappingURL=artifacts.js.map