Skip to content

Commit b0c2329

Browse files
Arta AsadiArta Asadi
authored andcommitted
fix: fix resource structure for cluster role binding
1 parent 9446315 commit b0c2329

File tree

4 files changed

+100
-17
lines changed

4 files changed

+100
-17
lines changed

cloudql/kubernetes/table_kubernetes_cluster_role_binding.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,33 @@ func tableKubernetesClusterRoleBinding(ctx context.Context) *plugin.Table {
2121
Name: "subjects",
2222
Type: proto.ColumnType_JSON,
2323
Description: "List of references to the objects the role applies to.",
24-
Transform: transform.FromField("Description.ClusterRoleBinding.subjects"),
24+
Transform: transform.FromField("Description.ClusterRoleBinding.Subjects"),
2525
},
2626

2727
//// RoleRef columns
2828
{
2929
Name: "role_name",
3030
Type: proto.ColumnType_STRING,
3131
Description: "Name of the cluster role for which access is granted to subjects.",
32-
Transform: transform.FromField("Description.ClusterRoleBinding.roleRef.name"),
32+
Transform: transform.FromField("Description.ClusterRoleBinding.RoleRef.Name"),
3333
},
3434
{
3535
Name: "role_api_group",
3636
Type: proto.ColumnType_STRING,
3737
Description: "The group for the referenced role.",
38-
Transform: transform.FromField("Description.ClusterRoleBinding.roleRef.apiGroup"),
38+
Transform: transform.FromField("Description.ClusterRoleBinding.RoleRef.APIGroup"),
3939
},
4040
{
4141
Name: "role_kind",
4242
Type: proto.ColumnType_STRING,
4343
Description: "Type of the role refrenced must be one of ClusterRole or Role.",
44-
Transform: transform.FromField("Description.ClusterRoleBinding.roleRef.kind"),
44+
Transform: transform.FromField("Description.ClusterRoleBinding.RoleRef.Kind"),
4545
},
4646
{
4747
Name: "title",
4848
Type: proto.ColumnType_STRING,
4949
Description: ColumnDescriptionTitle,
50-
Transform: transform.FromField("Description.ClusterRoleBinding.metadata.Name"),
50+
Transform: transform.FromField("Description.ClusterRoleBinding.Metadata.Name"),
5151
},
5252
{
5353
Name: "tags",

discovery/pkg/es/resources_clients.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,11 @@ func (p KubernetesClusterRoleBindingPaginator) NextPage(ctx context.Context) ([]
513513
}
514514

515515
var listKubernetesClusterRoleBindingFilters = map[string]string{
516-
"role_api_group": "Description.ClusterRoleBinding.roleRef.apiGroup",
517-
"role_kind": "Description.ClusterRoleBinding.roleRef.kind",
518-
"role_name": "Description.ClusterRoleBinding.roleRef.name",
519-
"subjects": "Description.ClusterRoleBinding.subjects",
520-
"title": "Description.ClusterRoleBinding.metadata.Name",
516+
"role_api_group": "Description.ClusterRoleBinding.RoleRef.APIGroup",
517+
"role_kind": "Description.ClusterRoleBinding.RoleRef.Kind",
518+
"role_name": "Description.ClusterRoleBinding.RoleRef.Name",
519+
"subjects": "Description.ClusterRoleBinding.Subjects",
520+
"title": "Description.ClusterRoleBinding.Metadata.Name",
521521
}
522522

523523
func ListKubernetesClusterRoleBinding(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
@@ -581,11 +581,11 @@ func ListKubernetesClusterRoleBinding(ctx context.Context, d *plugin.QueryData,
581581
}
582582

583583
var getKubernetesClusterRoleBindingFilters = map[string]string{
584-
"role_api_group": "Description.ClusterRoleBinding.roleRef.apiGroup",
585-
"role_kind": "Description.ClusterRoleBinding.roleRef.kind",
586-
"role_name": "Description.ClusterRoleBinding.roleRef.name",
587-
"subjects": "Description.ClusterRoleBinding.subjects",
588-
"title": "Description.ClusterRoleBinding.metadata.Name",
584+
"role_api_group": "Description.ClusterRoleBinding.RoleRef.APIGroup",
585+
"role_kind": "Description.ClusterRoleBinding.RoleRef.Kind",
586+
"role_name": "Description.ClusterRoleBinding.RoleRef.Name",
587+
"subjects": "Description.ClusterRoleBinding.Subjects",
588+
"title": "Description.ClusterRoleBinding.Metadata.Name",
589589
}
590590

591591
func GetKubernetesClusterRoleBinding(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {

discovery/provider/model.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ type KubernetesClusterRoleDescription struct {
3333
}
3434

3535
type KubernetesClusterRoleBindingDescription struct {
36-
MetaObject metav1.ObjectMeta
37-
ClusterRoleBinding rbacv1.ClusterRoleBinding
36+
MetaObject ObjectMeta
37+
ClusterRoleBinding ClusterRoleBinding
3838
}
3939

4040
type KubernetesConfigMapDescription struct {
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
package provider
2+
3+
import (
4+
"k8s.io/apimachinery/pkg/types"
5+
"time"
6+
)
7+
8+
type ManagedFieldsOperationType string
9+
10+
const (
11+
ManagedFieldsOperationApply ManagedFieldsOperationType = "Apply"
12+
ManagedFieldsOperationUpdate ManagedFieldsOperationType = "Update"
13+
)
14+
15+
type Time struct {
16+
time.Time
17+
}
18+
19+
type FieldsV1 struct {
20+
Raw []byte `json:"-" protobuf:"bytes,1,opt,name=Raw"`
21+
}
22+
23+
type OwnerReference struct {
24+
APIVersion string
25+
Kind string
26+
Name string
27+
UID types.UID
28+
Controller *bool
29+
BlockOwnerDeletion *bool
30+
}
31+
32+
type ManagedFieldsEntry struct {
33+
Manager string
34+
Operation ManagedFieldsOperationType
35+
APIVersion string
36+
Time *Time
37+
FieldsType string
38+
FieldsV1 *FieldsV1
39+
Subresource string
40+
}
41+
42+
type TypeMeta struct {
43+
Kind string
44+
APIVersion string
45+
}
46+
47+
type ObjectMeta struct {
48+
Name string
49+
GenerateName string
50+
Namespace string
51+
SelfLink string
52+
UID types.UID
53+
ResourceVersion string
54+
Generation int64
55+
CreationTimestamp Time
56+
DeletionTimestamp *Time
57+
DeletionGracePeriodSeconds *int64
58+
Labels map[string]string
59+
Annotations map[string]string
60+
OwnerReferences []OwnerReference
61+
Finalizers []string
62+
ManagedFields []ManagedFieldsEntry
63+
}
64+
65+
type Subject struct {
66+
Kind string
67+
APIGroup string
68+
Name string
69+
Namespace string
70+
}
71+
72+
type RoleRef struct {
73+
APIGroup string
74+
Kind string
75+
Name string
76+
}
77+
78+
type ClusterRoleBinding struct {
79+
TypeMeta
80+
ObjectMeta
81+
Subjects []Subject
82+
RoleRef RoleRef
83+
}

0 commit comments

Comments
 (0)