Skip to content

Commit ef59eb2

Browse files
authored
fix: correct renovate url for redirected tools (#220)
1 parent c1657f3 commit ef59eb2

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.toolbox.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ TB_OAPI_CODEGEN ?= $(TB_LOCALBIN)/oapi-codegen
1717
TB_SEMVER ?= $(TB_LOCALBIN)/semver
1818

1919
## Tool Versions
20-
# renovate: packageName=k8s.io/code-generator/cmd/deepcopy-gen
20+
# renovate: packageName=github.com/kubernetes/code-generator
2121
TB_DEEPCOPY_GEN_VERSION ?= v0.33.2
2222
# renovate: packageName=github.com/golangci/golangci-lint/v2
2323
TB_GOLANGCI_LINT_VERSION ?= v2.2.2

pkg/makefile/.toolbox.mk.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ TB_{{.UpperName}} ?= $(TB_LOCALBIN)/{{.Name}}
1717
{{- range .Tools }}
1818
{{- if .Version }}
1919
{{- if $.Renovate }}
20-
# renovate: packageName={{.GoModule}}
20+
# renovate: packageName={{.RepoURL}}
2121
{{- end }}
2222
TB_{{.UpperName}}_VERSION ?= {{.Version}}
2323
{{- end }}

pkg/makefile/make.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ func dataForTool(fromToolsGo bool, toolName string, fullTool ...string) toolData
140140
td.UpperName = strings.ReplaceAll(strings.ToUpper(td.Name), "-", "_")
141141
td.FromToolsGo = fromToolsGo
142142
td.GoModule = extractModulePath(td.ToolName)
143+
td.RepoURL = td.GoModule
144+
if strings.Contains(td.Tool, "@") {
145+
td.RepoURL = strings.Split(td.Tool, "@")[1]
146+
}
143147
return td
144148
}
145149

@@ -165,6 +169,7 @@ type toolData struct {
165169
UpperName string `json:"UpperName"`
166170
Version string `json:"Version"`
167171
GoModule string `json:"GoModule"`
172+
RepoURL string `json:"RepoURL"`
168173
Tool string `json:"Tool"`
169174
ToolName string `json:"ToolName"`
170175
FromToolsGo bool `json:"FromToolsGo"`

testdata/.toolbox.mk.renovate.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ TB_SEMVER ?= $(TB_LOCALBIN)/semver
1515
TB_TOOLBOX ?= $(TB_LOCALBIN)/toolbox
1616

1717
## Tool Versions
18-
# renovate: packageName=sigs.k8s.io/controller-tools/cmd/controller-gen
18+
# renovate: packageName=github.com/kubernetes-sigs/controller-tools
1919
TB_CONTROLLER_GEN_VERSION ?= v0.2.1
2020
# renovate: packageName=github.com/golangci/golangci-lint/v2
2121
TB_GOLANGCI_LINT_VERSION ?= v0.2.1

0 commit comments

Comments
 (0)