From 4fc174d501c76aef2068a862ed33a59c9caae454 Mon Sep 17 00:00:00 2001 From: Adi Muraru Date: Tue, 14 Jul 2026 12:57:06 +0200 Subject: [PATCH] fix: unblock two more dependencies silently dropped by Renovate customManagers Cross-checked every # renovate: / // renovate:-annotated line in the repo against its customManager regex (same audit that found the Kafka tracking bug in #284, but this covers other mismatch shapes, not just case). Cross-referenced against the live Dependency Dashboard (#156), which was missing exactly these entries, and confirmed each fix with a standalone regex test against the real file content. - Makefile: ADDLICENSE_VERSION, GOTEMPLATE_VERSION and MOCKGEN_VERSION used `:=` while the customManager regex only matches a plain `=`, so google/addlicense, cznic/gotemplate and uber-go/mock were never tracked. Switched to `=` to match the other working entries in the same file (GOLANGCI_VERSION, LICENSEI_VERSION, etc.) - harmless, since these are static literals with no dependency on recursive vs simple expansion. - tests/e2e/versions.go: ZookeeperOperatorVersion uses datasource=docker, which has no notion of a Helm repo registryUrl, but the customManager regex required `registryUrl=` unconditionally - every other entry in this file is a Helm chart and does supply one. Made registryUrl optional in the regex/template, mirroring the existing optional-group pattern already used for extractVersion in the sibling Dockerfile/Makefile manager. Co-Authored-By: Claude Sonnet 5 --- Makefile | 6 +++--- renovate.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a8d316887..0b30f3363 100644 --- a/Makefile +++ b/Makefile @@ -23,9 +23,9 @@ LICENSEI_VERSION = 0.9.0 # renovate: datasource=github-releases depName=goph/lic CONTROLLER_GEN_VERSION = v0.21.0 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools ENVTEST_K8S_VERSION = 1.36.2 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools extractVersion=^envtest-v(?.+)$ SETUP_ENVTEST_VERSION := latest -ADDLICENSE_VERSION := 1.2.0 # renovate: datasource=github-releases depName=google/addlicense -GOTEMPLATE_VERSION := 3.12.0 # renovate: datasource=github-releases depName=cznic/gotemplate -MOCKGEN_VERSION := 0.6.0 # renovate: datasource=github-releases depName=uber-go/mock +ADDLICENSE_VERSION = 1.2.0 # renovate: datasource=github-releases depName=google/addlicense +GOTEMPLATE_VERSION = 3.12.0 # renovate: datasource=github-releases depName=cznic/gotemplate +MOCKGEN_VERSION = 0.6.0 # renovate: datasource=github-releases depName=uber-go/mock GOPROXY=https://proxy.golang.org diff --git a/renovate.json b/renovate.json index a0942e8da..7c37da561 100644 --- a/renovate.json +++ b/renovate.json @@ -36,11 +36,11 @@ "/tests/e2e/versions\\.go$/" ], "matchStrings": [ - "\\s*(?\\w+)\\s*=\\s*\"(?[^\"]+)\"\\s*//\\s*renovate:\\s*datasource=(?[^\\s]+)\\s*depName=(?[^\\s]+)\\s*registryUrl=(?\\S+)" + "\\s*(?\\w+)\\s*=\\s*\"(?[^\"]+)\"\\s*//\\s*renovate:\\s*datasource=(?[^\\s]+)\\s*depName=(?[^\\s]+)(?:\\s*registryUrl=(?\\S+))?" ], "datasourceTemplate": "{{datasource}}", "depNameTemplate": "{{packageName}}", - "registryUrlTemplate": "{{registryUrl}}" + "registryUrlTemplate": "{{#if registryUrl}}{{{registryUrl}}}{{/if}}" }, { "customType": "regex",