From 2ef938f3af73ad8e5cfcabc1e899bb31bfcd9758 Mon Sep 17 00:00:00 2001 From: Pavlos Ratis Date: Wed, 24 Feb 2021 19:43:00 +0100 Subject: [PATCH] Add go mod tidy to be executed after the scaffolding api --- pkg/plugins/golang/v2/api.go | 5 +++++ pkg/plugins/golang/v2/init.go | 2 +- pkg/plugins/golang/v3/api.go | 5 +++++ pkg/plugins/golang/v3/init.go | 2 +- testdata/project-v2-addon/go.mod | 2 ++ testdata/project-v2-multigroup/go.mod | 2 ++ testdata/project-v2/go.mod | 2 ++ testdata/project-v3-addon/go.mod | 2 ++ testdata/project-v3-config/go.mod | 3 +++ testdata/project-v3-multigroup/go.mod | 2 ++ testdata/project-v3/go.mod | 3 +++ 11 files changed, 28 insertions(+), 2 deletions(-) diff --git a/pkg/plugins/golang/v2/api.go b/pkg/plugins/golang/v2/api.go index d8395eaf014..02e6e329b51 100644 --- a/pkg/plugins/golang/v2/api.go +++ b/pkg/plugins/golang/v2/api.go @@ -207,6 +207,11 @@ func (p *createAPISubcommand) PostScaffold() error { return fmt.Errorf("unknown pattern %q", p.pattern) } + err := util.RunCmd("Update dependencies", "go", "mod", "tidy") + if err != nil { + return err + } + if p.runMake { // TODO: check if API was scaffolded return util.RunCmd("Running make", "make", "generate") } diff --git a/pkg/plugins/golang/v2/init.go b/pkg/plugins/golang/v2/init.go index af767e74c65..0615ee15c13 100644 --- a/pkg/plugins/golang/v2/init.go +++ b/pkg/plugins/golang/v2/init.go @@ -178,7 +178,7 @@ func (p *initSubcommand) PostScaffold() error { return err } - err = util.RunCmd("Update go.mod", "go", "mod", "tidy") + err = util.RunCmd("Update dependencies", "go", "mod", "tidy") if err != nil { return err } diff --git a/pkg/plugins/golang/v3/api.go b/pkg/plugins/golang/v3/api.go index 34ca58df4cc..ca21cbef6a3 100644 --- a/pkg/plugins/golang/v3/api.go +++ b/pkg/plugins/golang/v3/api.go @@ -237,6 +237,11 @@ func (p *createAPISubcommand) PostScaffold() error { return fmt.Errorf("unknown pattern %q", p.pattern) } + err := util.RunCmd("Update dependencies", "go", "mod", "tidy") + if err != nil { + return err + } + if p.runMake { // TODO: check if API was scaffolded return util.RunCmd("Running make", "make", "generate") } diff --git a/pkg/plugins/golang/v3/init.go b/pkg/plugins/golang/v3/init.go index b2572c7bf4a..cc609db2c63 100644 --- a/pkg/plugins/golang/v3/init.go +++ b/pkg/plugins/golang/v3/init.go @@ -180,7 +180,7 @@ func (p *initSubcommand) PostScaffold() error { return err } - err = util.RunCmd("Update go.mod", "go", "mod", "tidy") + err = util.RunCmd("Update dependencies", "go", "mod", "tidy") if err != nil { return err } diff --git a/testdata/project-v2-addon/go.mod b/testdata/project-v2-addon/go.mod index c853a92bb0f..158ead9deb9 100644 --- a/testdata/project-v2-addon/go.mod +++ b/testdata/project-v2-addon/go.mod @@ -4,6 +4,8 @@ go 1.13 require ( github.com/go-logr/logr v0.1.0 + github.com/onsi/ginkgo v1.12.1 + github.com/onsi/gomega v1.10.1 k8s.io/apimachinery v0.18.6 k8s.io/client-go v0.18.6 sigs.k8s.io/controller-runtime v0.6.4 diff --git a/testdata/project-v2-multigroup/go.mod b/testdata/project-v2-multigroup/go.mod index 48e0bcb882c..d0ffad76e06 100644 --- a/testdata/project-v2-multigroup/go.mod +++ b/testdata/project-v2-multigroup/go.mod @@ -4,6 +4,8 @@ go 1.13 require ( github.com/go-logr/logr v0.1.0 + github.com/onsi/ginkgo v1.12.1 + github.com/onsi/gomega v1.10.1 k8s.io/api v0.18.6 k8s.io/apimachinery v0.18.6 k8s.io/client-go v0.18.6 diff --git a/testdata/project-v2/go.mod b/testdata/project-v2/go.mod index 57b94c83092..d12efdcca14 100644 --- a/testdata/project-v2/go.mod +++ b/testdata/project-v2/go.mod @@ -4,6 +4,8 @@ go 1.13 require ( github.com/go-logr/logr v0.1.0 + github.com/onsi/ginkgo v1.12.1 + github.com/onsi/gomega v1.10.1 k8s.io/apimachinery v0.18.6 k8s.io/client-go v0.18.6 sigs.k8s.io/controller-runtime v0.6.4 diff --git a/testdata/project-v3-addon/go.mod b/testdata/project-v3-addon/go.mod index 9419f0ce644..e64120517df 100644 --- a/testdata/project-v3-addon/go.mod +++ b/testdata/project-v3-addon/go.mod @@ -4,6 +4,8 @@ go 1.15 require ( github.com/go-logr/logr v0.3.0 + github.com/onsi/ginkgo v1.14.1 + github.com/onsi/gomega v1.10.2 k8s.io/apimachinery v0.19.2 k8s.io/client-go v0.19.2 sigs.k8s.io/controller-runtime v0.7.0 diff --git a/testdata/project-v3-config/go.mod b/testdata/project-v3-config/go.mod index 17104c35fcb..f3957e4e5a8 100644 --- a/testdata/project-v3-config/go.mod +++ b/testdata/project-v3-config/go.mod @@ -4,6 +4,9 @@ go 1.15 require ( github.com/go-logr/logr v0.3.0 + github.com/onsi/ginkgo v1.14.1 + github.com/onsi/gomega v1.10.2 + k8s.io/api v0.19.2 k8s.io/apimachinery v0.19.2 k8s.io/client-go v0.19.2 sigs.k8s.io/controller-runtime v0.7.0 diff --git a/testdata/project-v3-multigroup/go.mod b/testdata/project-v3-multigroup/go.mod index e5604171902..20900109e2c 100644 --- a/testdata/project-v3-multigroup/go.mod +++ b/testdata/project-v3-multigroup/go.mod @@ -4,6 +4,8 @@ go 1.15 require ( github.com/go-logr/logr v0.3.0 + github.com/onsi/ginkgo v1.14.1 + github.com/onsi/gomega v1.10.2 k8s.io/api v0.19.2 k8s.io/apimachinery v0.19.2 k8s.io/client-go v0.19.2 diff --git a/testdata/project-v3/go.mod b/testdata/project-v3/go.mod index 85b8c51e260..3a6c1779c1d 100644 --- a/testdata/project-v3/go.mod +++ b/testdata/project-v3/go.mod @@ -4,6 +4,9 @@ go 1.15 require ( github.com/go-logr/logr v0.3.0 + github.com/onsi/ginkgo v1.14.1 + github.com/onsi/gomega v1.10.2 + k8s.io/api v0.19.2 k8s.io/apimachinery v0.19.2 k8s.io/client-go v0.19.2 sigs.k8s.io/controller-runtime v0.7.0