Merge pull request #2037 from dastergon/fix-api-generation

k8s-ci-robot · web-flow · commit 2b464030b6e3 · 2021-03-01T13:30:16.000-08:00
✨: Add go mod tidy to be executed after the scaffolding api
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("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
@@ -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
@@ -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
@@ -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
@@ -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("Update dependencies", "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
`@@ -178,7 +178,7 @@ func (p *initSubcommand) PostScaffold() error {`
`178`	`178`	`return err`
`179`	`179`	`}`
`180`	`180`
`181`		`- err = util.RunCmd("Update go.mod", "go", "mod", "tidy")`
	`181`	`+ err = util.RunCmd("Update dependencies", "go", "mod", "tidy")`
`182`	`182`	`if err != nil {`
`183`	`183`	`return err`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,11 @@ func (p *createAPISubcommand) PostScaffold() error {`
`237`	`237`	`return fmt.Errorf("unknown pattern %q", p.pattern)`
`238`	`238`	`}`
`239`	`239`
	`240`	`+ err := util.RunCmd("Update dependencies", "go", "mod", "tidy")`
	`241`	`+ if err != nil {`
	`242`	`+ return err`
	`243`	`+ }`
	`244`	`+`
`240`	`245`	`if p.runMake { // TODO: check if API was scaffolded`
`241`	`246`	`return util.RunCmd("Running make", "make", "generate")`
`242`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func (p *initSubcommand) PostScaffold() error {`
`180`	`180`	`return err`
`181`	`181`	`}`
`182`	`182`
`183`		`- err = util.RunCmd("Update go.mod", "go", "mod", "tidy")`
	`183`	`+ err = util.RunCmd("Update dependencies", "go", "mod", "tidy")`
`184`	`184`	`if err != nil {`
`185`	`185`	`return err`
`186`	`186`	`}`