chore: refactor

Author: dareste

internal/data_collector/data_collector.go

@@ -0,0 +1,49 @@
+package data_collector
+
+import (
+	"fmt"
+	helmClient "github.com/mittwald/go-helm-client"
+	crdClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
+	metricsClient "k8s.io/metrics/pkg/client/clientset/versioned"
+	"os"
+)
+
+type DataCollector struct {
+	BaseDir             string
+	Namespaces []string
+	K8sCoreClientSet    *kubernetes.Clientset
+	K8sCrdClientSet     *crdClient.Clientset
+	K8sMetricsClientSet *metricsClient.Clientset
+	K8sHelmClientSet    helmClient.Client
+}
+
+func NewDataCollector(config *rest.Config, namespaces... string) *DataCollector {
+
+	tmpDir, err := os.MkdirTemp("", "kic-diag")
+
+	if err != nil {
+		panic(fmt.Sprintf("%s: Unable to create temporary directory.\n", err))
+	}
+
+	dc := DataCollector{
+		BaseDir: tmpDir,
+		Namespaces : namespaces,
+	}
+
+	//Initialize clients
+	dc.K8sCoreClientSet, _ = kubernetes.NewForConfig(config)
+	dc.K8sCrdClientSet, _ = crdClient.NewForConfig(config)
+	dc.K8sMetricsClientSet, _ = metricsClient.NewForConfig(config)
+	dc.K8sHelmClientSet, _ = helmClient.NewClientFromRestConf(&helmClient.RestConfClientOptions{
+		Options:    &helmClient.Options{},
+		RestConfig: config,
+	})
+
+	return &dc
+}
+
+func (c *DataCollector) WrapUp() {
+	os.RemoveAll(c.BaseDir)
+}

internal/jobs/helm_job.go

@@ -2,67 +2,28 @@ package jobs
 
 import (
 	"context"
-	crdClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	"k8s.io/client-go/kubernetes"
-	metricsClient "k8s.io/metrics/pkg/client/clientset/versioned"
+	"github.com/nginxinc/kubectl-kic-supportpkg/internal/data_collector"
 	"os"
 	"path"
 	"time"
 )
 
 type Job struct {
-	Name             string
-	OutputFile       string
-	RetrieveFunction func(*kubernetes.Clientset, context.Context) []byte
+	Name    string
+	Global  bool
+	Execute func(dc *data_collector.DataCollector, ctx context.Context) map[string][]byte
 }
 
-type CustomJob struct {
-	Name             string
-	OutputFile       string
-	RetrieveFunction func(*crdClient.Clientset, context.Context) []byte
-}
-
-type MetricsJob struct {
-	Name             string
-	OutputFile       string
-	RetrieveFunction func(*metricsClient.Clientset, context.Context) []byte
-}
-
-func (j Job) Collect(baseFolder string, cs *kubernetes.Clientset) {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-	result := j.RetrieveFunction(cs, ctx)
-
-	fullPathFile := path.Join(baseFolder, j.OutputFile)
-	os.MkdirAll(path.Dir(fullPathFile), os.ModePerm)
-
-	file, _ := os.Create(fullPathFile)
-	defer file.Close()
-	_, _ = file.Write(result)
-}
-
-func (j CustomJob) CustomCollect(baseFolder string, cs *crdClient.Clientset) {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-	result := j.RetrieveFunction(cs, ctx)
-
-	fullPathFile := path.Join(baseFolder, j.OutputFile)
-	os.MkdirAll(path.Dir(fullPathFile), os.ModePerm)
-
-	file, _ := os.Create(fullPathFile)
-	defer file.Close()
-	_, _ = file.Write(result)
-}
-
-func (j MetricsJob) MetricsCollect(baseFolder string, cs *metricsClient.Clientset) {
+func (j Job) Collect(dc *data_collector.DataCollector) {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	result := j.RetrieveFunction(cs, ctx)
 
-	fullPathFile := path.Join(baseFolder, j.OutputFile)
-	os.MkdirAll(path.Dir(fullPathFile), os.ModePerm)
+	jobResults := j.Execute(dc, ctx)
 
-	file, _ := os.Create(fullPathFile)
-	defer file.Close()
-	_, _ = file.Write(result)
+	for fileName, fileValue := range jobResults {
+		os.MkdirAll(path.Dir(fileName), os.ModePerm)
+		file, _ := os.Create(fileName)
+		_, _ = file.Write(fileValue)
+		file.Close()
+	}
 }