make imports

xrstf · xrstf · commit 18afc13862d5 · 2025-05-12T19:15:31.000+02:00
On-behalf-of: @SAP christoph.mewes@sap.com
diff --git a/cmd/client-gen/generators/client_generator.go b/cmd/client-gen/generators/client_generator.go
@@ -23,18 +23,18 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/args"
-	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/fake"
-	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/scheme"
-	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	codegennamer "k8s.io/code-generator/pkg/namer"
 	"k8s.io/gengo/v2"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
-
 	"k8s.io/klog/v2"
+
+	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/args"
+	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/fake"
+	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/scheme"
+	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 )
 
 // NameSystems returns the name system used by the generators in this package.
diff --git a/cmd/client-gen/generators/fake/generator_fake_for_clientset.go b/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
@@ -22,10 +22,11 @@ import (
 	"path"
 	"strings"
 
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
+
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 )
 
 // genClientset generates a package for a clientset.
diff --git a/cmd/client-gen/generators/generator_for_clientset.go b/cmd/client-gen/generators/generator_for_clientset.go
@@ -22,10 +22,11 @@ import (
 	"path"
 	"strings"
 
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
+
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 )
 
 // genClientset generates a package for a clientset.
diff --git a/cmd/client-gen/generators/scheme/generator_for_scheme.go b/cmd/client-gen/generators/scheme/generator_for_scheme.go
@@ -24,10 +24,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
+
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 )
 
 // GenScheme produces a package for a clientset with the scheme, codecs and parameter codecs.
diff --git a/cmd/client-gen/main.go b/cmd/client-gen/main.go
@@ -22,13 +22,14 @@ import (
 	"slices"
 
 	"github.com/spf13/pflag"
+
+	"k8s.io/gengo/v2"
+	"k8s.io/gengo/v2/generator"
 	"k8s.io/klog/v2"
 
 	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/args"
 	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators"
 	"github.com/kcp-dev/code-generator/v3/pkg/util"
-	"k8s.io/gengo/v2"
-	"k8s.io/gengo/v2/generator"
 )
 
 func main() {
diff --git a/cmd/informer-gen/generators/factory.go b/cmd/informer-gen/generators/factory.go
@@ -20,12 +20,12 @@ import (
 	"io"
 	"path"
 
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
-
 	"k8s.io/klog/v2"
+
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 )
 
 // factoryGenerator produces a file of listers for a given GroupVersion and
diff --git a/cmd/informer-gen/generators/factoryinterface.go b/cmd/informer-gen/generators/factoryinterface.go
@@ -22,7 +22,6 @@ import (
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
-
 	"k8s.io/klog/v2"
 )
 
diff --git a/cmd/informer-gen/generators/generic.go b/cmd/informer-gen/generators/generic.go
@@ -21,11 +21,12 @@ import (
 	"sort"
 	"strings"
 
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	codegennamer "k8s.io/code-generator/pkg/namer"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
+
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 )
 
 // genericGenerator generates the generic informer.
diff --git a/cmd/informer-gen/generators/groupinterface.go b/cmd/informer-gen/generators/groupinterface.go
@@ -21,10 +21,11 @@ import (
 	"path"
 	"strings"
 
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
+
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 )
 
 // groupInterfaceGenerator generates the per-group interface file.
diff --git a/cmd/informer-gen/generators/informer.go b/cmd/informer-gen/generators/informer.go
@@ -24,11 +24,10 @@ import (
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
+	"k8s.io/klog/v2"
 
 	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
 	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
-
-	"k8s.io/klog/v2"
 )
 
 // informerGenerator produces a file of listers for a given GroupVersion and
diff --git a/cmd/informer-gen/generators/targets.go b/cmd/informer-gen/generators/targets.go
@@ -22,15 +22,16 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
-	"github.com/kcp-dev/code-generator/v3/cmd/informer-gen/args"
-	genutil "github.com/kcp-dev/code-generator/v3/pkg/util"
 	"k8s.io/gengo/v2"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
 	"k8s.io/klog/v2"
+
+	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
+	"github.com/kcp-dev/code-generator/v3/cmd/informer-gen/args"
+	genutil "github.com/kcp-dev/code-generator/v3/pkg/util"
 )
 
 // NameSystems returns the name system used by the generators in this package.
diff --git a/cmd/informer-gen/main.go b/cmd/informer-gen/main.go
@@ -19,13 +19,15 @@ package main
 import (
 	"flag"
 
-	"github.com/kcp-dev/code-generator/v3/cmd/informer-gen/args"
-	"github.com/kcp-dev/code-generator/v3/cmd/informer-gen/generators"
-	"github.com/kcp-dev/code-generator/v3/pkg/util"
 	"github.com/spf13/pflag"
+
 	"k8s.io/gengo/v2"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/klog/v2"
+
+	"github.com/kcp-dev/code-generator/v3/cmd/informer-gen/args"
+	"github.com/kcp-dev/code-generator/v3/cmd/informer-gen/generators"
+	"github.com/kcp-dev/code-generator/v3/pkg/util"
 )
 
 func main() {
diff --git a/cmd/lister-gen/generators/lister.go b/cmd/lister-gen/generators/lister.go
@@ -23,14 +23,15 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
-	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
-	"github.com/kcp-dev/code-generator/v3/cmd/lister-gen/args"
 	"k8s.io/gengo/v2"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/gengo/v2/types"
 	"k8s.io/klog/v2"
+
+	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
+	clientgentypes "github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
+	"github.com/kcp-dev/code-generator/v3/cmd/lister-gen/args"
 )
 
 // NameSystems returns the name system used by the generators in this package.
diff --git a/cmd/lister-gen/main.go b/cmd/lister-gen/main.go
@@ -19,13 +19,15 @@ package main
 import (
 	"flag"
 
-	"github.com/kcp-dev/code-generator/v3/cmd/lister-gen/args"
-	"github.com/kcp-dev/code-generator/v3/cmd/lister-gen/generators"
-	"github.com/kcp-dev/code-generator/v3/pkg/util"
 	"github.com/spf13/pflag"
+
 	"k8s.io/gengo/v2"
 	"k8s.io/gengo/v2/generator"
 	"k8s.io/klog/v2"
+
+	"github.com/kcp-dev/code-generator/v3/cmd/lister-gen/args"
+	"github.com/kcp-dev/code-generator/v3/cmd/lister-gen/generators"
+	"github.com/kcp-dev/code-generator/v3/pkg/util"
 )
 
 func main() {
diff --git a/pkg/parser/extract.go b/pkg/parser/extract.go
@@ -22,13 +22,14 @@ import (
 
 	"golang.org/x/tools/go/ast/astutil"
 
-	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	"k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/gengo/v2/namer"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-tools/pkg/genall"
 	"sigs.k8s.io/controller-tools/pkg/markers"
+
+	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 )
 
 // isForbiddenGroupVersion hacks around the k8s client-set, where types have +genclient but aren't meant to have
diff --git a/pkg/parser/markers.go b/pkg/parser/markers.go
@@ -20,9 +20,10 @@ import (
 	"fmt"
 	"strings"
 
-	genutil "github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"sigs.k8s.io/controller-tools/pkg/markers"
+
+	genutil "github.com/kcp-dev/code-generator/v3/cmd/client-gen/generators/util"
 )
 
 var (
diff --git a/pkg/parser/types.go b/pkg/parser/types.go
@@ -22,9 +22,9 @@ import (
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
-	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 
+	"github.com/kcp-dev/code-generator/v3/cmd/client-gen/types"
 	"github.com/kcp-dev/code-generator/v3/pkg/util"
 	"github.com/kcp-dev/code-generator/v3/third_party/namer"
 )

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ import (`
`22`	`22`	`"k8s.io/gengo/v2/generator"`
`23`	`23`	`"k8s.io/gengo/v2/namer"`
`24`	`24`	`"k8s.io/gengo/v2/types"`
`25`		`-`
`26`	`25`	`"k8s.io/klog/v2"`
`27`	`26`	`)`
`28`	`27`