Skip to content

Commit ab220b2

Browse files
Arta AsadiArta Asadi
authored andcommitted
fix: remove secret data in k8_secret table
1 parent 53891d2 commit ab220b2

File tree

5 files changed

+116
-119
lines changed

5 files changed

+116
-119
lines changed

cloudql/kubernetes/table_kubernetes_secret.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,10 @@ func tableKubernetesSecret(ctx context.Context) *plugin.Table {
2929
Transform: transform.FromField("Description.Secret.Type"),
3030
},
3131
{
32-
Name: "data",
33-
Type: proto.ColumnType_JSON,
34-
Description: "Type of the secret data.",
35-
Transform: transform.FromField("Description.Secret.Data"),
36-
},
37-
{
38-
Name: "string_data",
39-
Type: proto.ColumnType_JSON,
40-
Description: "Type of the secret data.",
41-
Transform: transform.FromField("Description.Secret.StringData"),
32+
Name: "data_number",
33+
Type: proto.ColumnType_INT,
34+
Description: "Number of the secret data.",
35+
Transform: transform.FromField("Description.DataNumber"),
4236
},
4337

4438
//// Steampipe Standard Columns

discovery/describers/kubernetes.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,13 +1059,17 @@ func KubernetesSecret(ctx context.Context, client model.Client, extra string, st
10591059
}
10601060

10611061
for _, secret := range secrets.Items {
1062+
secret.StringData = nil
1063+
dataNumber := len(secret.Data)
1064+
secret.Data = nil
10621065
var resource models.Resource
10631066
resource = models.Resource{
10641067
ID: fmt.Sprintf("secret/%s/%s", secret.Namespace, secret.Name),
10651068
Name: fmt.Sprintf("%s/%s", secret.Namespace, secret.Name),
10661069
Description: model.KubernetesSecretDescription{
10671070
MetaObject: helpers.ConvertObjectMeta(&secret.ObjectMeta),
10681071
Secret: helpers.ConvertSecret(&secret),
1072+
DataNumber: dataNumber,
10691073
},
10701074
}
10711075

discovery/pkg/es/resources_clients.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6653,9 +6653,8 @@ func (p KubernetesSecretPaginator) NextPage(ctx context.Context) ([]KubernetesSe
66536653
}
66546654

66556655
var listKubernetesSecretFilters = map[string]string{
6656-
"data": "Description.Secret.Data",
6656+
"data_number": "Description.DataNumber",
66576657
"immutable": "Description.Secret.Immutable",
6658-
"string_data": "Description.Secret.StringData",
66596658
"title": "Description.Secret.Name",
66606659
"type": "Description.Secret.Type",
66616660
}
@@ -6721,9 +6720,8 @@ func ListKubernetesSecret(ctx context.Context, d *plugin.QueryData, _ *plugin.Hy
67216720
}
67226721

67236722
var getKubernetesSecretFilters = map[string]string{
6724-
"data": "Description.Secret.Data",
6723+
"data_number": "Description.DataNumber",
67256724
"immutable": "Description.Secret.Immutable",
6726-
"string_data": "Description.Secret.StringData",
67276725
"title": "Description.Secret.Name",
67286726
"type": "Description.Secret.Type",
67296727
}

discovery/provider/model.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ type KubernetesRoleBindingDescription struct {
179179
type KubernetesSecretDescription struct {
180180
MetaObject helpers.ObjectMeta
181181
Secret helpers.Secret
182+
DataNumber int
182183
}
183184
type KubernetesServiceDescription struct {
184185
MetaObject helpers.ObjectMeta

global/maps/table_index_map.gen.go

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -5,115 +5,115 @@ import (
55
)
66

77
var ResourceTypesToTables = map[string]string{
8-
"Kubernetes/Resource": "k8_resource",
9-
"Kubernetes/Node": "k8_node",
10-
"Kubernetes/PersistentVolume": "k8_persistent_volume",
11-
"Kubernetes/PersistentVolumeClaim": "k8_persistent_volume_claim",
12-
"Kubernetes/Pod": "k8_pod",
13-
"Kubernetes/Secret": "k8_secret",
14-
"Kubernetes/Service": "k8_service",
15-
"Kubernetes/ConfigMap": "k8_config_map",
16-
"Kubernetes/ServiceAccount": "k8_service_account",
17-
"Kubernetes/StatefulSet": "k8_stateful_set",
18-
"Kubernetes/Deployment": "k8_deployment",
19-
"Kubernetes/ReplicaSet": "k8_replicaset",
20-
"Kubernetes/DaemonSet": "k8_daemonset",
21-
"Kubernetes/Endpoint": "k8_endpoints",
22-
"Kubernetes/EndpointSlice": "k8_endpoint_slice",
23-
"Kubernetes/Event": "k8_event",
24-
"Kubernetes/Job": "k8_job",
25-
"Kubernetes/CronJob": "k8_cronjob",
26-
"Kubernetes/Ingress": "k8_ingress",
27-
"Kubernetes/NetworkPolicy": "k8_network_policy",
28-
"Kubernetes/Role": "k8_role",
29-
"Kubernetes/RoleBinding": "k8_role_binding",
30-
"Kubernetes/Cluster": "k8_cluster",
31-
"Kubernetes/ClusterRole": "k8_cluster_role",
32-
"Kubernetes/ClusterRoleBinding": "k8_cluster_role_binding",
33-
"Kubernetes/PodDisruptionBudget": "k8_pod_disruption_budget",
34-
"Kubernetes/PodTemplate": "k8_pod_template",
35-
"Kubernetes/HorizontalPodAutoscaler": "k8_horizontal_pod_autoscaler",
36-
"Kubernetes/CustomResourceDefinition": "k8_custom_resource_definition",
37-
"Kubernetes/CustomResource": "k8_custom_resource",
38-
"Kubernetes/StorageClass": "k8_storage_class",
39-
"Kubernetes/LimitRange": "k8_limit_range",
40-
"Kubernetes/Namespace": "k8_namespace",
41-
"Kubernetes/ReplicationController": "k8_replication_controller",
42-
"Kubernetes/RessourceQuota": "k8_resource_quota",
8+
"Kubernetes/Resource": "kubernetes_resource",
9+
"Kubernetes/Node": "kubernetes_node",
10+
"Kubernetes/PersistentVolume": "kubernetes_persistent_volume",
11+
"Kubernetes/PersistentVolumeClaim": "kubernetes_persistent_volume_claim",
12+
"Kubernetes/Pod": "kubernetes_pod",
13+
"Kubernetes/Secret": "kubernetes_secret",
14+
"Kubernetes/Service": "kubernetes_service",
15+
"Kubernetes/ConfigMap": "kubernetes_config_map",
16+
"Kubernetes/ServiceAccount": "kubernetes_service_account",
17+
"Kubernetes/StatefulSet": "kubernetes_stateful_set",
18+
"Kubernetes/Deployment": "kubernetes_deployment",
19+
"Kubernetes/ReplicaSet": "kubernetes_replicaset",
20+
"Kubernetes/DaemonSet": "kubernetes_daemonset",
21+
"Kubernetes/Endpoint": "kubernetes_endpoints",
22+
"Kubernetes/EndpointSlice": "kubernetes_endpoint_slice",
23+
"Kubernetes/Event": "kubernetes_event",
24+
"Kubernetes/Job": "kubernetes_job",
25+
"Kubernetes/CronJob": "kubernetes_cronjob",
26+
"Kubernetes/Ingress": "kubernetes_ingress",
27+
"Kubernetes/NetworkPolicy": "kubernetes_network_policy",
28+
"Kubernetes/Role": "kubernetes_role",
29+
"Kubernetes/RoleBinding": "kubernetes_role_binding",
30+
"Kubernetes/Cluster": "kubernetes_cluster",
31+
"Kubernetes/ClusterRole": "kubernetes_cluster_role",
32+
"Kubernetes/ClusterRoleBinding": "kubernetes_cluster_role_binding",
33+
"Kubernetes/PodDisruptionBudget": "kubernetes_pod_disruption_budget",
34+
"Kubernetes/PodTemplate": "kubernetes_pod_template",
35+
"Kubernetes/HorizontalPodAutoscaler": "kubernetes_horizontal_pod_autoscaler",
36+
"Kubernetes/CustomResourceDefinition": "kubernetes_custom_resource_definition",
37+
"Kubernetes/CustomResource": "kubernetes_custom_resource",
38+
"Kubernetes/StorageClass": "kubernetes_storage_class",
39+
"Kubernetes/LimitRange": "kubernetes_limit_range",
40+
"Kubernetes/Namespace": "kubernetes_namespace",
41+
"Kubernetes/ReplicationController": "kubernetes_replication_controller",
42+
"Kubernetes/RessourceQuota": "kubernetes_resource_quota",
4343
}
4444

4545
var ResourceTypeToDescription = map[string]interface{}{
46-
"Kubernetes/Resource": opengovernance.KubernetesResource{},
47-
"Kubernetes/Node": opengovernance.KubernetesNode{},
48-
"Kubernetes/PersistentVolume": opengovernance.KubernetesPersistentVolume{},
49-
"Kubernetes/PersistentVolumeClaim": opengovernance.KubernetesPersistentVolumeClaim{},
50-
"Kubernetes/Pod": opengovernance.KubernetesPod{},
51-
"Kubernetes/Secret": opengovernance.KubernetesSecret{},
52-
"Kubernetes/Service": opengovernance.KubernetesService{},
53-
"Kubernetes/ConfigMap": opengovernance.KubernetesConfigMap{},
54-
"Kubernetes/ServiceAccount": opengovernance.KubernetesServiceAccount{},
55-
"Kubernetes/StatefulSet": opengovernance.KubernetesStatefulSet{},
56-
"Kubernetes/Deployment": opengovernance.KubernetesDeployment{},
57-
"Kubernetes/ReplicaSet": opengovernance.KubernetesReplicaSet{},
58-
"Kubernetes/DaemonSet": opengovernance.KubernetesDaemonSet{},
59-
"Kubernetes/Endpoint": opengovernance.KubernetesEndpoint{},
60-
"Kubernetes/EndpointSlice": opengovernance.KubernetesEndpointSlice{},
61-
"Kubernetes/Event": opengovernance.KubernetesEvent{},
62-
"Kubernetes/Job": opengovernance.KubernetesJob{},
63-
"Kubernetes/CronJob": opengovernance.KubernetesCronJob{},
64-
"Kubernetes/Ingress": opengovernance.KubernetesIngress{},
65-
"Kubernetes/NetworkPolicy": opengovernance.KubernetesNetworkPolicy{},
66-
"Kubernetes/Role": opengovernance.KubernetesRole{},
67-
"Kubernetes/RoleBinding": opengovernance.KubernetesRoleBinding{},
68-
"Kubernetes/Cluster": opengovernance.KubernetesCluster{},
69-
"Kubernetes/ClusterRole": opengovernance.KubernetesClusterRole{},
70-
"Kubernetes/ClusterRoleBinding": opengovernance.KubernetesClusterRoleBinding{},
71-
"Kubernetes/PodDisruptionBudget": opengovernance.KubernetesPodDisruptionBudget{},
72-
"Kubernetes/PodTemplate": opengovernance.KubernetesPodTemplate{},
73-
"Kubernetes/HorizontalPodAutoscaler": opengovernance.KubernetesHorizontalPodAutoscaler{},
74-
"Kubernetes/CustomResourceDefinition": opengovernance.KubernetesCustomResourceDefinition{},
75-
"Kubernetes/CustomResource": opengovernance.KubernetesCustomResource{},
76-
"Kubernetes/StorageClass": opengovernance.KubernetesStorageClass{},
77-
"Kubernetes/LimitRange": opengovernance.KubernetesLimitRange{},
78-
"Kubernetes/Namespace": opengovernance.KubernetesNamespace{},
79-
"Kubernetes/ReplicationController": opengovernance.KubernetesReplicationController{},
80-
"Kubernetes/RessourceQuota": opengovernance.KubernetesResourceQuota{},
46+
"Kubernetes/Resource": opengovernance.KubernetesResource{},
47+
"Kubernetes/Node": opengovernance.KubernetesNode{},
48+
"Kubernetes/PersistentVolume": opengovernance.KubernetesPersistentVolume{},
49+
"Kubernetes/PersistentVolumeClaim": opengovernance.KubernetesPersistentVolumeClaim{},
50+
"Kubernetes/Pod": opengovernance.KubernetesPod{},
51+
"Kubernetes/Secret": opengovernance.KubernetesSecret{},
52+
"Kubernetes/Service": opengovernance.KubernetesService{},
53+
"Kubernetes/ConfigMap": opengovernance.KubernetesConfigMap{},
54+
"Kubernetes/ServiceAccount": opengovernance.KubernetesServiceAccount{},
55+
"Kubernetes/StatefulSet": opengovernance.KubernetesStatefulSet{},
56+
"Kubernetes/Deployment": opengovernance.KubernetesDeployment{},
57+
"Kubernetes/ReplicaSet": opengovernance.KubernetesReplicaSet{},
58+
"Kubernetes/DaemonSet": opengovernance.KubernetesDaemonSet{},
59+
"Kubernetes/Endpoint": opengovernance.KubernetesEndpoint{},
60+
"Kubernetes/EndpointSlice": opengovernance.KubernetesEndpointSlice{},
61+
"Kubernetes/Event": opengovernance.KubernetesEvent{},
62+
"Kubernetes/Job": opengovernance.KubernetesJob{},
63+
"Kubernetes/CronJob": opengovernance.KubernetesCronJob{},
64+
"Kubernetes/Ingress": opengovernance.KubernetesIngress{},
65+
"Kubernetes/NetworkPolicy": opengovernance.KubernetesNetworkPolicy{},
66+
"Kubernetes/Role": opengovernance.KubernetesRole{},
67+
"Kubernetes/RoleBinding": opengovernance.KubernetesRoleBinding{},
68+
"Kubernetes/Cluster": opengovernance.KubernetesCluster{},
69+
"Kubernetes/ClusterRole": opengovernance.KubernetesClusterRole{},
70+
"Kubernetes/ClusterRoleBinding": opengovernance.KubernetesClusterRoleBinding{},
71+
"Kubernetes/PodDisruptionBudget": opengovernance.KubernetesPodDisruptionBudget{},
72+
"Kubernetes/PodTemplate": opengovernance.KubernetesPodTemplate{},
73+
"Kubernetes/HorizontalPodAutoscaler": opengovernance.KubernetesHorizontalPodAutoscaler{},
74+
"Kubernetes/CustomResourceDefinition": opengovernance.KubernetesCustomResourceDefinition{},
75+
"Kubernetes/CustomResource": opengovernance.KubernetesCustomResource{},
76+
"Kubernetes/StorageClass": opengovernance.KubernetesStorageClass{},
77+
"Kubernetes/LimitRange": opengovernance.KubernetesLimitRange{},
78+
"Kubernetes/Namespace": opengovernance.KubernetesNamespace{},
79+
"Kubernetes/ReplicationController": opengovernance.KubernetesReplicationController{},
80+
"Kubernetes/RessourceQuota": opengovernance.KubernetesResourceQuota{},
8181
}
8282

8383
var TablesToResourceTypes = map[string]string{
84-
"k8_resource": "Kubernetes/Resource",
85-
"k8_node": "Kubernetes/Node",
86-
"k8_persistent_volume": "Kubernetes/PersistentVolume",
87-
"k8_persistent_volume_claim": "Kubernetes/PersistentVolumeClaim",
88-
"k8_pod": "Kubernetes/Pod",
89-
"k8_secret": "Kubernetes/Secret",
90-
"k8_service": "Kubernetes/Service",
91-
"k8_config_map": "Kubernetes/ConfigMap",
92-
"k8_service_account": "Kubernetes/ServiceAccount",
93-
"k8_stateful_set": "Kubernetes/StatefulSet",
94-
"k8_deployment": "Kubernetes/Deployment",
95-
"k8_replicaset": "Kubernetes/ReplicaSet",
96-
"k8_daemonset": "Kubernetes/DaemonSet",
97-
"k8_endpoints": "Kubernetes/Endpoint",
98-
"k8_endpoint_slice": "Kubernetes/EndpointSlice",
99-
"k8_event": "Kubernetes/Event",
100-
"k8_job": "Kubernetes/Job",
101-
"k8_cronjob": "Kubernetes/CronJob",
102-
"k8_ingress": "Kubernetes/Ingress",
103-
"k8_network_policy": "Kubernetes/NetworkPolicy",
104-
"k8_role": "Kubernetes/Role",
105-
"k8_role_binding": "Kubernetes/RoleBinding",
106-
"k8_cluster": "Kubernetes/Cluster",
107-
"k8_cluster_role": "Kubernetes/ClusterRole",
108-
"k8_cluster_role_binding": "Kubernetes/ClusterRoleBinding",
109-
"k8_pod_disruption_budget": "Kubernetes/PodDisruptionBudget",
110-
"k8_pod_template": "Kubernetes/PodTemplate",
111-
"k8_horizontal_pod_autoscaler": "Kubernetes/HorizontalPodAutoscaler",
112-
"k8_custom_resource_definition": "Kubernetes/CustomResourceDefinition",
113-
"k8_custom_resource": "Kubernetes/CustomResource",
114-
"k8_storage_class": "Kubernetes/StorageClass",
115-
"k8_limit_range": "Kubernetes/LimitRange",
116-
"k8_namespace": "Kubernetes/Namespace",
117-
"k8_replication_controller": "Kubernetes/ReplicationController",
118-
"k8_resource_quota": "Kubernetes/RessourceQuota",
84+
"kubernetes_resource": "Kubernetes/Resource",
85+
"kubernetes_node": "Kubernetes/Node",
86+
"kubernetes_persistent_volume": "Kubernetes/PersistentVolume",
87+
"kubernetes_persistent_volume_claim": "Kubernetes/PersistentVolumeClaim",
88+
"kubernetes_pod": "Kubernetes/Pod",
89+
"kubernetes_secret": "Kubernetes/Secret",
90+
"kubernetes_service": "Kubernetes/Service",
91+
"kubernetes_config_map": "Kubernetes/ConfigMap",
92+
"kubernetes_service_account": "Kubernetes/ServiceAccount",
93+
"kubernetes_stateful_set": "Kubernetes/StatefulSet",
94+
"kubernetes_deployment": "Kubernetes/Deployment",
95+
"kubernetes_replicaset": "Kubernetes/ReplicaSet",
96+
"kubernetes_daemonset": "Kubernetes/DaemonSet",
97+
"kubernetes_endpoints": "Kubernetes/Endpoint",
98+
"kubernetes_endpoint_slice": "Kubernetes/EndpointSlice",
99+
"kubernetes_event": "Kubernetes/Event",
100+
"kubernetes_job": "Kubernetes/Job",
101+
"kubernetes_cronjob": "Kubernetes/CronJob",
102+
"kubernetes_ingress": "Kubernetes/Ingress",
103+
"kubernetes_network_policy": "Kubernetes/NetworkPolicy",
104+
"kubernetes_role": "Kubernetes/Role",
105+
"kubernetes_role_binding": "Kubernetes/RoleBinding",
106+
"kubernetes_cluster": "Kubernetes/Cluster",
107+
"kubernetes_cluster_role": "Kubernetes/ClusterRole",
108+
"kubernetes_cluster_role_binding": "Kubernetes/ClusterRoleBinding",
109+
"kubernetes_pod_disruption_budget": "Kubernetes/PodDisruptionBudget",
110+
"kubernetes_pod_template": "Kubernetes/PodTemplate",
111+
"kubernetes_horizontal_pod_autoscaler": "Kubernetes/HorizontalPodAutoscaler",
112+
"kubernetes_custom_resource_definition": "Kubernetes/CustomResourceDefinition",
113+
"kubernetes_custom_resource": "Kubernetes/CustomResource",
114+
"kubernetes_storage_class": "Kubernetes/StorageClass",
115+
"kubernetes_limit_range": "Kubernetes/LimitRange",
116+
"kubernetes_namespace": "Kubernetes/Namespace",
117+
"kubernetes_replication_controller": "Kubernetes/ReplicationController",
118+
"kubernetes_resource_quota": "Kubernetes/RessourceQuota",
119119
}

0 commit comments

Comments
 (0)