fix: fix resource structure for cluster role binding

Author: Arta Asadi

discovery/describers/kubernetes.go

@@ -82,8 +82,13 @@ func KubernetesClusterRoleBinding(ctx context.Context, client model.Client, extr
 			ID:   fmt.Sprintf("clusterrolebinding/%s", clusterRoleBinding.Name),
 			Name: clusterRoleBinding.Name,
 			Description: model.KubernetesClusterRoleBindingDescription{
-				MetaObject:         clusterRoleBinding.ObjectMeta,
-				ClusterRoleBinding: clusterRoleBinding,
+				MetaObject: model.ConvertObjectMeta(clusterRoleBinding.ObjectMeta),
+				ClusterRoleBinding: model.ClusterRoleBinding{
+					TypeMeta:   model.ConvertTypeMeta(clusterRoleBinding.TypeMeta),
+					ObjectMeta: model.ConvertObjectMeta(clusterRoleBinding.ObjectMeta),
+					Subjects:   model.ConvertSubject(clusterRoleBinding.Subjects),
+					RoleRef:    model.ConvertRoleRef(clusterRoleBinding.RoleRef),
+				},
 			},
 		}
 

discovery/provider/model_helpers.go

@@ -1,6 +1,8 @@
 package provider
 
 import (
+	rbacv1 "k8s.io/api/rbac/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"time"
 )
@@ -16,8 +18,31 @@ type Time struct {
 	time.Time
 }
 
+func ConvertTime(timestamp metav1.Time) Time {
+	return Time{
+		timestamp.Time,
+	}
+}
+
+func ConvertTimePtr(timestamp *metav1.Time) *Time {
+	return &Time{
+		timestamp.Time,
+	}
+}
+
 type FieldsV1 struct {
-	Raw []byte `json:"-" protobuf:"bytes,1,opt,name=Raw"`
+	Raw []byte
+}
+
+func ConvertFieldsV1(raw metav1.FieldsV1) FieldsV1 {
+	return FieldsV1{
+		raw.Raw,
+	}
+}
+func ConvertFieldsV1Ptr(raw *metav1.FieldsV1) *FieldsV1 {
+	return &FieldsV1{
+		raw.Raw,
+	}
 }
 
 type OwnerReference struct {
@@ -29,6 +54,21 @@ type OwnerReference struct {
 	BlockOwnerDeletion *bool
 }
 
+func ConvertOwnerReferences(ownerReferences []metav1.OwnerReference) []OwnerReference {
+	ownerRefs := make([]OwnerReference, len(ownerReferences))
+	for i, ownerRef := range ownerReferences {
+		ownerRefs[i] = OwnerReference{
+			APIVersion:         ownerRef.APIVersion,
+			Kind:               ownerRef.Kind,
+			Name:               ownerRef.Name,
+			UID:                ownerRef.UID,
+			Controller:         ownerRef.Controller,
+			BlockOwnerDeletion: ownerRef.BlockOwnerDeletion,
+		}
+	}
+	return ownerRefs
+}
+
 type ManagedFieldsEntry struct {
 	Manager     string
 	Operation   ManagedFieldsOperationType
@@ -39,11 +79,34 @@ type ManagedFieldsEntry struct {
 	Subresource string
 }
 
+func ConvertManagedFieldsEntries(managedFieldsEntry []metav1.ManagedFieldsEntry) []ManagedFieldsEntry {
+	managedFieldsEntries := make([]ManagedFieldsEntry, len(managedFieldsEntry))
+	for i, entry := range managedFieldsEntry {
+		managedFieldsEntries[i] = ManagedFieldsEntry{
+			Manager:     entry.Manager,
+			Operation:   ManagedFieldsOperationType(entry.Operation),
+			APIVersion:  entry.APIVersion,
+			Time:        ConvertTimePtr(entry.Time),
+			FieldsType:  entry.FieldsType,
+			FieldsV1:    ConvertFieldsV1Ptr(entry.FieldsV1),
+			Subresource: entry.Subresource,
+		}
+	}
+	return managedFieldsEntries
+}
+
 type TypeMeta struct {
 	Kind       string
 	APIVersion string
 }
 
+func ConvertTypeMeta(typeMeta metav1.TypeMeta) TypeMeta {
+	return TypeMeta{
+		Kind:       typeMeta.Kind,
+		APIVersion: typeMeta.APIVersion,
+	}
+}
+
 type ObjectMeta struct {
 	Name                       string
 	GenerateName               string
@@ -62,19 +125,60 @@ type ObjectMeta struct {
 	ManagedFields              []ManagedFieldsEntry
 }
 
+func ConvertObjectMeta(obj metav1.ObjectMeta) ObjectMeta {
+	return ObjectMeta{
+		Name:                       obj.GetName(),
+		GenerateName:               obj.GetGenerateName(),
+		Namespace:                  obj.GetNamespace(),
+		SelfLink:                   obj.GetSelfLink(),
+		UID:                        obj.GetUID(),
+		ResourceVersion:            obj.GetResourceVersion(),
+		Generation:                 obj.GetGeneration(),
+		CreationTimestamp:          ConvertTime(obj.GetCreationTimestamp()),
+		DeletionTimestamp:          ConvertTimePtr(obj.GetDeletionTimestamp()),
+		DeletionGracePeriodSeconds: obj.GetDeletionGracePeriodSeconds(),
+		Labels:                     obj.GetLabels(),
+		Annotations:                obj.GetAnnotations(),
+		OwnerReferences:            ConvertOwnerReferences(obj.GetOwnerReferences()),
+		Finalizers:                 obj.GetFinalizers(),
+		ManagedFields:              ConvertManagedFieldsEntries(obj.GetManagedFields()),
+	}
+}
+
 type Subject struct {
 	Kind      string
 	APIGroup  string
 	Name      string
 	Namespace string
 }
 
+func ConvertSubject(srcSubjects []rbacv1.Subject) []Subject {
+	subjects := make([]Subject, len(srcSubjects))
+	for i, srcSubject := range srcSubjects {
+		subjects[i] = Subject{
+			Kind:      srcSubject.Kind,
+			APIGroup:  srcSubject.APIGroup,
+			Name:      srcSubject.Name,
+			Namespace: srcSubject.Namespace,
+		}
+	}
+	return subjects
+}
+
 type RoleRef struct {
 	APIGroup string
 	Kind     string
 	Name     string
 }
 
+func ConvertRoleRef(roleRef rbacv1.RoleRef) RoleRef {
+	return RoleRef{
+		APIGroup: roleRef.APIGroup,
+		Kind:     roleRef.Kind,
+		Name:     roleRef.Name,
+	}
+}
+
 type ClusterRoleBinding struct {
 	TypeMeta
 	ObjectMeta