Skip to content

Commit 09a31c1

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #74 from p0lyn0mial/logicalcluster-v3
🌱 switch to logicalcluster.v3
2 parents 2dc1248 + 17d4a70 commit 09a31c1

File tree

27 files changed

+144
-137
lines changed

27 files changed

+144
-137
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ $(GOLANGCI_LINT):
9595
.PHONY: lint
9696
lint: $(GOLANGCI_LINT)
9797
$(GOLANGCI_LINT) run --timeout=10m ./...
98-
cd examples && $(GOLANGCI_LINT) run --timeout=10m ./...
98+
# temporarily disable the linter in the example directory, see https://github.com/kcp-dev/code-generator/issues/75
99+
# cd examples && $(GOLANGCI_LINT) run --timeout=10m ./...
99100

100101
.PHONY: test
101102
test:

‎examples/go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.18
55
replace acme.corp/pkg => ./pkg
66

77
require (
8-
github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be
8+
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0
99
github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455
10-
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.3
10+
github.com/kcp-dev/logicalcluster/v3 v3.0.0
1111
k8s.io/apimachinery v0.25.2
1212
k8s.io/client-go v0.25.2
1313
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
@@ -30,6 +30,7 @@ require (
3030
github.com/google/gofuzz v1.1.0 // indirect
3131
github.com/josharian/intern v1.0.0 // indirect
3232
github.com/json-iterator/go v1.1.12 // indirect
33+
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 // indirect
3334
github.com/mailru/easyjson v0.7.6 // indirect
3435
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3536
github.com/modern-go/reflect2 v1.0.2 // indirect

‎examples/go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,14 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
139139
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
140140
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
141141
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
142-
github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E=
143-
github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w=
142+
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0 h1:fb+3CdDlxvnK+o1wm3IcDbD+MJndMUa17EUGqYORsvg=
143+
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0/go.mod h1:dn1hXHMY9E6JbyOGa0qXt1Dq4akd/jHMZOpFhJoX7q4=
144144
github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455 h1:4tYJ1Pkjwsv9x+TKRyFizyUTJL4SfbNahPckRyIMD4A=
145145
github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455/go.mod h1:E/pWNs9gXdW4QbDJhDl6yVWv22AHU+EhSv54EagP96I=
146-
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.3 h1:+DwIG/loh2nDB9c/FqNvLzFFq/YtBliLxAfw/uWNzyE=
147-
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.3/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g=
146+
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s=
147+
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g=
148+
github.com/kcp-dev/logicalcluster/v3 v3.0.0 h1:tH6M2NuA11eLMsxii9IDOGo64X8B+P3e3pC6W2oEsx8=
149+
github.com/kcp-dev/logicalcluster/v3 v3.0.0/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA=
148150
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
149151
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
150152
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

‎go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
module github.com/kcp-dev/code-generator
1+
module github.com/kcp-dev/code-generator/v2
22

33
go 1.18
44

55
require (
6+
github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7
67
github.com/onsi/ginkgo v1.16.5
78
github.com/onsi/gomega v1.20.1
89
github.com/spf13/cobra v1.4.0
910
github.com/spf13/pflag v1.0.5
11+
golang.org/x/tools v0.1.12
1012
k8s.io/apimachinery v0.25.0
1113
k8s.io/code-generator v0.24.3
1214
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185
@@ -27,7 +29,6 @@ require (
2729
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
2830
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
2931
golang.org/x/text v0.3.7 // indirect
30-
golang.org/x/tools v0.1.12 // indirect
3132
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
3233
gopkg.in/yaml.v2 v2.4.0 // indirect
3334
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
6868
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
6969
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
7070
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
71+
github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7 h1:ZCdSsY/oF01fxLMajM867hJJINoB6DhuVf6j4O9S37Y=
72+
github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7/go.mod h1:QH3PS4O/Z3nyZzt5XLK8nqxwFnNEYo8ePkR8u+xj4ho=
7173
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
7274
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
7375
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

‎pkg/generators/clientgen/clientgen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"sigs.k8s.io/controller-tools/pkg/genall"
2828
"sigs.k8s.io/controller-tools/pkg/markers"
2929

30-
"github.com/kcp-dev/code-generator/pkg/internal/clientgen"
31-
"github.com/kcp-dev/code-generator/pkg/parser"
32-
"github.com/kcp-dev/code-generator/pkg/util"
30+
"github.com/kcp-dev/code-generator/v2/pkg/internal/clientgen"
31+
"github.com/kcp-dev/code-generator/v2/pkg/parser"
32+
"github.com/kcp-dev/code-generator/v2/pkg/util"
3333
)
3434

3535
type Generator struct {

‎pkg/generators/informergen/informergen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"sigs.k8s.io/controller-tools/pkg/genall"
2828
"sigs.k8s.io/controller-tools/pkg/markers"
2929

30-
"github.com/kcp-dev/code-generator/pkg/internal/informergen"
31-
"github.com/kcp-dev/code-generator/pkg/parser"
32-
"github.com/kcp-dev/code-generator/pkg/util"
30+
"github.com/kcp-dev/code-generator/v2/pkg/internal/informergen"
31+
"github.com/kcp-dev/code-generator/v2/pkg/parser"
32+
"github.com/kcp-dev/code-generator/v2/pkg/util"
3333
)
3434

3535
type Generator struct {

‎pkg/generators/listergen/listergen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"sigs.k8s.io/controller-tools/pkg/genall"
2727
"sigs.k8s.io/controller-tools/pkg/markers"
2828

29-
"github.com/kcp-dev/code-generator/pkg/internal/listergen"
30-
"github.com/kcp-dev/code-generator/pkg/parser"
31-
"github.com/kcp-dev/code-generator/pkg/util"
29+
"github.com/kcp-dev/code-generator/v2/pkg/internal/listergen"
30+
"github.com/kcp-dev/code-generator/v2/pkg/parser"
31+
"github.com/kcp-dev/code-generator/v2/pkg/util"
3232
)
3333

3434
type Generator struct {

‎pkg/internal/clientgen/clientset.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"k8s.io/code-generator/cmd/client-gen/types"
99

10-
"github.com/kcp-dev/code-generator/pkg/util"
10+
"github.com/kcp-dev/code-generator/v2/pkg/util"
1111
)
1212

1313
type ClientSet struct {
@@ -57,8 +57,8 @@ import (
5757
"fmt"
5858
"net/http"
5959
60-
kcpclient "github.com/kcp-dev/apimachinery/pkg/client"
61-
"github.com/kcp-dev/logicalcluster/v2"
60+
kcpclient "github.com/kcp-dev/apimachinery/v2/pkg/client"
61+
"github.com/kcp-dev/logicalcluster/v3"
6262
6363
client "{{.singleClusterClientPackagePath}}"
6464
@@ -71,7 +71,7 @@ import (
7171
)
7272
7373
type ClusterInterface interface {
74-
Cluster(logicalcluster.Name) client.Interface
74+
Cluster(logicalcluster.Path) client.Interface
7575
Discovery() discovery.DiscoveryInterface
7676
{{range .groups}} {{.GroupGoName}}{{.Version}}() {{.PackageAlias}}.{{.GroupGoName}}{{.Version}}ClusterInterface
7777
{{end -}}
@@ -101,11 +101,11 @@ func (c *ClusterClientset) {{.GroupGoName}}{{.Version}}() {{.PackageAlias}}.{{.G
101101
{{end -}}
102102
103103
// Cluster scopes this clientset to one cluster.
104-
func (c *ClusterClientset) Cluster(name logicalcluster.Name) client.Interface {
105-
if name == logicalcluster.Wildcard {
104+
func (c *ClusterClientset) Cluster(clusterPath logicalcluster.Path) client.Interface {
105+
if clusterPath == logicalcluster.Wildcard {
106106
panic("A specific cluster must be provided when scoping, not the wildcard.")
107107
}
108-
return c.clientCache.ClusterOrDie(name)
108+
return c.clientCache.ClusterOrDie(clusterPath)
109109
}
110110
111111
// NewForConfig creates a new ClusterClientset for the given config.
@@ -145,7 +145,7 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*ClusterCli
145145
cache := kcpclient.NewCache(c, httpClient, &kcpclient.Constructor[*client.Clientset]{
146146
NewForConfigAndClient: client.NewForConfigAndClient,
147147
})
148-
if _, err := cache.Cluster(logicalcluster.New("root")); err != nil {
148+
if _, err := cache.Cluster(logicalcluster.Name("root").Path()); err != nil {
149149
return nil, err
150150
}
151151

‎pkg/internal/clientgen/fake_clientset.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"k8s.io/code-generator/cmd/client-gen/types"
99

10-
"github.com/kcp-dev/code-generator/pkg/util"
10+
"github.com/kcp-dev/code-generator/v2/pkg/util"
1111
)
1212

1313
type FakeClientset struct {
@@ -56,7 +56,7 @@ package fake
5656
import (
5757
kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing"
5858
kcpfakediscovery "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/discovery/fake"
59-
"github.com/kcp-dev/logicalcluster/v2"
59+
"github.com/kcp-dev/logicalcluster/v3"
6060
6161
"k8s.io/apimachinery/pkg/runtime"
6262
"k8s.io/client-go/discovery"
@@ -82,7 +82,7 @@ func NewSimpleClientset(objects ...runtime.Object) *ClusterClientset {
8282
o.AddAll(objects...)
8383
8484
cs := &ClusterClientset{Fake: &kcptesting.Fake{}, tracker: o}
85-
cs.discovery = &kcpfakediscovery.FakeDiscovery{Fake: cs.Fake, Cluster: logicalcluster.Wildcard}
85+
cs.discovery = &kcpfakediscovery.FakeDiscovery{Fake: cs.Fake, ClusterPath: logicalcluster.Wildcard}
8686
cs.AddReactor("*", "*", kcptesting.ObjectReaction(o))
8787
cs.AddWatchReactor("*", kcptesting.WatchReaction(o))
8888
@@ -115,15 +115,15 @@ func (c *ClusterClientset) {{.GroupGoName}}{{.Version}}() kcp{{.PackageAlias}}.{
115115
{{end -}}
116116
117117
// Cluster scopes this clientset to one cluster.
118-
func (c *ClusterClientset) Cluster(cluster logicalcluster.Name) client.Interface {
119-
if cluster == logicalcluster.Wildcard {
118+
func (c *ClusterClientset) Cluster(clusterPath logicalcluster.Path) client.Interface {
119+
if clusterPath == logicalcluster.Wildcard {
120120
panic("A specific cluster must be provided when scoping, not the wildcard.")
121121
}
122122
return &Clientset{
123123
Fake: c.Fake,
124-
discovery: &kcpfakediscovery.FakeDiscovery{Fake: c.Fake, Cluster: cluster},
125-
tracker: c.tracker.Cluster(cluster),
126-
cluster: cluster,
124+
discovery: &kcpfakediscovery.FakeDiscovery{Fake: c.Fake, ClusterPath: clusterPath},
125+
tracker: c.tracker.Cluster(clusterPath),
126+
clusterPath: clusterPath,
127127
}
128128
}
129129
@@ -134,7 +134,7 @@ type Clientset struct {
134134
*kcptesting.Fake
135135
discovery *kcpfakediscovery.FakeDiscovery
136136
tracker kcptesting.ScopedObjectTracker
137-
cluster logicalcluster.Name
137+
clusterPath logicalcluster.Path
138138
}
139139
140140
// Discovery retrieves the DiscoveryClient
@@ -149,7 +149,7 @@ func (c *Clientset) Tracker() kcptesting.ScopedObjectTracker {
149149
{{range .groups}}
150150
// {{.GroupGoName}}{{.Version}} retrieves the {{.GroupGoName}}{{.Version}}Client.
151151
func (c *Clientset) {{.GroupGoName}}{{.Version}}() {{.PackageAlias}}.{{.GroupGoName}}{{.Version}}Interface {
152-
return &fake{{.PackageAlias}}.{{.GroupGoName}}{{.Version}}Client{Fake: c.Fake, Cluster: c.cluster}
152+
return &fake{{.PackageAlias}}.{{.GroupGoName}}{{.Version}}Client{Fake: c.Fake, ClusterPath: c.clusterPath}
153153
}
154154
{{end -}}
155155
`

0 commit comments

Comments
 (0)