From 98ab144e4216448b2e35ca2d9cdb84196f08b849 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 30 Jan 2024 15:00:23 +0800 Subject: [PATCH] update sdk-go lib (#357) Signed-off-by: Wei Liu --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../pkg/cloudevents/generic/options/mqtt/options.go | 13 +++++++++---- .../sdk-go/pkg/cloudevents/generic/types/types.go | 1 + 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 1781d5da3..5f715b711 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( k8s.io/utils v0.0.0-20240102154912-e7106e64919e open-cluster-management.io/addon-framework v0.8.1-0.20240123051722-71f1b13cbb63 open-cluster-management.io/api v0.12.1-0.20240122084346-e7bd1bd9ea6a - open-cluster-management.io/sdk-go v0.0.0-20240129065956-3ff755820797 + open-cluster-management.io/sdk-go v0.0.0-20240130025514-7385f9baadf0 sigs.k8s.io/controller-runtime v0.16.2 sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 ) diff --git a/go.sum b/go.sum index 40045fda3..283e10645 100644 --- a/go.sum +++ b/go.sum @@ -454,8 +454,8 @@ open-cluster-management.io/addon-framework v0.8.1-0.20240123051722-71f1b13cbb63 open-cluster-management.io/addon-framework v0.8.1-0.20240123051722-71f1b13cbb63/go.mod h1:SBs6wF0Umzr5/miJb9p8uMaTDbcjphHHQLa76nXnbU8= open-cluster-management.io/api v0.12.1-0.20240122084346-e7bd1bd9ea6a h1:NjIU3aN4JSJjTotHiOkOCqYaPGG2tNtm7BY/o9uPb8M= open-cluster-management.io/api v0.12.1-0.20240122084346-e7bd1bd9ea6a/go.mod h1:vOz9InrJq1BDFEI51+OwAyq2M3tjYPY+1cnoQhMhIlE= -open-cluster-management.io/sdk-go v0.0.0-20240129065956-3ff755820797 h1:UgM7kMPxiGAtik/382oOYk2AaTCAWPmnILs39W9ojSk= -open-cluster-management.io/sdk-go v0.0.0-20240129065956-3ff755820797/go.mod h1:p3oaf+iu9ghMl4cBJXWXlDnUHVn+QxL90YLTve9bn/k= +open-cluster-management.io/sdk-go v0.0.0-20240130025514-7385f9baadf0 h1:A+l3SkDPWnRwK3+WE5MVMh7NBvDCKkhdA+AB7Tw/lRM= +open-cluster-management.io/sdk-go v0.0.0-20240130025514-7385f9baadf0/go.mod h1:p3oaf+iu9ghMl4cBJXWXlDnUHVn+QxL90YLTve9bn/k= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y= sigs.k8s.io/controller-runtime v0.16.2 h1:mwXAVuEk3EQf478PQwQ48zGOXvW27UJc8NHktQVuIPU= diff --git a/vendor/modules.txt b/vendor/modules.txt index dbd021369..4819999a5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1578,7 +1578,7 @@ open-cluster-management.io/api/utils/work/v1/workapplier open-cluster-management.io/api/utils/work/v1/workvalidator open-cluster-management.io/api/work/v1 open-cluster-management.io/api/work/v1alpha1 -# open-cluster-management.io/sdk-go v0.0.0-20240129065956-3ff755820797 +# open-cluster-management.io/sdk-go v0.0.0-20240130025514-7385f9baadf0 ## explicit; go 1.21 open-cluster-management.io/sdk-go/pkg/apis/cluster/v1alpha1 open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta1 diff --git a/vendor/open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/mqtt/options.go b/vendor/open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/mqtt/options.go index 593c44bb0..4a7abfc94 100644 --- a/vendor/open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/mqtt/options.go +++ b/vendor/open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/mqtt/options.go @@ -250,12 +250,17 @@ func validateTopics(topics *types.Topics) error { } func getSourceFromEventsTopic(topic string) (string, error) { - subTopics := strings.Split(topic, "/") - - if len(subTopics) != 5 { - return "", fmt.Errorf("bad format for topic %q", topic) + if !regexp.MustCompile(types.EventsTopicPattern).MatchString(topic) { + return "", fmt.Errorf("failed to get source from topic: %q", topic) } + subTopics := strings.Split(topic, "/") + // get source form share topic, e.g. $share/group/sources/+/consumers/+/agentevents + if strings.HasPrefix(topic, "$share") { + return subTopics[3], nil + } + + // get source form topic, e.g. sources/+/consumers/+/agentevents return subTopics[1], nil } diff --git a/vendor/open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types/types.go b/vendor/open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types/types.go index 6cd946634..b39361162 100644 --- a/vendor/open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types/types.go +++ b/vendor/open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types/types.go @@ -80,6 +80,7 @@ const ( ) const ( + EventsTopicPattern = `^(\$share/[a-z0-9-]+/)?([a-z]+)/([a-z0-9-]+|\+)/([a-z]+)/([a-z0-9-]+|\+)/(sourceevents|agentevents)$` SourceEventsTopicPattern = `^(\$share/[a-z0-9-]+/)?([a-z]+)/([a-z0-9-]+|\+)/([a-z]+)/([a-z0-9-]+|\+)/sourceevents$` AgentEventsTopicPattern = `^(\$share/[a-z0-9-]+/)?([a-z]+)/([a-z0-9-]+|\+)/([a-z]+)/([a-z0-9-]+|\+)/agentevents$` SourceBroadcastTopicPattern = `^(\$share/[a-z0-9-]+/)?([a-z]+)/([a-z0-9-]+|\+)/sourcebroadcast$`