Update go.mod after API scaffold generation

dastergon · dastergon · commit 0d42eb0b4188 · 2021-02-25T16:17:52.000+01:00
diff --git 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("Running go mod tidy", "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/api.go b/pkg/plugins/golang/v3/api.go
@@ -236,6 +236,11 @@ func (p *createAPISubcommand) PostScaffold() error {
 		return fmt.Errorf("unknown pattern %q", p.pattern)
 	}
 
+	err := util.RunCmd("Running go mod tidy", "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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,11 @@ func (p *createAPISubcommand) PostScaffold() error {`
`207`	`207`	`return fmt.Errorf("unknown pattern %q", p.pattern)`
`208`	`208`	`}`
`209`	`209`
	`210`	`+ err := util.RunCmd("Running go mod tidy", "go", "mod", "tidy")`
	`211`	`+ if err != nil {`
	`212`	`+ return err`
	`213`	`+ }`
	`214`	`+`
`210`	`215`	`if p.runMake { // TODO: check if API was scaffolded`
`211`	`216`	`return util.RunCmd("Running make", "make", "generate")`
`212`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,11 @@ func (p *createAPISubcommand) PostScaffold() error {`
`236`	`236`	`return fmt.Errorf("unknown pattern %q", p.pattern)`
`237`	`237`	`}`
`238`	`238`
	`239`	`+ err := util.RunCmd("Running go mod tidy", "go", "mod", "tidy")`
	`240`	`+ if err != nil {`
	`241`	`+ return err`
	`242`	`+ }`
	`243`	`+`
`239`	`244`	`if p.runMake { // TODO: check if API was scaffolded`
`240`	`245`	`return util.RunCmd("Running make", "make", "generate")`
`241`	`246`	`}`