fix: fixed method naming. introduced setting of kind becuase it is mi…

…ssing in api responses by design.
mogenius · Apr 3, 2024 · 8cd256d · 8cd256d
1 parent 1793586
commit 8cd256d
Show file tree

Hide file tree

Showing 36 changed files with 645 additions and 73 deletions.
diff --git a/kubernetes/certificates.go b/kubernetes/certificates.go
@@ -27,6 +27,7 @@ func AllCertificates(namespaceName string, contextId *string) []cmapi.Certificat
 
 	for _, certificate := range certificatesList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, certificate.ObjectMeta.Namespace) {
+			certificate.Kind = "Certificate"
 			result = append(result, certificate)
 		}
 	}
@@ -61,6 +62,7 @@ func AllK8sCertificates(namespaceName string, contextId *string) utils.K8sWorklo
 
 	for _, certificate := range certificatesList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, certificate.ObjectMeta.Namespace) {
+			certificate.Kind = "Certificate"
 			result = append(result, certificate)
 		}
 	}

diff --git a/kubernetes/cluster-role-bindings.go b/kubernetes/cluster-role-bindings.go
@@ -10,7 +10,29 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func AllClusterRoleBindings(contextId *string) utils.K8sWorkloadResult {
+func AllClusterRoleBindings(contextId *string) []v1.ClusterRoleBinding {
+	result := []v1.ClusterRoleBinding{}
+
+	provider, err := NewKubeProvider(contextId)
+	if err != nil {
+		return result
+	}
+	rolesList, err := provider.ClientSet.RbacV1().ClusterRoleBindings().List(context.TODO(), metav1.ListOptions{})
+	if err != nil {
+		logger.Log.Errorf("AllClusterRoleBindings ERROR: %s", err.Error())
+		return result
+	}
+
+	for _, role := range rolesList.Items {
+		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, role.ObjectMeta.Namespace) {
+			role.Kind = "ClusterRoleBinding"
+			result = append(result, role)
+		}
+	}
+	return result
+}
+
+func AllK8sClusterRoleBindings(contextId *string) utils.K8sWorkloadResult {
 	result := []v1.ClusterRoleBinding{}
 
 	provider, err := NewKubeProvider(contextId)
@@ -25,6 +47,7 @@ func AllClusterRoleBindings(contextId *string) utils.K8sWorkloadResult {
 
 	for _, role := range rolesList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, role.ObjectMeta.Namespace) {
+			role.Kind = "ClusterRoleBinding"
 			result = append(result, role)
 		}
 	}

diff --git a/kubernetes/cluster-roles.go b/kubernetes/cluster-roles.go
@@ -13,7 +13,29 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func AllClusterRoles(contextId *string) utils.K8sWorkloadResult {
+func AllClusterRoles(contextId *string) []v1.ClusterRole {
+	result := []v1.ClusterRole{}
+
+	provider, err := NewKubeProvider(contextId)
+	if err != nil {
+		return result
+	}
+	rolesList, err := provider.ClientSet.RbacV1().ClusterRoles().List(context.TODO(), metav1.ListOptions{})
+	if err != nil {
+		logger.Log.Errorf("AllClusterRoles ERROR: %s", err.Error())
+		return result
+	}
+
+	for _, role := range rolesList.Items {
+		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, role.ObjectMeta.Namespace) {
+			role.Kind = "ClusterRole"
+			result = append(result, role)
+		}
+	}
+	return result
+}
+
+func AllK8sClusterRoles(contextId *string) utils.K8sWorkloadResult {
 	result := []v1.ClusterRole{}
 
 	provider, err := NewKubeProvider(contextId)
@@ -28,6 +50,7 @@ func AllClusterRoles(contextId *string) utils.K8sWorkloadResult {
 
 	for _, role := range rolesList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, role.ObjectMeta.Namespace) {
+			role.Kind = "ClusterRole"
 			result = append(result, role)
 		}
 	}

diff --git a/kubernetes/clusterIssuer.go b/kubernetes/clusterIssuer.go
@@ -12,7 +12,29 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func AllClusterIssuers(contextId *string) utils.K8sWorkloadResult {
+func AllClusterIssuers(contextId *string) []cmapi.ClusterIssuer {
+	result := []cmapi.ClusterIssuer{}
+
+	provider, err := NewKubeProviderCertManager(contextId)
+	if err != nil {
+		return result
+	}
+	issuersList, err := provider.ClientSet.CertmanagerV1().ClusterIssuers().List(context.TODO(), metav1.ListOptions{})
+	if err != nil {
+		logger.Log.Errorf("AllIssuer ERROR: %s", err.Error())
+		return result
+	}
+
+	for _, issuer := range issuersList.Items {
+		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, issuer.ObjectMeta.Namespace) {
+			issuer.Kind = "ClusterIssuer"
+			result = append(result, issuer)
+		}
+	}
+	return result
+}
+
+func AllK8sClusterIssuers(contextId *string) utils.K8sWorkloadResult {
 	result := []cmapi.ClusterIssuer{}
 
 	provider, err := NewKubeProviderCertManager(contextId)
@@ -27,6 +49,7 @@ func AllClusterIssuers(contextId *string) utils.K8sWorkloadResult {
 
 	for _, issuer := range issuersList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, issuer.ObjectMeta.Namespace) {
+			issuer.Kind = "ClusterIssuer"
 			result = append(result, issuer)
 		}
 	}

diff --git a/kubernetes/configmap.go b/kubernetes/configmap.go
@@ -43,6 +43,7 @@ func AllConfigmaps(namespaceName string, contextId *string) []v1.ConfigMap {
 
 	for _, configmap := range configmapList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, configmap.ObjectMeta.Namespace) {
+			configmap.Kind = "ConfigMap"
 			result = append(result, configmap)
 		}
 	}
@@ -64,6 +65,7 @@ func AllK8sConfigmaps(namespaceName string, contextId *string) utils.K8sWorkload
 
 	for _, configmap := range configmapList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, configmap.ObjectMeta.Namespace) {
+			configmap.Kind = "ConfigMap"
 			result = append(result, configmap)
 		}
 	}

diff --git a/kubernetes/cronjobs.go b/kubernetes/cronjobs.go
@@ -12,7 +12,29 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func AllCronjobs(namespaceName string, contextId *string) utils.K8sWorkloadResult {
+func AllCronjobs(namespaceName string, contextId *string) []v1.CronJob {
+	result := []v1.CronJob{}
+
+	provider, err := NewKubeProvider(contextId)
+	if err != nil {
+		return result
+	}
+	cronJobList, err := provider.ClientSet.BatchV1().CronJobs(namespaceName).List(context.TODO(), metav1.ListOptions{FieldSelector: "metadata.namespace!=kube-system"})
+	if err != nil {
+		logger.Log.Errorf("AllCronjobs ERROR: %s", err.Error())
+		return result
+	}
+
+	for _, cronJob := range cronJobList.Items {
+		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, cronJob.ObjectMeta.Namespace) {
+			cronJob.Kind = "CronJob"
+			result = append(result, cronJob)
+		}
+	}
+	return result
+}
+
+func AllK8sCronjobs(namespaceName string, contextId *string) utils.K8sWorkloadResult {
 	result := []v1.CronJob{}
 
 	provider, err := NewKubeProvider(contextId)
@@ -27,6 +49,7 @@ func AllCronjobs(namespaceName string, contextId *string) utils.K8sWorkloadResul
 
 	for _, cronJob := range cronJobList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, cronJob.ObjectMeta.Namespace) {
+			cronJob.Kind = "CronJob"
 			result = append(result, cronJob)
 		}
 	}

diff --git a/kubernetes/csr.go b/kubernetes/csr.go
@@ -12,7 +12,29 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func AllCertificateSigningRequests(namespaceName string, contextId *string) utils.K8sWorkloadResult {
+func AllCertificateSigningRequests(namespaceName string, contextId *string) []cmapi.CertificateRequest {
+	result := []cmapi.CertificateRequest{}
+
+	provider, err := NewKubeProviderCertManager(contextId)
+	if err != nil {
+		return result
+	}
+	certificatesList, err := provider.ClientSet.CertmanagerV1().CertificateRequests(namespaceName).List(context.TODO(), metav1.ListOptions{FieldSelector: "metadata.namespace!=kube-system"})
+	if err != nil {
+		logger.Log.Errorf("AllCertificateSigningRequests ERROR: %s", err.Error())
+		return result
+	}
+
+	for _, certificate := range certificatesList.Items {
+		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, certificate.ObjectMeta.Namespace) {
+			certificate.Kind = "CertificateSigningRequest"
+			result = append(result, certificate)
+		}
+	}
+	return result
+}
+
+func AllK8sCertificateSigningRequests(namespaceName string, contextId *string) utils.K8sWorkloadResult {
 	result := []cmapi.CertificateRequest{}
 
 	provider, err := NewKubeProviderCertManager(contextId)
@@ -27,6 +49,7 @@ func AllCertificateSigningRequests(namespaceName string, contextId *string) util
 
 	for _, certificate := range certificatesList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, certificate.ObjectMeta.Namespace) {
+			certificate.Kind = "CertificateSigningRequest"
 			result = append(result, certificate)
 		}
 	}

diff --git a/kubernetes/daemonsets.go b/kubernetes/daemonsets.go
@@ -27,6 +27,7 @@ func AllDaemonsets(namespaceName string, contextId *string) []v1.DaemonSet {
 
 	for _, daemonset := range daemonsetList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, daemonset.ObjectMeta.Namespace) {
+			daemonset.Kind = "DaemonSet"
 			result = append(result, daemonset)
 		}
 	}
@@ -48,6 +49,7 @@ func AllK8sDaemonsets(namespaceName string, contextId *string) utils.K8sWorkload
 
 	for _, daemonset := range daemonsetList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, daemonset.ObjectMeta.Namespace) {
+			daemonset.Kind = "DaemonSet"
 			result = append(result, daemonset)
 		}
 	}

diff --git a/kubernetes/deployment.go b/kubernetes/deployment.go
@@ -33,17 +33,23 @@ func AllDeployments(namespaceName string, contextId *string) []v1.Deployment {
 }
 
 func AllDeploymentsIncludeIgnored(namespaceName string, contextId *string) []v1.Deployment {
+	result := []v1.Deployment{}
 	provider, err := NewKubeProvider(contextId)
 	if err != nil {
-		return []v1.Deployment{}
+		return result
 	}
 	deploymentList, err := provider.ClientSet.AppsV1().Deployments(namespaceName).List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
 		logger.Log.Errorf("AllDeployments ERROR: %s", err.Error())
-		return deploymentList.Items
+		return result
 	}
 
-	return deploymentList.Items
+	for _, deployment := range deploymentList.Items {
+		deployment.Kind = "Deployment"
+		result = append(result, deployment)
+	}
+
+	return result
 }
 
 func AllK8sDeployments(namespaceName string, contextId *string) utils.K8sWorkloadResult {
@@ -61,6 +67,7 @@ func AllK8sDeployments(namespaceName string, contextId *string) utils.K8sWorkloa
 
 	for _, deployment := range deploymentList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, deployment.ObjectMeta.Namespace) {
+			deployment.Kind = "Deployment"
 			result = append(result, deployment)
 		}
 	}

diff --git a/kubernetes/endpoints.go b/kubernetes/endpoints.go
@@ -11,22 +11,45 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func AllEndpoints(namespaceName string, contextId *string) utils.K8sWorkloadResult {
+func AllEndpoints(namespaceName string, contextId *string) []corev1.Endpoints {
+	result := []corev1.Endpoints{}
+
+	provider, err := NewKubeProvider(contextId)
+	if err != nil {
+		return result
+	}
+	endpointList, err := provider.ClientSet.CoreV1().Endpoints(namespaceName).List(context.TODO(), metav1.ListOptions{FieldSelector: "metadata.namespace!=kube-system"})
+	if err != nil {
+		logger.Log.Errorf("AllEndpoints ERROR: %s", err.Error())
+		return result
+	}
+
+	for _, endpoint := range endpointList.Items {
+		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, endpoint.ObjectMeta.Namespace) {
+			endpoint.Kind = "Endpoints"
+			result = append(result, endpoint)
+		}
+	}
+	return result
+}
+
+func AllK8sEndpoints(namespaceName string, contextId *string) utils.K8sWorkloadResult {
 	result := []corev1.Endpoints{}
 
 	provider, err := NewKubeProvider(contextId)
 	if err != nil {
 		return WorkloadResult(nil, err)
 	}
-	hpaList, err := provider.ClientSet.CoreV1().Endpoints(namespaceName).List(context.TODO(), metav1.ListOptions{FieldSelector: "metadata.namespace!=kube-system"})
+	endpointList, err := provider.ClientSet.CoreV1().Endpoints(namespaceName).List(context.TODO(), metav1.ListOptions{FieldSelector: "metadata.namespace!=kube-system"})
 	if err != nil {
-		logger.Log.Errorf("AllHpas ERROR: %s", err.Error())
+		logger.Log.Errorf("AllEndpoints ERROR: %s", err.Error())
 		return WorkloadResult(nil, err)
 	}
 
-	for _, hpa := range hpaList.Items {
-		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, hpa.ObjectMeta.Namespace) {
-			result = append(result, hpa)
+	for _, endpoint := range endpointList.Items {
+		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, endpoint.ObjectMeta.Namespace) {
+			endpoint.Kind = "Endpoints"
+			result = append(result, endpoint)
 		}
 	}
 	return WorkloadResult(result, nil)

diff --git a/kubernetes/events.go b/kubernetes/events.go
@@ -11,7 +11,29 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func AllEvents(namespaceName string, contextId *string) utils.K8sWorkloadResult {
+func AllEvents(namespaceName string, contextId *string) []v1Core.Event {
+	result := []v1Core.Event{}
+
+	provider, err := NewKubeProvider(contextId)
+	if err != nil {
+		return result
+	}
+	eventList, err := provider.ClientSet.CoreV1().Events(namespaceName).List(context.TODO(), metav1.ListOptions{FieldSelector: "metadata.namespace!=kube-system"})
+	if err != nil {
+		logger.Log.Errorf("AllEvents ERROR: %s", err.Error())
+		return result
+	}
+
+	for _, event := range eventList.Items {
+		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, event.ObjectMeta.Namespace) {
+			event.Kind = "Event"
+			result = append(result, event)
+		}
+	}
+	return result
+}
+
+func AllK8sEvents(namespaceName string, contextId *string) utils.K8sWorkloadResult {
 	result := []v1Core.Event{}
 
 	provider, err := NewKubeProvider(contextId)
@@ -26,6 +48,7 @@ func AllEvents(namespaceName string, contextId *string) utils.K8sWorkloadResult
 
 	for _, event := range eventList.Items {
 		if !utils.Contains(utils.CONFIG.Misc.IgnoreNamespaces, event.ObjectMeta.Namespace) {
+			event.Kind = "Event"
 			result = append(result, event)
 		}
 	}