introduce v2 of the code-generator package

p0lyn0mial · p0lyn0mial · commit 17d4a705cf15 · 2022-12-14T14:22:02.000+01:00
diff --git a/go.mod b/go.mod
@@ -1,8 +1,9 @@
-module github.com/kcp-dev/code-generator
+module github.com/kcp-dev/code-generator/v2
 
 go 1.18
 
 require (
+	github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.20.1
 	github.com/spf13/cobra v1.4.0
diff --git a/go.sum b/go.sum
@@ -68,6 +68,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7 h1:ZCdSsY/oF01fxLMajM867hJJINoB6DhuVf6j4O9S37Y=
+github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7/go.mod h1:QH3PS4O/Z3nyZzt5XLK8nqxwFnNEYo8ePkR8u+xj4ho=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
diff --git a/pkg/generators/clientgen/clientgen.go b/pkg/generators/clientgen/clientgen.go
@@ -27,9 +27,9 @@ import (
 	"sigs.k8s.io/controller-tools/pkg/genall"
 	"sigs.k8s.io/controller-tools/pkg/markers"
 
-	"github.com/kcp-dev/code-generator/pkg/internal/clientgen"
-	"github.com/kcp-dev/code-generator/pkg/parser"
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/internal/clientgen"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type Generator struct {
diff --git a/pkg/generators/informergen/informergen.go b/pkg/generators/informergen/informergen.go
@@ -27,9 +27,9 @@ import (
 	"sigs.k8s.io/controller-tools/pkg/genall"
 	"sigs.k8s.io/controller-tools/pkg/markers"
 
-	"github.com/kcp-dev/code-generator/pkg/internal/informergen"
-	"github.com/kcp-dev/code-generator/pkg/parser"
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/internal/informergen"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type Generator struct {
diff --git a/pkg/generators/listergen/listergen.go b/pkg/generators/listergen/listergen.go
@@ -26,9 +26,9 @@ import (
 	"sigs.k8s.io/controller-tools/pkg/genall"
 	"sigs.k8s.io/controller-tools/pkg/markers"
 
-	"github.com/kcp-dev/code-generator/pkg/internal/listergen"
-	"github.com/kcp-dev/code-generator/pkg/parser"
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/internal/listergen"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type Generator struct {
diff --git a/pkg/internal/clientgen/clientset.go b/pkg/internal/clientgen/clientset.go
@@ -7,7 +7,7 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type ClientSet struct {
diff --git a/pkg/internal/clientgen/fake_clientset.go b/pkg/internal/clientgen/fake_clientset.go
@@ -7,7 +7,7 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type FakeClientset struct {
diff --git a/pkg/internal/clientgen/fake_group.go b/pkg/internal/clientgen/fake_group.go
@@ -7,8 +7,8 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type FakeGroup struct {
diff --git a/pkg/internal/clientgen/fake_type.go b/pkg/internal/clientgen/fake_type.go
@@ -10,8 +10,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type FakeTypedClient struct {
diff --git a/pkg/internal/clientgen/group.go b/pkg/internal/clientgen/group.go
@@ -7,8 +7,8 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type Group struct {
diff --git a/pkg/internal/clientgen/scheme.go b/pkg/internal/clientgen/scheme.go
@@ -7,7 +7,7 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type Scheme struct {
diff --git a/pkg/internal/clientgen/type.go b/pkg/internal/clientgen/type.go
@@ -7,8 +7,8 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 type TypedClient struct {
diff --git a/pkg/internal/informergen/factory.go b/pkg/internal/informergen/factory.go
@@ -20,7 +20,7 @@ import (
 	"io"
 	"text/template"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
 )
 
 type Factory struct {
diff --git a/pkg/internal/informergen/generic.go b/pkg/internal/informergen/generic.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
 )
 
 type Generic struct {
diff --git a/pkg/internal/informergen/groupinterface.go b/pkg/internal/informergen/groupinterface.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
 )
 
 type GroupInterface struct {
diff --git a/pkg/internal/informergen/informer.go b/pkg/internal/informergen/informer.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
 )
 
 type Informer struct {
diff --git a/pkg/internal/informergen/parser.go b/pkg/internal/informergen/parser.go
@@ -23,8 +23,8 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 var (
diff --git a/pkg/internal/informergen/versioninterface.go b/pkg/internal/informergen/versioninterface.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
 )
 
 type VersionInterface struct {
diff --git a/pkg/internal/listergen/expansions.go b/pkg/internal/listergen/expansions.go
@@ -6,7 +6,7 @@ import (
 
 	clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
 )
 
 type Expansions struct {
diff --git a/pkg/internal/listergen/lister.go b/pkg/internal/listergen/lister.go
@@ -6,7 +6,7 @@ import (
 
 	clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/parser"
+	"github.com/kcp-dev/code-generator/v2/pkg/parser"
 )
 
 type Lister struct {
diff --git a/pkg/internal/listergen/parser.go b/pkg/internal/listergen/parser.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 var (
diff --git a/pkg/parser/types.go b/pkg/parser/types.go
@@ -20,8 +20,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/code-generator/cmd/client-gen/types"
 
-	"github.com/kcp-dev/code-generator/pkg/util"
-	"github.com/kcp-dev/code-generator/third_party/namer"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/third_party/namer"
 )
 
 type Kind struct {
diff --git a/third_party/namer/namer_test.go b/third_party/namer/namer_test.go
@@ -19,7 +19,7 @@ package namer
 import (
 	"testing"
 
-	"github.com/kcp-dev/code-generator/pkg/util"
+	"github.com/kcp-dev/code-generator/v2/pkg/util"
 )
 
 func TestNamer(t *testing.T) {

-Original file line number
+Diff line change
@@ @@ -1,8 +1,9 @@ @@
 -module github.com/kcp-dev/code-generator
 +module github.com/kcp-dev/code-generator/v2
 go 1.18
 require (
 +	github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.20.1
 	github.com/spf13/cobra v1.4.0
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"k8s.io/code-generator/cmd/client-gen/types"`
`9`	`9`
`10`		`- "github.com/kcp-dev/code-generator/pkg/util"`
	`10`	`+ "github.com/kcp-dev/code-generator/v2/pkg/util"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type ClientSet struct {`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`
`8`	`8`	`"k8s.io/code-generator/cmd/client-gen/types"`
`9`	`9`
`10`		`- "github.com/kcp-dev/code-generator/pkg/parser"`
`11`		`- "github.com/kcp-dev/code-generator/pkg/util"`
	`10`	`+ "github.com/kcp-dev/code-generator/v2/pkg/parser"`
	`11`	`+ "github.com/kcp-dev/code-generator/v2/pkg/util"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type FakeGroup struct {`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"k8s.io/apimachinery/pkg/util/sets"`
`11`	`11`	`"k8s.io/code-generator/cmd/client-gen/types"`
`12`	`12`
`13`		`- "github.com/kcp-dev/code-generator/pkg/parser"`
`14`		`- "github.com/kcp-dev/code-generator/pkg/util"`
	`13`	`+ "github.com/kcp-dev/code-generator/v2/pkg/parser"`
	`14`	`+ "github.com/kcp-dev/code-generator/v2/pkg/util"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type FakeTypedClient struct {`