Skip to content

🌱 [refactor] reorg the ce generic packages #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Oct 31, 2025
Merged

🌱 [refactor] reorg the ce generic packages #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/cloudevents/clients/addon/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import (

// ManagedClusterAddOnClient implements the ManagedClusterAddonInterface.
type ManagedClusterAddOnClient struct {
cloudEventsClient *generic.CloudEventAgentClient[*addonapiv1alpha1.ManagedClusterAddOn]
cloudEventsClient generic.CloudEventsClient[*addonapiv1alpha1.ManagedClusterAddOn]
watcherStore store.ClientWatcherStore[*addonapiv1alpha1.ManagedClusterAddOn]
namespace string
}

var _ addonv1alpha1client.ManagedClusterAddOnInterface = &ManagedClusterAddOnClient{}

func NewManagedClusterAddOnClient(
cloudEventsClient *generic.CloudEventAgentClient[*addonapiv1alpha1.ManagedClusterAddOn],
cloudEventsClient generic.CloudEventsClient[*addonapiv1alpha1.ManagedClusterAddOn],
watcherStore store.ClientWatcherStore[*addonapiv1alpha1.ManagedClusterAddOn],
) *ManagedClusterAddOnClient {
return &ManagedClusterAddOnClient{
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudevents/clients/addon/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
)

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

ceClientOpt := fake.NewAgentOptions(gochan.New(), nil, c.clusterName, c.clusterName+"agent")
ceClient, err := generic.NewCloudEventAgentClient(
ceClient, err := clients.NewCloudEventAgentClient(
context.Background(),
ceClientOpt,
store.NewAgentWatcherStoreLister(watcherStore),
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudevents/clients/cluster/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (
// ManagedClusterClient implements the ManagedClusterInterface. It sends the ManagedCluster status back to source by
// CloudEventAgentClient.
type ManagedClusterClient struct {
cloudEventsClient *generic.CloudEventAgentClient[*clusterv1.ManagedCluster]
cloudEventsClient generic.CloudEventsClient[*clusterv1.ManagedCluster]
watcherStore store.ClientWatcherStore[*clusterv1.ManagedCluster]
}

var _ clusterv1client.ManagedClusterInterface = &ManagedClusterClient{}

func NewManagedClusterClient(
cloudEventsClient *generic.CloudEventAgentClient[*clusterv1.ManagedCluster],
cloudEventsClient generic.CloudEventsClient[*clusterv1.ManagedCluster],
watcherStore store.ClientWatcherStore[*clusterv1.ManagedCluster],
clusterName string,
) *ManagedClusterClient {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cloudevents/clients/cluster/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
)

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

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

watcherStore := store.NewAgentInformerWatcherStore[*clusterv1.ManagedCluster]()
ceClientOpt := fake.NewAgentOptions(gochan.New(), nil, "cluster1", "test-agent")
ceClient, err := generic.NewCloudEventAgentClient(
ceClient, err := clients.NewCloudEventAgentClient(
ctx,
ceClientOpt,
store.NewAgentWatcherStoreLister(watcherStore),
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudevents/clients/csr/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import (
// CSRClient implements the CSRInterface. It sends the csr to source by
// CloudEventAgentClient.
type CSRClient struct {
cloudEventsClient *generic.CloudEventAgentClient[*certificatev1.CertificateSigningRequest]
cloudEventsClient generic.CloudEventsClient[*certificatev1.CertificateSigningRequest]
watcherStore store.ClientWatcherStore[*certificatev1.CertificateSigningRequest]
}

var _ cache.ListerWatcher = &CSRClient{}

func NewCSRClient(
cloudEventsClient *generic.CloudEventAgentClient[*certificatev1.CertificateSigningRequest],
cloudEventsClient generic.CloudEventsClient[*certificatev1.CertificateSigningRequest],
watcherStore store.ClientWatcherStore[*certificatev1.CertificateSigningRequest],
clusterName string,
) *CSRClient {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudevents/clients/csr/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
)

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

watcherStore := store.NewAgentInformerWatcherStore[*certificatev1.CertificateSigningRequest]()
ceClientOpt := fake.NewAgentOptions(gochan.New(), nil, "cluster1", "cluster1-agent")
ceClient, err := generic.NewCloudEventAgentClient(
ceClient, err := clients.NewCloudEventAgentClient(
ctx,
ceClientOpt,
store.NewAgentWatcherStoreLister(watcherStore),
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudevents/clients/event/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
)

type EventClient struct {
cloudEventsClient *generic.CloudEventAgentClient[*eventv1.Event]
cloudEventsClient generic.CloudEventsClient[*eventv1.Event]
namespace string
}

func NewEventClient(cloudEventsClient *generic.CloudEventAgentClient[*eventv1.Event]) *EventClient {
func NewEventClient(cloudEventsClient generic.CloudEventsClient[*eventv1.Event]) *EventClient {
return &EventClient{
cloudEventsClient: cloudEventsClient,
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/cloudevents/clients/event/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"k8s.io/apimachinery/pkg/util/strategicpatch"

"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
)

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

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

for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
ceClient, err := generic.NewCloudEventAgentClient(
ceClient, err := clients.NewCloudEventAgentClient(
context.Background(),
fake.NewAgentOptions(gochan.New(), nil, c.clusterName, c.clusterName+"agent"),
nil,
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudevents/clients/lease/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
)

type LeaseClient struct {
cloudEventsClient *generic.CloudEventAgentClient[*coordinationv1.Lease]
cloudEventsClient generic.CloudEventsClient[*coordinationv1.Lease]
watcherStore store.ClientWatcherStore[*coordinationv1.Lease]
namespace string
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/cloudevents/clients/lease/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/fake"
)

Expand All @@ -36,7 +36,7 @@ func TestUpdate(t *testing.T) {
for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
leaseWatchStore := store.NewSimpleStore[*coordv1.Lease]()
ceClient, err := generic.NewCloudEventAgentClient(
ceClient, err := clients.NewCloudEventAgentClient(
context.Background(),
fake.NewAgentOptions(gochan.New(), nil, c.clusterName, c.clusterName+"agent"),
store.NewAgentWatcherStoreLister(leaseWatchStore),
Expand Down Expand Up @@ -88,7 +88,7 @@ func TestGet(t *testing.T) {
}
}

ceClient, err := generic.NewCloudEventAgentClient(
ceClient, err := clients.NewCloudEventAgentClient(
context.Background(),
fake.NewAgentOptions(gochan.New(), nil, "cluster1", "cluster1-agent"),
store.NewAgentWatcherStoreLister(leaseWatchStore),
Expand Down
14 changes: 8 additions & 6 deletions pkg/cloudevents/clients/options/generic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/statushash"
"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/store"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/clients"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/builder"
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types"
)

Expand Down Expand Up @@ -96,7 +98,7 @@ func (o *GenericClientOptions[T]) WatcherStore() store.ClientWatcherStore[T] {
return o.watcherStore
}

func (o *GenericClientOptions[T]) AgentClient(ctx context.Context) (*generic.CloudEventAgentClient[T], error) {
func (o *GenericClientOptions[T]) AgentClient(ctx context.Context) (generic.CloudEventsClient[T], error) {
if len(o.clientID) == 0 {
return nil, fmt.Errorf("client id is required")
}
Expand All @@ -109,12 +111,12 @@ func (o *GenericClientOptions[T]) AgentClient(ctx context.Context) (*generic.Clo
o.watcherStore = store.NewAgentInformerWatcherStore[T]()
}

options, err := generic.BuildCloudEventsAgentOptions(o.config, o.clusterName, o.clientID)
options, err := builder.BuildCloudEventsAgentOptions(o.config, o.clusterName, o.clientID)
if err != nil {
return nil, err
}

cloudEventsClient, err := generic.NewCloudEventAgentClient(
cloudEventsClient, err := clients.NewCloudEventAgentClient(
ctx,
options,
store.NewAgentWatcherStoreLister(o.watcherStore),
Expand Down Expand Up @@ -167,7 +169,7 @@ func (o *GenericClientOptions[T]) AgentClient(ctx context.Context) (*generic.Clo
return cloudEventsClient, nil
}

func (o *GenericClientOptions[T]) SourceClient(ctx context.Context) (*generic.CloudEventSourceClient[T], error) {
func (o *GenericClientOptions[T]) SourceClient(ctx context.Context) (generic.CloudEventsClient[T], error) {
if len(o.clientID) == 0 {
return nil, fmt.Errorf("client id is required")
}
Expand All @@ -180,12 +182,12 @@ func (o *GenericClientOptions[T]) SourceClient(ctx context.Context) (*generic.Cl
return nil, fmt.Errorf("a watcher store is required")
}

options, err := generic.BuildCloudEventsSourceOptions(o.config, o.clientID, o.sourceID)
options, err := builder.BuildCloudEventsSourceOptions(o.config, o.clientID, o.sourceID)
if err != nil {
return nil, err
}

cloudEventsClient, err := generic.NewCloudEventSourceClient(
cloudEventsClient, err := clients.NewCloudEventSourceClient(
ctx,
options,
store.NewSourceWatcherStoreLister(o.watcherStore),
Expand Down
Loading