Skip to content

CNTRLPLANE-5: Decode CBOR data in etcd test #29601

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
Mar 17, 2025
Merged

CNTRLPLANE-5: Decode CBOR data in etcd test #29601

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
10 changes: 9 additions & 1 deletion test/extended/etcd/etcd_storage_path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
cbor "k8s.io/apimachinery/pkg/runtime/serializer/cbor/direct"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/sets"
Expand Down Expand Up @@ -678,7 +679,10 @@ func JSONToUnstructured(stub, namespace string, mapping *meta.RESTMapping, dynam
return dynamicClient.Resource(mapping.Resource).Namespace(namespace), &unstructured.Unstructured{Object: typeMetaAdder}, nil
}

var protoEncodingPrefix = []byte{0x6b, 0x38, 0x73, 0x00}
var (
protoEncodingPrefix = []byte{0x6b, 0x38, 0x73, 0x00}
cborPrefix = []byte{0xd9, 0xd9, 0xf7}
)

func getFromEtcd(kv etcdv3.KV, path string) (*metaObject, error) {
response, err := kv.Get(context.Background(), "/"+path)
Expand Down Expand Up @@ -712,6 +716,10 @@ func getFromEtcd(kv etcdv3.KV, path string) (*metaObject, error) {
if err := json.Unmarshal(value, metaObj); err != nil {
return nil, err
}
case bytes.HasPrefix(value, cborPrefix):
if err := cbor.Unmarshal(value, metaObj); err != nil {
return nil, err
}
default:
// TODO handle encrypted data
return nil, fmt.Errorf("unknown data format at path /%s: %s", path, string(value))
Expand Down