Skip to content

Commit b492d8b

Browse files
skeeeyskeeey
authored
reorg the ce generic packages (#157)
Signed-off-by: Wei Liu <[email protected]>
1 parent b8354e3 commit b492d8b

30 files changed

+630
-460
lines changed

‎pkg/cloudevents/clients/addon/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ import (
2323

2424
// ManagedClusterAddOnClient implements the ManagedClusterAddonInterface.
2525
type ManagedClusterAddOnClient struct {
26-
cloudEventsClient *generic.CloudEventAgentClient[*addonapiv1alpha1.ManagedClusterAddOn]
26+
cloudEventsClient generic.CloudEventsClient[*addonapiv1alpha1.ManagedClusterAddOn]
2727
watcherStore store.ClientWatcherStore[*addonapiv1alpha1.ManagedClusterAddOn]
2828
namespace string
2929
}
3030

3131
var _ addonv1alpha1client.ManagedClusterAddOnInterface = &ManagedClusterAddOnClient{}
3232

3333
func NewManagedClusterAddOnClient(
34-
cloudEventsClient *generic.CloudEventAgentClient[*addonapiv1alpha1.ManagedClusterAddOn],
34+
cloudEventsClient generic.CloudEventsClient[*addonapiv1alpha1.ManagedClusterAddOn],
3535
watcherStore store.ClientWatcherStore[*addonapiv1alpha1.ManagedClusterAddOn],
3636
) *ManagedClusterAddOnClient {
3737
return &ManagedClusterAddOnClient{

‎pkg/cloudevents/clients/addon/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
1919
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
20-
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
20+
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
2121
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
2222
)
2323

@@ -67,7 +67,7 @@ func TestPatch(t *testing.T) {
6767
watcherStore := store.NewAgentInformerWatcherStore[*addonapiv1alpha1.ManagedClusterAddOn]()
6868

6969
ceClientOpt := fake.NewAgentOptions(gochan.New(), nil, c.clusterName, c.clusterName+"agent")
70-
ceClient, err := generic.NewCloudEventAgentClient(
70+
ceClient, err := clients.NewCloudEventAgentClient(
7171
context.Background(),
7272
ceClientOpt,
7373
store.NewAgentWatcherStoreLister(watcherStore),

‎pkg/cloudevents/clients/cluster/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ import (
2424
// ManagedClusterClient implements the ManagedClusterInterface. It sends the ManagedCluster status back to source by
2525
// CloudEventAgentClient.
2626
type ManagedClusterClient struct {
27-
cloudEventsClient *generic.CloudEventAgentClient[*clusterv1.ManagedCluster]
27+
cloudEventsClient generic.CloudEventsClient[*clusterv1.ManagedCluster]
2828
watcherStore store.ClientWatcherStore[*clusterv1.ManagedCluster]
2929
}
3030

3131
var _ clusterv1client.ManagedClusterInterface = &ManagedClusterClient{}
3232

3333
func NewManagedClusterClient(
34-
cloudEventsClient *generic.CloudEventAgentClient[*clusterv1.ManagedCluster],
34+
cloudEventsClient generic.CloudEventsClient[*clusterv1.ManagedCluster],
3535
watcherStore store.ClientWatcherStore[*clusterv1.ManagedCluster],
3636
clusterName string,
3737
) *ManagedClusterClient {

‎pkg/cloudevents/clients/cluster/client_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
2020
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
21-
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
21+
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
2222
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
2323
)
2424

@@ -58,7 +58,7 @@ func TestCreate(t *testing.T) {
5858

5959
watcherStore := store.NewAgentInformerWatcherStore[*clusterv1.ManagedCluster]()
6060
ceClientOpt := fake.NewAgentOptions(gochan.New(), nil, "cluster1", "cluster1-agent")
61-
ceClient, err := generic.NewCloudEventAgentClient(
61+
ceClient, err := clients.NewCloudEventAgentClient(
6262
ctx,
6363
ceClientOpt,
6464
store.NewAgentWatcherStoreLister(watcherStore),
@@ -117,7 +117,7 @@ func TestPatch(t *testing.T) {
117117

118118
watcherStore := store.NewAgentInformerWatcherStore[*clusterv1.ManagedCluster]()
119119
ceClientOpt := fake.NewAgentOptions(gochan.New(), nil, "cluster1", "test-agent")
120-
ceClient, err := generic.NewCloudEventAgentClient(
120+
ceClient, err := clients.NewCloudEventAgentClient(
121121
ctx,
122122
ceClientOpt,
123123
store.NewAgentWatcherStoreLister(watcherStore),

‎pkg/cloudevents/clients/csr/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ import (
2323
// CSRClient implements the CSRInterface. It sends the csr to source by
2424
// CloudEventAgentClient.
2525
type CSRClient struct {
26-
cloudEventsClient *generic.CloudEventAgentClient[*certificatev1.CertificateSigningRequest]
26+
cloudEventsClient generic.CloudEventsClient[*certificatev1.CertificateSigningRequest]
2727
watcherStore store.ClientWatcherStore[*certificatev1.CertificateSigningRequest]
2828
}
2929

3030
var _ cache.ListerWatcher = &CSRClient{}
3131

3232
func NewCSRClient(
33-
cloudEventsClient *generic.CloudEventAgentClient[*certificatev1.CertificateSigningRequest],
33+
cloudEventsClient generic.CloudEventsClient[*certificatev1.CertificateSigningRequest],
3434
watcherStore store.ClientWatcherStore[*certificatev1.CertificateSigningRequest],
3535
clusterName string,
3636
) *CSRClient {

‎pkg/cloudevents/clients/csr/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
1818
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
19-
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
19+
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
2020
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
2121
)
2222

@@ -62,7 +62,7 @@ func TestCreate(t *testing.T) {
6262

6363
watcherStore := store.NewAgentInformerWatcherStore[*certificatev1.CertificateSigningRequest]()
6464
ceClientOpt := fake.NewAgentOptions(gochan.New(), nil, "cluster1", "cluster1-agent")
65-
ceClient, err := generic.NewCloudEventAgentClient(
65+
ceClient, err := clients.NewCloudEventAgentClient(
6666
ctx,
6767
ceClientOpt,
6868
store.NewAgentWatcherStoreLister(watcherStore),

‎pkg/cloudevents/clients/event/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
)
2020

2121
type EventClient struct {
22-
cloudEventsClient *generic.CloudEventAgentClient[*eventv1.Event]
22+
cloudEventsClient generic.CloudEventsClient[*eventv1.Event]
2323
namespace string
2424
}
2525

26-
func NewEventClient(cloudEventsClient *generic.CloudEventAgentClient[*eventv1.Event]) *EventClient {
26+
func NewEventClient(cloudEventsClient generic.CloudEventsClient[*eventv1.Event]) *EventClient {
2727
return &EventClient{
2828
cloudEventsClient: cloudEventsClient,
2929
}

‎pkg/cloudevents/clients/event/client_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"k8s.io/apimachinery/pkg/util/strategicpatch"
1414

1515
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
16-
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
16+
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
1717
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
1818
)
1919

@@ -34,7 +34,7 @@ func TestCreate(t *testing.T) {
3434

3535
for _, c := range cases {
3636
t.Run(c.name, func(t *testing.T) {
37-
ceClient, err := generic.NewCloudEventAgentClient(
37+
ceClient, err := clients.NewCloudEventAgentClient(
3838
context.Background(),
3939
fake.NewAgentOptions(gochan.New(), nil, c.clusterName, c.clusterName+"agent"),
4040
nil,
@@ -89,7 +89,7 @@ func TestPatch(t *testing.T) {
8989

9090
for _, c := range cases {
9191
t.Run(c.name, func(t *testing.T) {
92-
ceClient, err := generic.NewCloudEventAgentClient(
92+
ceClient, err := clients.NewCloudEventAgentClient(
9393
context.Background(),
9494
fake.NewAgentOptions(gochan.New(), nil, c.clusterName, c.clusterName+"agent"),
9595
nil,

‎pkg/cloudevents/clients/lease/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
type LeaseClient struct {
23-
cloudEventsClient *generic.CloudEventAgentClient[*coordinationv1.Lease]
23+
cloudEventsClient generic.CloudEventsClient[*coordinationv1.Lease]
2424
watcherStore store.ClientWatcherStore[*coordinationv1.Lease]
2525
namespace string
2626
}

‎pkg/cloudevents/clients/lease/client_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
1313
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
14-
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
14+
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
1515
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
1616
)
1717

@@ -36,7 +36,7 @@ func TestUpdate(t *testing.T) {
3636
for _, c := range cases {
3737
t.Run(c.name, func(t *testing.T) {
3838
leaseWatchStore := store.NewSimpleStore[*coordv1.Lease]()
39-
ceClient, err := generic.NewCloudEventAgentClient(
39+
ceClient, err := clients.NewCloudEventAgentClient(
4040
context.Background(),
4141
fake.NewAgentOptions(gochan.New(), nil, c.clusterName, c.clusterName+"agent"),
4242
store.NewAgentWatcherStoreLister(leaseWatchStore),
@@ -88,7 +88,7 @@ func TestGet(t *testing.T) {
8888
}
8989
}
9090

91-
ceClient, err := generic.NewCloudEventAgentClient(
91+
ceClient, err := clients.NewCloudEventAgentClient(
9292
context.Background(),
9393
fake.NewAgentOptions(gochan.New(), nil, "cluster1", "cluster1-agent"),
9494
store.NewAgentWatcherStoreLister(leaseWatchStore),

0 commit comments

Comments
 (0)