From 392e70cedd8efa1116eb0d801e0a6199045aa3a1 Mon Sep 17 00:00:00 2001 From: Dustin Scott Date: Mon, 20 Jun 2022 15:35:18 -0500 Subject: [PATCH] fix: also version indirect dependencies to ensure compatibility Signed-off-by: Dustin Scott --- go.sum | 1 + .../workload/v1/scaffolds/templates/gomod.go | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/go.sum b/go.sum index e4f9206..f940555 100644 --- a/go.sum +++ b/go.sum @@ -1128,6 +1128,7 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= diff --git a/internal/plugins/workload/v1/scaffolds/templates/gomod.go b/internal/plugins/workload/v1/scaffolds/templates/gomod.go index 7db6577..2fece40 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/gomod.go +++ b/internal/plugins/workload/v1/scaffolds/templates/gomod.go @@ -18,8 +18,9 @@ type GoMod struct { machinery.TemplateMixin machinery.RepositoryMixin - GoVersionMinimum string - Dependencies map[string]string + GoVersionMinimum string + Dependencies map[string]string + IndirectDependencies map[string]string } // goModDependencyMap pins the versions within the go.mod file so that they @@ -45,6 +46,12 @@ func goModDependencyMap() map[string]string { } } +func goModIndirectDependencyMap() map[string]string { + return map[string]string{ + "gopkg.in/check.v1": "v1.0.0-20201130134442-10cb98267c6c", + } +} + func (f *GoMod) SetTemplateDefaults() error { if f.Path == "" { f.Path = "go.mod" @@ -52,6 +59,7 @@ func (f *GoMod) SetTemplateDefaults() error { f.GoVersionMinimum = GoVersionMinimum f.Dependencies = goModDependencyMap() + f.IndirectDependencies = goModIndirectDependencyMap() f.TemplateBody = goModTemplate f.IfExistsAction = machinery.OverwriteFile @@ -66,6 +74,12 @@ go {{ .GoVersionMinimum }} require ( {{ range $package, $version := $.Dependencies }} "{{ $package }}" {{ $version }} - {{ end -}} + {{- end }} +) + +require ( + {{ range $package, $version := $.IndirectDependencies }} + "{{ $package }}" {{ $version }} + {{- end }} ) `